1 files changed, 23 insertions, 24 deletions

diff --git a/source.local/l/libpcap/libpcap.SlackBuild b/source.local/l/libpcap/libpcap.SlackBuild
index 5069b2c..68fe8d0 100755
--- a/source.local/l/libpcap/libpcap.SlackBuild
+++ b/source.local/l/libpcap/libpcap.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,27 +24,30 @@
 
 
 PKGNAM=libpcap
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.gz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-1.3.0}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i486 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "x86_64" ]; then
-  LIBDIRSUFFIX="64"
+if [ -e $CWD/machine.conf ]; then
+  . $CWD/machine.conf ]
+elif [ -e /etc/slackbuild/machine.conf ]; then
+  . /etc/slackbuild/machine.conf ]
 else
-  LIBDIRSUFFIX=""
+  # Automatically determine the architecture we're building on:
+  if [ -z "$ARCH" ]; then
+    case "$( uname -m )" in
+      i?86) export ARCH=i486 ;;
+      arm*) export ARCH=arm ;;
+      # Unless $ARCH is already set, use uname -m for all other archs:
+         *) export ARCH=$( uname -m ) ;;
+    esac
+  fi
+  if [ "$ARCH" = "x86_64" ]; then
+    LIBDIRSUFFIX="64"
+  else
+    LIBDIRSUFFIX=""
+  fi
 fi
 
 case "$ARCH" in
@@ -89,13 +92,6 @@ make install DESTDIR=$PKG || exit 1
 
 strip --strip-debug libpcap.so.1.?.?
 
-cp libpcap.so.?.?.? $PKG/usr/lib${LIBDIRSUFFIX}
-( cd $PKG/usr/lib${LIBDIRSUFFIX}
-  ln -sf libpcap.so.1.?.? libpcap.so.1
-  ln -sf libpcap.so.1 libpcap.so.0
-  ln -sf libpcap.so.1 libpcap.so
-)
-
 mkdir -p $PKG/usr/doc/libpcap-$VERSION
 cp -a \
   CHANGES CREDITS INSTALL.txt LICENSE README* TODO VERSION \
@@ -115,6 +111,9 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
   ln -sf pcap_next_ex.3pcap pcap_next.3pcap
   ln -sf pcap_open_offline.3pcap pcap_fopen_offline.3pcap
   ln -sf pcap_setnonblock.3pcap pcap_getnonblock.3pcap
+  ln -sf pcap_findalldevs.3pcap pcap_freealldevs.3pcap
+  ln -sf pcap_free_tstamp_types.3pcap pcap_list_tstamp_types.3pcap
+  ln -sf pcap_free_datalinks.3pcap pcap_list_datalinks.3pcap
 )
 
 # Compress and if needed symlink the man pages: