svn commit: r365269 - in head/security/ftimes: . files

Thomas Zander riggs at FreeBSD.org
Mon Aug 18 06:59:31 UTC 2014 

Author: riggs
Date: Mon Aug 18 06:59:30 2014
New Revision: 365269
URL: http://svnweb.freebsd.org/changeset/ports/365269
QAT: https://qat.redports.org/buildarchive/r365269/

Log:
  - Update to upstream release 3.11.0
  - Fix pkg-plist for all permutations of OPTIONS
  
  PR:		192615
  Submitted by:	klm at uidzero.org (maintainer)
  Approved by:	mentors (implicit)

Added:
  head/security/ftimes/files/patch-configure   (contents, props changed)
Deleted:
  head/security/ftimes/files/patch-etc__xmagic__xmagic.base
Modified:
  head/security/ftimes/Makefile
  head/security/ftimes/distinfo
  head/security/ftimes/pkg-plist

Modified: head/security/ftimes/Makefile
==============================================================================
--- head/security/ftimes/Makefile	Mon Aug 18 06:44:04 2014	(r365268)
+++ head/security/ftimes/Makefile	Mon Aug 18 06:59:30 2014	(r365269)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=		ftimes
-PORTVERSION=		3.10.0
-PORTREVISION=		1
+PORTVERSION=		3.11.0
 CATEGORIES=		security sysutils
 MASTER_SITES=		SF
 
@@ -15,13 +14,14 @@ LICENSE_COMB=		multi
 
 GNU_CONFIGURE=		yes
 USES=			perl5 shebangfix tar:tgz
-USE_PERL5=		run build fixpacklist
+USE_PERL5=		run build
 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-bimvl/ftimes-bimvl \
 			${WRKSRC}/tools/ftimes-cmp2diff/ftimes-cmp2diff \
 			${WRKSRC}/tools/ftimes-dbm-bash/ftimes-dbm-bash \
 			${WRKSRC}/tools/ftimes-dbm-dump/ftimes-dbm-dump \
@@ -67,6 +67,8 @@ CONFIGURE_ARGS+=	--with-pcre=${LOCALBASE
 
 STRIP_FILES=		${STAGEDIR}${PREFIX}/bin/ftimes
 
+INSTALL_PERL5_LIBS=
+
 .if ${PORT_OPTIONS:MDBM_TOOLS}
 PLIST_SUB+=		DBM_TOOLS=""
 CONFIGURE_ARGS+=	--with-dbm-tools
@@ -78,6 +80,7 @@ PLIST_SUB+=		DBM_TOOLS="@comment "
 PLIST_SUB+=		DIG_TOOLS=""
 CONFIGURE_ARGS+=	--with-dig-tools
 RUN_DEPENDS+=		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+INSTALL_PERL5_LIBS=	yes
 .else
 PLIST_SUB+=		DIG_TOOLS="@comment "
 .endif
@@ -100,6 +103,7 @@ PLIST_SUB+=		HASHDIG_TOOLS="@comment "
 PLIST_SUB+=		MAP_TOOLS=""
 CONFIGURE_ARGS+=	--with-map-tools
 STRIP_FILES+=		${STAGEDIR}${PREFIX}/bin/ftimes-cat ${STAGEDIR}${PREFIX}/bin/ftimes-xpa ${STAGEDIR}${PREFIX}/bin/hashcp ${STAGEDIR}${PREFIX}/bin/tarmap
+INSTALL_PERL5_LIBS=	yes
 .else
 PLIST_SUB+=		MAP_TOOLS="@comment "
 .endif
@@ -117,10 +121,18 @@ PLIST_SUB+=		XMAGIC=""
 CONFIGURE_ARGS+=	--enable-xmagic
 .else
 PLIST_SUB+=		XMAGIC="@comment "
+CONFIGURE_ARGS+=	--disable-xmagic
+.endif
+
+.if ${INSTALL_PERL5_LIBS}
+PLIST_SUB+=		FTIMES_PERL5_LIBS=""
+USE_PERL5+=		fixpacklist
+.else
+PLIST_SUB+=		FTIMES_PERL5_LIBS="@comment "
 .endif
 
 post-configure:
-	${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' ${WRKSRC}/lib/perl/Makefile
+	if [ "${INSTALL_PERL5_LIBS}" = "yes" ] ; then ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' ${WRKSRC}/lib/perl/Makefile ; fi
 
 post-install:
 	${STRIP_CMD} ${STRIP_FILES}

Modified: head/security/ftimes/distinfo
==============================================================================
--- head/security/ftimes/distinfo	Mon Aug 18 06:44:04 2014	(r365268)
+++ head/security/ftimes/distinfo	Mon Aug 18 06:59:30 2014	(r365269)
@@ -1,2 +1,2 @@
-SHA256 (ftimes-3.10.0.tgz) = 3bd4a66c685e365d0dc4f74edaf220808530d75e78fa0246c7727d5597e95af2
-SIZE (ftimes-3.10.0.tgz) = 643517
+SHA256 (ftimes-3.11.0.tgz) = 70178e80c4ea7a8ce65404dd85a4bf5958a78f6a60c48f1fd06f78741c200f64
+SIZE (ftimes-3.11.0.tgz) = 653540

Added: head/security/ftimes/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/ftimes/files/patch-configure	Mon Aug 18 06:59:30 2014	(r365269)
@@ -0,0 +1,10 @@
+--- configure.orig	2014-08-17 13:35:11.932131244 -0400
++++ configure	2014-08-17 13:35:37.032505938 -0400
+@@ -5760,6 +5760,7 @@
+ tests/hipdig/common/dig/Makefile
+ tests/hipdig/common/dig/test_1/Makefile
+ "
++  install_lib_perl="1"
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }

Modified: head/security/ftimes/pkg-plist
==============================================================================
--- head/security/ftimes/pkg-plist	Mon Aug 18 06:44:04 2014	(r365268)
+++ head/security/ftimes/pkg-plist	Mon Aug 18 06:59:30 2014	(r365269)
@@ -20,6 +20,7 @@
 %%HASHDIG_TOOLS%%bin/hashdig-resolve-sunsolve.pl
 %%HASHDIG_TOOLS%%bin/hashdig-stat.pl
 %%HASHDIG_TOOLS%%bin/hashdig-weed.pl
+%%MAP_TOOLS%%bin/ftimes-bimvl
 %%MAP_TOOLS%%bin/ftimes-cat
 %%MAP_TOOLS%%bin/ftimes-cmp2dbi.pl
 %%MAP_TOOLS%%bin/ftimes-cmp2diff
@@ -40,9 +41,9 @@ bin/ftimes
 etc/ftimes-dig.cfg.sample
 etc/ftimes-get.cfg.sample
 etc/ftimes-map.cfg.sample
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FTimes/.packlist
-%%SITE_PERL%%/FTimes/EadRoutines.pm
-%%SITE_PERL%%/FTimes/Properties.pm
+%%FTIMES_PERL5_LIBS%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/FTimes/.packlist
+%%FTIMES_PERL5_LIBS%%%%SITE_PERL%%/FTimes/EadRoutines.pm
+%%FTIMES_PERL5_LIBS%%%%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
@@ -66,6 +67,7 @@ man/man1/ftimes.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-bimvl.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
@@ -81,7 +83,7 @@ man/man1/ftimes.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
- at dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FTimes
- at dirrm %%SITE_PERL%%/FTimes
+%%FTIMES_PERL5_LIBS%%man/man3/FTimes::EadRoutines.3.gz
+%%FTIMES_PERL5_LIBS%%man/man3/FTimes::Properties.3.gz
+%%FTIMES_PERL5_LIBS%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FTimes
+%%FTIMES_PERL5_LIBS%%@dirrm %%SITE_PERL%%/FTimes

More information about the svn-ports-head mailing list