Tue Nov 19 03:07:49 2013 UTC ()
Make tcpreplay build on Darwin


(minskim)
diff -r1.10 -r1.11 pkgsrc/net/tcpreplay/distinfo
diff -r1.2 -r1.3 pkgsrc/net/tcpreplay/patches/patch-ab
cvs diff -r1.10 -r1.11 pkgsrc/net/tcpreplay/distinfo (expand / switch to unified diff)

--- pkgsrc/net/tcpreplay/distinfo 2013/10/31 02:25:16 1.10
+++ pkgsrc/net/tcpreplay/distinfo 2013/11/19 03:07:49 1.11
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.10 2013/10/31 02:25:16 minskim Exp $ 1$NetBSD: distinfo,v 1.11 2013/11/19 03:07:49 minskim Exp $
2 2
3SHA1 (tcpreplay-3.4.4.tar.gz) = 9e4cca81cfbfb919f8759e1a27ce1b3b963ff3b8 3SHA1 (tcpreplay-3.4.4.tar.gz) = 9e4cca81cfbfb919f8759e1a27ce1b3b963ff3b8
4RMD160 (tcpreplay-3.4.4.tar.gz) = 672812755ff39b284044b08cba32c574ab2b7e70 4RMD160 (tcpreplay-3.4.4.tar.gz) = 672812755ff39b284044b08cba32c574ab2b7e70
5Size (tcpreplay-3.4.4.tar.gz) = 947179 bytes 5Size (tcpreplay-3.4.4.tar.gz) = 947179 bytes
6SHA1 (patch-aa) = 377cd7e829b00df9aff0aeed4c4136317602334a 6SHA1 (patch-aa) = 377cd7e829b00df9aff0aeed4c4136317602334a
7SHA1 (patch-ab) = 78063660f925229cf10df88462128664f080c6c0 7SHA1 (patch-ab) = 54bd9c0a3e07eef3a3e4cfccc87c8351090301c1
8SHA1 (patch-lib_Makefile.in) = 9a59f2652c08efb87944e132998a3c0778a5b5a7 8SHA1 (patch-lib_Makefile.in) = 9a59f2652c08efb87944e132998a3c0778a5b5a7
9SHA1 (patch-src_common_Makefile.in) = 7cd6878eecd94d735e314768a0302298ac415ffc 9SHA1 (patch-src_common_Makefile.in) = 7cd6878eecd94d735e314768a0302298ac415ffc
10SHA1 (patch-src_common_cidr.c) = 77694f71876916e9e77a0257ce91bf7bb2f140a2 10SHA1 (patch-src_common_cidr.c) = 77694f71876916e9e77a0257ce91bf7bb2f140a2
11SHA1 (patch-src_common_tcpdump.c) = f46d713dc57db02845173dc92c4f2ec94c158298 11SHA1 (patch-src_common_tcpdump.c) = f46d713dc57db02845173dc92c4f2ec94c158298
12SHA1 (patch-src_defines.h.in) = 58fa82a29f997662d5e793461f4d3cfccd593eb0 12SHA1 (patch-src_defines.h.in) = 58fa82a29f997662d5e793461f4d3cfccd593eb0
13SHA1 (patch-src_tcpprep.c) = 2c5ce09986c4e215230472791a99c4c183223c85 13SHA1 (patch-src_tcpprep.c) = 2c5ce09986c4e215230472791a99c4c183223c85
cvs diff -r1.2 -r1.3 pkgsrc/net/tcpreplay/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/net/tcpreplay/patches/Attic/patch-ab 2013/10/31 02:25:17 1.2
+++ pkgsrc/net/tcpreplay/patches/Attic/patch-ab 2013/11/19 03:07:49 1.3
@@ -1,47 +1,60 @@ @@ -1,47 +1,60 @@
1$NetBSD: patch-ab,v 1.2 2013/10/31 02:25:17 minskim Exp $ 1$NetBSD: patch-ab,v 1.3 2013/11/19 03:07:49 minskim Exp $
2 2
3--- configure.orig 2010-04-05 00:58:26.000000000 +0000 3--- configure.orig 2010-04-05 00:58:26.000000000 +0000
4+++ configure 4+++ configure
5@@ -9872,7 +9872,11 @@ darwin* | rhapsody*) 5@@ -9872,7 +9872,11 @@ darwin* | rhapsody*)
6 soname_spec='${libname}${release}${major}$shared_ext' 6 soname_spec='${libname}${release}${major}$shared_ext'
7 shlibpath_overrides_runpath=yes 7 shlibpath_overrides_runpath=yes
8 shlibpath_var=DYLD_LIBRARY_PATH 8 shlibpath_var=DYLD_LIBRARY_PATH
9- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' 9- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
10+ if test .$module = .yes ; then 10+ if test .$module = .yes ; then
11+ shrext_cmds=".so" 11+ shrext_cmds=".so"
12+ else 12+ else
13+ shrext_cmds=".dylib" 13+ shrext_cmds=".dylib"
14+ fi 14+ fi
15  15
16 sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" 16 sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
17 sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' 17 sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
18@@ -17353,9 +17357,9 @@ for testdir in $trypcapdir /usr/local /o 18@@ -14675,7 +14679,11 @@ darwin* | rhapsody*)
 19 soname_spec='${libname}${release}${major}$shared_ext'
 20 shlibpath_overrides_runpath=yes
 21 shlibpath_var=DYLD_LIBRARY_PATH
 22- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
 23+ if test .$module = .yes ; then
 24+ shrext_cmds=".so"
 25+ else
 26+ shrext_cmds=".dylib"
 27+ fi
 28
 29 sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
 30 ;;
 31@@ -17353,9 +17361,9 @@ for testdir in $trypcapdir /usr/local /o
19 LPCAPINC="${testdir}/include/pcap.h" 32 LPCAPINC="${testdir}/include/pcap.h"
20 LPCAPINCDIR="${testdir}/include" 33 LPCAPINCDIR="${testdir}/include"
21 if test $dynamic_link = yes; then 34 if test $dynamic_link = yes; then
22- if test -f "${testdir}/lib64/libpcap${shrext_cmds}" ; then 35- if test -f "${testdir}/lib64/libpcap${shrext_cmds}" ; then
23+ if test -e "${testdir}/lib64/libpcap${shrext_cmds}" ; then 36+ if test -e "${testdir}/lib64/libpcap${shrext_cmds}" ; then
24 LPCAPLIB="-L${testdir}/lib64 -lpcap" 37 LPCAPLIB="-L${testdir}/lib64 -lpcap"
25- elif test -f "${testdir}/lib/libpcap${shrext_cmds}" ; then 38- elif test -f "${testdir}/lib/libpcap${shrext_cmds}" ; then
26+ elif test -e "${testdir}/lib/libpcap${shrext_cmds}" ; then 39+ elif test -e "${testdir}/lib/libpcap${shrext_cmds}" ; then
27 LPCAPLIB="-L${testdir}/lib -lpcap" 40 LPCAPLIB="-L${testdir}/lib -lpcap"
28 else 41 else
29 as_fn_error "Unable to find libpcap in ${testdir}" "$LINENO" 5 42 as_fn_error "Unable to find libpcap in ${testdir}" "$LINENO" 5
30@@ -18172,7 +18176,7 @@ libdnet_version= 43@@ -18172,7 +18180,7 @@ libdnet_version=
31 enable_fragroute=no 44 enable_fragroute=no
32 trydnetdir=/usr/local 45 trydnetdir=/usr/local
33  46
34-if test $have_cygwin == no ; then 47-if test $have_cygwin == no ; then
35+if test $have_cygwin = no ; then 48+if test $have_cygwin = no ; then
36 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libdnet" >&5 49 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libdnet" >&5
37 $as_echo_n "checking for libdnet... " >&6; } 50 $as_echo_n "checking for libdnet... " >&6; }
38  51
39@@ -18751,7 +18755,7 @@ esac 52@@ -18751,7 +18759,7 @@ esac
40 fi 53 fi
41  54
42  55
43- if test "$osx_frameworks" == "yes"; then 56- if test "$osx_frameworks" == "yes"; then
44+ if test "$osx_frameworks" = "yes"; then 57+ if test "$osx_frameworks" = "yes"; then
45 ENABLE_OSX_FRAMEWORKS_TRUE= 58 ENABLE_OSX_FRAMEWORKS_TRUE=
46 ENABLE_OSX_FRAMEWORKS_FALSE='#' 59 ENABLE_OSX_FRAMEWORKS_FALSE='#'
47 else 60 else