Pullup ticket 395 - requested by Dan McMahill

portability fix for tcpdump

Revisions pulled up:
- pkgsrc/net/tcpdump/distinfo		1.7
- pkgsrc/net/tcpdump/patches/patch-aa	1.3
- pkgsrc/net/tcpdump/patches/patch-ab	1.3


    Module Name:    pkgsrc
    Committed By:   dmcmahill
    Date:           Sat Mar 26 16:40:33 UTC 2005

    Modified Files:
            pkgsrc/net/tcpdump: distinfo
    Added Files:
            pkgsrc/net/tcpdump/patches: patch-aa patch-ab

    Log Message:
    fix some configure.in bugs which prevent building on solaris

3 files changed, 83 insertions, 1 deletions

diff --git a/net/tcpdump/distinfo b/net/tcpdump/distinfo
index 5a6b3be127c..d6e3e66100f 100644
--- a/net/tcpdump/distinfo
+++ b/net/tcpdump/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 12:14:05 agc Exp $
+$NetBSD: distinfo,v 1.6.2.1 2005/03/27 07:00:55 snj Exp $
 
 SHA1 (tcpdump-3.8.3.tar.gz) = 7ae3c29fe843fc23ae89acd8b1b1e513213f6042
 RMD160 (tcpdump-3.8.3.tar.gz) = 585c1ad9a93a8329b1d60057dd334e7b1a88097c
 Size (tcpdump-3.8.3.tar.gz) = 567116 bytes
+SHA1 (patch-aa) = d70302c6fa68d0d170fa5c22ce0a348bdf0233be
+SHA1 (patch-ab) = 628f0ecf34a7c9a5c17000b234360f7846c07847
diff --git a/net/tcpdump/patches/patch-aa b/net/tcpdump/patches/patch-aa
new file mode 100644
index 00000000000..4e29eed638b
--- /dev/null
+++ b/net/tcpdump/patches/patch-aa
@@ -0,0 +1,40 @@
+$NetBSD: patch-aa,v 1.2.2.1 2005/03/27 07:00:56 snj Exp $
+
+--- configure.in.orig	2004-03-28 16:04:48.000000000 -0500
++++ configure.in
+@@ -513,7 +513,7 @@ needsnprintf=no
+ AC_CHECK_FUNCS(vsnprintf snprintf,,
+ 	[needsnprintf=yes])
+ if test $needsnprintf = yes; then
+-	AC_LIBOBJ(snprintf.o)
++	AC_LIBOBJ(snprintf)
+ fi
+ 
+ AC_LBL_TYPE_SIGNAL
+@@ -550,7 +550,7 @@ AC_TRY_LINK([#include <sys/types.h>
+ #include <arpa/inet.h>], [char src[4], dst[128];
+ inet_ntop(AF_INET, src, dst, sizeof(dst));],
+ 	[AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)
+-	AC_LIBOBJ(inet_ntop.o)])
++	AC_LIBOBJ(inet_ntop)])
+ AC_MSG_CHECKING(for inet_pton)
+ AC_TRY_LINK([#include <sys/types.h>
+ #include <sys/socket.h>
+@@ -558,7 +558,7 @@ AC_TRY_LINK([#include <sys/types.h>
+ #include <arpa/inet.h>], [char src[128], dst[4];
+ inet_pton(AF_INET, src, dst);],
+ 	[AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)
+-	AC_LIBOBJ(inet_pton.o)])
++	AC_LIBOBJ(inet_pton)])
+ AC_MSG_CHECKING(for inet_aton)
+ AC_TRY_LINK([#include <sys/types.h>
+ #include <netinet/in.h>
+@@ -566,7 +566,7 @@ AC_TRY_LINK([#include <sys/types.h>
+ struct in_addr dst;
+ inet_aton(src, &dst);],
+ 	[AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)
+-	AC_LIBOBJ(inet_aton.o)])
++	AC_LIBOBJ(inet_aton)])
+ 
+ dnl portability macros for getaddrinfo/getnameinfo
+ dnl
diff --git a/net/tcpdump/patches/patch-ab b/net/tcpdump/patches/patch-ab
new file mode 100644
index 00000000000..6210e3011f5
--- /dev/null
+++ b/net/tcpdump/patches/patch-ab
@@ -0,0 +1,40 @@
+$NetBSD: patch-ab,v 1.2.2.1 2005/03/27 07:00:56 snj Exp $
+
+--- configure.orig	2004-03-28 16:06:09.000000000 -0500
++++ configure
+@@ -6836,7 +6836,7 @@ fi
+ done
+ 
+ if test $needsnprintf = yes; then
+-	LIBOBJS="$LIBOBJS snprintf.o.$ac_objext"
++	LIBOBJS="$LIBOBJS snprintf.$ac_objext"
+ fi
+ 
+ 
+@@ -8509,7 +8509,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+-	LIBOBJS="$LIBOBJS inet_ntop.o.$ac_objext"
++	LIBOBJS="$LIBOBJS inet_ntop.$ac_objext"
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ echo "$as_me:$LINENO: checking for inet_pton" >&5
+@@ -8554,7 +8554,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+-	LIBOBJS="$LIBOBJS inet_pton.o.$ac_objext"
++	LIBOBJS="$LIBOBJS inet_pton.$ac_objext"
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ echo "$as_me:$LINENO: checking for inet_aton" >&5
+@@ -8599,7 +8599,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+-	LIBOBJS="$LIBOBJS inet_aton.o.$ac_objext"
++	LIBOBJS="$LIBOBJS inet_aton.$ac_objext"
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+