summaryrefslogtreecommitdiff
path: root/net/nprobe
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-05-12 09:19:54 +0000
committerjoerg <joerg@pkgsrc.org>2006-05-12 09:19:54 +0000
commit05367ea72fdf0d89189c774d1275b719e6258bc7 (patch)
tree215c8395048e221217ae7212cead43885669c99b /net/nprobe
parentcbb48755bf593b357ede6c1e85500485445ff33d (diff)
downloadpkgsrc-05367ea72fdf0d89189c774d1275b719e6258bc7.tar.gz
Correct pthread detection in configure. Has libtool, so annotate that.
Update source checksum, I have no idea what changed, but even ftp.netbsd.org doesn't have the old version around. Remove the interactive fetch, since it is normal GPL code and can be fetched directly. Bump revision due to unclear status.
Diffstat (limited to 'net/nprobe')
-rw-r--r--net/nprobe/Makefile6
-rw-r--r--net/nprobe/distinfo8
-rw-r--r--net/nprobe/patches/patch-aa31
3 files changed, 39 insertions, 6 deletions
diff --git a/net/nprobe/Makefile b/net/nprobe/Makefile
index 19137c44cda..46267ea5d4d 100644
--- a/net/nprobe/Makefile
+++ b/net/nprobe/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2006/02/05 23:10:28 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/05/12 09:19:54 joerg Exp $
DISTNAME= nProbe-source-1.3.1
-PKGREVISION= 3
+PKGREVISION= 4
PKGNAME= nprobe-1.3.1
CATEGORIES= net
MASTER_SITES= http://luca.ntop.org/nprobeDownload/
@@ -13,10 +13,10 @@ COMMENT= Monitor a network interface and generate NetFlow data
WRKSRC= ${WRKDIR}/nProbe
GNU_CONFIGURE= YES
+USE_LIBTOOL= yes
USE_TOOLS+= gmake
BUILD_TARGET= nprobe
-INTERACTIVE_STAGE= fetch
INSTALLATION_DIRS= sbin
# Uncomment this to make a demo version of nprobe.
diff --git a/net/nprobe/distinfo b/net/nprobe/distinfo
index 2de821f6dcb..10859d0807d 100644
--- a/net/nprobe/distinfo
+++ b/net/nprobe/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.2 2002/08/07 07:00:54 cjs Exp $
+$NetBSD: distinfo,v 1.3 2006/05/12 09:19:54 joerg Exp $
-SHA1 (nProbe-source-1.3.1.tgz) = defd9120990a0dab979f9472bac9cb9aa3c2e969
-Size (nProbe-source-1.3.1.tgz) = 161478 bytes
+SHA1 (nProbe-source-1.3.1.tgz) = 95e7614999a3db9f1b4c191bc614446da81226d7
+RMD160 (nProbe-source-1.3.1.tgz) = 7d016d06eeb587986240bf77be5252ee51bec360
+Size (nProbe-source-1.3.1.tgz) = 161315 bytes
+SHA1 (patch-aa) = b8d26dae9d0b07a3e941f005a18dfa2b8adb3f6c
diff --git a/net/nprobe/patches/patch-aa b/net/nprobe/patches/patch-aa
new file mode 100644
index 00000000000..faed23d2ac7
--- /dev/null
+++ b/net/nprobe/patches/patch-aa
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.1 2006/05/12 09:19:54 joerg Exp $
+
+--- configure.orig 2006-05-12 09:05:13.000000000 +0000
++++ configure
+@@ -3754,14 +3754,14 @@ EOF
+ ;;
+ esac
+
+-echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
+-echo "configure:3759: checking for pthread_create in -lpthread" >&5
++echo $ac_n "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}""... $ac_c" 1>&6
++echo "configure:3759: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
+ ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+-LIBS="-lpthread $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 3767 "configure"
+ #include "confdefs.h"
+@@ -3795,7 +3795,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
+ #define $ac_tr_lib 1
+ EOF
+
+- LIBS="-lpthread $LIBS"
++ LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+
+ else
+ echo "$ac_t""no" 1>&6