From owner-svn-ports-all@FreeBSD.ORG  Mon Mar 24 13:35:09 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5D54DD5A;
 Mon, 24 Mar 2014 13:35:09 +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 4A00564D;
 Mon, 24 Mar 2014 13:35:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2ODZ9IX007075;
 Mon, 24 Mar 2014 13:35:09 GMT (envelope-from nemysis@svn.freebsd.org)
Received: (from nemysis@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2ODZ8jS007073;
 Mon, 24 Mar 2014 13:35:08 GMT (envelope-from nemysis@svn.freebsd.org)
Message-Id: <201403241335.s2ODZ8jS007073@svn.freebsd.org>
From: Rusmir Dusko <nemysis@FreeBSD.org>
Date: Mon, 24 Mar 2014 13:35:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r348998 - 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-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Mar 2014 13:35:09 -0000

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