Date: Mon, 10 Dec 2012 19:50:01 GMT From: nemysis <nemysis@gmx.ch> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/174327: [PATCH] security/zenmap: Fixed Man pages, take maintainership Message-ID: <201212101950.qBAJo1kQ098630@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/174327; it has been noted by GNATS. From: nemysis <nemysis@gmx.ch> To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/174327: [PATCH] security/zenmap: Fixed Man pages, take maintainership Date: Mon, 10 Dec 2012 20:46:12 +0100 --MP_/vypTz7v7oOmvjMMgUrYKxU+ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Fixed conditional installation for NLS, changed pkg-plist --MP_/vypTz7v7oOmvjMMgUrYKxU+ Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=zenmap.diff Original version does not exist at /usr/ports/security/py-zenmap Using /usr/ports/security/zenmap instead ===> Generating patch ===> Viewing diff with more diff -ruN --exclude=CVS /usr/ports/security/zenmap/Makefile ./Makefile --- /usr/ports/security/zenmap/Makefile 2012-12-10 09:12:34.000000000 +0100 +++ ./Makefile 2012-12-10 20:45:25.000000000 +0100 @@ -7,12 +7,13 @@ PORTNAME= zenmap PORTVERSION= 6.01 +PORTREVISION= 1 CATEGORIES= security ipv6 MASTER_SITES= http://nmap.org/dist/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= nmap-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= nemysis@gmx.ch COMMENT= GUI frontend for the nmap scanning utility LICENSE= GPLv2 @@ -20,27 +21,44 @@ RUN_DEPENDS= ${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap \ ${PYTHON_PACKAGENAMEPREFIX}sqlite3>:${PORTSDIR}/databases/py-sqlite3 -WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME} +WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME} USE_BZIP2= yes USE_GNOME= pygtk2 -USE_GETTEXT= yes USE_PYTHON= 2.5+ -USE_PYDISTUTILS= yes +USE_PYDISTUTILS=yes MLINKS= zenmap.1 xnmap.1 -MAN1= zenmap.1 xnmap.1 ndiff.1 +MAN1= zenmap.1 ndiff.1 + +OPTIONS_DEFINE= NLS + +.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} +USE_GETTEXT= yes +PLIST_SUB+= NLS="" +.else +PLIST_SUB+= NLS="@comment " +.endif post-patch: - @${REINPLACE_CMD} -e \ - '/self.create_uninstaller/s|^|#|' ${WRKSRC}/setup.py - @${REINPLACE_CMD} -e \ - 's|share/man/man1|man/man1|' ${WRKSRC}/../ndiff/setup.py + @${REINPLACE_CMD} \ + -e '/self.create_uninstaller/s|^|#|' ${WRKSRC}/setup.py + @${REINPLACE_CMD} \ + -e 's|share/man/man1|man/man1|' ${WRKSRC}/../ndiff/setup.py +.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_MAN} ${WRKSRC}/../docs/zenmap.1 ${MAN1PREFIX}/man/man1 @(cd ${WRKSRC}/../ndiff \ && ${PYTHON_CMD} setup.py install --prefix ${PREFIX}) -.include <bsd.port.mk> + +.include <bsd.port.post.mk> diff -ruN --exclude=CVS /usr/ports/security/zenmap/pkg-plist ./pkg-plist --- /usr/ports/security/zenmap/pkg-plist 2012-12-05 00:41:02.000000000 +0100 +++ ./pkg-plist 2012-12-10 20:35:27.000000000 +0100 @@ -321,11 +321,11 @@ %%DATADIR%%/config/zenmap.conf %%DATADIR%%/config/zenmap_version %%DATADIR%%/docs/help.html -%%DATADIR%%/locale/de/LC_MESSAGES/zenmap.mo -%%DATADIR%%/locale/fr/LC_MESSAGES/zenmap.mo -%%DATADIR%%/locale/hr/LC_MESSAGES/zenmap.mo -%%DATADIR%%/locale/pt_BR/LC_MESSAGES/zenmap.mo -%%DATADIR%%/locale/ru/LC_MESSAGES/zenmap.mo +%%NLS%%%%DATADIR%%/locale/de/LC_MESSAGES/zenmap.mo +%%NLS%%%%DATADIR%%/locale/fr/LC_MESSAGES/zenmap.mo +%%NLS%%%%DATADIR%%/locale/hr/LC_MESSAGES/zenmap.mo +%%NLS%%%%DATADIR%%/locale/pt_BR/LC_MESSAGES/zenmap.mo +%%NLS%%%%DATADIR%%/locale/ru/LC_MESSAGES/zenmap.mo %%DATADIR%%/misc/profile_editor.xml %%DATADIR%%/pixmaps/default_32.png %%DATADIR%%/pixmaps/default_75.png @@ -373,17 +373,17 @@ @dirrm %%DATADIR%%/pixmaps/radialnet @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%%/misc -@dirrm %%DATADIR%%/locale/ru/LC_MESSAGES -@dirrm %%DATADIR%%/locale/ru -@dirrm %%DATADIR%%/locale/pt_BR/LC_MESSAGES -@dirrm %%DATADIR%%/locale/pt_BR -@dirrm %%DATADIR%%/locale/hr/LC_MESSAGES -@dirrm %%DATADIR%%/locale/hr -@dirrm %%DATADIR%%/locale/fr/LC_MESSAGES -@dirrm %%DATADIR%%/locale/fr -@dirrm %%DATADIR%%/locale/de/LC_MESSAGES -@dirrm %%DATADIR%%/locale/de -@dirrm %%DATADIR%%/locale +%%NLS%%@dirrm %%DATADIR%%/locale/ru/LC_MESSAGES +%%NLS%%@dirrm %%DATADIR%%/locale/ru +%%NLS%%@dirrm %%DATADIR%%/locale/pt_BR/LC_MESSAGES +%%NLS%%@dirrm %%DATADIR%%/locale/pt_BR +%%NLS%%@dirrm %%DATADIR%%/locale/hr/LC_MESSAGES +%%NLS%%@dirrm %%DATADIR%%/locale/hr +%%NLS%%@dirrm %%DATADIR%%/locale/fr/LC_MESSAGES +%%NLS%%@dirrm %%DATADIR%%/locale/fr +%%NLS%%@dirrm %%DATADIR%%/locale/de/LC_MESSAGES +%%NLS%%@dirrm %%DATADIR%%/locale/de +%%NLS%%@dirrm %%DATADIR%%/locale @dirrm %%DATADIR%%/docs @dirrm %%DATADIR%%/config @dirrm %%DATADIR%% ===> Done --MP_/vypTz7v7oOmvjMMgUrYKxU+--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212101950.qBAJo1kQ098630>