svn commit: r340075 - in head/security/zenmap: . files

[Rusmir Dusko]

Author: nemysis
Date: Fri Jan 17 16:59:33 2014
New Revision: 340075
URL: http://svnweb.freebsd.org/changeset/ports/340075
QAT: https://qat.redports.org/buildarchive/r340075/

Log:
  - Bump PORTREVISION
  - Change master sites and icon
  - Use PYDISTUTILS_AUTOPLIST=yes and PLIST_FILES instead of pkg-plist
  - Support STAGEDIR
  - Change Desktop entry file zenmap-root.desktop, add SUB_FILES=zenmap-root
    for proper Desktop usage
  
  Reviewed by:	horia

Added:
  head/security/zenmap/files/zenmap-root.in   (contents, props changed)
Deleted:
  head/security/zenmap/pkg-plist
Modified:
  head/security/zenmap/Makefile
  head/security/zenmap/distinfo

Modified: head/security/zenmap/Makefile
==============================================================================
--- head/security/zenmap/Makefile	Fri Jan 17 16:56:53 2014	(r340074)
+++ head/security/zenmap/Makefile	Fri Jan 17 16:59:33 2014	(r340075)
@@ -3,9 +3,14 @@
 
 PORTNAME=	zenmap
 PORTVERSION=	6.40
+PORTREVISION=	1
 CATEGORIES=	security ipv6
-MASTER_SITES=	http://nmap.org/dist/
+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 at FreeBSD.org
 COMMENT=	GUI frontend for the Nmap scanning utility
@@ -22,9 +27,7 @@ USES=		desktop-file-utils
 USE_GNOME=	pygtk2
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-
-MLINKS=	zenmap.1 xnmap.1
-MAN1=	zenmap.1 ndiff.1
+PYDISTUTILS_AUTOPLIST=	yes
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
@@ -32,7 +35,14 @@ OPTIONS_SUB=	yes
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
 
-NO_STAGE=	yes
+PLIST_FILES=	bin/ndiff \
+		bin/zenmap-root \
+		man/man1/ndiff.1.gz \
+		man/man1/zenmap.1.gz \
+		share/pixmaps/zenmap.png
+
+SUB_FILES=	zenmap-root
+
 .include <bsd.port.options.mk>
 
 post-extract:
@@ -40,16 +50,22 @@ post-extract:
 	@${CP} -a ${FILESDIR}/pc-su ${WRKSRC}/install_scripts/unix/su-to-zenmap.sh
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|su-to-zenmap.sh %F|su-to-zenmap.sh ${PORTNAME}|' \
+	@${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|^|#|' \
-		-e 's,distutils\.command\.install ,setuptools\.command\.install ,' \
+		-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|' \
-		-e 's,"install": checked_install,,' \
+		-e 's|share/man/man1|man/man1|; \
+		s|"install": checked_install||' \
 		${WRKSRC}/../ndiff/setup.py
+
 .if ! ${PORT_OPTIONS:MNLS}
 	@${REINPLACE_CMD} -i '' '/locale_dir, mo_find, /d' ${WRKSRC}/setup.py
 .endif
@@ -59,8 +75,12 @@ post-build:
 		&& ${PYTHON_CMD} setup.py build)
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/../docs/zenmap.1 ${MAN1PREFIX}/man/man1
+	${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=${PREFIX})
+		&& ${PYTHON_CMD} setup.py install --prefix=${STAGEDIR}${PREFIX})
+	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/
 
 .include <bsd.port.mk>

Modified: head/security/zenmap/distinfo
==============================================================================
--- head/security/zenmap/distinfo	Fri Jan 17 16:56:53 2014	(r340074)
+++ head/security/zenmap/distinfo	Fri Jan 17 16:59:33 2014	(r340075)
@@ -1,2 +1,4 @@
 SHA256 (nmap-6.40.tar.bz2) = 491f77d8b3fb3bb38ba4e3850011fe6fb43bbe197f9382b88cb59fa4e8f7a401
 SIZE (nmap-6.40.tar.bz2) = 7871636
+SHA256 (zenmap.png) = 55c232603d0cf02ee2e7cc0c0ba02101d18a33555644a6348fb533329c4cfce1
+SIZE (zenmap.png) = 2832

Added: head/security/zenmap/files/zenmap-root.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/zenmap/files/zenmap-root.in	Fri Jan 17 16:59:33 2014	(r340075)
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+cd "%%DATADIR%%" ; exec su-to-zenmap.sh zenmap
+
+