too many changes to list here, but one positive note - no more local
patches needed...update from 3.81 -> 3.93
tested on i386/amd64/sparc64
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/nmap/Makefile,v
retrieving revision 1.57
diff -u -r1.57 Makefile
--- Makefile 8 Feb 2005 19:06:42 -0000 1.57
+++ Makefile 20 Sep 2005 16:10:27 -0000
@@ -2,7 +2,7 @@
COMMENT= "scan ports and fingerprint stack of network hosts"
-DISTNAME= nmap-3.81
+DISTNAME= nmap-3.93
CATEGORIES= net security
MASTER_SITES= ${HOMEPAGE}dist/
EXTRACT_SUFX= .tgz
@@ -18,10 +18,13 @@
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c crypto m pcap ssl stdc++
+USE_GMAKE= yes
+
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-libpcap=/usr \
+ --with-openssl=/usr \
--with-libpcre=${LOCALBASE} \
- --with-openssl=/usr
+ --with-libdnet=${LOCALBASE}
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} \
${WRKSRC}/nbase \
${WRKSRC}/nsock/src
@@ -29,7 +32,8 @@
FLAVORS= no_x11
FLAVOR?=
-LIB_DEPENDS+= pcre::devel/pcre
+LIB_DEPENDS+= pcre::devel/pcre \
+ dnet::net/libdnet
.if ${FLAVOR:L:Mno_x11}
ALL_TARGET= nmap
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/nmap/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo 8 Feb 2005 19:06:42 -0000 1.8
+++ distinfo 20 Sep 2005 16:10:27 -0000
@@ -1,4 +1,4 @@
-MD5 (nmap-3.81.tgz) = 9b32f74e2f6999e4f7668a24f2a1ea85
-RMD160 (nmap-3.81.tgz) = d57533f1bf614541dd0cdfcf0f14b257d26a28c9
-SHA1 (nmap-3.81.tgz) = 9d1ce1ab3e097ce5d61078fd4bc713f9b701fa1c
-SIZE (nmap-3.81.tgz) = 1846196
+MD5 (nmap-3.93.tgz) = 9998b39f09b7ee066ae2952bd009e453
+RMD160 (nmap-3.93.tgz) = 12c7cf018aa246fcf384db5dd706f92100594c4e
+SHA1 (nmap-3.93.tgz) = 9bf965387ce5019e78aa009b792ab4f19d358b95
+SIZE (nmap-3.93.tgz) = 2562758
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 29 Jan 2005 20:15:32 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.6 2005/01/29 20:15:32 sturm Exp $
---- Makefile.in.orig Sat Jan 29 20:35:39 2005
-+++ Makefile.in Sat Jan 29 20:36:12 2005
-@@ -18,7 +18,7 @@ CXX = @CXX@
- CCOPT =
- LIBPCAPDIR = @libpcapdir@
- LIBPCREDIR = @LIBPCREDIR@
--INCLS = -I$(LIBPCAPDIR)
-+INCLS = -I.
- DEFS = @DEFS@ -DNMAP_VERSION=\"$(NMAP_VERSION)\" -DNMAP_NAME=\"$(NMAP_NAME)\"
-DNMAP_URL=\"$(NMAP_URL)\" -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\"
-DNMAPDATADIR=\"$(nmapdatadir)\"
- # For mtrace debugging -- see MTRACE define in main.cc for instructions
- # Should only be enabled during debugging and not in any real release.
Index: patches/patch-tcpip_cc
===================================================================
RCS file: patches/patch-tcpip_cc
diff -N patches/patch-tcpip_cc
--- patches/patch-tcpip_cc 8 Feb 2005 19:06:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-tcpip_cc,v 1.3 2005/02/08 19:06:42 sturm Exp $
---- tcpip.cc.orig Sat Feb 5 23:37:55 2005
-+++ tcpip.cc Tue Feb 8 19:36:27 2005
-@@ -1664,7 +1664,8 @@ if (timedout) {
- gettimeofday(&tv_end, NULL);
- *rcvdtime = tv_end;
- #else
-- *rcvdtime = head.ts;
-+ rcvdtime->tv_sec = head.ts.tv_sec;
-+ rcvdtime->tv_usec = head.ts.tv_usec;
- assert(head.ts.tv_sec);
- #endif
- }
Index: patches/patch-tcpip_h
===================================================================
RCS file: patches/patch-tcpip_h
diff -N patches/patch-tcpip_h
--- patches/patch-tcpip_h 8 Feb 2005 19:06:42 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-tcpip_h,v 1.3 2005/02/08 19:06:42 sturm Exp $
---- tcpip.h.orig Sat Feb 5 23:37:55 2005
-+++ tcpip.h Tue Feb 8 19:36:27 2005
-@@ -256,7 +256,7 @@ extern "C" {
- #endif
-
- #ifndef BSDFIX
--#if FREEBSD || BSDI || NETBSD || DEC
-+#if FREEBSD || OPENBSD || BSDI || NETBSD || DEC
- #define BSDFIX(x) x
- #define BSDUFIX(x) x
- #else
