Attachment #89306 for bug #126211

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




# Ports collection makefile for:  nmap
# Date created:			  1998-08-04
# Whom:				  David O'Brien (obrien@NUXI.com)
#
# $FreeBSD: ports/security/nmap/Makefile,v 1.109 2008/05/06 13:26:10 miwi Exp $
#

PORTNAME=	nmap
PORTVERSION=	4.68
CATEGORIES=	security ipv6
MASTER_SITES=	http://nmap.org/dist/ \
		http://www.mirrors.wiretapped.net/security/network-mapping/nmap/ \

Lines 1-3 Link Here

(-)nmap/distinfo (-3 / +3 lines)
1	MD5 (nmap-4.62.tar.bz2) = 4fdaa418f4008509d4c91ec087131d4e	1	MD5 (nmap-4.68.tar.bz2) = c363d32a00c697d15996fced22072b6c
2	SHA256 (nmap-4.62.tar.bz2) = 2fb7b72c1416428dd786f37e3aab0b36f633ee5246dd7a1b0240b0a5f9e13791	2	SHA256 (nmap-4.68.tar.bz2) = 1866be3d8d397ea7721c08f520d033c208492d3e1551311805d18efbe6cef161
3	SIZE (nmap-4.62.tar.bz2) = 3308006	3	SIZE (nmap-4.68.tar.bz2) = 5979048




 NMAPDEVDIR=~/nmap-dev
 
 export NBASEDIR=@NBASEDIR@
@@ -178,7 +178,7 @@
 # Use strip -x to avoid stripping dynamically loaded NSE functions. See
 # http://seclists.org/nmap-dev/2007/q4/0272.html.
 	$(STRIP) -x $(DESTDIR)$(bindir)/nmap
-	$(INSTALL) -c -m 644 docs/$(TARGET).1 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/
+	$(INSTALL) -c -m 644 docs/$(TARGET).1 $(DESTDIR)$(mandir)/man1/
 	$(INSTALL) -c -m 644 docs/nmap.xsl $(DESTDIR)$(nmapdatadir)/
 	$(INSTALL) -c -m 644 docs/nmap.dtd $(DESTDIR)$(nmapdatadir)/
 	$(INSTALL) -c -m 644 nmap-services $(DESTDIR)$(nmapdatadir)/




--- configure.orig	2008-06-15 09:05:12.000000000 +0200
+++ configure	2008-08-03 12:41:04.000000000 +0200
@@ -1930,7 +1930,7 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then

 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
@@ -7337,8 +7337,8 @@
     no_lua="yes"
   ;;
   *)
-    CPPFLAGS="-I$with_liblua/include $CPPFLAGS"
-    LDFLAGS="-L$with_liblua/lib $LDFLAGS"
-    have_lua=yes
+    CPPFLAGS="-I${LUA_INCDIR} $CPPFLAGS"
+    LDFLAGS="-L${LUA_LIBDIR} $LDFLAGS"
+    #have_lua=yes
   ;;
   esac
 
@@ -7189,7 +7189,7 @@
 
 
 # They don't want lua
-if test $no_lua == yes; then
+if test $no_lua = yes; then
   CXXFLAGS="-DNOLUA $CXXFLAGS"
   LIBLUA_LIBS=""
   LUA_DEPENDS=""

Lines 17-24 Link Here

(-)nmap/pkg-plist (-2 / +1 lines)
17	%%DATADIR%%/scripts/promiscuous.nse	17	%%DATADIR%%/scripts/promiscuous.nse
18	%%DATADIR%%/scripts/netbios-smb-os-discovery.nse	18	%%DATADIR%%/scripts/netbios-smb-os-discovery.nse
19	%%DATADIR%%/scripts/nbstat.nse	19	%%DATADIR%%/scripts/nbstat.nse
20	%%DATADIR%%/scripts/mswindowsShell.nse
21	%%DATADIR%%/scripts/kibuvDetection.nse
22	%%DATADIR%%/scripts/ircZombieTest.nse	20	%%DATADIR%%/scripts/ircZombieTest.nse
23	%%DATADIR%%/scripts/ircServerInfo.nse	21	%%DATADIR%%/scripts/ircServerInfo.nse
24	%%DATADIR%%/scripts/iax2Detect.nse	22	%%DATADIR%%/scripts/iax2Detect.nse
Lines 58-63 Link Here
58	%%DATADIR%%/nselib/url.lua	56	%%DATADIR%%/nselib/url.lua
59	%%DATADIR%%/nselib/tab.lua	57	%%DATADIR%%/nselib/tab.lua
60	%%DATADIR%%/nselib/datafiles.lua	58	%%DATADIR%%/nselib/datafiles.lua
		59	%%DATADIR%%/nselib/comm.lua
61	@dirrm %%DATADIR%%/nselib	60	@dirrm %%DATADIR%%/nselib
62	%%DATADIR%%/nmap-mac-prefixes	61	%%DATADIR%%/nmap-mac-prefixes
63	%%DATADIR%%/nmap-os-db	62	%%DATADIR%%/nmap-os-db

Return to bug 126211

Lines 1-12 Link Here

(-)nmap/Makefile (-2 / +2 lines)
1	# Ports collection makefile for: nmap	1	# Ports collection makefile for: nmap
2	# Date created: Tue Aug 04, 1998	2	# Date created: 1998-08-04
3	# Whom: David O'Brien (obrien@NUXI.com)	3	# Whom: David O'Brien (obrien@NUXI.com)
4	#	4	#
5	# $FreeBSD: ports/security/nmap/Makefile,v 1.109 2008/05/06 13:26:10 miwi Exp $	5	# $FreeBSD: ports/security/nmap/Makefile,v 1.109 2008/05/06 13:26:10 miwi Exp $
6	#	6	#
7		7
8	PORTNAME= nmap	8	PORTNAME= nmap
9	PORTVERSION= 4.62	9	PORTVERSION= 4.68
10	CATEGORIES= security ipv6	10	CATEGORIES= security ipv6
11	MASTER_SITES= http://nmap.org/dist/ \	11	MASTER_SITES= http://nmap.org/dist/ \
12	http://www.mirrors.wiretapped.net/security/network-mapping/nmap/ \	12	http://www.mirrors.wiretapped.net/security/network-mapping/nmap/ \

Lines 9-20 Link Here

(-)nmap/files/patch-Makefile.in (-9 lines)
9	NMAPDEVDIR=~/nmap-dev	9	NMAPDEVDIR=~/nmap-dev
10		10
11	export NBASEDIR=@NBASEDIR@	11	export NBASEDIR=@NBASEDIR@
12	@@ -178,7 +178,7 @@
13	# Use strip -x to avoid stripping dynamically loaded NSE functions. See
14	# http://seclists.org/nmap-dev/2007/q4/0272.html.
15	$(STRIP) -x $(DESTDIR)$(bindir)/nmap
16	- $(INSTALL) -c -m 644 docs/$(TARGET).1 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/
17	+ $(INSTALL) -c -m 644 docs/$(TARGET).1 $(DESTDIR)$(mandir)/man1/
18	$(INSTALL) -c -m 644 docs/nmap.xsl $(DESTDIR)$(nmapdatadir)/
19	$(INSTALL) -c -m 644 docs/nmap.dtd $(DESTDIR)$(nmapdatadir)/
20	$(INSTALL) -c -m 644 nmap-services $(DESTDIR)$(nmapdatadir)/

Lines 1-5 Link Here

(-)nmap/files/patch-configure (-14 / +3 lines)
1	--- configure.orig 2008-04-28 19:53:32.000000000 +0200	1	--- configure.orig 2008-06-15 09:05:12.000000000 +0200
2	+++ configure 2008-05-04 20:25:47.000000000 +0200	2	+++ configure 2008-08-03 12:41:04.000000000 +0200
3	@@ -1930,7 +1930,7 @@	3	@@ -1930,7 +1930,7 @@
4	ac_compiler_gnu=$ac_cv_c_compiler_gnu	4	ac_compiler_gnu=$ac_cv_c_compiler_gnu
5	if test -n "$ac_tool_prefix"; then	5	if test -n "$ac_tool_prefix"; then
Lines 9-33 Link Here
9	{ echo "$as_me:$LINENO: checking for $ac_word" >&5	9	{ echo "$as_me:$LINENO: checking for $ac_word" >&5
10	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }	10	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
11	if test "${ac_cv_prog_CC+set}" = set; then	11	if test "${ac_cv_prog_CC+set}" = set; then
12	@@ -7179,9 +7179,9 @@	12	@@ -7337,8 +7337,8 @@
13	no_lua="yes"	13	no_lua="yes"
14	;;	14	;;
15	*)	15	*)
16	- CPPFLAGS="-I$with_liblua/include $CPPFLAGS"	16	- CPPFLAGS="-I$with_liblua/include $CPPFLAGS"
17	- LDFLAGS="-L$with_liblua/lib $LDFLAGS"	17	- LDFLAGS="-L$with_liblua/lib $LDFLAGS"
18	- have_lua=yes
19	+ CPPFLAGS="-I${LUA_INCDIR} $CPPFLAGS"	18	+ CPPFLAGS="-I${LUA_INCDIR} $CPPFLAGS"
20	+ LDFLAGS="-L${LUA_LIBDIR} $LDFLAGS"	19	+ LDFLAGS="-L${LUA_LIBDIR} $LDFLAGS"
21	+ #have_lua=yes
22	;;	20	;;
23	esac	21	esac
24		22
25	@@ -7189,7 +7189,7 @@
26
27
28	# They don't want lua
29	-if test $no_lua == yes; then
30	+if test $no_lua = yes; then
31	CXXFLAGS="-DNOLUA $CXXFLAGS"
32	LIBLUA_LIBS=""
33	LUA_DEPENDS=""