svn commit: r405321 - in branches/2016Q1/security/zenmap: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Tue Jan  5 23:29:49 2016
New Revision: 405321
URL: https://svnweb.freebsd.org/changeset/ports/405321

Log:
  MFH: r405296
  
  - Fix broken zenmap-root script
  - While here, add LICENSE_FILE, switch to WRKSRC_SUBDIR, add NO_ARCH and switch to options helpers
  
  PR:		204713
  Submitted by:	admin at vladiom.com.ua
  Approved by:	maintainer timeout (nemysis, 6 weeks)
  Approved by:	ports-secteam (feld)

Modified:
  branches/2016Q1/security/zenmap/Makefile
  branches/2016Q1/security/zenmap/files/zenmap-root.in
Directory Properties:
  branches/2016Q1/   (props changed)

Modified: branches/2016Q1/security/zenmap/Makefile
==============================================================================
--- branches/2016Q1/security/zenmap/Makefile	Tue Jan  5 22:39:46 2016	(r405320)
+++ branches/2016Q1/security/zenmap/Makefile	Tue Jan  5 23:29:49 2016	(r405321)
@@ -3,6 +3,7 @@
 
 PORTNAME=	zenmap
 PORTVERSION=	6.47
+PORTREVISION=	1
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://nmap.org/dist/ \
 		SF/nemysisfreebsdp/security/:icons
@@ -15,16 +16,18 @@ MAINTAINER=	nemysis at 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
@@ -34,8 +37,6 @@ 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
@@ -65,9 +66,8 @@ post-patch:
 	@${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/

Modified: branches/2016Q1/security/zenmap/files/zenmap-root.in
==============================================================================
--- branches/2016Q1/security/zenmap/files/zenmap-root.in	Tue Jan  5 22:39:46 2016	(r405320)
+++ branches/2016Q1/security/zenmap/files/zenmap-root.in	Tue Jan  5 23:29:49 2016	(r405321)
@@ -3,6 +3,4 @@
 # $FreeBSD$
 #
 
-cd "%%DATADIR%%" && exec su-to-zenmap.sh zenmap
-
-
+exec %%DATADIR%%/su-to-zenmap.sh zenmap