Date: Sun, 13 Apr 2014 20:30:10 +0000 (UTC) From: Rusmir Dusko <nemysis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351238 - head/security/zenmap Message-ID: <201404132030.s3DKUAQp025040@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nemysis Date: Sun Apr 13 20:30:10 2014 New Revision: 351238 URL: http://svnweb.freebsd.org/changeset/ports/351238 QAT: https://qat.redports.org/buildarchive/r351238/ Log: - Update to 6.45 - Change dependency for security/nmap - Use pkg-plist instead of PLIST_FILES - Fix the usage of 'python' to get rid of the implicit lang/python dependency - Delete bad ndiff.pyc and compile new (not usuall .) Added: head/security/zenmap/pkg-plist (contents, props changed) Modified: head/security/zenmap/Makefile head/security/zenmap/distinfo Modified: head/security/zenmap/Makefile ============================================================================== --- head/security/zenmap/Makefile Sun Apr 13 20:29:52 2014 (r351237) +++ head/security/zenmap/Makefile Sun Apr 13 20:30:10 2014 (r351238) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= zenmap -PORTVERSION= 6.40 -PORTREVISION= 1 +PORTVERSION= 6.45 CATEGORIES= security ipv6 MASTER_SITES= http://nmap.org/dist/ \ SF/nemysisfreebsdp/security/:icons @@ -17,7 +16,7 @@ COMMENT= GUI frontend for the Nmap scann LICENSE= GPLv2 -RUN_DEPENDS= ${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap \ +RUN_DEPENDS= nmap:${PORTSDIR}/security/nmap \ ${PYTHON_PACKAGENAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME} @@ -35,12 +34,6 @@ OPTIONS_SUB= yes NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext -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> @@ -50,6 +43,12 @@ post-extract: @${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 @@ -65,15 +64,13 @@ post-patch: -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} @${REINPLACE_CMD} -i '' '/locale_dir, mo_find, /d' ${WRKSRC}/setup.py .endif -post-build: - @(cd ${WRKSRC}/../ndiff \ - && ${PYTHON_CMD} setup.py build) - post-install: ${INSTALL_SCRIPT} ${WRKDIR}/zenmap-root ${STAGEDIR}${PREFIX}/bin/ @(cd ${STAGEDIR}${DATADIR} && ${CHMOD} 754 su-to-zenmap.sh) @@ -81,6 +78,10 @@ post-install: ${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/ Modified: head/security/zenmap/distinfo ============================================================================== --- head/security/zenmap/distinfo Sun Apr 13 20:29:52 2014 (r351237) +++ head/security/zenmap/distinfo Sun Apr 13 20:30:10 2014 (r351238) @@ -1,4 +1,4 @@ -SHA256 (nmap-6.40.tar.bz2) = 491f77d8b3fb3bb38ba4e3850011fe6fb43bbe197f9382b88cb59fa4e8f7a401 -SIZE (nmap-6.40.tar.bz2) = 7871636 +SHA256 (nmap-6.45.tar.bz2) = 13e595cbceb97f5281c43aa7ad56059a27d9a8b01ba97f199c4b9c826fcb5764 +SIZE (nmap-6.45.tar.bz2) = 7911456 SHA256 (zenmap.png) = 55c232603d0cf02ee2e7cc0c0ba02101d18a33555644a6348fb533329c4cfce1 SIZE (zenmap.png) = 2832 Added: head/security/zenmap/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/zenmap/pkg-plist Sun Apr 13 20:30:10 2014 (r351238) @@ -0,0 +1,8 @@ +bin/ndiff +bin/zenmap-root +%%PYTHON_SITELIBDIR%%/ndiff.py +%%PYTHON_SITELIBDIR%%/ndiff.pyc +%%PYTHON_SITELIBDIR%%/ndiff.pyo +man/man1/ndiff.1.gz +man/man1/zenmap.1.gz +share/pixmaps/zenmap.png
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404132030.s3DKUAQp025040>