3 files changed, 30 insertions, 20 deletions
diff --git a/libraries/libnet/libnet.SlackBuild b/libraries/libnet/libnet.SlackBuild
index e75e8d4f67..ef7f126897 100644
--- a/libraries/libnet/libnet.SlackBuild
+++ b/libraries/libnet/libnet.SlackBuild
@@ -8,7 +8,7 @@
 # - remove CVS directories from source tree and miscellaneous script cleanup
 
 PRGNAM=libnet
-VERSION=${VERSION:-1.1.2.1}
+VERSION=${VERSION:-1.1.4}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -20,10 +20,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- elif [ "$ARCH" = "i686" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- elif [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -31,31 +34,38 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM
+cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r,a-s .
-find . -type d -name CVS | sort -r | xargs rm -rf
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
-  ./configure \
+./configure \
   --prefix=/usr \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --enable-static=no \
   --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
 
-cp -a doc/man $PKG/usr/
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
   for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 )
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README VERSION doc/html $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
+cp -a \
+  README doc/{BUGS,CHANGELOG,CONTRIB,COPYING,DESIGN_NOTES,MIGRATION} \
+  doc/{PACKET_BUILDING,PORTED,RAWSOCKET_NON_SEQUITUR,TODO} \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a doc/html/{*.png,*.gif,*.html,*.css} $PKG/usr/doc/$PRGNAM-$VERSION/html
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/libnet/libnet.info b/libraries/libnet/libnet.info
index f311b1c661..bf54785089 100644
--- a/libraries/libnet/libnet.info
+++ b/libraries/libnet/libnet.info
@@ -1,8 +1,8 @@
 PRGNAM="libnet"
-VERSION="1.1.2.1"
-HOMEPAGE="http://www.packetfactory.net/projects/libnet/"
-DOWNLOAD="http://www.packetfactory.net/libnet/dist/libnet-1.1.2.1.tar.gz"
-MD5SUM="be845c41170d72c7db524f3411b50256"
+VERSION="1.1.4"
+HOMEPAGE="http://sourceforge.net/projects/libnet-dev/"
+DOWNLOAD="http://downloads.sourceforge.net/sourceforge/libnet-dev/libnet-1.1.4.tar.gz"
+MD5SUM="c5e06418a89cc4209f677a776a798fd9"
 MAINTAINER="Joe Rozner"
 EMAIL="livinded@deadbytes.net"
 APPROVED="rworkman"
diff --git a/libraries/libnet/slack-desc b/libraries/libnet/slack-desc
index 40e5133be5..ef5bf40cd9 100644
--- a/libraries/libnet/slack-desc
+++ b/libraries/libnet/slack-desc
@@ -7,7 +7,7 @@
 
       |-----handy-ruler----------------------------------------------------|
 libnet: libnet (Packet Construction Library)
-libnet: 
+libnet:
 libnet: Libnet is a high-level API (toolkit) allowing the application
 libnet: programmer to construct and inject network packets. It provides a
 libnet: portable and simplified interface for low-level network packet
@@ -15,5 +15,5 @@ libnet: shaping, handling and injection.
 libnet:
 libnet: http://www.packetfactory.net/projects/libnet/
 libnet:
-libnet: 
-libnet: 
+libnet:
+libnet: