Attachment #35434 for bug #57196

View | Details | Raw Unified | Return to bug 57196
Collapse All | Expand All




# ex:ts=8
# Ports collection makefile for:  nmap
# Date created:			  Tue Aug 04, 1998
# Whom:				  David O'Brien (obrien@NUXI.com)

# $FreeBSD: ports/security/nmap/Makefile,v 1.72 2003/09/24 09:36:56 osa Exp $
#

PORTNAME?=		nmap
PORTVERSION=		3.46
CATEGORIES=		security ipv6
MASTER_SITES=		http://download.insecure.org/nmap/dist/
DISTNAME=		nmap-${PORTVERSION}

MAINTAINER=		eikemeier@fillmore-labs.com
COMMENT?=		Port scanning utility for large networks

USE_BZIP2=		yes
CONFIGURE_ARGS=	--without-localdirs
USE_BZIP2=	yes

GNU_CONFIGURE=		yes
CONFIGURE_ARGS=		--without-localdirs

CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}

.ifndef BUILD_NMAPFE

MAN1=			nmap.1

LIB_DEPENDS=		pcre.0:${PORTSDIR}/devel/pcre

CONFIGURE_ARGS+=	--with-libpcre=${LOCALBASE}

.ifndef WITHOUT_SSL
USE_OPENSSL=		yes
CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
.else
CONFIGURE_ARGS+=	--without-openssl
.endif

CONFIGURE_TARGET=	-build=${ARCH}-portbld-freebsd${OSREL}
.if ${PORTNAME} == "nmap"
CONFIGURE_ARGS+=	--without-nmapfe
.endif
ALL_TARGET?=		nmap
INSTALL_TARGET?=	install-nmap

ALL_TARGET=		nmap
INSTALL_TARGET=		install-nmap

post-install:
	@${STRIP_CMD} ${PREFIX}/bin/nmap
.ifndef NOPORTDOCS
	@${MKDIR} ${DOCSDIR}
	@for doc in CHANGELOG HACKING docs/nmap.dtd; do \
		${INSTALL_DATA} ${WRKSRC}/$${doc} ${DOCSDIR}; \
	done
.endif

.else

RUN_DEPENDS=		nmap:${PORTSDIR}/security/nmap

DESCR=			${PKGDIR}/pkg-descr.fe
PLIST=			${PKGDIR}/pkg-plist.fe
PLIST_SUB=		REALPREFIX=${PREFIX}

MAN1=			nmapfe.1
MLINKS=			nmapfe.1 xnmap.1

USE_GNOME=		gtk12

CONFIGURE_ARGS+=	--without-openssl

CONFIGURE_ARGS+=	--with-nmapfe

ALL_TARGET=		nbase/libnbase.a nmapfe/nmapfe
INSTALL_TARGET=		install-nmapfe

post-install:
	@${STRIP_CMD} ${PREFIX}/bin/nmapfe

.endif

.include <bsd.port.mk>

Line 1 Link Here

(-)security/nmap/distinfo (-1 / +1 lines)
1	MD5 (nmap-3.30.tar.bz2) = 639fc1c91f48319eca97401e74f9c90e	1	MD5 (nmap-3.46.tar.bz2) = 58974b2d4059752a9f66adc4659f7878




--- Makefile.in.orig	Sat Sep 20 11:00:04 2003
+++ Makefile.in	Wed Sep 24 23:59:42 2003
@@ -9,7 +9,7 @@
 mandir = @mandir@
 srcdir = @srcdir@
 nmapdatadir = @datadir@/nmap

+deskdir = $(X11BASE)/share/gnome/apps/Utilities
 
 NBASEDIR=@NBASEDIR@
 NSOCKDIR=@NSOCKDIR@
@@ -23,6 +23,7 @@
 CCOPT = 
 LIBPCAPDIR = @libpcapdir@
-INCLS = -I$(LIBPCAPDIR) 
+#INCLS = -I$(LIBPCAPDIR) 
 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.
 # DEFS += -DMTRACE=1
+CPPFLAGS = @CPPFLAGS@
 CXXFLAGS = @CXXFLAGS@ $(CCOPT) $(DEFS) $(INCLS)
 # CFLAGS = $(CXXFLAGS)
 # CFLAGS = $(DEFS) $(INCLS)
+	$(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(nmapdatadir)
 	$(INSTALL) -c -m 755 nmap $(bindir)/nmap
 	$(INSTALL) -c -m 644 docs/$(TARGET).1 $(mandir)/man1/$(TARGET).1
 	$(INSTALL) -c -m 644 nmap-os-fingerprints  $(nmapdatadir)/nmap-os-fingerprints




--- configure.orig	Sat Sep 20 09:06:56 2003
+++ configure	Wed Sep 24 23:09:21 2003
@@ -1302,7 +1302,7 @@
      fi
    if test -d /usr/local/include; then
      CFLAGS="$CFLAGS -I/usr/local/include"
-     CXXFLAGS="$CFLAGS -I/usr/local/include"
+     CXXFLAGS="$CXXFLAGS -I/usr/local/include"
    fi
 fi
 
@@ -3299,7 +3299,7 @@
 
 
 
-for ac_header in string.h getopt.h strings.h memory.h sys/param.h sys/sockio.h bstring.h sys/time.h pwd.h unistd.h
+for ac_header in string.h strings.h memory.h sys/param.h sys/sockio.h bstring.h sys/time.h pwd.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -4319,7 +4319,7 @@
     ;;
   *)
     specialssldir="$with_openssl"
-    CXXFLAGS="$CXXFLAGS -I$with_openssl/include"
+    CPPFLAGS="$CPPFLAGS -I$with_openssl/include"
     LDFLAGS="$LDFLAGS -L$with_openssl/lib"
     ;;
   esac
@@ -5105,10 +5105,10 @@
 
     ;;
   *)
-    _cppflags=$CXXFLAGS
+    _cppflags=$CPPFLAGS
     _ldflags=$LDFLAGS
 
-    CXXFLAGS="-I$with_libpcap/include $CXXFLAGS"
+    CPPFLAGS="-I$with_libpcap/include $CPPFLAGS"
     LDFLAGS="-L$with_libpcap/lib $LDFLAGS"
 
     if test "${ac_cv_header_pcap_h+set}" = set; then
@@ -5307,7 +5307,7 @@
 
 
     LDFLAGS=$_ldflags
-    CXXFLAGS=$_cppflags
+    CPPFLAGS=$_cppflags
     ;;
   esac
 
@@ -5323,10 +5323,10 @@
 
 if test $have_libpcap = yes; then
   if test "${LIBPCAP_INC+set}" = "set"; then
-    _cflags=$CXXFLAGS
+    _cppflags=$CPPFLAGS
     _ldflags=$LDFLAGS
 
-    CXXFLAGS="-I$LIBPCAP_INC $CXXFLAGS"
+    CPPFLAGS="-I$LIBPCAP_INC $CPPFLAGS"
     LDFLAGS="-L$LIBPCAP_LIB $LDFLAGS"
   fi
 
@@ -5336,6 +5336,8 @@
   echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; have_libpcap=no
 else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpcap  $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
@@ -5391,6 +5393,7 @@
 echo "${ECHO_T}no" >&6; have_libpcap=no
 fi
 rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
 fi
 
@@ -5406,10 +5409,10 @@
 else
   if test "${LIBPCAP_INC+set}" = "set"; then
     LDFLAGS="-L$libpcapdir $_ldflags"
-    CXXFLAGS="$_cflags -I$libpcapdir"
+    CPPFLAGS="$_cppflags -I$libpcapdir"
   else
     LDFLAGS="-L$libpcapdir $LDFLAGS"
-    CXXFLAGS="$CXXFLAGS -I$libpcapdir"
+    CPPFLAGS="$CPPFLAGS -I$libpcapdir"
   fi
   PCAP_DEPENDS='$(LIBPCAPDIR)/libpcap.a'
   PCAP_CLEAN="pcap_clean"
@@ -5433,7 +5436,7 @@
   yes)
     ;;
   *)
-    CXXFLAGS="-I$with_libpcre/include $CXXFLAGS"
+    CPPFLAGS="-I$with_libpcre/include $CPPFLAGS"
     LDFLAGS="-L$with_libpcre/lib $LDFLAGS"
     have_pcre=yes
     ;;
@@ -5844,7 +5847,7 @@
 
 subdirs="$subdirs libpcre "
 
-  CXXFLAGS="-I$LIBPCREDIR $CXXFLAGS"
+  CPPFLAGS="-I$LIBPCREDIR $CPPFLAGS"
   LIBPCRE_LIB="$LIBPCREDIR"
   LIBS="$LIBS $LIBPCRE_LIB/libpcre.a"
   PCRE_DEPENDS="$LIBPCRE_LIB/libpcre.a"




--- nbase/configure.orig	Sat Sep 20 11:13:26 2003
+++ nbase/configure	Wed Sep 24 23:10:21 2003
@@ -2971,7 +2971,7 @@
 
 
 
-for ac_header in string.h getopt.h strings.h memory.h sys/param.h sys/time.h unistd.h bstring.h errno.h sys/types.h sys/socket.h netinet/in.h sys/sockio.h rpc/types.h netdb.h pwd.h arpa/inet.h sys/resource.h sys/stat.h sys/wait.h libiberty.h fcntl.h
+for ac_header in string.h strings.h memory.h sys/param.h sys/time.h unistd.h bstring.h errno.h sys/types.h sys/socket.h netinet/in.h sys/sockio.h rpc/types.h netdb.h pwd.h arpa/inet.h sys/resource.h sys/stat.h sys/wait.h libiberty.h fcntl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -5905,7 +5905,7 @@
     ;;
   *)
     specialssldir="$with_openssl"
-    CXXFLAGS="-I$with_openssl/include $CXXFLAGS"
+    CPPFLAGS="-I$with_openssl/include $CPPFLAGS"
     ;;
   esac
 




--- nsock/src/configure.orig	Sat Sep 20 09:07:00 2003
+++ nsock/src/configure	Wed Sep 24 22:05:32 2003
@@ -3169,27 +3169,6 @@
 
 
 
-# Check whether --with-libnbase or --without-libnbase was given.
-if test "${with_libnbase+set}" = set; then
-  withval="$with_libnbase"
-    case "$with_libnbase" in
-  yes)
-    ;;
-  *)
-    NBASEDIR="$with_libnbase"
-    ;;
-  esac
-else
-  NBASEDIR="../../nbase"
-
-fi;
-
-LDFLAGS="$LDFLAGS -L$NBASEDIR"
-CFLAGS="$CFLAGS -I$NBASEDIR"
-LIBS="$LIBS -lnbase"
-
-
-
 # First we test whether they specified openssl desires explicitly
 use_openssl="yes"
 specialssldir=""
@@ -3206,7 +3185,7 @@
     ;;
   *)
     specialssldir="$with_openssl"
-    CXXFLAGS="-I$with_openssl/include $CXXFLAGS"
+    CPPFLAGS="-I$with_openssl/include $CPPFLAGS"
     ;;
   esac
 
@@ -3856,6 +3835,27 @@
 _ACEOF
 
 fi
+
+
+# Check whether --with-libnbase or --without-libnbase was given.
+if test "${with_libnbase+set}" = set; then
+  withval="$with_libnbase"
+    case "$with_libnbase" in
+  yes)
+    ;;
+  *)
+    NBASEDIR="$with_libnbase"
+    ;;
+  esac
+else
+  NBASEDIR="../../nbase"
+
+fi;
+
+LDFLAGS="$LDFLAGS -L$NBASEDIR"
+CFLAGS="$CFLAGS -I$NBASEDIR"
+LIBS="$LIBS -lnbase"
+
 
 
 echo "$as_me:$LINENO: checking struct ip" >&5




Nmap is a utility for network exploration or security auditing. It
supports ping scanning (determine which hosts are up), many port
scanning techniques, version detection (determine service protocols
and application versions listening behind ports), and TCP/IP
fingerprinting (remote host OS or device identification). Nmap also
offers flexible target and port specification, decoy/stealth scanning,
sunRPC scanning, and more.

WWW: http://www.insecure.org/nmap/

See the web page and the Phrack Magazine article (Volume 7, Issue 51 
September 01, 1997, article 11 of 17) http://www.insecure.org/nmap/p51-11.txt

-- David

Line 0 Link Here

(-)security/nmap/pkg-descr.fe (+6 lines)
	1	nmapfe is a GUI front end for the nmap port scanning tool.
	2
	3	WWW: http://www.insecure.org/nmap/
	4
	5	-- David
	6	obrien@cs.ucdavis.edu

Lines 1-6 Link Here

(-)security/nmap/pkg-plist (-5 / +10 lines)
1	bin/nmap	1	bin/nmap
2	share/nmap/nmap-os-fingerprints	2	%%DATADIR%%/nmap-os-fingerprints
3	share/nmap/nmap-protocols	3	%%DATADIR%%/nmap-protocols
4	share/nmap/nmap-services	4	%%DATADIR%%/nmap-rpc
5	share/nmap/nmap-rpc	5	%%DATADIR%%/nmap-service-probes
6	@dirrm share/nmap	6	%%DATADIR%%/nmap-services
		7	@dirrm %%DATADIR%%
		8	%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
		9	%%PORTDOCS%%%%DOCSDIR%%/HACKING
		10	%%PORTDOCS%%%%DOCSDIR%%/nmap.dtd
		11	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Line 0 Link Here

(-)security/nmap/pkg-plist.fe (+8 lines)
	1	bin/nmapfe
	2	bin/xnmap
	3	@cwd %%X11BASE%%
	4	share/gnome/apps/Utilities/nmapfe.desktop
	5	@unexec rmdir %D/share/gnome/apps/Utilities 2>/dev/null \|\| true
	6	@unexec rmdir %D/share/gnome/apps 2>/dev/null \|\| true
	7	@unexec rmdir %D/share/gnome 2>/dev/null \|\| true
	8	@cwd %%REALPREFIX%%




# ex:ts=8
# Ports collection makefile for:  nmap
# Date created:			  Tue Aug 04, 1998
# Whom:				  David O'Brien (obrien@NUXI.com)


COMMENT=	GUI frontend for the nmap scanning utility

RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap

MASTERDIR=	${.CURDIR}/../nmap
PLIST=		${.CURDIR}/pkg-plist

USE_GNOME=	gtk12

MAN1=		nmapfe.1 xnmap.1

BUILD_NMAPFE=	yes
INSTALL_TARGET=	install-nmapfe

.include "${MASTERDIR}/Makefile"

Lines 1-6 Link Here

(-)security/nmapfe/pkg-descr (-4 lines)
1	nmapfe is a GUI front end for the nmap port scanning tool.
2
3	WWW: http://www.insecure.org/nmap/index.html
4

Lines 1-5 Link Here

(-)security/nmapfe/pkg-plist (-5 lines)
1	bin/nmapfe
2	bin/xnmap
3	@cwd %%X11BASE%%
4	share/gnome/apps/Utilities/nmapfe.desktop
5	@cwd %%LOCALBASE%%

Return to bug 57196

Lines 1-4 Link Here

(-)security/nmap/Makefile (-22 / +58 lines)
1	# ex:ts=8
2	# Ports collection makefile for: nmap	1	# Ports collection makefile for: nmap
3	# Date created: Tue Aug 04, 1998	2	# Date created: Tue Aug 04, 1998
4	# Whom: David O'Brien (obrien@NUXI.com)	3	# Whom: David O'Brien (obrien@NUXI.com)
Lines 6-42 Link Here
6	# $FreeBSD: ports/security/nmap/Makefile,v 1.72 2003/09/24 09:36:56 osa Exp $	5	# $FreeBSD: ports/security/nmap/Makefile,v 1.72 2003/09/24 09:36:56 osa Exp $
7	#	6	#
8		7
9	PORTNAME?= nmap	8	PORTNAME?= nmap
10	PORTVERSION= 3.30	9	PORTVERSION= 3.46
11	CATEGORIES= security ipv6	10	CATEGORIES= security ipv6
12	MASTER_SITES= http://download.insecure.org/nmap/dist/	11	MASTER_SITES= http://download.insecure.org/nmap/dist/
13	DISTNAME= nmap-${PORTVERSION:S/.b/BETA/}	12	DISTNAME= nmap-${PORTVERSION}
14		13
15	MAINTAINER= eikemeier@fillmore-labs.com	14	MAINTAINER= eikemeier@fillmore-labs.com
16	COMMENT?= Port scanning utility for large networks	15	COMMENT?= Port scanning utility for large networks
17		16
18	GNU_CONFIGURE= yes	17	USE_BZIP2= yes
19	CONFIGURE_ARGS= --without-localdirs
20	USE_BZIP2= yes
21		18
22	MAN1?= nmap.1	19	GNU_CONFIGURE= yes
		20	CONFIGURE_ARGS= --without-localdirs
23		21
24	.include <bsd.port.pre.mk>	22	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
25		23
26	.if ${OSVERSION} < 300004	24	.ifndef BUILD_NMAPFE
27	CFLAGS+= -DDLT_RAW=12 # for obsoleted <net/bpf.h>	25
		26	MAN1= nmap.1
		27
		28	LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
		29
		30	CONFIGURE_ARGS+= --with-libpcre=${LOCALBASE}
		31
		32	.ifndef WITHOUT_SSL
		33	USE_OPENSSL= yes
		34	CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
		35	.else
		36	CONFIGURE_ARGS+= --without-openssl
28	.endif	37	.endif
29		38
30	CONFIGURE_TARGET= -build=${ARCH}-portbld-freebsd${OSREL}
31	.if ${PORTNAME} == "nmap"
32	CONFIGURE_ARGS+= --without-nmapfe	39	CONFIGURE_ARGS+= --without-nmapfe
33	.endif
34	ALL_TARGET?= nmap
35	INSTALL_TARGET?= install-nmap
36		40
37	.if !target(post-install) && (${PORTNAME} == "nmap")	41	ALL_TARGET= nmap
		42	INSTALL_TARGET= install-nmap
		43
38	post-install:	44	post-install:
39	@${STRIP_CMD} ${PREFIX}/bin/nmap	45	@${STRIP_CMD} ${PREFIX}/bin/nmap
		46	.ifndef NOPORTDOCS
		47	@${MKDIR} ${DOCSDIR}
		48	@for doc in CHANGELOG HACKING docs/nmap.dtd; do \
		49	${INSTALL_DATA} ${WRKSRC}/$${doc} ${DOCSDIR}; \
		50	done
		51	.endif
		52
		53	.else
		54
		55	RUN_DEPENDS= nmap:${PORTSDIR}/security/nmap
		56
		57	DESCR= ${PKGDIR}/pkg-descr.fe
		58	PLIST= ${PKGDIR}/pkg-plist.fe
		59	PLIST_SUB= REALPREFIX=${PREFIX}
		60
		61	MAN1= nmapfe.1
		62	MLINKS= nmapfe.1 xnmap.1
		63
		64	USE_GNOME= gtk12
		65
		66	CONFIGURE_ARGS+= --without-openssl
		67
		68	CONFIGURE_ARGS+= --with-nmapfe
		69
		70	ALL_TARGET= nbase/libnbase.a nmapfe/nmapfe
		71	INSTALL_TARGET= install-nmapfe
		72
		73	post-install:
		74	@${STRIP_CMD} ${PREFIX}/bin/nmapfe
		75
40	.endif	76	.endif
41		77
42	.include <bsd.port.post.mk>	78	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)security/nmap/files/patch-Makefile.in (-19 / +10 lines)
1	--- Makefile.in.orig Fri Mar 9 22:25:19 2001	1	--- Makefile.in.orig Sat Sep 20 11:00:04 2003
2	+++ Makefile.in Sun May 27 17:49:17 2001	2	+++ Makefile.in Wed Sep 24 23:59:42 2003
3	@@ -9,14 +9,14 @@	3	@@ -9,7 +9,7 @@
4	mandir = @mandir@	4	mandir = @mandir@
5	srcdir = @srcdir@	5	srcdir = @srcdir@
6	nmapdatadir = @datadir@/nmap	6	nmapdatadir = @datadir@/nmap
Lines 8-28 Link Here
8	+deskdir = $(X11BASE)/share/gnome/apps/Utilities	8	+deskdir = $(X11BASE)/share/gnome/apps/Utilities
9		9
10	NBASEDIR=@NBASEDIR@	10	NBASEDIR=@NBASEDIR@
11	CC = @CC@	11	NSOCKDIR=@NSOCKDIR@
12	CXX = @CXX@	12	@@ -23,6 +23,7 @@
13	CCOPT =
14	LIBPCAPDIR = @libpcapdir@
15	-INCLS = -I$(LIBPCAPDIR)
16	+#INCLS = -I$(LIBPCAPDIR)
17	DEFS = @DEFS@ -DNMAP_VERSION=\"$(NMAP_VERSION)\" -DNMAP_NAME=\"$(NMAP_NAME)\" -DNMAP_URL=\"$(NMAP_URL)\" -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\"
18	# For mtrace debugging -- see MTRACE define in main.cc for instructions	13	# For mtrace debugging -- see MTRACE define in main.cc for instructions
19	# Should only be enabled during debugging and not in any real release.	14	# Should only be enabled during debugging and not in any real release.
20	@@ -200,7 +200,7 @@	15	# DEFS += -DMTRACE=1
21	$(MAKEDEPEND) $(INCLS) -s "# DO NOT DELETE" -- $(DEFS) -- $(SRCS)	16	+CPPFLAGS = @CPPFLAGS@
22		17	CXXFLAGS = @CXXFLAGS@ $(CCOPT) $(DEFS) $(INCLS)
23	install-nmap: $(TARGET)	18	# CFLAGS = $(CXXFLAGS)
24	- $(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(nmapdatadir) $(deskdir)	19	# CFLAGS = $(DEFS) $(INCLS)
25	+ $(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(nmapdatadir)
26	$(INSTALL) -c -m 755 nmap $(bindir)/nmap
27	$(INSTALL) -c -m 644 docs/$(TARGET).1 $(mandir)/man1/$(TARGET).1
28	$(INSTALL) -c -m 644 nmap-os-fingerprints $(nmapdatadir)/nmap-os-fingerprints

Line 0 Link Here

(-)security/nmap/files/patch-configure (+112 lines)
		1	--- configure.orig Sat Sep 20 09:06:56 2003
		2	+++ configure Wed Sep 24 23:09:21 2003
		3	@@ -1302,7 +1302,7 @@
		4	fi
		5	if test -d /usr/local/include; then
		6	CFLAGS="$CFLAGS -I/usr/local/include"
		7	- CXXFLAGS="$CFLAGS -I/usr/local/include"
		8	+ CXXFLAGS="$CXXFLAGS -I/usr/local/include"
		9	fi
		10	fi
		11
		12	@@ -3299,7 +3299,7 @@
		13
		14
		15
		16	-for ac_header in string.h getopt.h strings.h memory.h sys/param.h sys/sockio.h bstring.h sys/time.h pwd.h unistd.h
		17	+for ac_header in string.h strings.h memory.h sys/param.h sys/sockio.h bstring.h sys/time.h pwd.h unistd.h
		18	do
		19	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
		20	if eval "test \"\${$as_ac_Header+set}\" = set"; then
		21	@@ -4319,7 +4319,7 @@
		22	;;
		23	*)
		24	specialssldir="$with_openssl"
		25	- CXXFLAGS="$CXXFLAGS -I$with_openssl/include"
		26	+ CPPFLAGS="$CPPFLAGS -I$with_openssl/include"
		27	LDFLAGS="$LDFLAGS -L$with_openssl/lib"
		28	;;
		29	esac
		30	@@ -5105,10 +5105,10 @@
		31
		32	;;
		33	*)
		34	- _cppflags=$CXXFLAGS
		35	+ _cppflags=$CPPFLAGS
		36	_ldflags=$LDFLAGS
		37
		38	- CXXFLAGS="-I$with_libpcap/include $CXXFLAGS"
		39	+ CPPFLAGS="-I$with_libpcap/include $CPPFLAGS"
		40	LDFLAGS="-L$with_libpcap/lib $LDFLAGS"
		41
		42	if test "${ac_cv_header_pcap_h+set}" = set; then
		43	@@ -5307,7 +5307,7 @@
		44
		45
		46	LDFLAGS=$_ldflags
		47	- CXXFLAGS=$_cppflags
		48	+ CPPFLAGS=$_cppflags
		49	;;
		50	esac
		51
		52	@@ -5323,10 +5323,10 @@
		53
		54	if test $have_libpcap = yes; then
		55	if test "${LIBPCAP_INC+set}" = "set"; then
		56	- _cflags=$CXXFLAGS
		57	+ _cppflags=$CPPFLAGS
		58	_ldflags=$LDFLAGS
		59
		60	- CXXFLAGS="-I$LIBPCAP_INC $CXXFLAGS"
		61	+ CPPFLAGS="-I$LIBPCAP_INC $CPPFLAGS"
		62	LDFLAGS="-L$LIBPCAP_LIB $LDFLAGS"
		63	fi
		64
65	@@ -5336,6 +5336,8 @@
66	echo "$as_me:$LINENO: result: no" >&5
67	echo "${ECHO_T}no" >&6; have_libpcap=no
68	else
69	+ ac_check_lib_save_LIBS=$LIBS
70	+LIBS="-lpcap $LIBS"
71	cat >conftest.$ac_ext <<_ACEOF
72	#line $LINENO "configure"
73	/* confdefs.h. */
74	@@ -5391,6 +5393,7 @@
75	echo "${ECHO_T}no" >&6; have_libpcap=no
76	fi
77	rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
78	+LIBS=$ac_check_lib_save_LIBS
79	fi
80	fi
81
82	@@ -5406,10 +5409,10 @@
83	else
84	if test "${LIBPCAP_INC+set}" = "set"; then
85	LDFLAGS="-L$libpcapdir $_ldflags"
86	- CXXFLAGS="$_cflags -I$libpcapdir"
87	+ CPPFLAGS="$_cppflags -I$libpcapdir"
88	else
89	LDFLAGS="-L$libpcapdir $LDFLAGS"
90	- CXXFLAGS="$CXXFLAGS -I$libpcapdir"
91	+ CPPFLAGS="$CPPFLAGS -I$libpcapdir"
92	fi
93	PCAP_DEPENDS='$(LIBPCAPDIR)/libpcap.a'
94	PCAP_CLEAN="pcap_clean"
95	@@ -5433,7 +5436,7 @@
96	yes)
97	;;
98	*)
99	- CXXFLAGS="-I$with_libpcre/include $CXXFLAGS"
100	+ CPPFLAGS="-I$with_libpcre/include $CPPFLAGS"
101	LDFLAGS="-L$with_libpcre/lib $LDFLAGS"
102	have_pcre=yes
103	;;
104	@@ -5844,7 +5847,7 @@
105
106	subdirs="$subdirs libpcre "
107
108	- CXXFLAGS="-I$LIBPCREDIR $CXXFLAGS"
109	+ CPPFLAGS="-I$LIBPCREDIR $CPPFLAGS"
110	LIBPCRE_LIB="$LIBPCREDIR"
111	LIBS="$LIBS $LIBPCRE_LIB/libpcre.a"
112	PCRE_DEPENDS="$LIBPCRE_LIB/libpcre.a"

Line 0 Link Here

(-)security/nmap/files/patch-nbase::configure (+20 lines)
	1	--- nbase/configure.orig Sat Sep 20 11:13:26 2003
	2	+++ nbase/configure Wed Sep 24 23:10:21 2003
	3	@@ -2971,7 +2971,7 @@
	4
	5
	6
	7	-for ac_header in string.h getopt.h strings.h memory.h sys/param.h sys/time.h unistd.h bstring.h errno.h sys/types.h sys/socket.h netinet/in.h sys/sockio.h rpc/types.h netdb.h pwd.h arpa/inet.h sys/resource.h sys/stat.h sys/wait.h libiberty.h fcntl.h
	8	+for ac_header in string.h strings.h memory.h sys/param.h sys/time.h unistd.h bstring.h errno.h sys/types.h sys/socket.h netinet/in.h sys/sockio.h rpc/types.h netdb.h pwd.h arpa/inet.h sys/resource.h sys/stat.h sys/wait.h libiberty.h fcntl.h
	9	do
	10	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
	11	if eval "test \"\${$as_ac_Header+set}\" = set"; then
	12	@@ -5905,7 +5905,7 @@
	13	;;
	14	*)
	15	specialssldir="$with_openssl"
	16	- CXXFLAGS="-I$with_openssl/include $CXXFLAGS"
	17	+ CPPFLAGS="-I$with_openssl/include $CPPFLAGS"
	18	;;
	19	esac
	20

Line 0 Link Here

(-)security/nmap/files/patch-nsock::src::configure (+67 lines)
		1	--- nsock/src/configure.orig Sat Sep 20 09:07:00 2003
		2	+++ nsock/src/configure Wed Sep 24 22:05:32 2003
		3	@@ -3169,27 +3169,6 @@
		4
		5
		6
		7	-# Check whether --with-libnbase or --without-libnbase was given.
		8	-if test "${with_libnbase+set}" = set; then
		9	- withval="$with_libnbase"
		10	- case "$with_libnbase" in
		11	- yes)
		12	- ;;
		13	- *)
		14	- NBASEDIR="$with_libnbase"
		15	- ;;
		16	- esac
		17	-else
		18	- NBASEDIR="../../nbase"
		19	-
		20	-fi;
		21	-
		22	-LDFLAGS="$LDFLAGS -L$NBASEDIR"
		23	-CFLAGS="$CFLAGS -I$NBASEDIR"
		24	-LIBS="$LIBS -lnbase"
		25	-
		26	-
		27	-
		28	# First we test whether they specified openssl desires explicitly
		29	use_openssl="yes"
		30	specialssldir=""
		31	@@ -3206,7 +3185,7 @@
		32	;;
		33	*)
		34	specialssldir="$with_openssl"
		35	- CXXFLAGS="-I$with_openssl/include $CXXFLAGS"
		36	+ CPPFLAGS="-I$with_openssl/include $CPPFLAGS"
		37	;;
		38	esac
		39
		40	@@ -3856,6 +3835,27 @@
		41	_ACEOF
		42
		43	fi
		44	+
		45	+
		46	+# Check whether --with-libnbase or --without-libnbase was given.
		47	+if test "${with_libnbase+set}" = set; then
		48	+ withval="$with_libnbase"
		49	+ case "$with_libnbase" in
		50	+ yes)
		51	+ ;;
		52	+ *)
		53	+ NBASEDIR="$with_libnbase"
		54	+ ;;
		55	+ esac
		56	+else
		57	+ NBASEDIR="../../nbase"
		58	+
		59	+fi;
		60	+
		61	+LDFLAGS="$LDFLAGS -L$NBASEDIR"
		62	+CFLAGS="$CFLAGS -I$NBASEDIR"
		63	+LIBS="$LIBS -lnbase"
		64	+
65
66
67	echo "$as_me:$LINENO: checking struct ip" >&5

Lines 1-14 Link Here

(-)security/nmap/pkg-descr (-9 / +9 lines)
1	nmap is a utility for port scanning large networks, although it works fine	1	Nmap is a utility for network exploration or security auditing. It
2	for single hosts. The guiding philosophy for the creation of nmap was TMTOWTDI	2	supports ping scanning (determine which hosts are up), many port
3	(There's More Than One Way To Do It). Sometimes you need speed, other times	3	scanning techniques, version detection (determine service protocols
4	you may need stealth. In some cases, bypassing firewalls may be required. Not	4	and application versions listening behind ports), and TCP/IP
5	to mention the fact that you may want to scan different protocols (UDP, TCP,	5	fingerprinting (remote host OS or device identification). Nmap also
6	ICMP, etc.). You just can't do all this with one scanning mode. Thus nmap	6	offers flexible target and port specification, decoy/stealth scanning,
7	incorporates virtually every scanning technique known of.	7	sunRPC scanning, and more.
8		8
9	WWW: http://www.insecure.org/nmap/index.html	9	WWW: http://www.insecure.org/nmap/
10		10
11	See the webpage and the Phrack Magazine article (Volume 7, Issue 51	11	See the web page and the Phrack Magazine article (Volume 7, Issue 51
12	September 01, 1997, article 11 of 17) http://www.insecure.org/nmap/p51-11.txt	12	September 01, 1997, article 11 of 17) http://www.insecure.org/nmap/p51-11.txt
13		13
14	-- David	14	-- David

Lines 1-4 Link Here

(-)security/nmapfe/Makefile (-10 / +1 lines)
1	# ex:ts=8
2	# Ports collection makefile for: nmap	1	# Ports collection makefile for: nmap
3	# Date created: Tue Aug 04, 1998	2	# Date created: Tue Aug 04, 1998
4	# Whom: David O'Brien (obrien@NUXI.com)	3	# Whom: David O'Brien (obrien@NUXI.com)
Lines 10-25 Link Here
10		9
11	COMMENT= GUI frontend for the nmap scanning utility	10	COMMENT= GUI frontend for the nmap scanning utility
12		11
13	RUN_DEPENDS= nmap:${PORTSDIR}/security/nmap
14
15	MASTERDIR= ${.CURDIR}/../nmap	12	MASTERDIR= ${.CURDIR}/../nmap
16	PLIST= ${.CURDIR}/pkg-plist
17
18	USE_GNOME= gtk12
19
20	MAN1= nmapfe.1 xnmap.1
21		13
22	ALL_TARGET= nbase/libnbase.a nmapfe/nmapfe	14	BUILD_NMAPFE= yes
23	INSTALL_TARGET= install-nmapfe
24		15
25	.include "${MASTERDIR}/Makefile"	16	.include "${MASTERDIR}/Makefile"