Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Mar 2014 13:35:08 +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: r348998 - in head/security/zenmap: . files
Message-ID:  <201403241335.s2ODZ8jS007073@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nemysis
Date: Mon Mar 24 13:35:08 2014
New Revision: 348998
URL: http://svnweb.freebsd.org/changeset/ports/348998
QAT: https://qat.redports.org/buildarchive/r348998/

Log:
  - Remove USES desktop-file-utils and add dos2unix
  - Use tar:bzip2 instead of USE_BZIP2=yes
  - Break lines around 80 characters
  - Use && instead of ;

Modified:
  head/security/zenmap/Makefile
  head/security/zenmap/files/zenmap-root.in

Modified: head/security/zenmap/Makefile
==============================================================================
--- head/security/zenmap/Makefile	Mon Mar 24 13:30:03 2014	(r348997)
+++ head/security/zenmap/Makefile	Mon Mar 24 13:35:08 2014	(r348998)
@@ -22,8 +22,8 @@ RUN_DEPENDS=	${LOCALBASE}/bin/nmap:${POR
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 
-USE_BZIP2=	yes
-USES=		desktop-file-utils
+USES=		dos2unix tar:bzip2
+DOS2UNIX_GLOB=	*.xml
 USE_GNOME=	pygtk2
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
@@ -77,7 +77,8 @@ post-build:
 post-install:
 	${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/
+	${INSTALL_MAN} ${WRKSRC}/../docs/zenmap.1 \
+		${STAGEDIR}${MAN1PREFIX}/man/man1/
 	@(cd ${WRKSRC}/../ndiff \
 		&& ${PYTHON_CMD} setup.py install --prefix=${STAGEDIR}${PREFIX})
 	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \

Modified: head/security/zenmap/files/zenmap-root.in
==============================================================================
--- head/security/zenmap/files/zenmap-root.in	Mon Mar 24 13:30:03 2014	(r348997)
+++ head/security/zenmap/files/zenmap-root.in	Mon Mar 24 13:35:08 2014	(r348998)
@@ -3,6 +3,6 @@
 # $FreeBSD$
 #
 
-cd "%%DATADIR%%" ; exec su-to-zenmap.sh zenmap
+cd "%%DATADIR%%" && exec su-to-zenmap.sh zenmap
 
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403241335.s2ODZ8jS007073>