Tue Jul 21 19:17:53 2009 UTC ()
Make it build on DragonFly.


(hasso)
diff -r1.13 -r1.14 pkgsrc/net/ntop/distinfo
diff -r1.16 -r1.17 pkgsrc/net/ntop/patches/patch-ab
cvs diff -r1.13 -r1.14 pkgsrc/net/ntop/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/net/ntop/Attic/distinfo 2009/05/25 09:03:14 1.13
+++ pkgsrc/net/ntop/Attic/distinfo 2009/07/21 19:17:53 1.14
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.13 2009/05/25 09:03:14 adam Exp $ 1$NetBSD: distinfo,v 1.14 2009/07/21 19:17:53 hasso Exp $
2 2
3SHA1 (ntop-3.3.10.tar.gz) = 8c6b5024a99e73241abd1c831f5ea241b67d0dbf 3SHA1 (ntop-3.3.10.tar.gz) = 8c6b5024a99e73241abd1c831f5ea241b67d0dbf
4RMD160 (ntop-3.3.10.tar.gz) = 85e73de0d7db041d12ae8d77a832b6ed199b6f4b 4RMD160 (ntop-3.3.10.tar.gz) = 85e73de0d7db041d12ae8d77a832b6ed199b6f4b
5Size (ntop-3.3.10.tar.gz) = 3235500 bytes 5Size (ntop-3.3.10.tar.gz) = 3235500 bytes
6SHA1 (patch-aa) = 64b2d4cda050cd9b8981b29b0e10d900469d4b7d 6SHA1 (patch-aa) = 64b2d4cda050cd9b8981b29b0e10d900469d4b7d
7SHA1 (patch-ab) = 2592d685f011eaf3268ec7a73b70c572e7f4354f 7SHA1 (patch-ab) = cf5a15ede9863bd5bab7913cdef315d6655863f9
cvs diff -r1.16 -r1.17 pkgsrc/net/ntop/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/net/ntop/patches/Attic/patch-ab 2009/05/25 09:03:15 1.16
+++ pkgsrc/net/ntop/patches/Attic/patch-ab 2009/07/21 19:17:53 1.17
@@ -1,66 +1,70 @@ @@ -1,66 +1,70 @@
1$NetBSD: patch-ab,v 1.16 2009/05/25 09:03:15 adam Exp $ 1$NetBSD: patch-ab,v 1.17 2009/07/21 19:17:53 hasso Exp $
2 2
3--- configure.in.orig 2009-05-06 16:55:22.000000000 +0200 3--- configure.in.orig 2009-05-06 17:55:22 +0300
4+++ configure.in 4+++ configure.in 2009-07-21 21:19:57 +0300
5@@ -431,6 +431,15 @@ case "${target}:${CC}" in 5@@ -431,6 +431,19 @@ case "${target}:${CC}" in
6 echo "* This appears to be ${DEFINEOS} (release not checked)" 6 echo "* This appears to be ${DEFINEOS} (release not checked)"
7 ;; 7 ;;
8  8
9+ *-*-netbsd*:* ) 9+ *-*-netbsd*:* )
10+ DEFINEOS="NETBSD" 10+ DEFINEOS="NETBSD"
11+ echo "* This appears to be ${DEFINEOS}" 11+ echo "* This appears to be ${DEFINEOS}"
12+ ;; 12+ ;;
13+ *-*-openbsd*:* ) 13+ *-*-openbsd*:* )
14+ DEFINEOS="OPENBSD" 14+ DEFINEOS="OPENBSD"
15+ echo "* This appears to be ${DEFINEOS}" 15+ echo "* This appears to be ${DEFINEOS}"
16+ ;; 16+ ;;
 17+ *-*-dragonfly*:* )
 18+ DEFINEOS="DRAGONFLY"
 19+ echo "* This appears to be ${DEFINEOS}"
 20+ ;;
17+ 21+
18 * ) 22 * )
19 echo "* ${target} is an unknown/unsupported OS" 23 echo "* ${target} is an unknown/unsupported OS"
20 echo "*" 24 echo "*"
21@@ -621,8 +630,8 @@ if test ".${PCAPRING_DIR}" != .; then 25@@ -621,8 +634,8 @@ if test ".${PCAPRING_DIR}" != .; then
22 else 26 else
23 if test ".${PCAP_ROOT}" != .; then 27 if test ".${PCAP_ROOT}" != .; then
24 if test -d $PCAP_ROOT && 28 if test -d $PCAP_ROOT &&
25- test -r $PCAP_ROOT/libpcap.a && 29- test -r $PCAP_ROOT/libpcap.a &&
26- test -r $PCAP_ROOT/pcap.h; then 30- test -r $PCAP_ROOT/pcap.h; then
27+ test -r $PCAP_ROOT/lib/libpcap.a -o -r $PCAP_ROOT/lib/libpcap.dylib && 31+ test -r $PCAP_ROOT/lib/libpcap.a -o -r $PCAP_ROOT/lib/libpcap.dylib &&
28+ test -r $PCAP_ROOT/include/pcap.h; then 32+ test -r $PCAP_ROOT/include/pcap.h; then
29 PCAP_ROOT=`cd ${PCAP_ROOT} && pwd` 33 PCAP_ROOT=`cd ${PCAP_ROOT} && pwd`
30 CORELIBS="${CORELIBS} -L$PCAP_ROOT -lpcap" 34 CORELIBS="${CORELIBS} -L$PCAP_ROOT -lpcap"
31 INCS="${INCS} -I$PCAP_ROOT" 35 INCS="${INCS} -I$PCAP_ROOT"
32@@ -1656,18 +1665,10 @@ LUA_VERSION=lua-5.1.4 36@@ -1656,18 +1669,10 @@ LUA_VERSION=lua-5.1.4
33 if test -f "$LUA_VERSION.tar.gz"; then 37 if test -f "$LUA_VERSION.tar.gz"; then
34 echo "Lua already present on this machine" 38 echo "Lua already present on this machine"
35 else 39 else
36- wget http://www.lua.org/ftp/$LUA_VERSION.tar.gz 40- wget http://www.lua.org/ftp/$LUA_VERSION.tar.gz
37 fi 41 fi
38  42
39-tar xvfz $LUA_VERSION.tar.gz 43-tar xvfz $LUA_VERSION.tar.gz
40-cat $LUA_VERSION/src/Makefile | sed -e s,'MYCFLAGS=-DLUA_USE_POSIX',' MYCFLAGS="-fPIC -DLUA_USE_POSIX"',g > /tmp/lua.temp 44-cat $LUA_VERSION/src/Makefile | sed -e s,'MYCFLAGS=-DLUA_USE_POSIX',' MYCFLAGS="-fPIC -DLUA_USE_POSIX"',g > /tmp/lua.temp
41-cat /tmp/lua.temp > $LUA_VERSION/src/Makefile 45-cat /tmp/lua.temp > $LUA_VERSION/src/Makefile
42-#rm -f /tmp/lua.temp 46-#rm -f /tmp/lua.temp
43-cd $LUA_VERSION; make posix; cd .. 47-cd $LUA_VERSION; make posix; cd ..
44- 48-
45-LUA_LIB_DIR=$PWD/$LUA_VERSION"/src" 49-LUA_LIB_DIR=$PWD/$LUA_VERSION"/src"
46-LIBS="-L${LUA_LIB_DIR} -llua ${LIBS} " 50-LIBS="-L${LUA_LIB_DIR} -llua ${LIBS} "
47-INCS="${INCS} -I${LUA_LIB_DIR}" 51-INCS="${INCS} -I${LUA_LIB_DIR}"
48+ 52+
49+LIBS="-llua ${LIBS} " 53+LIBS="-llua ${LIBS} "
50 AC_DEFINE_UNQUOTED(HAVE_LUA, 1, [LUA is supported]) 54 AC_DEFINE_UNQUOTED(HAVE_LUA, 1, [LUA is supported])
51  55
52 dnl> 56 dnl>
53@@ -1966,36 +1967,20 @@ dnl> GeoIP (http://www.maxmind.com/) 57@@ -1966,36 +1971,20 @@ dnl> GeoIP (http://www.maxmind.com/)
54 if test -f "GeoIP.tar.gz"; then 58 if test -f "GeoIP.tar.gz"; then
55 echo "GeoIP already present on this machine" 59 echo "GeoIP already present on this machine"
56 else 60 else
57- wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz 61- wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz
58-fi 62-fi
59-tar xvfz GeoIP.tar.gz 63-tar xvfz GeoIP.tar.gz
60-GEO_DIR=`find $PWD -type d -name "GeoIP-*"` 64-GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
61-cd $GEO_DIR; ./configure --prefix=${prefix}; make; cd .. 65-cd $GEO_DIR; ./configure --prefix=${prefix}; make; cd ..
62-# OSX Fix 66-# OSX Fix
63-GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib" 67-GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib"
64-if test -f $GEO_DYLIB; then 68-if test -f $GEO_DYLIB; then
65- ln -s $GEO_DYLIB . 69- ln -s $GEO_DYLIB .
66 fi 70 fi