Tue Oct 30 23:34:38 2012 UTC ()
Ignore subversion if detected (don't install experimental tool nmap-update)


(pettai)
diff -r1.97 -r1.98 pkgsrc/net/nmap/Makefile
cvs diff -r1.97 -r1.98 pkgsrc/net/nmap/Makefile (expand / switch to unified diff)

--- pkgsrc/net/nmap/Makefile 2012/10/23 17:18:42 1.97
+++ pkgsrc/net/nmap/Makefile 2012/10/30 23:34:38 1.98
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.97 2012/10/23 17:18:42 asau Exp $ 1# $NetBSD: Makefile,v 1.98 2012/10/30 23:34:38 pettai Exp $
2 2
3DISTNAME= nmap-6.01 3DISTNAME= nmap-6.01
4PKGREVISION= 3 4PKGREVISION= 4
5CATEGORIES= net security 5CATEGORIES= net security
6MASTER_SITES= http://nmap.org/dist/ 6MASTER_SITES= http://nmap.org/dist/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pettai@NetBSD.org 9MAINTAINER= pettai@NetBSD.org
10HOMEPAGE= http://insecure.org/nmap/ 10HOMEPAGE= http://insecure.org/nmap/
11COMMENT= Network/port scanner with OS detection 11COMMENT= Network/port scanner with OS detection
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14#PKG_INSTALLATION_TYPES= overwrite pkgviews 14#PKG_INSTALLATION_TYPES= overwrite pkgviews
15 15
16BUILDLINK_API_DEPENDS.libpcap+= libpcap>=1.0.0 16BUILDLINK_API_DEPENDS.libpcap+= libpcap>=1.0.0
17BUILDLINK_API_DEPENDS.libpcre+= libpcre>=7.6 17BUILDLINK_API_DEPENDS.libpcre+= libpcre>=7.6
@@ -29,26 +29,27 @@ BUILD_DEFS+= IPV6_READY @@ -29,26 +29,27 @@ BUILD_DEFS+= IPV6_READY
29.include "options.mk" 29.include "options.mk"
30 30
31CHECK_INTERPRETER_SKIP= bin/uninstall_zenmap 31CHECK_INTERPRETER_SKIP= bin/uninstall_zenmap
32CHECK_INTERPRETER_SKIP+= share/zenmap/su-to-zenmap.sh 32CHECK_INTERPRETER_SKIP+= share/zenmap/su-to-zenmap.sh
33CHECK_INTERPRETER_SKIP+= share/nmap/nselib/data/oracle-default-accounts.lst 33CHECK_INTERPRETER_SKIP+= share/nmap/nselib/data/oracle-default-accounts.lst
34CHECK_INTERPRETER_SKIP+= share/nmap/nselib/data/oracle-sids 34CHECK_INTERPRETER_SKIP+= share/nmap/nselib/data/oracle-sids
35CHECK_INTERPRETER_SKIP+= share/nmap/nselib/data/passwords.lst 35CHECK_INTERPRETER_SKIP+= share/nmap/nselib/data/passwords.lst
36CHECK_INTERPRETER_SKIP+= share/nmap/nselib/data/rtsp-urls.txt 36CHECK_INTERPRETER_SKIP+= share/nmap/nselib/data/rtsp-urls.txt
37CHECK_INTERPRETER_SKIP+= share/nmap/nselib/data/snmpcommunities.lst 37CHECK_INTERPRETER_SKIP+= share/nmap/nselib/data/snmpcommunities.lst
38 38
39CONFIGURE_ARGS+= --with-libpcap=${BUILDLINK_PREFIX.libpcap} 39CONFIGURE_ARGS+= --with-libpcap=${BUILDLINK_PREFIX.libpcap}
40CONFIGURE_ARGS+= --with-libpcre=${BUILDLINK_PREFIX.pcre} 40CONFIGURE_ARGS+= --with-libpcre=${BUILDLINK_PREFIX.pcre}
41CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} 41CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
 42CONFIGURE_ARGS+= --without-subversion
42 43
43.include "../../mk/bsd.prefs.mk" 44.include "../../mk/bsd.prefs.mk"
44 45
45.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" 46.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
46MAKE_ENV+= CPPFLAGS="" 47MAKE_ENV+= CPPFLAGS=""
47.endif 48.endif
48 49
49# The SunPro C++ compiler does not understand __FUNCTION__, as well as 50# The SunPro C++ compiler does not understand __FUNCTION__, as well as
50# __func__. So __FILE__ is the nearest replacement. 51# __func__. So __FILE__ is the nearest replacement.
51.include "../../mk/compiler.mk" 52.include "../../mk/compiler.mk"
52.if !empty(PKGSRC_COMPILER:Msunpro) 53.if !empty(PKGSRC_COMPILER:Msunpro)
53CFLAGS.SunOS+= -D__FUNCTION__=__FILE__ 54CFLAGS.SunOS+= -D__FUNCTION__=__FILE__
54.endif 55.endif
@@ -63,15 +64,16 @@ pre-build: @@ -63,15 +64,16 @@ pre-build:
63 64
64SUBST_CLASSES+= paths 65SUBST_CLASSES+= paths
65SUBST_STAGE.paths= post-patch 66SUBST_STAGE.paths= post-patch
66SUBST_FILES.paths= ndiff/setup.py 67SUBST_FILES.paths= ndiff/setup.py
67SUBST_SED.paths= -e "s|@@PKGMANDIR@@|${PKGMANDIR}|g" 68SUBST_SED.paths= -e "s|@@PKGMANDIR@@|${PKGMANDIR}|g"
68SUBST_MESSAGE.paths= Fixing paths. 69SUBST_MESSAGE.paths= Fixing paths.
69 70
70post-build: 71post-build:
71 ${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC 72 ${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
72 73
73.include "../../devel/pcre/buildlink3.mk" 74.include "../../devel/pcre/buildlink3.mk"
74.include "../../net/libpcap/buildlink3.mk" 75.include "../../net/libpcap/buildlink3.mk"
75.include "../../security/openssl/buildlink3.mk" 76.include "../../security/openssl/buildlink3.mk"
 77#.include "../../devel/subversion-base/buildlink3.mk"
76 78
77.include "../../mk/bsd.pkg.mk" 79.include "../../mk/bsd.pkg.mk"