CVS commit: pkgsrc/net/nmap

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Dec 14 22:47:06 UTC 2016

Modified Files:
        pkgsrc/net/nmap: options.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/nmap/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/nmap/options.mk
diff -u pkgsrc/net/nmap/options.mk:1.16 pkgsrc/net/nmap/options.mk:1.17
--- pkgsrc/net/nmap/options.mk:1.16     Sat Jul  9 13:03:59 2016
+++ pkgsrc/net/nmap/options.mk  Wed Dec 14 22:47:06 2016
@@ -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