[pkgsrc/trunk]: pkgsrc/net/nmap Move ndiff option handling below the one for ...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6464d3ed1e1f
branches:  trunk
changeset: 355864:6464d3ed1e1f
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Dec 14 22:47:06 2016 +0000

description:
Move ndiff option handling below the one for zenmap, since
the latter restricts the allowed python versions.

diffstat:

 net/nmap/options.mk |  35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 deletions(-)

diffs (53 lines):

diff -r 582edcb610a6 -r 6464d3ed1e1f net/nmap/options.mk
--- a/net/nmap/options.mk       Wed Dec 14 21:36:35 2016 +0000
+++ b/net/nmap/options.mk       Wed Dec 14 22:47:06 2016 +0000
@@ -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+=       --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 @@
 .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