diff options
| author | abs <abs@pkgsrc.org> | 2013-04-07 10:11:54 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2013-04-07 10:11:54 +0000 |
| commit | eb0a1944882571658518c923a687bdb11cbefe2c (patch) | |
| tree | 72c93b24523a91d74892edc01d0d94dcb2af23b9 /net | |
| parent | 7b0abe566005a7d3c4c2fefddacfbfff31bbd28e (diff) | |
| download | pkgsrc-eb0a1944882571658518c923a687bdb11cbefe2c.tar.gz | |
Fix PKG_OPTIONS.nmap=ndiff to include python/application.mk - previously
would only work when set in addition to PKG_OPTIONS.zenmap
Diffstat (limited to 'net')
| -rw-r--r-- | net/nmap/Makefile | 8 | ||||
| -rw-r--r-- | net/nmap/options.mk | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/net/nmap/Makefile b/net/nmap/Makefile index 2832993ccfc..adf3dd9ca49 100644 --- a/net/nmap/Makefile +++ b/net/nmap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.103 2013/02/16 11:23:58 wiz Exp $ +# $NetBSD: Makefile,v 1.104 2013/04/07 10:11:54 abs Exp $ DISTNAME= nmap-6.01 PKGREVISION= 9 @@ -62,12 +62,6 @@ pre-build: ${ECHO} "# ignored" > ${WRKSRC}/makefile.dep .endif -SUBST_CLASSES+= paths -SUBST_STAGE.paths= post-patch -SUBST_FILES.paths= ndiff/setup.py -SUBST_SED.paths= -e "s|@@PKGMANDIR@@|${PKGMANDIR}|g" -SUBST_MESSAGE.paths= Fixing paths. - post-build: ${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC diff --git a/net/nmap/options.mk b/net/nmap/options.mk index 523e523b403..ee866f8776f 100644 --- a/net/nmap/options.mk +++ b/net/nmap/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2012/04/08 19:09:09 wiz Exp $ +# $NetBSD: options.mk,v 1.8 2013/04/07 10:11:54 abs Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.nmap @@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --disable-ipv6 CONFIGURE_ARGS+= --with-zenmap PLIST_SRC+= ${PKGDIR}/PLIST.zenmap PY_PATCHPLIST= yes -REPLACE_PYTHON= zenmap/zenmapCore/*.py +REPLACE_PYTHON+= zenmap/zenmapCore/*.py REPLACE_PYTHON+= zenmap/zenmapGUI/*.py REPLACE_PYTHON+= zenmap/zenmapGUI/higwidgets/*.py .include "../../lang/python/application.mk" @@ -37,6 +37,12 @@ CONFIGURE_ARGS+= --without-zenmap .if !empty(PKG_OPTIONS:Mndiff) CONFIGURE_ARGS+= --with-ndiff PLIST_SRC+= ${PKGDIR}/PLIST.ndiff +SUBST_CLASSES+= paths +SUBST_STAGE.paths= post-patch +SUBST_FILES.paths= ndiff/setup.py +SUBST_SED.paths= -e "s|@@PKGMANDIR@@|${PKGMANDIR}|g" +SUBST_MESSAGE.paths= Fixing paths. +.include "../../lang/python/application.mk" .else CONFIGURE_ARGS+= --without-ndiff .endif |