diff options
| author | wiz <wiz@pkgsrc.org> | 2016-12-14 22:47:06 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2016-12-14 22:47:06 +0000 |
| commit | 13f65e55da37a350677fdf6dd4761a391815100e (patch) | |
| tree | 940c79edf5d15b813dca97c6b8cfc35483b8caec /net/nmap | |
| parent | 9da27367e758452f640f1de5652766314915f845 (diff) | |
| download | pkgsrc-13f65e55da37a350677fdf6dd4761a391815100e.tar.gz | |
Move ndiff option handling below the one for zenmap, since
the latter restricts the allowed python versions.
Diffstat (limited to 'net/nmap')
| -rw-r--r-- | net/nmap/options.mk | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/net/nmap/options.mk b/net/nmap/options.mk index a6c4220ab9e..7c220966168 100644 --- a/net/nmap/options.mk +++ b/net/nmap/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.16 2016/07/09 13:03:59 wiz Exp $ +# $NetBSD: options.mk,v 1.17 2016/12/14 22:47:06 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.nmap @@ -15,22 +15,6 @@ CONFIGURE_ARGS+= --enable-ipv6 CONFIGURE_ARGS+= --disable-ipv6 .endif -.if !empty(PKG_OPTIONS:Mndiff) -CONFIGURE_ARGS+= --with-ndiff -PLIST.ndiff= yes -PY_PATCHPLIST= yes -REPLACE_PYTHON+= ndiff/*.py -SUBST_CLASSES+= paths -SUBST_STAGE.paths= post-patch -SUBST_FILES.paths= ndiff/setup.py -SUBST_VARS.paths= PKGMANDIR -SUBST_MESSAGE.paths= Fixing paths. -.include "../../lang/python/application.mk" -.include "../../lang/python/extension.mk" -.else -CONFIGURE_ARGS+= --without-ndiff -.endif - # Enable dynamically loadable preprocessors, detection engine # and rules libraries. .if !empty(PKG_OPTIONS:Mzenmap) @@ -59,3 +43,20 @@ PLIST.lua= yes .else CONFIGURE_ARGS+= --without-liblua .endif + +# this needs to be below zenmap option handling, because that restricts python versions +.if !empty(PKG_OPTIONS:Mndiff) +CONFIGURE_ARGS+= --with-ndiff +PLIST.ndiff= yes +PY_PATCHPLIST= yes +REPLACE_PYTHON+= ndiff/*.py +SUBST_CLASSES+= paths +SUBST_STAGE.paths= post-patch +SUBST_FILES.paths= ndiff/setup.py +SUBST_VARS.paths= PKGMANDIR +SUBST_MESSAGE.paths= Fixing paths. +.include "../../lang/python/application.mk" +.include "../../lang/python/extension.mk" +.else +CONFIGURE_ARGS+= --without-ndiff +.endif |