From owner-svn-ports-branches@freebsd.org Tue Jan 5 23:29:51 2016 Return-Path: Delivered-To: svn-ports-branches@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 3C2E9A63172; Tue, 5 Jan 2016 23:29:51 +0000 (UTC) (envelope-from amdmi3@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 E7B7712AF; Tue, 5 Jan 2016 23:29:50 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u05NTo8m012881; Tue, 5 Jan 2016 23:29:50 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u05NTn03012879; Tue, 5 Jan 2016 23:29:49 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201601052329.u05NTn03012879@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 5 Jan 2016 23:29:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r405321 - in branches/2016Q1/security/zenmap: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jan 2016 23:29:51 -0000 Author: amdmi3 Date: Tue Jan 5 23:29:49 2016 New Revision: 405321 URL: https://svnweb.freebsd.org/changeset/ports/405321 Log: MFH: r405296 - Fix broken zenmap-root script - While here, add LICENSE_FILE, switch to WRKSRC_SUBDIR, add NO_ARCH and switch to options helpers PR: 204713 Submitted by: admin@vladiom.com.ua Approved by: maintainer timeout (nemysis, 6 weeks) Approved by: ports-secteam (feld) Modified: branches/2016Q1/security/zenmap/Makefile branches/2016Q1/security/zenmap/files/zenmap-root.in Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/security/zenmap/Makefile ============================================================================== --- branches/2016Q1/security/zenmap/Makefile Tue Jan 5 22:39:46 2016 (r405320) +++ branches/2016Q1/security/zenmap/Makefile Tue Jan 5 23:29:49 2016 (r405321) @@ -3,6 +3,7 @@ PORTNAME= zenmap PORTVERSION= 6.47 +PORTREVISION= 1 CATEGORIES= security ipv6 MASTER_SITES= http://nmap.org/dist/ \ SF/nemysisfreebsdp/security/:icons @@ -15,16 +16,18 @@ MAINTAINER= nemysis@FreeBSD.org COMMENT= GUI frontend for the Nmap scanning utility LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= nmap:${PORTSDIR}/security/nmap \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 -WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME} +WRKSRC_SUBDIR= ${PORTNAME} USES= dos2unix python tar:bzip2 DOS2UNIX_GLOB= *.xml USE_GNOME= pygtk2 USE_PYTHON= autoplist distutils +NO_ARCH= yes OPTIONS_DEFINE= NLS OPTIONS_SUB= yes @@ -34,8 +37,6 @@ NLS_USES= gettext SUB_FILES= zenmap-root -.include - 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 @@ -65,9 +66,8 @@ post-patch: @${FIND} ${WRKSRC} -name "*.bak" -delete @${FIND} ${WRKSRC}/../ndiff -name "*.bak" -delete -.if ! ${PORT_OPTIONS:MNLS} +post-patch-NLS-off: @${REINPLACE_CMD} -i '' '/locale_dir, mo_find, /d' ${WRKSRC}/setup.py -.endif post-install: ${INSTALL_SCRIPT} ${WRKDIR}/zenmap-root ${STAGEDIR}${PREFIX}/bin/ Modified: branches/2016Q1/security/zenmap/files/zenmap-root.in ============================================================================== --- branches/2016Q1/security/zenmap/files/zenmap-root.in Tue Jan 5 22:39:46 2016 (r405320) +++ branches/2016Q1/security/zenmap/files/zenmap-root.in Tue Jan 5 23:29:49 2016 (r405321) @@ -3,6 +3,4 @@ # $FreeBSD$ # -cd "%%DATADIR%%" && exec su-to-zenmap.sh zenmap - - +exec %%DATADIR%%/su-to-zenmap.sh zenmap