update nmap options ndiff and zenmap and corresponding PLIST entries,

as well as getting the test facility to run.  okay'd pettai@
No PKGREVISION for now as default installation remains unchanged.

6 files changed, 51 insertions, 5 deletions

diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 4a0ea5f4f4b..b1864c292ae 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.126 2015/12/31 12:06:34 adam Exp $
+# $NetBSD: Makefile,v 1.127 2016/01/24 13:46:49 richard Exp $
 
 DISTNAME=	nmap-7.01
 CATEGORIES=	net security
@@ -26,6 +26,8 @@ CONFIGURE_ARGS+=	--without-subversion
 
 BUILD_DEFS+=		IPV6_READY
 
+TEST_TARGET+=		check
+
 .include "options.mk"
 
 CHECK_INTERPRETER_SKIP=		bin/uninstall_zenmap
@@ -59,6 +61,11 @@ pre-build:
 	${ECHO} "# ignored" > ${WRKSRC}/makefile.dep
 .endif
 
+# Remove eventual uninstall_ndiff and/or uninstall_zenmap files.
+# This also avoids check-interpreter.mk issues with "/usr/bin/env python".
+post-install:
+	${RM} -f ${DESTDIR}${PREFIX}/bin/uninstall_*
+
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../math/liblinear/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
diff --git a/net/nmap/PLIST b/net/nmap/PLIST
index b02c02433a5..26b41d9bfe7 100644
--- a/net/nmap/PLIST
+++ b/net/nmap/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.21 2015/11/20 15:37:40 adam Exp $
+@comment $NetBSD: PLIST,v 1.22 2016/01/24 13:46:49 richard Exp $
 bin/ncat
 ${PLIST.ndiff}bin/ndiff
+${PLIST.ndiff}${PYSITELIB}/ndiff.py
+${PLIST.ndiff}${PYSITELIB}/ndiff.pyc
 bin/nmap
 ${PLIST.zenmap}bin/nmapfe
 bin/nping
-${PLIST.zenmap}bin/uninstall_zenmap
 ${PLIST.zenmap}bin/xnmap
 ${PLIST.zenmap}bin/zenmap
 ${PLIST.zenmap}${PYSITELIB}/radialnet/__init__.py
@@ -75,6 +76,8 @@ ${PLIST.zenmap}${PYSITELIB}/radialnet/util/misc.py
 ${PLIST.zenmap}${PYSITELIB}/radialnet/util/misc.pyc
 ${PLIST.zenmap}${PYSITELIB}/zenmapCore/BasePaths.py
 ${PLIST.zenmap}${PYSITELIB}/zenmapCore/BasePaths.pyc
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/DelayedObject.py
+${PLIST.zenmap}${PYSITELIB}/zenmapCore/DelayedObject.pyc
 ${PLIST.zenmap}${PYSITELIB}/zenmapCore/Diff.py
 ${PLIST.zenmap}${PYSITELIB}/zenmapCore/Diff.pyc
 ${PLIST.zenmap}${PYSITELIB}/zenmapCore/I18N.py
@@ -930,12 +933,14 @@ ${PLIST.zenmap}share/zenmap/config/zenmap_version
 ${PLIST.zenmap}share/zenmap/docs/help.html
 ${PLIST.zenmap}share/zenmap/locale/de/LC_MESSAGES/zenmap.mo
 ${PLIST.zenmap}share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo
+${PLIST.zenmap}share/zenmap/locale/hi/LC_MESSAGES/zenmap.mo
 ${PLIST.zenmap}share/zenmap/locale/hr/LC_MESSAGES/zenmap.mo
 ${PLIST.zenmap}share/zenmap/locale/it/LC_MESSAGES/zenmap.mo
 ${PLIST.zenmap}share/zenmap/locale/ja/LC_MESSAGES/zenmap.mo
 ${PLIST.zenmap}share/zenmap/locale/pl/LC_MESSAGES/zenmap.mo
 ${PLIST.zenmap}share/zenmap/locale/pt_BR/LC_MESSAGES/zenmap.mo
 ${PLIST.zenmap}share/zenmap/locale/ru/LC_MESSAGES/zenmap.mo
+${PLIST.zenmap}share/zenmap/locale/zh/LC_MESSAGES/zenmap.mo
 ${PLIST.zenmap}share/zenmap/misc/profile_editor.xml
 ${PLIST.zenmap}share/zenmap/pixmaps/default_32.png
 ${PLIST.zenmap}share/zenmap/pixmaps/default_75.png
diff --git a/net/nmap/distinfo b/net/nmap/distinfo
index 90c621dd082..c7de2cecc89 100644
--- a/net/nmap/distinfo
+++ b/net/nmap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.66 2015/12/31 12:06:34 adam Exp $
+$NetBSD: distinfo,v 1.67 2016/01/24 13:46:49 richard Exp $
 
 SHA1 (nmap-7.01.tar.bz2) = c1a44558c72aed3c78d63d54b5b008db69f0aaac
 RMD160 (nmap-7.01.tar.bz2) = 4f79df88e836adb260966ddf1d322b18e16251a2
@@ -7,3 +7,5 @@ Size (nmap-7.01.tar.bz2) = 8922697 bytes
 SHA1 (patch-configure) = 5fc39f084eadd6ea0560cd8e6f52074113566600
 SHA1 (patch-libnetutil_netutil.cc) = 7bd1059d6cbcf4f6d129730d6c6f6bc3ab54c0a0
 SHA1 (patch-ndiff_setup.py) = 4e4af27cb896fd1bffc2c9089f930d7075daeb22
+SHA1 (patch-nsock_tests_run__tests.sh) = 88a7447f93dd3377e7e24e317c55528a73a17401
+SHA1 (patch-zenmap_test_run__tests.py) = f2532bcbdd50e1a0d6aa85427b55269679f79459
diff --git a/net/nmap/options.mk b/net/nmap/options.mk
index 84732ba09e7..31e151cc20e 100644
--- a/net/nmap/options.mk
+++ b/net/nmap/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2015/12/05 21:25:52 adam Exp $
+# $NetBSD: options.mk,v 1.15 2016/01/24 13:46:49 richard Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.nmap
 
@@ -18,12 +18,15 @@ CONFIGURE_ARGS+=	--disable-ipv6
 .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
@@ -37,6 +40,7 @@ PY_PATCHPLIST=		yes
 REPLACE_PYTHON+=	zenmap/zenmapCore/*.py
 REPLACE_PYTHON+=	zenmap/zenmapGUI/*.py
 REPLACE_PYTHON+=	zenmap/zenmapGUI/higwidgets/*.py
+REPLACE_PYTHON+=	zenmap/test/*.py
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35 # py-xml, py-sqlite2, py-gtk2
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
diff --git a/net/nmap/patches/patch-nsock_tests_run__tests.sh b/net/nmap/patches/patch-nsock_tests_run__tests.sh
new file mode 100644
index 00000000000..0df8b75a2e4
--- /dev/null
+++ b/net/nmap/patches/patch-nsock_tests_run__tests.sh
@@ -0,0 +1,13 @@
+$NetBSD: patch-nsock_tests_run__tests.sh,v 1.1 2016/01/24 13:46:49 richard Exp $
+
+--- nsock/tests/run_tests.sh.orig	2015-11-10 04:26:26.000000000 +0000
++++ nsock/tests/run_tests.sh
+@@ -11,7 +11,7 @@ PORT_TCPSSL=$(grep "PORT_TCPSSL " test-c
+ EXEC_MAIN=./tests_main
+ 
+ NCAT=${NCAT:-ncat}
+-if [ ! -x "$NCAT" -a -z "$(which $NCAT)" ]; then
++if [ ! -x "$NCAT" ]; then
+     echo "Can't find your ncat: $NCAT"
+     echo "Trying ../../ncat/ncat"
+     NCAT="../../ncat/ncat"
diff --git a/net/nmap/patches/patch-zenmap_test_run__tests.py b/net/nmap/patches/patch-zenmap_test_run__tests.py
new file mode 100644
index 00000000000..4db7e9f48ff
--- /dev/null
+++ b/net/nmap/patches/patch-zenmap_test_run__tests.py
@@ -0,0 +1,15 @@
+$NetBSD: patch-zenmap_test_run__tests.py,v 1.1 2016/01/24 13:46:49 richard Exp $
+
+--- zenmap/test/run_tests.py.orig	2014-08-23 04:22:09.000000000 +0000
++++ zenmap/test/run_tests.py
+@@ -11,8 +11,9 @@ if __name__ == "__main__":
+         sys.exit(0)
+ 
+     os.chdir("..")
++    sys.path.insert(1,"build/lib")
+     suite = unittest.defaultTestLoader.discover(
+-            start_dir=glob.glob("build/lib.*")[0],
++            start_dir=glob.glob("build/lib/*")[0],
+             pattern="*.py"
+             )
+     unittest.TextTestRunner().run(suite)