From owner-svn-ports-all@freebsd.org Sat Sep 17 00:13:39 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EFF40BDC999; Sat, 17 Sep 2016 00:13:39 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B2FA6F5B; Sat, 17 Sep 2016 00:13:39 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8H0DcsF084207; Sat, 17 Sep 2016 00:13:38 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8H0DcFr084205; Sat, 17 Sep 2016 00:13:38 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201609170013.u8H0DcFr084205@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Sat, 17 Sep 2016 00:13:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422291 - in head/security: nmap zenmap X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Sep 2016 00:13:40 -0000 Author: woodsb02 Date: Sat Sep 17 00:13:38 2016 New Revision: 422291 URL: https://svnweb.freebsd.org/changeset/ports/422291 Log: security/zenmap: Update to 7.25 BETA2 and use security/nmap as MASTERDIR security/nmap: - Ensure MAINTAINER and COMMENT do not clobber those of slave port - Add .if !defined(MASTERDIR) to prevent inclusion in slave port - Do not include bsd.port.options.mk, as none of the features are used security/zenmap: - Convert to slave of security/nmap to ensure they are updated in lockstep - Inherently update to 7.25 BETA2 (current version of security/nmap) - Take maintainership - Remove redundant port header variables included from MASTERDIR - PKGNAME of zenmap achieved using PKGNAMEPREFIX=ze and PORTNAME=nmap - Inherit LICENSE_FILE, as zenmap/COPYING states it is the same as nmap - Set directory variables so they are not inhereted from MASTERDIR - Convert post-extract to post-patch, as it is modifying WRKSRC files - Fix REINPLACE command, as it was leaving the line with nothing but a single ',' and causing the build to fail - Do not download external zenmap icon, as one is included in distfile Approved by: ohauer (security/nmap maintainer), mat (mentor) Differential Revision: https://reviews.freebsd.org/D7880 Deleted: head/security/zenmap/distinfo Modified: head/security/nmap/Makefile head/security/zenmap/Makefile Modified: head/security/nmap/Makefile ============================================================================== --- head/security/nmap/Makefile Sat Sep 17 00:03:59 2016 (r422290) +++ head/security/nmap/Makefile Sat Sep 17 00:13:38 2016 (r422291) @@ -7,8 +7,8 @@ CATEGORIES= security ipv6 MASTER_SITES= http://nmap.org/dist/ \ LOCAL/ohauer -MAINTAINER= ohauer@FreeBSD.org -COMMENT= Port scanning utility for large networks +MAINTAINER?= ohauer@FreeBSD.org +COMMENT?= Port scanning utility for large networks # nmap-6.47 => svn.nmap.org/nmap-releases/nmap-6.47 (r33605) # http://nmap.org/book/man-legal.html @@ -17,6 +17,8 @@ COMMENT= Port scanning utility for large LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +.if !defined(MASTERDIR) + LIB_DEPENDS= libpcre.so:devel/pcre USES= tar:bzip2 gmake cpe @@ -33,8 +35,6 @@ SSL_CONFIGURE_OFF= --without-openssl SSL_CFLAGS= -I${OPENSSLINC} SSL_VARS= STRIP_FILES=ncat -.include - DOCS= CHANGELOG HACKING STRIP_FILES+= nmap nping @@ -62,4 +62,6 @@ post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} +.endif + .include Modified: head/security/zenmap/Makefile ============================================================================== --- head/security/zenmap/Makefile Sat Sep 17 00:03:59 2016 (r422290) +++ head/security/zenmap/Makefile Sat Sep 17 00:13:38 2016 (r422291) @@ -1,27 +1,20 @@ # Created by: Daniel Roethlisberger # $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} +PKGNAMEPREFIX= ze -MAINTAINER= ports@FreeBSD.org +MAINTAINER= woodsb02@FreeBSD.org COMMENT= GUI frontend for the Nmap scanning utility -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING - RUN_DEPENDS= nmap:security/nmap \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 -WRKSRC_SUBDIR= ${PORTNAME} +MASTERDIR= ${.CURDIR}/../nmap +PATCHDIR= ${.CURDIR}/files +FILESDIR= ${.CURDIR}/files +DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME} +PKGDIR= ${.CURDIR} +WRKSRC_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME} USES= dos2unix python tar:bzip2 DOS2UNIX_GLOB= *.xml @@ -37,11 +30,9 @@ NLS_USES= gettext SUB_FILES= zenmap-root -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: + @${RM} ${WRKSRC}/install_scripts/unix/su-to-zenmap.sh + @${CP} -a ${FILESDIR}/pc-su ${WRKSRC}/install_scripts/unix/su-to-zenmap.sh @${FIND} ${WRKSRC} -name '*.py' -or -name '*.pyw' | ${XARGS} \ ${REINPLACE_CMD} -e 's|^.*#!.*python.*$$|#!${PYTHON_CMD}|' @${REINPLACE_CMD} -e 's|^.*#!.*python.*$$|#!${PYTHON_CMD}|' \ @@ -60,8 +51,8 @@ post-patch: s|self.saved_prefix, pixmaps_dir, ||' \ ${WRKSRC}/setup.py @${REINPLACE_CMD} \ - -e 's|share/man/man1|man/man1|; \ - s|"install": checked_install||' \ + -e 's|share/man/man1|man/man1|' \ + -e '/"install": checked_install/d' \ ${WRKSRC}/../ndiff/setup.py @${FIND} ${WRKSRC} -name "*.bak" -delete @${FIND} ${WRKSRC}/../ndiff -name "*.bak" -delete @@ -71,7 +62,7 @@ post-patch-NLS-off: post-install: ${INSTALL_SCRIPT} ${WRKDIR}/zenmap-root ${STAGEDIR}${PREFIX}/bin/ - @(cd ${STAGEDIR}${DATADIR} && ${CHMOD} 754 su-to-zenmap.sh) + @${CHMOD} 754 ${STAGEDIR}${DATADIR}/su-to-zenmap.sh ${INSTALL_MAN} ${WRKSRC}/../docs/zenmap.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1/ @(cd ${WRKSRC}/../ndiff \ @@ -79,8 +70,6 @@ post-install: @(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 .) + @(cd ${STAGEDIR}${PREFIX}/share/pixmaps && ${LN} -sf ../zenmap/pixmaps/zenmap.png zenmap.png) - ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \ - ${STAGEDIR}${PREFIX}/share/pixmaps/ - -.include +.include "${MASTERDIR}/Makefile"