From b00d8ea8c4740256ad784958b7915e3b6854693c Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 14 Apr 2018 13:04:33 +0000 Subject: nmap: ndiff and zenmap are now separate packages (incl. build fixes for zenmap) --- net/nmap/Makefile | 14 +- net/nmap/Makefile.common | 15 ++ net/nmap/PLIST | 285 +---------------------- net/nmap/distinfo | 4 +- net/nmap/options.mk | 44 +--- net/nmap/patches/patch-ndiff_setup.py | 15 -- net/nmap/patches/patch-zenmap_test_run__tests.py | 12 - 7 files changed, 25 insertions(+), 364 deletions(-) create mode 100644 net/nmap/Makefile.common delete mode 100644 net/nmap/patches/patch-ndiff_setup.py delete mode 100644 net/nmap/patches/patch-zenmap_test_run__tests.py (limited to 'net/nmap') diff --git a/net/nmap/Makefile b/net/nmap/Makefile index cd5216b0610..0c6d4f30819 100644 --- a/net/nmap/Makefile +++ b/net/nmap/Makefile @@ -1,14 +1,9 @@ -# $NetBSD: Makefile,v 1.139 2018/04/03 14:34:00 adam Exp $ +# $NetBSD: Makefile,v 1.140 2018/04/14 13:04:33 adam Exp $ -DISTNAME= nmap-7.70 -CATEGORIES= net security -MASTER_SITES= http://nmap.org/dist/ -EXTRACT_SUFX= .tar.bz2 +.include "Makefile.common" -MAINTAINER= pettai@NetBSD.org -HOMEPAGE= http://insecure.org/nmap/ +PKGREVISION= 1 COMMENT= Network/port scanner with OS detection -LICENSE= gnu-gpl-v2 BUILDLINK_API_DEPENDS.libpcap+= libpcap>=1.0.0 BUILDLINK_API_DEPENDS.libpcre+= libpcre>=7.6 @@ -22,7 +17,9 @@ CONFIGURE_ARGS+= --with-liblinear=${BUILDLINK_PREFIX.liblinear} CONFIGURE_ARGS+= --with-libpcap=${BUILDLINK_PREFIX.libpcap} CONFIGURE_ARGS+= --with-libpcre=${BUILDLINK_PREFIX.pcre} CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} +CONFIGURE_ARGS+= --without-ndiff # provided by net/ndiff CONFIGURE_ARGS+= --without-subversion +CONFIGURE_ARGS+= --without-zenmap # provided by net/zenmap BUILD_DEFS+= IPV6_READY @@ -70,5 +67,4 @@ post-install: .include "../../math/liblinear/buildlink3.mk" .include "../../net/libpcap/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" -#.include "../../devel/subversion-base/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/nmap/Makefile.common b/net/nmap/Makefile.common new file mode 100644 index 00000000000..1edf620c8b1 --- /dev/null +++ b/net/nmap/Makefile.common @@ -0,0 +1,15 @@ +# $NetBSD: Makefile.common,v 1.1 2018/04/14 13:04:33 adam Exp $ +# used by net/ndiff/Makefile +# used by net/nmap/Makefile +# used by net/zenmap/Makefile + +DISTNAME= nmap-7.70 +CATEGORIES= net security +MASTER_SITES= http://nmap.org/dist/ +EXTRACT_SUFX= .tar.bz2 + +MAINTAINER?= pettai@NetBSD.org +HOMEPAGE= http://insecure.org/nmap/ +LICENSE= gnu-gpl-v2 + +CONFLICTS= nmap<=7.70 diff --git a/net/nmap/PLIST b/net/nmap/PLIST index 221dbfe94bf..368b4117b08 100644 --- a/net/nmap/PLIST +++ b/net/nmap/PLIST @@ -1,227 +1,7 @@ -@comment $NetBSD: PLIST,v 1.28 2018/04/03 14:34:00 adam Exp $ +@comment $NetBSD: PLIST,v 1.29 2018/04/14 13:04:33 adam Exp $ bin/ncat -${PLIST.ndiff}bin/ndiff bin/nmap -${PLIST.zenmap}bin/nmapfe bin/nping -${PLIST.zenmap}bin/xnmap -${PLIST.zenmap}bin/zenmap -${PLIST.ndiff}${PYSITELIB}/ndiff.py -${PLIST.ndiff}${PYSITELIB}/ndiff.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/__init__.py -${PLIST.zenmap}${PYSITELIB}/radialnet/__init__.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/__init__.py -${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/__init__.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/boxes.py -${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/boxes.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/buttons.py -${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/buttons.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/comboboxes.py -${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/comboboxes.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/expanders.py -${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/expanders.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/frames.py -${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/frames.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/labels.py -${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/labels.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/textview.py -${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/textview.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/windows.py -${PLIST.zenmap}${PYSITELIB}/radialnet/bestwidgets/windows.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/core/ArgvHandle.py -${PLIST.zenmap}${PYSITELIB}/radialnet/core/ArgvHandle.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/core/Coordinate.py -${PLIST.zenmap}${PYSITELIB}/radialnet/core/Coordinate.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/core/Graph.py -${PLIST.zenmap}${PYSITELIB}/radialnet/core/Graph.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/core/Info.py -${PLIST.zenmap}${PYSITELIB}/radialnet/core/Info.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/core/Interpolation.py -${PLIST.zenmap}${PYSITELIB}/radialnet/core/Interpolation.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/core/XMLHandler.py -${PLIST.zenmap}${PYSITELIB}/radialnet/core/XMLHandler.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/core/__init__.py -${PLIST.zenmap}${PYSITELIB}/radialnet/core/__init__.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/gui/Application.py -${PLIST.zenmap}${PYSITELIB}/radialnet/gui/Application.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/gui/ControlWidget.py -${PLIST.zenmap}${PYSITELIB}/radialnet/gui/ControlWidget.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/gui/Dialogs.py -${PLIST.zenmap}${PYSITELIB}/radialnet/gui/Dialogs.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/gui/HostsViewer.py -${PLIST.zenmap}${PYSITELIB}/radialnet/gui/HostsViewer.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/gui/Image.py -${PLIST.zenmap}${PYSITELIB}/radialnet/gui/Image.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/gui/LegendWindow.py -${PLIST.zenmap}${PYSITELIB}/radialnet/gui/LegendWindow.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/gui/NodeNotebook.py -${PLIST.zenmap}${PYSITELIB}/radialnet/gui/NodeNotebook.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/gui/NodeWindow.py -${PLIST.zenmap}${PYSITELIB}/radialnet/gui/NodeWindow.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/gui/RadialNet.py -${PLIST.zenmap}${PYSITELIB}/radialnet/gui/RadialNet.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/gui/SaveDialog.py -${PLIST.zenmap}${PYSITELIB}/radialnet/gui/SaveDialog.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/gui/Toolbar.py -${PLIST.zenmap}${PYSITELIB}/radialnet/gui/Toolbar.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/gui/__init__.py -${PLIST.zenmap}${PYSITELIB}/radialnet/gui/__init__.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/util/__init__.py -${PLIST.zenmap}${PYSITELIB}/radialnet/util/__init__.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/util/drawing.py -${PLIST.zenmap}${PYSITELIB}/radialnet/util/drawing.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/util/geometry.py -${PLIST.zenmap}${PYSITELIB}/radialnet/util/geometry.pyc -${PLIST.zenmap}${PYSITELIB}/radialnet/util/integration.py -${PLIST.zenmap}${PYSITELIB}/radialnet/util/integration.pyc -${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 -${PLIST.zenmap}${PYSITELIB}/zenmapCore/I18N.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapCore/NSEDocParser.py -${PLIST.zenmap}${PYSITELIB}/zenmapCore/NSEDocParser.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapCore/Name.py -${PLIST.zenmap}${PYSITELIB}/zenmapCore/Name.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapCore/NetworkInventory.py -${PLIST.zenmap}${PYSITELIB}/zenmapCore/NetworkInventory.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapCore/NmapCommand.py -${PLIST.zenmap}${PYSITELIB}/zenmapCore/NmapCommand.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapCore/NmapOptions.py -${PLIST.zenmap}${PYSITELIB}/zenmapCore/NmapOptions.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapCore/NmapParser.py -${PLIST.zenmap}${PYSITELIB}/zenmapCore/NmapParser.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapCore/Paths.py -${PLIST.zenmap}${PYSITELIB}/zenmapCore/Paths.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapCore/RecentScans.py -${PLIST.zenmap}${PYSITELIB}/zenmapCore/RecentScans.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapCore/ScriptArgsParser.py -${PLIST.zenmap}${PYSITELIB}/zenmapCore/ScriptArgsParser.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapCore/ScriptMetadata.py -${PLIST.zenmap}${PYSITELIB}/zenmapCore/ScriptMetadata.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapCore/SearchResult.py -${PLIST.zenmap}${PYSITELIB}/zenmapCore/SearchResult.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapCore/StringPool.py -${PLIST.zenmap}${PYSITELIB}/zenmapCore/StringPool.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapCore/TargetList.py -${PLIST.zenmap}${PYSITELIB}/zenmapCore/TargetList.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapCore/UmitConf.py -${PLIST.zenmap}${PYSITELIB}/zenmapCore/UmitConf.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapCore/UmitConfigParser.py -${PLIST.zenmap}${PYSITELIB}/zenmapCore/UmitConfigParser.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapCore/UmitDB.py -${PLIST.zenmap}${PYSITELIB}/zenmapCore/UmitDB.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapCore/UmitLogging.py -${PLIST.zenmap}${PYSITELIB}/zenmapCore/UmitLogging.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapCore/UmitOptionParser.py -${PLIST.zenmap}${PYSITELIB}/zenmapCore/UmitOptionParser.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapCore/Version.py -${PLIST.zenmap}${PYSITELIB}/zenmapCore/Version.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapCore/__init__.py -${PLIST.zenmap}${PYSITELIB}/zenmapCore/__init__.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/About.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/About.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/App.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/App.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/BugReport.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/BugReport.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/CrashReport.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/CrashReport.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/DiffCompare.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/DiffCompare.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/FileChoosers.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/FileChoosers.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/FilterBar.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/FilterBar.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/Icons.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/Icons.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/MainWindow.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/MainWindow.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/NmapOutputProperties.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/NmapOutputProperties.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/NmapOutputViewer.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/NmapOutputViewer.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/OptionBuilder.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/OptionBuilder.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/Print.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/Print.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ProfileCombo.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ProfileCombo.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ProfileEditor.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ProfileEditor.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ProfileHelp.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ProfileHelp.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanHostDetailsPage.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanHostDetailsPage.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanHostsView.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanHostsView.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanInterface.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanInterface.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanNmapOutputPage.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanNmapOutputPage.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanOpenPortsPage.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanOpenPortsPage.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanRunDetailsPage.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanRunDetailsPage.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanScanListPage.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanScanListPage.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanToolbar.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScanToolbar.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScansListStore.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScansListStore.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScriptInterface.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/ScriptInterface.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/SearchGUI.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/SearchGUI.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/SearchWindow.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/SearchWindow.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/TargetCombo.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/TargetCombo.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/TopologyPage.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/TopologyPage.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/__init__.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/__init__.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/__init__.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/__init__.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/gtkutils.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/gtkutils.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higboxes.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higboxes.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higbuttons.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higbuttons.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higdialogs.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higdialogs.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higentries.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higentries.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higexpanders.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higexpanders.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higframe.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higframe.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higlabels.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higlabels.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higlogindialogs.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higlogindialogs.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/hignotebooks.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/hignotebooks.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higprogressbars.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higprogressbars.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higscrollers.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higscrollers.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higspinner.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higspinner.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higtables.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higtables.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higtextviewers.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higtextviewers.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higwindows.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/higwindows.pyc -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/utils.py -${PLIST.zenmap}${PYSITELIB}/zenmapGUI/higwidgets/utils.pyc man/de/man1/nmap.1 man/es/man1/nmap.1 man/fr/man1/nmap.1 @@ -230,10 +10,8 @@ man/hu/man1/nmap.1 man/it/man1/nmap.1 man/ja/man1/nmap.1 man/man1/ncat.1 -${PLIST.ndiff}man/man1/ndiff.1 man/man1/nmap.1 man/man1/nping.1 -${PLIST.zenmap}man/man1/zenmap.1 man/pl/man1/nmap.1 man/pt_BR/man1/nmap.1 man/pt_PT/man1/nmap.1 @@ -241,8 +19,6 @@ man/ro/man1/nmap.1 man/ru/man1/nmap.1 man/sk/man1/nmap.1 man/zh/man1/nmap.1 -${PLIST.zenmap}share/applications/zenmap-root.desktop -${PLIST.zenmap}share/applications/zenmap.desktop share/ncat/ca-bundle.crt share/nmap/nmap-mac-prefixes share/nmap/nmap-os-db @@ -1022,62 +798,3 @@ ${PLIST.lua}share/nmap/scripts/xdmcp-discover.nse ${PLIST.lua}share/nmap/scripts/xmlrpc-methods.nse ${PLIST.lua}share/nmap/scripts/xmpp-brute.nse ${PLIST.lua}share/nmap/scripts/xmpp-info.nse -${PLIST.zenmap}share/zenmap/config/scan_profile.usp -${PLIST.zenmap}share/zenmap/config/zenmap.conf -${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/es/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 -${PLIST.zenmap}share/zenmap/pixmaps/freebsd_32.png -${PLIST.zenmap}share/zenmap/pixmaps/freebsd_75.png -${PLIST.zenmap}share/zenmap/pixmaps/irix_32.png -${PLIST.zenmap}share/zenmap/pixmaps/irix_75.png -${PLIST.zenmap}share/zenmap/pixmaps/linux_32.png -${PLIST.zenmap}share/zenmap/pixmaps/linux_75.png -${PLIST.zenmap}share/zenmap/pixmaps/macosx_32.png -${PLIST.zenmap}share/zenmap/pixmaps/macosx_75.png -${PLIST.zenmap}share/zenmap/pixmaps/openbsd_32.png -${PLIST.zenmap}share/zenmap/pixmaps/openbsd_75.png -${PLIST.zenmap}share/zenmap/pixmaps/radialnet/border.png -${PLIST.zenmap}share/zenmap/pixmaps/radialnet/firewall.png -${PLIST.zenmap}share/zenmap/pixmaps/radialnet/logo.png -${PLIST.zenmap}share/zenmap/pixmaps/radialnet/padlock.png -${PLIST.zenmap}share/zenmap/pixmaps/radialnet/router.png -${PLIST.zenmap}share/zenmap/pixmaps/radialnet/switch.png -${PLIST.zenmap}share/zenmap/pixmaps/radialnet/wireless.png -${PLIST.zenmap}share/zenmap/pixmaps/redhat_32.png -${PLIST.zenmap}share/zenmap/pixmaps/redhat_75.png -${PLIST.zenmap}share/zenmap/pixmaps/solaris_32.png -${PLIST.zenmap}share/zenmap/pixmaps/solaris_75.png -${PLIST.zenmap}share/zenmap/pixmaps/throbber.gif -${PLIST.zenmap}share/zenmap/pixmaps/throbber.png -${PLIST.zenmap}share/zenmap/pixmaps/ubuntu_32.png -${PLIST.zenmap}share/zenmap/pixmaps/ubuntu_75.png -${PLIST.zenmap}share/zenmap/pixmaps/unknown_32.png -${PLIST.zenmap}share/zenmap/pixmaps/unknown_75.png -${PLIST.zenmap}share/zenmap/pixmaps/vl_1_32.png -${PLIST.zenmap}share/zenmap/pixmaps/vl_1_75.png -${PLIST.zenmap}share/zenmap/pixmaps/vl_2_32.png -${PLIST.zenmap}share/zenmap/pixmaps/vl_2_75.png -${PLIST.zenmap}share/zenmap/pixmaps/vl_3_32.png -${PLIST.zenmap}share/zenmap/pixmaps/vl_3_75.png -${PLIST.zenmap}share/zenmap/pixmaps/vl_4_32.png -${PLIST.zenmap}share/zenmap/pixmaps/vl_4_75.png -${PLIST.zenmap}share/zenmap/pixmaps/vl_5_32.png -${PLIST.zenmap}share/zenmap/pixmaps/vl_5_75.png -${PLIST.zenmap}share/zenmap/pixmaps/win_32.png -${PLIST.zenmap}share/zenmap/pixmaps/win_75.png -${PLIST.zenmap}share/zenmap/pixmaps/zenmap.png -${PLIST.zenmap}share/zenmap/su-to-zenmap.sh diff --git a/net/nmap/distinfo b/net/nmap/distinfo index 209722d565b..53a68e235f3 100644 --- a/net/nmap/distinfo +++ b/net/nmap/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.76 2018/04/03 14:34:00 adam Exp $ +$NetBSD: distinfo,v 1.77 2018/04/14 13:04:33 adam Exp $ SHA1 (nmap-7.70.tar.bz2) = 71057361a0953bba5967dc0385de77f3eed792de RMD160 (nmap-7.70.tar.bz2) = 39b176e3b515bb5bf95503e3cb431a0dcd9e97ed @@ -7,6 +7,4 @@ Size (nmap-7.70.tar.bz2) = 10467371 bytes SHA1 (patch-configure) = 5fc39f084eadd6ea0560cd8e6f52074113566600 SHA1 (patch-libdnet-stripped_src_arp-bsd.c) = c56c4e70eca2fa04dd8aab38ed2c3f4cac83f5e3 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) = 189e3b8d71131da31b65ebb6444e517bb1611a9b diff --git a/net/nmap/options.mk b/net/nmap/options.mk index e9ccc97d83a..4bd7713d358 100644 --- a/net/nmap/options.mk +++ b/net/nmap/options.mk @@ -1,13 +1,13 @@ -# $NetBSD: options.mk,v 1.19 2017/10/19 21:43:25 leot Exp $ +# $NetBSD: options.mk,v 1.20 2018/04/14 13:04:33 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.nmap -PKG_SUPPORTED_OPTIONS= inet6 ndiff zenmap lua +PKG_SUPPORTED_OPTIONS= inet6 lua PKG_SUGGESTED_OPTIONS= inet6 .include "../../mk/bsd.options.mk" -PLIST_VARS+= ndiff zenmap lua +PLIST_VARS+= lua .if !empty(PKG_OPTIONS:Minet6) CONFIGURE_ARGS+= --enable-ipv6 @@ -15,27 +15,6 @@ CONFIGURE_ARGS+= --enable-ipv6 CONFIGURE_ARGS+= --disable-ipv6 .endif -# Enable dynamically loadable preprocessors, detection engine -# and rules libraries. -.if !empty(PKG_OPTIONS:Mzenmap) -CONFIGURE_ARGS+= --with-zenmap -PLIST.zenmap= yes -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= 34 35 36 # py-xml, py-sqlite2, py-gtk2 -.include "../../lang/python/application.mk" -.include "../../lang/python/extension.mk" -.include "../../x11/py-gtk2/buildlink3.mk" -.include "../../databases/py-sqlite2/buildlink3.mk" -.include "../../textproc/py-xml/buildlink3.mk" -.include "../../sysutils/desktop-file-utils/desktopdb.mk" -.else -CONFIGURE_ARGS+= --without-zenmap -.endif - .if !empty(PKG_OPTIONS:Mlua) LUA_VERSIONS_ACCEPTED= 53 # needs lua_isyieldable, introduced in Lua 5.3 .include "../../lang/lua/buildlink3.mk" @@ -44,20 +23,3 @@ 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 diff --git a/net/nmap/patches/patch-ndiff_setup.py b/net/nmap/patches/patch-ndiff_setup.py deleted file mode 100644 index 4c501574e2e..00000000000 --- a/net/nmap/patches/patch-ndiff_setup.py +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ndiff_setup.py,v 1.1 2015/11/20 15:37:40 adam Exp $ - -Use PKGMANDIR. - ---- ndiff/setup.py.orig 2015-09-20 04:16:36.000000000 +0000 -+++ ndiff/setup.py -@@ -309,7 +309,7 @@ class my_uninstall(distutils.cmd.Command - - distutils.core.setup(name=u"ndiff", scripts=[u"scripts/ndiff"], - py_modules=[u"ndiff"], -- data_files=[(u"share/man/man1", [u"docs/ndiff.1"])], -+ data_files=[(u"@PKGMANDIR@/man1", [u"docs/ndiff.1"])], - cmdclass={ - "install_egg_info": null_command, - "install": checked_install, diff --git a/net/nmap/patches/patch-zenmap_test_run__tests.py b/net/nmap/patches/patch-zenmap_test_run__tests.py deleted file mode 100644 index 031310d29b3..00000000000 --- a/net/nmap/patches/patch-zenmap_test_run__tests.py +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-zenmap_test_run__tests.py,v 1.3 2018/04/03 14:34:00 adam Exp $ - ---- zenmap/test/run_tests.py.orig 2017-08-07 16:14:51.000000000 +0000 -+++ zenmap/test/run_tests.py -@@ -11,6 +11,7 @@ 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], - pattern="*.py" -- cgit v1.2.3