Sun Mar 3 04:52:39 2013 UTC ()
Fix pthread test case. Nesting main doesn't make much sense.


(joerg)
diff -r1.7 -r1.8 pkgsrc/net/ettercap-NG/distinfo
diff -r1.4 -r1.5 pkgsrc/net/ettercap-NG/patches/patch-ae
cvs diff -r1.7 -r1.8 pkgsrc/net/ettercap-NG/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/net/ettercap-NG/Attic/distinfo 2011/12/22 22:11:41 1.7
+++ pkgsrc/net/ettercap-NG/Attic/distinfo 2013/03/03 04:52:38 1.8
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.7 2011/12/22 22:11:41 marino Exp $ 1$NetBSD: distinfo,v 1.8 2013/03/03 04:52:38 joerg Exp $
2 2
3SHA1 (ettercap-NG-0.7.3.tar.gz) = 7a2c3f848ca4f39c07fddeb0d6308641265bc4ff 3SHA1 (ettercap-NG-0.7.3.tar.gz) = 7a2c3f848ca4f39c07fddeb0d6308641265bc4ff
4RMD160 (ettercap-NG-0.7.3.tar.gz) = f4e6c0d87b2064b3775e9af60f34575273742616 4RMD160 (ettercap-NG-0.7.3.tar.gz) = f4e6c0d87b2064b3775e9af60f34575273742616
5Size (ettercap-NG-0.7.3.tar.gz) = 1138643 bytes 5Size (ettercap-NG-0.7.3.tar.gz) = 1138643 bytes
6SHA1 (patch-aa) = 27c7f53e0d704b7dc2b8c9c76bf1f9aeff1bbece 6SHA1 (patch-aa) = 27c7f53e0d704b7dc2b8c9c76bf1f9aeff1bbece
7SHA1 (patch-ab) = 7cf863797abac4b67dbca55f6f763bf7b9830259 7SHA1 (patch-ab) = 7cf863797abac4b67dbca55f6f763bf7b9830259
8SHA1 (patch-ac) = ad04400499dcfdb4067079a58c849c287a34d12f 8SHA1 (patch-ac) = ad04400499dcfdb4067079a58c849c287a34d12f
9SHA1 (patch-ad) = f39de66feb894ef2f1134abd3a3ca36677bea2b4 9SHA1 (patch-ad) = f39de66feb894ef2f1134abd3a3ca36677bea2b4
10SHA1 (patch-ae) = 1020e3d6b0aadd96f7a30455d30e3d3cb363e0b6 10SHA1 (patch-ae) = 0932412d46b780f948c7e65d326ae93cabd0e5fb
cvs diff -r1.4 -r1.5 pkgsrc/net/ettercap-NG/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/net/ettercap-NG/patches/Attic/patch-ae 2011/12/22 22:11:41 1.4
+++ pkgsrc/net/ettercap-NG/patches/Attic/patch-ae 2013/03/03 04:52:39 1.5
@@ -1,36 +1,51 @@ @@ -1,36 +1,51 @@
1$NetBSD: patch-ae,v 1.4 2011/12/22 22:11:41 marino Exp $ 1$NetBSD: patch-ae,v 1.5 2013/03/03 04:52:39 joerg Exp $
2 2
3--- configure.orig 2005-05-27 15:11:45.000000000 +0000 3--- configure.orig 2005-05-27 15:11:45.000000000 +0000
4+++ configure 4+++ configure
5@@ -2169,7 +2169,7 @@ fi 5@@ -2169,7 +2169,7 @@ fi
6  6
7 OS="LINUX" 7 OS="LINUX"
8 ;; 8 ;;
9-*freebsd*) 9-*freebsd*)
10+*freebsd* | *dragonfly*) 10+*freebsd* | *dragonfly*)
11 cat >>confdefs.h <<\_ACEOF 11 cat >>confdefs.h <<\_ACEOF
12 #define OS_BSD 1 12 #define OS_BSD 1
13 _ACEOF 13 _ACEOF
14@@ -8346,7 +8346,7 @@ echo "${ECHO_T}no" >&6 14@@ -8346,7 +8346,7 @@ echo "${ECHO_T}no" >&6
15 exit 1 15 exit 1
16 fi 16 fi
17 gentoo_lt_version="1.5.18" 17 gentoo_lt_version="1.5.18"
18-gentoo_ltmain_version=`grep '^[:space:]*VERSION=' $ltmain | sed -e 's|^[:space:]*VERSION=||'` 18-gentoo_ltmain_version=`grep '^[:space:]*VERSION=' $ltmain | sed -e 's|^[:space:]*VERSION=||'`
19+gentoo_ltmain_version=`grep '^[[:space:]]*VERSION=' $ltmain | sed -e 's|^[[:space:]]*VERSION=||'` 19+gentoo_ltmain_version=`grep '^[[:space:]]*VERSION=' $ltmain | sed -e 's|^[[:space:]]*VERSION=||'`
20 if test "$gentoo_lt_version" != "$gentoo_ltmain_version"; then 20 if test "$gentoo_lt_version" != "$gentoo_ltmain_version"; then
21 echo "$as_me:$LINENO: result: no" >&5 21 echo "$as_me:$LINENO: result: no" >&5
22 echo "${ECHO_T}no" >&6 22 echo "${ECHO_T}no" >&6
23@@ -31721,11 +31721,11 @@ echo "$as_me: error: \"*** ettercap cann 23@@ -28261,14 +28261,8 @@ int
 24 main ()
 25 {
 26
 27- int main(int argc, char **argv)
 28- {
 29 pthread_create(NULL, NULL, NULL, NULL);
 30 return 0;
 31- }
 32-
 33- ;
 34- return 0;
 35 }
 36 _ACEOF
 37 rm -f conftest.$ac_objext conftest$ac_exeext
 38@@ -31721,11 +31715,11 @@ echo "$as_me: error: \"*** ettercap cann
24 ac_ec_libnet=$withval 39 ac_ec_libnet=$withval
25 echo "$as_me:$LINENO: result: $withval" >&5 40 echo "$as_me:$LINENO: result: $withval" >&5
26 echo "${ECHO_T}$withval" >&6 41 echo "${ECHO_T}$withval" >&6
27- elif test -f $withval/include/libnet.h; then 42- elif test -f $withval/include/libnet.h; then
28+ elif test -f @@LN_INC@@/libnet.h; then 43+ elif test -f @@LN_INC@@/libnet.h; then
29 owd=`pwd` 44 owd=`pwd`
30 if cd $withval; then withval=`pwd`; cd $owd; fi 45 if cd $withval; then withval=`pwd`; cd $owd; fi
31- LNETINC="-I$withval/include" 46- LNETINC="-I$withval/include"
32- LNETLIB="-L$withval/lib -L$withval/src -lnet" 47- LNETLIB="-L$withval/lib -L$withval/src -lnet"
33+ LNETINC="-I@@LN_INC@@" 48+ LNETINC="-I@@LN_INC@@"
34+ LNETLIB="-L@@LN_LIB@@ -L$withval/src -lnet" 49+ LNETLIB="-L@@LN_LIB@@ -L$withval/src -lnet"
35 ac_ec_libnet=$withval 50 ac_ec_libnet=$withval
36 echo "$as_me:$LINENO: result: $withval" >&5 51 echo "$as_me:$LINENO: result: $withval" >&5