3 files changed, 19 insertions, 2 deletions
diff --git a/network/arping/README b/network/arping/README
index 4c7e187636..6e6ca93cb2 100644
--- a/network/arping/README
+++ b/network/arping/README
@@ -7,3 +7,6 @@ very useful when you are trying to pick an unused IP for a net to which
 you don't yet have routing.
 
 This requires libnet.
+
+Note: The installed files are called arping2 to avoid conflicts with
+Slackware's arping.
diff --git a/network/arping/arping.SlackBuild b/network/arping/arping.SlackBuild
index 02e9c0e9cd..1021d6dda4 100644
--- a/network/arping/arping.SlackBuild
+++ b/network/arping/arping.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=arping
 VERSION=${VERSION:-2.09}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,12 +69,25 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# We are renameing the installed files arping2 to aviod conflicts with
+# Slackware's iputils arping so lets fix the manpages and scan script.
+sed \
+  -e "s|\(arping\)|\12|g" \
+  -e "s|\(arping\)\(\W\)|\12\2|g" \
+  -e "s|arping2-|arping-|g" \
+  -e "s|(arping2 2.*\.x only)||g" \
+  -i doc/arping.8
+sed \
+  -e "s|\(arping\) |\12 |g" \
+  -i extra/arping-scan-net.sh
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --program-suffix=2 \
   --build=$ARCH-slackware-linux
 
 make
@@ -90,6 +103,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   INSTALL LICENSE README \
   $PKG/usr/doc/$PRGNAM-$VERSION
+install -m644 extra/arping-scan-net.sh $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/arping/arping.info b/network/arping/arping.info
index 4fc4b9882e..4de2211d2c 100644
--- a/network/arping/arping.info
+++ b/network/arping/arping.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Nilton Moura"
 EMAIL="nmoura@nmoura.eti.br"
-APPROVED="rworkman"
+APPROVED="dsomero"