From owner-svn-ports-head@FreeBSD.ORG Fri Jan 17 16:59:34 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0DBC4370; Fri, 17 Jan 2014 16:59:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id ED01F15EA; Fri, 17 Jan 2014 16:59:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HGxXmB077818; Fri, 17 Jan 2014 16:59:33 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HGxXPe077815; Fri, 17 Jan 2014 16:59:33 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201401171659.s0HGxXPe077815@svn.freebsd.org> From: Rusmir Dusko Date: Fri, 17 Jan 2014 16:59:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340075 - in head/security/zenmap: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 16:59:34 -0000 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@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 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 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 + +