3 files changed, 55 insertions, 65 deletions

diff --git a/security/zenmap/Makefile b/security/zenmap/Makefile
index f88e07de6e08..c85bb0d9fe51 100644
--- a/security/zenmap/Makefile
+++ b/security/zenmap/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	zenmap
-PORTVERSION=	4.62
-PORTREVISION=	1
+PORTVERSION=	4.68
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://nmap.org/dist/ \
 		http://www.mirrors.wiretapped.net/security/network-mapping/nmap/ \
diff --git a/security/zenmap/distinfo b/security/zenmap/distinfo
index 8edac279a68f..a8f542cbd6c4 100644
--- a/security/zenmap/distinfo
+++ b/security/zenmap/distinfo
@@ -1,3 +1,3 @@
-MD5 (nmap-4.62.tar.bz2) = 4fdaa418f4008509d4c91ec087131d4e
-SHA256 (nmap-4.62.tar.bz2) = 2fb7b72c1416428dd786f37e3aab0b36f633ee5246dd7a1b0240b0a5f9e13791
-SIZE (nmap-4.62.tar.bz2) = 3308006
+MD5 (nmap-4.68.tar.bz2) = c363d32a00c697d15996fced22072b6c
+SHA256 (nmap-4.68.tar.bz2) = 1866be3d8d397ea7721c08f520d033c208492d3e1551311805d18efbe6cef161
+SIZE (nmap-4.68.tar.bz2) = 5979048
diff --git a/security/zenmap/pkg-plist b/security/zenmap/pkg-plist
index cf994b9f04d1..be756a0ff1fc 100644
--- a/security/zenmap/pkg-plist
+++ b/security/zenmap/pkg-plist
@@ -157,66 +157,56 @@ bin/zenmap
 %%PYTHON_SITELIBDIR%%/zenmapGUI/Wizard.pyc
 %%PYTHON_SITELIBDIR%%/zenmapGUI/__init__.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/__init__.pyc
-share/icons/nmap-eye.ico
-share/icons/umit_128.ico
-share/icons/umit_16.ico
-share/icons/umit_24.ico
-share/icons/umit_32.ico
-share/icons/umit_48.ico
-share/pixmaps/default.svg
-share/pixmaps/default_32.png
-share/pixmaps/default_75.png
-share/pixmaps/freebsd.svg
-share/pixmaps/freebsd_32.png
-share/pixmaps/freebsd_75.png
-share/pixmaps/irix.svg
-share/pixmaps/irix_32.png
-share/pixmaps/irix_75.png
-share/pixmaps/linux.svg
-share/pixmaps/linux_32.png
-share/pixmaps/linux_75.png
-share/pixmaps/logo.png
-share/pixmaps/macosx.svg
-share/pixmaps/macosx_32.png
-share/pixmaps/macosx_75.png
-share/pixmaps/openbsd.svg
-share/pixmaps/openbsd_32.png
-share/pixmaps/openbsd_75.png
-share/pixmaps/redhat.svg
-share/pixmaps/redhat_32.png
-share/pixmaps/redhat_75.png
-share/pixmaps/shadow_man.svg
-share/pixmaps/shadow_man_32.png
-share/pixmaps/shadow_man_75.png
-share/pixmaps/solaris.svg
-share/pixmaps/solaris_32.png
-share/pixmaps/solaris_75.png
-share/pixmaps/splash.png
-share/pixmaps/ubuntu.svg
-share/pixmaps/ubuntu_32.png
-share/pixmaps/ubuntu_75.png
-share/pixmaps/unknown.svg
-share/pixmaps/unknown_32.png
-share/pixmaps/unknown_75.png
-share/pixmaps/vl_1.svg
-share/pixmaps/vl_1_32.png
-share/pixmaps/vl_1_75.png
-share/pixmaps/vl_2.svg
-share/pixmaps/vl_2_32.png
-share/pixmaps/vl_2_75.png
-share/pixmaps/vl_3.svg
-share/pixmaps/vl_3_32.png
-share/pixmaps/vl_3_75.png
-share/pixmaps/vl_4.svg
-share/pixmaps/vl_4_32.png
-share/pixmaps/vl_4_75.png
-share/pixmaps/vl_5.svg
-share/pixmaps/vl_5_32.png
-share/pixmaps/vl_5_75.png
-share/pixmaps/win.svg
-share/pixmaps/win_32.png
-share/pixmaps/win_75.png
-share/pixmaps/wizard_logo.png
+%%DATADIR%%/pixmaps/default.svg
+%%DATADIR%%/pixmaps/default_32.png
+%%DATADIR%%/pixmaps/default_75.png
+%%DATADIR%%/pixmaps/freebsd.svg
+%%DATADIR%%/pixmaps/freebsd_32.png
+%%DATADIR%%/pixmaps/freebsd_75.png
+%%DATADIR%%/pixmaps/irix.svg
+%%DATADIR%%/pixmaps/irix_32.png
+%%DATADIR%%/pixmaps/irix_75.png
+%%DATADIR%%/pixmaps/linux.svg
+%%DATADIR%%/pixmaps/linux_32.png
+%%DATADIR%%/pixmaps/linux_75.png
+%%DATADIR%%/pixmaps/macosx.svg
+%%DATADIR%%/pixmaps/macosx_32.png
+%%DATADIR%%/pixmaps/macosx_75.png
+%%DATADIR%%/pixmaps/openbsd.svg
+%%DATADIR%%/pixmaps/openbsd_32.png
+%%DATADIR%%/pixmaps/openbsd_75.png
+%%DATADIR%%/pixmaps/redhat.svg
+%%DATADIR%%/pixmaps/redhat_32.png
+%%DATADIR%%/pixmaps/redhat_75.png
+%%DATADIR%%/pixmaps/solaris.svg
+%%DATADIR%%/pixmaps/solaris_32.png
+%%DATADIR%%/pixmaps/solaris_75.png
+%%DATADIR%%/pixmaps/splash.png
+%%DATADIR%%/pixmaps/ubuntu.svg
+%%DATADIR%%/pixmaps/ubuntu_32.png
+%%DATADIR%%/pixmaps/ubuntu_75.png
+%%DATADIR%%/pixmaps/unknown.svg
+%%DATADIR%%/pixmaps/unknown_32.png
+%%DATADIR%%/pixmaps/unknown_75.png
+%%DATADIR%%/pixmaps/vl_1.svg
+%%DATADIR%%/pixmaps/vl_1_32.png
+%%DATADIR%%/pixmaps/vl_1_75.png
+%%DATADIR%%/pixmaps/vl_2.svg
+%%DATADIR%%/pixmaps/vl_2_32.png
+%%DATADIR%%/pixmaps/vl_2_75.png
+%%DATADIR%%/pixmaps/vl_3.svg
+%%DATADIR%%/pixmaps/vl_3_32.png
+%%DATADIR%%/pixmaps/vl_3_75.png
+%%DATADIR%%/pixmaps/vl_4.svg
+%%DATADIR%%/pixmaps/vl_4_32.png
+%%DATADIR%%/pixmaps/vl_4_75.png
+%%DATADIR%%/pixmaps/vl_5.svg
+%%DATADIR%%/pixmaps/vl_5_32.png
+%%DATADIR%%/pixmaps/vl_5_75.png
+%%DATADIR%%/pixmaps/win.svg
+%%DATADIR%%/pixmaps/win_32.png
+%%DATADIR%%/pixmaps/win_75.png
+%%DATADIR%%/pixmaps/wizard_logo.png
 %%DATADIR%%/config/scan_profile.usp
 %%DATADIR%%/config/zenmap.conf
 %%DATADIR%%/config/zenmap_version
@@ -233,6 +223,7 @@ share/pixmaps/wizard_logo.png
 @dirrm %%DATADIR%%/locale
 @dirrm %%DATADIR%%/docs
 @dirrm %%DATADIR%%/config
+@dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%
 @dirrmtry share/icons
 @dirrm %%PYTHON_SITELIBDIR%%/zenmapGUI