From owner-svn-ports-all@FreeBSD.ORG Wed Jul 2 22:00:45 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 06AF9F22; Wed, 2 Jul 2014 22:00:45 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DC4E126D3; Wed, 2 Jul 2014 22:00:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s62M0i9n017143; Wed, 2 Jul 2014 22:00:44 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s62M0i2g017140; Wed, 2 Jul 2014 22:00:44 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201407022200.s62M0i2g017140@svn.freebsd.org> From: Dmitry Marakasov Date: Wed, 2 Jul 2014 22:00:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360276 - head/security/ftimes 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.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jul 2014 22:00:45 -0000 Author: amdmi3 Date: Wed Jul 2 22:00:44 2014 New Revision: 360276 URL: http://svnweb.freebsd.org/changeset/ports/360276 QAT: https://qat.redports.org/buildarchive/r360276/ Log: - Stagify - Clarify LICENSE - Fix shebangs - Use new LIB_DEPENDS syntax - Chase devel/libklel .so version change Approved by: portmgr blanket Modified: head/security/ftimes/Makefile head/security/ftimes/pkg-plist Modified: head/security/ftimes/Makefile ============================================================================== --- head/security/ftimes/Makefile Wed Jul 2 22:00:24 2014 (r360275) +++ head/security/ftimes/Makefile Wed Jul 2 22:00:44 2014 (r360276) @@ -3,6 +3,7 @@ PORTNAME= ftimes PORTVERSION= 3.10.0 +PORTREVISION= 1 CATEGORIES= security sysutils MASTER_SITES= SF EXTRACT_SUFX= .tgz @@ -10,14 +11,46 @@ EXTRACT_SUFX= .tgz MAINTAINER= klm@uidzero.org COMMENT= System baselining and evidence collection tool -LICENSE= BSD APACHE20 MIT +LICENSE= BSD3CLAUSE APACHE20 MIT LICENSE_COMB= multi GNU_CONFIGURE= yes -USES= perl5 - -MAN1= ftimes.1 -MAN3= FTimes::EadRoutines.3 FTimes::Properties.3 +USES= perl5 shebangfix +USE_PERL5= run build fixpacklist +SHEBANG_FILES= \ + ${WRKSRC}/tools/dig/ftimes-crv2dbi.pl \ + ${WRKSRC}/tools/dig/ftimes-crv2raw.pl \ + ${WRKSRC}/tools/dig/ftimes-dig2ctx.pl \ + ${WRKSRC}/tools/dig/ftimes-dig2dbi.pl \ + ${WRKSRC}/tools/dig/hipdig.pl \ + ${WRKSRC}/tools/ftimes-cmp2diff/ftimes-cmp2diff \ + ${WRKSRC}/tools/ftimes-dbm-bash/ftimes-dbm-bash \ + ${WRKSRC}/tools/ftimes-dbm-dump/ftimes-dbm-dump \ + ${WRKSRC}/tools/ftimes-dbm-find/ftimes-dbm-find \ + ${WRKSRC}/tools/ftimes-dbm-make/ftimes-dbm-make \ + ${WRKSRC}/tools/ftimes-dbm-reap/ftimes-dbm-reap \ + ${WRKSRC}/tools/ftimes-dbm-weed/ftimes-dbm-weed \ + ${WRKSRC}/tools/ftimes-encoder/ftimes-encoder \ + ${WRKSRC}/tools/ftimes-grabber/ftimes-grabber \ + ${WRKSRC}/tools/ftimes-proximo/ftimes-proximo \ + ${WRKSRC}/tools/ftimes-sizimus/ftimes-sizimus \ + ${WRKSRC}/tools/ftimes-sortini/ftimes-sortini \ + ${WRKSRC}/tools/ftimes-xformer/ftimes-xformer \ + ${WRKSRC}/tools/hashdig/hashdig-bash.pl \ + ${WRKSRC}/tools/hashdig/hashdig-bind.pl \ + ${WRKSRC}/tools/hashdig/hashdig-dump.pl \ + ${WRKSRC}/tools/hashdig/hashdig-filter.pl \ + ${WRKSRC}/tools/hashdig/hashdig-find.pl \ + ${WRKSRC}/tools/hashdig/hashdig-harvest-sunsolve.pl \ + ${WRKSRC}/tools/hashdig/hashdig-harvest.pl \ + ${WRKSRC}/tools/hashdig/hashdig-make.pl \ + ${WRKSRC}/tools/hashdig/hashdig-resolve-sunsolve.pl \ + ${WRKSRC}/tools/hashdig/hashdig-stat.pl \ + ${WRKSRC}/tools/hashdig/hashdig-weed.pl \ + ${WRKSRC}/tools/map/ftimes-cmp2dbi.pl \ + ${WRKSRC}/tools/map/ftimes-map2dbi.pl \ + ${WRKSRC}/tools/map/ftimes-map2mac.pl \ + ${WRKSRC}/tools/zipmap/zipmap OPTIONS_DEFINE= DBM_TOOLS DIG_TOOLS FILE_HOOKS HASHDIG_TOOLS MAP_TOOLS SSL XMAGIC OPTIONS_DEFAULT= DBM_TOOLS DIG_TOOLS FILE_HOOKS HASHDIG_TOOLS MAP_TOOLS SSL XMAGIC @@ -28,18 +61,16 @@ HASHDIG_TOOLS_DESC= Install hashdig tool MAP_TOOLS_DESC= Install map tools XMAGIC_DESC= XMagic support -NO_STAGE= yes .include -LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre +LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre CONFIGURE_ARGS+= --with-pcre=${LOCALBASE} -STRIP_FILES= ${PREFIX}/bin/ftimes +STRIP_FILES= ${STAGEDIR}${PREFIX}/bin/ftimes .if ${PORT_OPTIONS:MDBM_TOOLS} PLIST_SUB+= DBM_TOOLS="" CONFIGURE_ARGS+= --with-dbm-tools -MAN1+= ftimes-dbm-bash.1 ftimes-dbm-dump.1 ftimes-dbm-find.1 ftimes-dbm-make.1 ftimes-dbm-reap.1 ftimes-dbm-weed.1 .else PLIST_SUB+= DBM_TOOLS="@comment " .endif @@ -47,14 +78,13 @@ PLIST_SUB+= DBM_TOOLS="@comment " .if ${PORT_OPTIONS:MDIG_TOOLS} PLIST_SUB+= DIG_TOOLS="" CONFIGURE_ARGS+= --with-dig-tools -MAN1+= ftimes-crv2dbi.1 ftimes-crv2raw.1 ftimes-dig2ctx.1 ftimes-dig2dbi.1 hipdig.1 RUN_DEPENDS+= p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 .else PLIST_SUB+= DIG_TOOLS="@comment " .endif .if ${PORT_OPTIONS:MFILE_HOOKS} -LIB_DEPENDS+= klel:${PORTSDIR}/devel/libklel +LIB_DEPENDS+= libklel.so:${PORTSDIR}/devel/libklel CONFIGURE_ARGS+= --enable-file-hooks --with-klel=${LOCALBASE} --with-perl=${LOCALBASE}/bin/perl .else PLIST_SUB+= WITH_FILE_HOOKS="@comment " @@ -63,7 +93,6 @@ PLIST_SUB+= WITH_FILE_HOOKS="@comment " .if ${PORT_OPTIONS:MHASHDIG_TOOLS} PLIST_SUB+= HASHDIG_TOOLS="" CONFIGURE_ARGS+= --with-hashdig-tools -MAN1+= hashdig-bash.1 hashdig-bind.1 hashdig-dump.1 hashdig-filter.1 hashdig-find.1 hashdig-harvest.1 hashdig-harvest-sunsolve.1 hashdig-make.1 hashdig-resolve-sunsolve.1 hashdig-stat.1 hashdig-weed.1 .else PLIST_SUB+= HASHDIG_TOOLS="@comment " .endif @@ -71,8 +100,7 @@ PLIST_SUB+= HASHDIG_TOOLS="@comment " .if ${PORT_OPTIONS:MMAP_TOOLS} PLIST_SUB+= MAP_TOOLS="" CONFIGURE_ARGS+= --with-map-tools -MAN1+= ftimes-cat.1 ftimes-cmp2dbi.1 ftimes-cmp2diff.1 ftimes-encoder.1 ftimes-grabber.1 ftimes-map2dbi.1 ftimes-map2mac.1 ftimes-proximo.1 ftimes-sizimus.1 ftimes-sortini.1 ftimes-xformer.1 ftimes-xpa.1 hashcp.1 tarmap.1 zipmap.1 -STRIP_FILES+= ${PREFIX}/bin/ftimes-cat ${PREFIX}/bin/ftimes-xpa ${PREFIX}/bin/hashcp ${PREFIX}/bin/tarmap +STRIP_FILES+= ${STAGEDIR}${PREFIX}/bin/ftimes-cat ${STAGEDIR}${PREFIX}/bin/ftimes-xpa ${STAGEDIR}${PREFIX}/bin/hashcp ${STAGEDIR}${PREFIX}/bin/tarmap .else PLIST_SUB+= MAP_TOOLS="@comment " .endif Modified: head/security/ftimes/pkg-plist ============================================================================== --- head/security/ftimes/pkg-plist Wed Jul 2 22:00:24 2014 (r360275) +++ head/security/ftimes/pkg-plist Wed Jul 2 22:00:44 2014 (r360276) @@ -43,5 +43,45 @@ etc/ftimes-map.cfg.sample %%SITE_PERL%%/%%PERL_ARCH%%/auto/FTimes/.packlist %%SITE_PERL%%/FTimes/EadRoutines.pm %%SITE_PERL%%/FTimes/Properties.pm +man/man1/ftimes.1.gz +%%DBM_TOOLS%%man/man1/ftimes-dbm-bash.1.gz +%%DBM_TOOLS%%man/man1/ftimes-dbm-dump.1.gz +%%DBM_TOOLS%%man/man1/ftimes-dbm-find.1.gz +%%DBM_TOOLS%%man/man1/ftimes-dbm-make.1.gz +%%DBM_TOOLS%%man/man1/ftimes-dbm-reap.1.gz +%%DBM_TOOLS%%man/man1/ftimes-dbm-weed.1.gz +%%DIG_TOOLS%%man/man1/ftimes-crv2dbi.1.gz +%%DIG_TOOLS%%man/man1/ftimes-crv2raw.1.gz +%%DIG_TOOLS%%man/man1/ftimes-dig2ctx.1.gz +%%DIG_TOOLS%%man/man1/ftimes-dig2dbi.1.gz +%%DIG_TOOLS%%man/man1/hipdig.1.gz +%%HASHDIG_TOOLS%%man/man1/hashdig-bash.1.gz +%%HASHDIG_TOOLS%%man/man1/hashdig-bind.1.gz +%%HASHDIG_TOOLS%%man/man1/hashdig-dump.1.gz +%%HASHDIG_TOOLS%%man/man1/hashdig-filter.1.gz +%%HASHDIG_TOOLS%%man/man1/hashdig-find.1.gz +%%HASHDIG_TOOLS%%man/man1/hashdig-harvest.1.gz +%%HASHDIG_TOOLS%%man/man1/hashdig-harvest-sunsolve.1.gz +%%HASHDIG_TOOLS%%man/man1/hashdig-make.1.gz +%%HASHDIG_TOOLS%%man/man1/hashdig-resolve-sunsolve.1.gz +%%HASHDIG_TOOLS%%man/man1/hashdig-stat.1.gz +%%HASHDIG_TOOLS%%man/man1/hashdig-weed.1.gz +%%MAP_TOOLS%%man/man1/ftimes-cat.1.gz +%%MAP_TOOLS%%man/man1/ftimes-cmp2dbi.1.gz +%%MAP_TOOLS%%man/man1/ftimes-cmp2diff.1.gz +%%MAP_TOOLS%%man/man1/ftimes-encoder.1.gz +%%MAP_TOOLS%%man/man1/ftimes-grabber.1.gz +%%MAP_TOOLS%%man/man1/ftimes-map2dbi.1.gz +%%MAP_TOOLS%%man/man1/ftimes-map2mac.1.gz +%%MAP_TOOLS%%man/man1/ftimes-proximo.1.gz +%%MAP_TOOLS%%man/man1/ftimes-sizimus.1.gz +%%MAP_TOOLS%%man/man1/ftimes-sortini.1.gz +%%MAP_TOOLS%%man/man1/ftimes-xformer.1.gz +%%MAP_TOOLS%%man/man1/ftimes-xpa.1.gz +%%MAP_TOOLS%%man/man1/hashcp.1.gz +%%MAP_TOOLS%%man/man1/tarmap.1.gz +%%MAP_TOOLS%%man/man1/zipmap.1.gz +man/man3/FTimes::EadRoutines.3.gz +man/man3/FTimes::Properties.3.gz @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FTimes @dirrm %%SITE_PERL%%/FTimes