network/arptables: Updated for version 0.0.3

5 files changed, 34 insertions, 23 deletions

diff --git a/network/arptables/README b/network/arptables/README
index 949ba0c9bf64..f0c803b1c35a 100644
--- a/network/arptables/README
+++ b/network/arptables/README
@@ -6,8 +6,6 @@ Currently, only support for specifying hardware addresses for Ethernet
 is available. This tool is not luser-proof: you can specify an Ethernet 
 source address and set hardware length to something different than 6, f.e.
 
-arptables was written by Bart De Schuymer based on code from iptables
-
 Arptables Frequently (and less frequently) Asked Questions:
 http://ebtables.sourceforge.net/arptables-faq.html
 
diff --git a/network/arptables/arptables.SlackBuild b/network/arptables/arptables.SlackBuild
index 397ba76ec3d3..082e176e582d 100644
--- a/network/arptables/arptables.SlackBuild
+++ b/network/arptables/arptables.SlackBuild
@@ -21,10 +21,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e # exit on most errors
@@ -33,7 +36,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-v$VERSION-3
-tar xzvf $CWD/$PRGNAM-v$VERSION-3.tar.gz 
+tar xvf $CWD/$PRGNAM-v$VERSION-3.tar.gz 
 cd $PRGNAM-v$VERSION-3 
 
 chown -R root:root .
@@ -43,18 +46,20 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
   -o -perm 400 \) -exec chmod 644 {} \;
 
-# Configure and build
-sed -i -e "s/^\(COPT_FLAGS:=\).*/\1$SLKCFLAGS/" \
-       -e "s#^\(PREFIX:=\).*#\1/usr#" Makefile
-
 mkdir -p $PKG/usr/{man,sbin}
 mkdir -p $PKG/etc/{sysconfig,rc.d/init.d}
 
-make
+make \
+  COPT_FLAGS="$SLKCFLAGS" \
+  PREFIX=/usr \
+  BINDIR=/usr/sbin \
+  SYSCONFIGDIR=/etc
 
-BINDIR=/usr/sbin \
-SYSCONFIGDIR=/etc \
-make install DESTDIR=$PKG
+make install \
+  PREFIX=/usr \
+  BINDIR=/usr/sbin \
+  SYSCONFIGDIR=/etc \
+  DESTDIR=$PKG
 
 # Move the init script to .new and let doinst.sh handle it
 ( cd $PKG/etc/rc.d/init.d
@@ -83,4 +88,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/arptables/arptables.info b/network/arptables/arptables.info
index 152810990402..29219239d8ba 100644
--- a/network/arptables/arptables.info
+++ b/network/arptables/arptables.info
@@ -3,6 +3,8 @@ VERSION="0.0.3"
 HOMEPAGE="http://ebtables.sourceforge.net/"
 DOWNLOAD="http://downloads.sourceforge.net/ebtables/arptables-v0.0.3-3.tar.gz"
 MD5SUM="3f4a8b62920a46d746ab892be7de088f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Menno E. Duursma"
 EMAIL="druiloor@zonnet.nl"
-APPROVED="David Somero"
+APPROVED="dsomero,rworkman"
diff --git a/network/arptables/doinst.sh b/network/arptables/doinst.sh
index e2d05cefb50b..e2658e2fe1f4 100644
--- a/network/arptables/doinst.sh
+++ b/network/arptables/doinst.sh
@@ -1,5 +1,3 @@
-PRGNAM=arptables
-
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
@@ -14,18 +12,18 @@ config() {
 }
 
 # Keep same permissions on rc files:
-if [ -e etc/rc.d/init.d/$PRGNAM ]; then
-  cp -a etc/rc.d/init.d/$PRGNAM etc/rc.d/init.d/$PRGNAM.new.incoming
-  cat etc/rc.d/init.d/$PRGNAM.new > etc/rc.d/init.d/$PRGNAM.new.incoming
-  mv etc/rc.d/init.d/$PRGNAM.new.incoming etc/rc.d/init.d/$PRGNAM.new
+if [ -e etc/rc.d/init.d/arptables ]; then
+  cp -a etc/rc.d/init.d/arptables etc/rc.d/init.d/arptables.new.incoming
+  cat etc/rc.d/init.d/arptables.new > etc/rc.d/init.d/arptables.new.incoming
+  mv etc/rc.d/init.d/arptables.new.incoming etc/rc.d/init.d/arptables.new
 fi
-config etc/rc.d/init.d/$PRGNAM.new
+config etc/rc.d/init.d/arptables.new
 
 # Make sure we have the sysv-style configs
 if [ ! -e etc/sysconfig/network ]; then
   touch etc/sysconfig/network
 fi
-if [ ! -e etc/sysconfig/$PRGNAM ]; then
-  touch etc/sysconfig/$PRGNAM
+if [ ! -e etc/sysconfig/arptables ]; then
+  touch etc/sysconfig/arptables
 fi
 
diff --git a/network/arptables/slack-desc b/network/arptables/slack-desc
index 6e42b83dc719..46fdfca71498 100644
--- a/network/arptables/slack-desc
+++ b/network/arptables/slack-desc
@@ -1,3 +1,11 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+         |-----handy-ruler------------------------------------------------------|
 arptables: arptables (ARP filter table administration)
 arptables:
 arptables: arptables is a user space tool used to set up and maintain
@@ -6,6 +14,6 @@ arptables:
 arptables: Only support for specifying hardware addresses for
 arptables: Ethernet is currently available.
 arptables:
-arptables: arptables was written by Bart De Schuymer
+arptables:
 arptables:
 arptables: