Index: head/security/zenmap/Makefile
===================================================================
--- head/security/zenmap/Makefile	(revision 405295)
+++ head/security/zenmap/Makefile	(revision 405296)
@@ -1,86 +1,86 @@
 # Created by: Daniel Roethlisberger <daniel@roe.ch>
 # $FreeBSD$
 
 PORTNAME=	zenmap
 PORTVERSION=	6.47
+PORTREVISION=	1
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://nmap.org/dist/ \
 		SF/nemysisfreebsdp/security/:icons
 DISTNAME=	nmap-${PORTVERSION}
 DISTFILES=	nmap-${PORTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}.png:icons
 EXTRACT_ONLY=	nmap-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	GUI frontend for the Nmap scanning utility
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
+WRKSRC_SUBDIR=	${PORTNAME}
 
 USES=		dos2unix python tar:bzip2
 DOS2UNIX_GLOB=	*.xml
 USE_GNOME=	pygtk2
 USE_PYTHON=	autoplist distutils
+NO_ARCH=	yes
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
 
 SUB_FILES=	zenmap-root
 
-.include <bsd.port.options.mk>
-
 post-extract:
 	@${RM} -f ${WRKSRC}/install_scripts/unix/su-to-zenmap.sh
 	@${CP} -a ${FILESDIR}/pc-su ${WRKSRC}/install_scripts/unix/su-to-zenmap.sh
 
 post-patch:
 	@${FIND} ${WRKSRC} -name '*.py' -or -name '*.pyw' | ${XARGS} \
 		${REINPLACE_CMD} -e 's|^.*#!.*python.*$$|#!${PYTHON_CMD}|'
 	@${REINPLACE_CMD} -e 's|^.*#!.*python.*$$|#!${PYTHON_CMD}|' \
 		${WRKSRC}/zenmap
 	@${FIND} ${WRKSRC}/../ndiff -name '*.py' | ${XARGS} \
 		${REINPLACE_CMD} -e 's|^.*#!.*python.*$$|#!${PYTHON_CMD}|'
 	@${REINPLACE_CMD} -e 's|su-to-zenmap.sh|zenmap-root|; \
 		s| %F||' \
 		${WRKSRC}/install_scripts/unix/zenmap-root.desktop
 	@${REINPLACE_CMD} -e 's|Security;|Security;System;|' \
 		${WRKSRC}/install_scripts/unix/zenmap-root.desktop \
 		${WRKSRC}/install_scripts/unix/zenmap.desktop
 	@${REINPLACE_CMD} \
 		-e '/self.create_uninstaller/s|^|#|; \
 		s|distutils\.command\.install |setuptools\.command\.install |; \
 		s|self.saved_prefix, pixmaps_dir, ||' \
 		${WRKSRC}/setup.py
 	@${REINPLACE_CMD} \
 		-e 's|share/man/man1|man/man1|; \
 		s|"install": checked_install||' \
 		${WRKSRC}/../ndiff/setup.py
 	@${FIND} ${WRKSRC} -name "*.bak" -delete
 	@${FIND} ${WRKSRC}/../ndiff -name "*.bak" -delete
 
-.if ! ${PORT_OPTIONS:MNLS}
+post-patch-NLS-off:
 	@${REINPLACE_CMD} -i '' '/locale_dir, mo_find, /d' ${WRKSRC}/setup.py
-.endif
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/zenmap-root ${STAGEDIR}${PREFIX}/bin/
 	 @(cd ${STAGEDIR}${DATADIR} && ${CHMOD} 754 su-to-zenmap.sh)
 	${INSTALL_MAN} ${WRKSRC}/../docs/zenmap.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1/
 	@(cd ${WRKSRC}/../ndiff \
 		&& ${PYTHON_CMD} setup.py install --prefix=${STAGEDIR}${PREFIX})
 	@(cd ${STAGEDIR}${PYTHON}${PYTHON_SITELIBDIR} && ${RM} ndiff.pyc)
 	@(cd ${STAGEDIR}${PYTHON}${PYTHON_SITELIBDIR} && ${PYTHON_CMD} -m compileall .)
 	@(cd ${STAGEDIR}${PYTHON}${PYTHON_SITELIBDIR} && ${PYTHON_CMD} -O -m compileall .)
 
 	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 
 .include <bsd.port.mk>
Index: head/security/zenmap/files/zenmap-root.in
===================================================================
--- head/security/zenmap/files/zenmap-root.in	(revision 405295)
+++ head/security/zenmap/files/zenmap-root.in	(revision 405296)
@@ -1,8 +1,6 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
-cd "%%DATADIR%%" && exec su-to-zenmap.sh zenmap
-
-
+exec %%DATADIR%%/su-to-zenmap.sh zenmap