- Update to 4.85.b7

PR:		ports/133549
Submitted by:	Daniel Roethlisberger <daniel@roe.ch> (maintainer)
Approved by:	miwi (mentor)

4 files changed, 176 insertions, 58 deletions

diff --git a/security/zenmap/Makefile b/security/zenmap/Makefile
index 694186c861da..cc19d6d8f508 100644
--- a/security/zenmap/Makefile
+++ b/security/zenmap/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	zenmap
-PORTVERSION=	4.76
+DISTVERSION=	4.85BETA7
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://nmap.org/dist/ \
 		http://www.mirrors.wiretapped.net/security/network-mapping/nmap/ \
 		http://www.mirrorservice.org/sites/ftp.wiretapped.net/pub/security/network-mapping/nmap/ \
 		http://mirror.sg.depaul.edu/pub/security/nmap/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	nmap-${PORTVERSION}
+DISTNAME=	nmap-${DISTVERSION}
 
 MAINTAINER=	daniel@roe.ch
 COMMENT=	GUI frontend for the nmap scanning utility
@@ -21,12 +21,14 @@ COMMENT=	GUI frontend for the nmap scanning utility
 RUN_DEPENDS=	${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap \
 		${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite23
 
+PYDISTUTILS_PKGVERSION=	${DISTVERSION}
 USE_BZIP2=	yes
 USE_PYTHON=	yes
+USE_GETTEXT=	yes
 USE_GNOME=	pygtk2
 INSTALLS_EGGINFO=	yes
 
-MAN1=		zenmap.1
+MAN1=		zenmap.1 ndiff.1
 MLINKS=		zenmap.1 xnmap.1
 
 .include <bsd.port.pre.mk>
@@ -44,14 +46,25 @@ pre-everything::
 	@${ECHO_MSG} '===> Define WITHOUT_PSYCO to disable devel/py-psyco optimization'
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|share/man/man1|man/man1|g' ${WRKSRC}/ndiff/setup.py
+
 do-build:
 	cd ${WRKSRC}/${PORTNAME} && \
 		${PYTHON_CMD} setup.py build
+	cd ${WRKSRC}/ndiff && \
+		${PYTHON_CMD} setup.py build
 
 do-install:
 	cd ${WRKSRC}/${PORTNAME} && \
 		${PYTHON_CMD} setup.py install --prefix ${PREFIX}
 	@${RM} ${PREFIX}/bin/uninstall_zenmap
 	${INSTALL_MAN} ${WRKSRC}/docs/zenmap.1 ${MAN1PREFIX}/man/man1
+.for P in radialnet zenmapCore zenmapGUI
+	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PYTHON_SITELIBDIR}/${P}
+	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${PYTHON_SITELIBDIR}/${P}
+.endfor
+	cd ${WRKSRC}/ndiff && \
+		${PYTHON_CMD} setup.py install --prefix ${PREFIX}
 
 .include <bsd.port.post.mk>
diff --git a/security/zenmap/distinfo b/security/zenmap/distinfo
index bb85f2e86936..b1aaa5ef87eb 100644
--- a/security/zenmap/distinfo
+++ b/security/zenmap/distinfo
@@ -1,3 +1,3 @@
-MD5 (nmap-4.76.tar.bz2) = 278dd2e849cc3dbb947df961a1aaffd0
-SHA256 (nmap-4.76.tar.bz2) = 4e24328ca6ec97afb2a8caf312b1f111a15cf41763a5ac41e7a633fdb217d66d
-SIZE (nmap-4.76.tar.bz2) = 6061317
+MD5 (nmap-4.85BETA7.tar.bz2) = 49218e9a5ec7b2628334b911a885b432
+SHA256 (nmap-4.85BETA7.tar.bz2) = dfff90a51fa44770a48dbeb31378d090ee334e4df2d013c8934f6ebf33eaabe5
+SIZE (nmap-4.85BETA7.tar.bz2) = 6454664
diff --git a/security/zenmap/pkg-descr b/security/zenmap/pkg-descr
index cc71cb208528..63fcc8ccee5f 100644
--- a/security/zenmap/pkg-descr
+++ b/security/zenmap/pkg-descr
@@ -1,4 +1,5 @@
-zenmap is the official GUI front end for the nmap port scanning tool.
-Originally based on umit, it has replaced nmapfe as per nmap 4.50.
+Zenmap is the official GUI front end for the Nmap port scanning tool.
+Originally based on Umit, it has replaced NmapFE as per Nmap 4.50.
+Also included are python based Nmap auxilary tools (currently Ndiff).
 
 WWW: http://nmap.org/
diff --git a/security/zenmap/pkg-plist b/security/zenmap/pkg-plist
index 3a37d25e6cab..dea7ecc7057a 100644
--- a/security/zenmap/pkg-plist
+++ b/security/zenmap/pkg-plist
@@ -1,208 +1,307 @@
 bin/zenmap
+bin/ndiff
 share/applications/zenmap-root.desktop
 share/applications/zenmap.desktop
-%%PYTHON_SITELIBDIR%%/radialnet/__init__.py
-%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/labels.py
-%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/frames.py
-%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/comboboxes.py
 %%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/boxes.py
-%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/__init__.py
-%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/expanders.py
+%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/boxes.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/boxes.pyo
 %%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/buttons.py
-%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/textview.py
-%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/windows.py
-%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/labels.pyc
-%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/frames.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/buttons.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/buttons.pyo
+%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/comboboxes.py
 %%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/comboboxes.pyc
-%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/boxes.pyc
-%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/__init__.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/comboboxes.pyo
+%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/expanders.py
 %%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/expanders.pyc
-%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/buttons.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/expanders.pyo
+%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/frames.py
+%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/frames.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/frames.pyo
+%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/labels.py
+%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/labels.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/labels.pyo
+%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/textview.py
 %%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/textview.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/textview.pyo
+%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/windows.py
 %%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/windows.pyc
-%%PYTHON_SITELIBDIR%%/radialnet/core/Info.py
-%%PYTHON_SITELIBDIR%%/radialnet/core/XMLHandler.py
+%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/windows.pyo
+%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/__init__.py
+%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/__init__.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/bestwidgets/__init__.pyo
 %%PYTHON_SITELIBDIR%%/radialnet/core/ArgvHandle.py
-%%PYTHON_SITELIBDIR%%/radialnet/core/Graph.py
-%%PYTHON_SITELIBDIR%%/radialnet/core/__init__.py
+%%PYTHON_SITELIBDIR%%/radialnet/core/ArgvHandle.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/core/ArgvHandle.pyo
 %%PYTHON_SITELIBDIR%%/radialnet/core/Coordinate.py
-%%PYTHON_SITELIBDIR%%/radialnet/core/Interpolation.py
+%%PYTHON_SITELIBDIR%%/radialnet/core/Coordinate.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/core/Coordinate.pyo
+%%PYTHON_SITELIBDIR%%/radialnet/core/Graph.py
+%%PYTHON_SITELIBDIR%%/radialnet/core/Graph.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/core/Graph.pyo
+%%PYTHON_SITELIBDIR%%/radialnet/core/Info.py
 %%PYTHON_SITELIBDIR%%/radialnet/core/Info.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/core/Info.pyo
+%%PYTHON_SITELIBDIR%%/radialnet/core/Interpolation.py
+%%PYTHON_SITELIBDIR%%/radialnet/core/Interpolation.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/core/Interpolation.pyo
+%%PYTHON_SITELIBDIR%%/radialnet/core/XMLHandler.py
 %%PYTHON_SITELIBDIR%%/radialnet/core/XMLHandler.pyc
-%%PYTHON_SITELIBDIR%%/radialnet/core/ArgvHandle.pyc
-%%PYTHON_SITELIBDIR%%/radialnet/core/Graph.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/core/XMLHandler.pyo
+%%PYTHON_SITELIBDIR%%/radialnet/core/__init__.py
 %%PYTHON_SITELIBDIR%%/radialnet/core/__init__.pyc
-%%PYTHON_SITELIBDIR%%/radialnet/core/Coordinate.pyc
-%%PYTHON_SITELIBDIR%%/radialnet/core/Interpolation.pyc
-%%PYTHON_SITELIBDIR%%/radialnet/gui/NodeNotebook.py
+%%PYTHON_SITELIBDIR%%/radialnet/core/__init__.pyo
 %%PYTHON_SITELIBDIR%%/radialnet/gui/Application.py
+%%PYTHON_SITELIBDIR%%/radialnet/gui/Application.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/gui/Application.pyo
 %%PYTHON_SITELIBDIR%%/radialnet/gui/ControlWidget.py
-%%PYTHON_SITELIBDIR%%/radialnet/gui/Image.py
+%%PYTHON_SITELIBDIR%%/radialnet/gui/ControlWidget.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/gui/ControlWidget.pyo
 %%PYTHON_SITELIBDIR%%/radialnet/gui/Dialogs.py
-%%PYTHON_SITELIBDIR%%/radialnet/gui/Toolbar.py
-%%PYTHON_SITELIBDIR%%/radialnet/gui/RadialNet.py
-%%PYTHON_SITELIBDIR%%/radialnet/gui/__init__.py
+%%PYTHON_SITELIBDIR%%/radialnet/gui/Dialogs.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/gui/Dialogs.pyo
 %%PYTHON_SITELIBDIR%%/radialnet/gui/HostsViewer.py
-%%PYTHON_SITELIBDIR%%/radialnet/gui/NodeWindow.py
-%%PYTHON_SITELIBDIR%%/radialnet/gui/NodeNotebook.pyc
-%%PYTHON_SITELIBDIR%%/radialnet/gui/Application.pyc
-%%PYTHON_SITELIBDIR%%/radialnet/gui/ControlWidget.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/gui/HostsViewer.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/gui/HostsViewer.pyo
+%%PYTHON_SITELIBDIR%%/radialnet/gui/Image.py
 %%PYTHON_SITELIBDIR%%/radialnet/gui/Image.pyc
-%%PYTHON_SITELIBDIR%%/radialnet/gui/Dialogs.pyc
-%%PYTHON_SITELIBDIR%%/radialnet/gui/Toolbar.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/gui/Image.pyo
+%%PYTHON_SITELIBDIR%%/radialnet/gui/NodeNotebook.py
+%%PYTHON_SITELIBDIR%%/radialnet/gui/NodeNotebook.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/gui/NodeNotebook.pyo
+%%PYTHON_SITELIBDIR%%/radialnet/gui/NodeWindow.py
+%%PYTHON_SITELIBDIR%%/radialnet/gui/NodeWindow.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/gui/NodeWindow.pyo
+%%PYTHON_SITELIBDIR%%/radialnet/gui/RadialNet.py
 %%PYTHON_SITELIBDIR%%/radialnet/gui/RadialNet.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/gui/RadialNet.pyo
+%%PYTHON_SITELIBDIR%%/radialnet/gui/Toolbar.py
+%%PYTHON_SITELIBDIR%%/radialnet/gui/Toolbar.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/gui/Toolbar.pyo
+%%PYTHON_SITELIBDIR%%/radialnet/gui/__init__.py
 %%PYTHON_SITELIBDIR%%/radialnet/gui/__init__.pyc
-%%PYTHON_SITELIBDIR%%/radialnet/gui/HostsViewer.pyc
-%%PYTHON_SITELIBDIR%%/radialnet/gui/NodeWindow.pyc
-%%PYTHON_SITELIBDIR%%/radialnet/util/integration.py
-%%PYTHON_SITELIBDIR%%/radialnet/util/geometry.py
-%%PYTHON_SITELIBDIR%%/radialnet/util/misc.py
-%%PYTHON_SITELIBDIR%%/radialnet/util/__init__.py
+%%PYTHON_SITELIBDIR%%/radialnet/gui/__init__.pyo
 %%PYTHON_SITELIBDIR%%/radialnet/util/drawing.py
-%%PYTHON_SITELIBDIR%%/radialnet/util/integration.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/util/drawing.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/util/drawing.pyo
+%%PYTHON_SITELIBDIR%%/radialnet/util/geometry.py
 %%PYTHON_SITELIBDIR%%/radialnet/util/geometry.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/util/geometry.pyo
+%%PYTHON_SITELIBDIR%%/radialnet/util/integration.py
+%%PYTHON_SITELIBDIR%%/radialnet/util/integration.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/util/integration.pyo
+%%PYTHON_SITELIBDIR%%/radialnet/util/misc.py
 %%PYTHON_SITELIBDIR%%/radialnet/util/misc.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/util/misc.pyo
+%%PYTHON_SITELIBDIR%%/radialnet/util/__init__.py
 %%PYTHON_SITELIBDIR%%/radialnet/util/__init__.pyc
-%%PYTHON_SITELIBDIR%%/radialnet/util/drawing.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/util/__init__.pyo
+%%PYTHON_SITELIBDIR%%/radialnet/__init__.py
 %%PYTHON_SITELIBDIR%%/radialnet/__init__.pyc
+%%PYTHON_SITELIBDIR%%/radialnet/__init__.pyo
 %%PYTHON_SITELIBDIR%%/zenmapCore/BasePaths.py
 %%PYTHON_SITELIBDIR%%/zenmapCore/BasePaths.pyc
+%%PYTHON_SITELIBDIR%%/zenmapCore/BasePaths.pyo
 %%PYTHON_SITELIBDIR%%/zenmapCore/BugRegister.py
 %%PYTHON_SITELIBDIR%%/zenmapCore/BugRegister.pyc
+%%PYTHON_SITELIBDIR%%/zenmapCore/BugRegister.pyo
 %%PYTHON_SITELIBDIR%%/zenmapCore/Diff.py
 %%PYTHON_SITELIBDIR%%/zenmapCore/Diff.pyc
-%%PYTHON_SITELIBDIR%%/zenmapCore/DiffHtml.py
-%%PYTHON_SITELIBDIR%%/zenmapCore/DiffHtml.pyc
+%%PYTHON_SITELIBDIR%%/zenmapCore/Diff.pyo
 %%PYTHON_SITELIBDIR%%/zenmapCore/I18N.py
 %%PYTHON_SITELIBDIR%%/zenmapCore/I18N.pyc
+%%PYTHON_SITELIBDIR%%/zenmapCore/I18N.pyo
 %%PYTHON_SITELIBDIR%%/zenmapCore/Name.py
 %%PYTHON_SITELIBDIR%%/zenmapCore/Name.pyc
+%%PYTHON_SITELIBDIR%%/zenmapCore/Name.pyo
 %%PYTHON_SITELIBDIR%%/zenmapCore/NetworkInventory.py
 %%PYTHON_SITELIBDIR%%/zenmapCore/NetworkInventory.pyc
+%%PYTHON_SITELIBDIR%%/zenmapCore/NetworkInventory.pyo
 %%PYTHON_SITELIBDIR%%/zenmapCore/NmapCommand.py
 %%PYTHON_SITELIBDIR%%/zenmapCore/NmapCommand.pyc
+%%PYTHON_SITELIBDIR%%/zenmapCore/NmapCommand.pyo
 %%PYTHON_SITELIBDIR%%/zenmapCore/NmapOptions.py
 %%PYTHON_SITELIBDIR%%/zenmapCore/NmapOptions.pyc
+%%PYTHON_SITELIBDIR%%/zenmapCore/NmapOptions.pyo
 %%PYTHON_SITELIBDIR%%/zenmapCore/NmapParser.py
 %%PYTHON_SITELIBDIR%%/zenmapCore/NmapParser.pyc
+%%PYTHON_SITELIBDIR%%/zenmapCore/NmapParser.pyo
 %%PYTHON_SITELIBDIR%%/zenmapCore/Paths.py
 %%PYTHON_SITELIBDIR%%/zenmapCore/Paths.pyc
+%%PYTHON_SITELIBDIR%%/zenmapCore/Paths.pyo
 %%PYTHON_SITELIBDIR%%/zenmapCore/RecentScans.py
 %%PYTHON_SITELIBDIR%%/zenmapCore/RecentScans.pyc
+%%PYTHON_SITELIBDIR%%/zenmapCore/RecentScans.pyo
 %%PYTHON_SITELIBDIR%%/zenmapCore/SearchResult.py
 %%PYTHON_SITELIBDIR%%/zenmapCore/SearchResult.pyc
+%%PYTHON_SITELIBDIR%%/zenmapCore/SearchResult.pyo
 %%PYTHON_SITELIBDIR%%/zenmapCore/TargetList.py
 %%PYTHON_SITELIBDIR%%/zenmapCore/TargetList.pyc
+%%PYTHON_SITELIBDIR%%/zenmapCore/TargetList.pyo
 %%PYTHON_SITELIBDIR%%/zenmapCore/UmitConf.py
 %%PYTHON_SITELIBDIR%%/zenmapCore/UmitConf.pyc
+%%PYTHON_SITELIBDIR%%/zenmapCore/UmitConf.pyo
 %%PYTHON_SITELIBDIR%%/zenmapCore/UmitConfigParser.py
 %%PYTHON_SITELIBDIR%%/zenmapCore/UmitConfigParser.pyc
+%%PYTHON_SITELIBDIR%%/zenmapCore/UmitConfigParser.pyo
 %%PYTHON_SITELIBDIR%%/zenmapCore/UmitDB.py
 %%PYTHON_SITELIBDIR%%/zenmapCore/UmitDB.pyc
+%%PYTHON_SITELIBDIR%%/zenmapCore/UmitDB.pyo
 %%PYTHON_SITELIBDIR%%/zenmapCore/UmitLogging.py
 %%PYTHON_SITELIBDIR%%/zenmapCore/UmitLogging.pyc
+%%PYTHON_SITELIBDIR%%/zenmapCore/UmitLogging.pyo
 %%PYTHON_SITELIBDIR%%/zenmapCore/UmitOptionParser.py
 %%PYTHON_SITELIBDIR%%/zenmapCore/UmitOptionParser.pyc
+%%PYTHON_SITELIBDIR%%/zenmapCore/UmitOptionParser.pyo
 %%PYTHON_SITELIBDIR%%/zenmapCore/Version.py
 %%PYTHON_SITELIBDIR%%/zenmapCore/Version.pyc
+%%PYTHON_SITELIBDIR%%/zenmapCore/Version.pyo
 %%PYTHON_SITELIBDIR%%/zenmapCore/__init__.py
 %%PYTHON_SITELIBDIR%%/zenmapCore/__init__.pyc
-%%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/__init__.py
-%%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/__init__.pyc
+%%PYTHON_SITELIBDIR%%/zenmapCore/__init__.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/gtkutils.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/gtkutils.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/gtkutils.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higboxes.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higboxes.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higboxes.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higbuttons.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higbuttons.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higbuttons.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higdialogs.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higdialogs.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higdialogs.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higentries.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higentries.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higentries.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higexpanders.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higexpanders.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higexpanders.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higframe.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higframe.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higframe.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higlabels.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higlabels.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higlabels.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higlogindialogs.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higlogindialogs.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higlogindialogs.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/hignotebooks.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/hignotebooks.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/hignotebooks.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higprogressbars.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higprogressbars.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higprogressbars.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higscrollers.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higscrollers.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higscrollers.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higspinner.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higspinner.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higspinner.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higtables.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higtables.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higtables.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higtextviewers.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higtextviewers.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higtextviewers.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higwindows.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higwindows.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/higwindows.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/utils.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/utils.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/utils.pyo
+%%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/__init__.py
+%%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/__init__.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/__init__.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/About.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/About.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/About.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/App.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/App.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/App.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/BugReport.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/BugReport.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/BugReport.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/CrashReport.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/CrashReport.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/CrashReport.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/DiffCompare.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/DiffCompare.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/DiffCompare.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/FileChoosers.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/FileChoosers.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/FileChoosers.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/Icons.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/Icons.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/Icons.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/MainWindow.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/MainWindow.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/MainWindow.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/NmapOutputProperties.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/NmapOutputProperties.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/NmapOutputProperties.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/NmapOutputViewer.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/NmapOutputViewer.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/NmapOutputViewer.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/OptionBuilder.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/OptionBuilder.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/OptionBuilder.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/ProfileCombo.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/ProfileCombo.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/ProfileCombo.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/ProfileEditor.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/ProfileEditor.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/ProfileEditor.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/ProfileHelp.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/ProfileHelp.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/ProfileHelp.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/ScanHostDetailsPage.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/ScanHostDetailsPage.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/ScanHostDetailsPage.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/ScanHostsView.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/ScanHostsView.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/ScanHostsView.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/ScanNmapOutputPage.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/ScanNmapOutputPage.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/ScanNmapOutputPage.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/ScanNotebook.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/ScanNotebook.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/ScanNotebook.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/ScanOpenPortsPage.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/ScanOpenPortsPage.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/ScanOpenPortsPage.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/ScanRunDetailsPage.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/ScanRunDetailsPage.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/ScanRunDetailsPage.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/ScanScanListPage.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/ScanScanListPage.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/ScanScanListPage.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/ScanToolbar.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/ScanToolbar.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/ScanToolbar.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/ScansListStore.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/ScansListStore.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/ScansListStore.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/SearchGUI.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/SearchGUI.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/SearchGUI.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/SearchWindow.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/SearchWindow.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/SearchWindow.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/Splash.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/Splash.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/Splash.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/TargetCombo.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/TargetCombo.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/TargetCombo.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/TopologyPage.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/TopologyPage.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/TopologyPage.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/Wizard.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/Wizard.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/Wizard.pyo
 %%PYTHON_SITELIBDIR%%/zenmapGUI/__init__.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/__init__.pyc
+%%PYTHON_SITELIBDIR%%/zenmapGUI/__init__.pyo
 %%DATADIR%%/pixmaps/default.svg
 %%DATADIR%%/pixmaps/default_32.png
 %%DATADIR%%/pixmaps/default_75.png
@@ -255,9 +354,6 @@ share/applications/zenmap.desktop
 %%DATADIR%%/pixmaps/wizard_logo.png
 %%DATADIR%%/pixmaps/zenmap.png
 %%DATADIR%%/pixmaps/radialnet/border.png
-%%DATADIR%%/pixmaps/radialnet/close.png
-%%DATADIR%%/pixmaps/radialnet/collapse.png
-%%DATADIR%%/pixmaps/radialnet/expand.png
 %%DATADIR%%/pixmaps/radialnet/firewall.png
 %%DATADIR%%/pixmaps/radialnet/logo.png
 %%DATADIR%%/pixmaps/radialnet/logo.svg
@@ -269,14 +365,22 @@ share/applications/zenmap.desktop
 %%DATADIR%%/config/zenmap.conf
 %%DATADIR%%/config/zenmap_version
 %%DATADIR%%/docs/help.html
-%%DATADIR%%/locale/pt_BR/LC_MESSAGES/umit.mo
-%%DATADIR%%/misc/options.xml
+%%DATADIR%%/locale/hr/LC_MESSAGES/zenmap.mo
+%%DATADIR%%/locale/pt_BR/LC_MESSAGES/zenmap.mo
+%%DATADIR%%/locale/fr/LC_MESSAGES/zenmap.mo
+%%DATADIR%%/locale/de/LC_MESSAGES/zenmap.mo
 %%DATADIR%%/misc/profile_editor.xml
 %%DATADIR%%/misc/wizard.xml
 %%DATADIR%%/su-to-zenmap.sh
 @dirrm %%DATADIR%%/misc
+@dirrm %%DATADIR%%/locale/hr/LC_MESSAGES
+@dirrm %%DATADIR%%/locale/hr
 @dirrm %%DATADIR%%/locale/pt_BR/LC_MESSAGES
 @dirrm %%DATADIR%%/locale/pt_BR
+@dirrm %%DATADIR%%/locale/fr/LC_MESSAGES
+@dirrm %%DATADIR%%/locale/fr
+@dirrm %%DATADIR%%/locale/de/LC_MESSAGES
+@dirrm %%DATADIR%%/locale/de
 @dirrm %%DATADIR%%/locale
 @dirrm %%DATADIR%%/docs
 @dirrm %%DATADIR%%/config