View | Details | Raw Unified | Return to bug 192615 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-4 / +16 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=		ftimes
4
PORTNAME=		ftimes
5
PORTVERSION=		3.10.0
5
PORTVERSION=		3.11.0
6
PORTREVISION=		1
7
CATEGORIES=		security sysutils
6
CATEGORIES=		security sysutils
8
MASTER_SITES=		SF
7
MASTER_SITES=		SF
9
8
Lines 15-27 Link Here
15
14
16
GNU_CONFIGURE=		yes
15
GNU_CONFIGURE=		yes
17
USES=			perl5 shebangfix tar:tgz
16
USES=			perl5 shebangfix tar:tgz
18
USE_PERL5=		run build fixpacklist
17
USE_PERL5=		run build
19
SHEBANG_FILES= \
18
SHEBANG_FILES= \
20
			${WRKSRC}/tools/dig/ftimes-crv2dbi.pl \
19
			${WRKSRC}/tools/dig/ftimes-crv2dbi.pl \
21
			${WRKSRC}/tools/dig/ftimes-crv2raw.pl \
20
			${WRKSRC}/tools/dig/ftimes-crv2raw.pl \
22
			${WRKSRC}/tools/dig/ftimes-dig2ctx.pl \
21
			${WRKSRC}/tools/dig/ftimes-dig2ctx.pl \
23
			${WRKSRC}/tools/dig/ftimes-dig2dbi.pl \
22
			${WRKSRC}/tools/dig/ftimes-dig2dbi.pl \
24
			${WRKSRC}/tools/dig/hipdig.pl \
23
			${WRKSRC}/tools/dig/hipdig.pl \
24
			${WRKSRC}/tools/ftimes-bimvl/ftimes-bimvl \
25
			${WRKSRC}/tools/ftimes-cmp2diff/ftimes-cmp2diff \
25
			${WRKSRC}/tools/ftimes-cmp2diff/ftimes-cmp2diff \
26
			${WRKSRC}/tools/ftimes-dbm-bash/ftimes-dbm-bash \
26
			${WRKSRC}/tools/ftimes-dbm-bash/ftimes-dbm-bash \
27
			${WRKSRC}/tools/ftimes-dbm-dump/ftimes-dbm-dump \
27
			${WRKSRC}/tools/ftimes-dbm-dump/ftimes-dbm-dump \
Lines 67-72 Link Here
67
67
68
STRIP_FILES=		${STAGEDIR}${PREFIX}/bin/ftimes
68
STRIP_FILES=		${STAGEDIR}${PREFIX}/bin/ftimes
69
69
70
INSTALL_PERL5_LIBS=
71
70
.if ${PORT_OPTIONS:MDBM_TOOLS}
72
.if ${PORT_OPTIONS:MDBM_TOOLS}
71
PLIST_SUB+=		DBM_TOOLS=""
73
PLIST_SUB+=		DBM_TOOLS=""
72
CONFIGURE_ARGS+=	--with-dbm-tools
74
CONFIGURE_ARGS+=	--with-dbm-tools
Lines 78-83 Link Here
78
PLIST_SUB+=		DIG_TOOLS=""
80
PLIST_SUB+=		DIG_TOOLS=""
79
CONFIGURE_ARGS+=	--with-dig-tools
81
CONFIGURE_ARGS+=	--with-dig-tools
80
RUN_DEPENDS+=		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
82
RUN_DEPENDS+=		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
83
INSTALL_PERL5_LIBS=	yes
81
.else
84
.else
82
PLIST_SUB+=		DIG_TOOLS="@comment "
85
PLIST_SUB+=		DIG_TOOLS="@comment "
83
.endif
86
.endif
Lines 100-105 Link Here
100
PLIST_SUB+=		MAP_TOOLS=""
103
PLIST_SUB+=		MAP_TOOLS=""
101
CONFIGURE_ARGS+=	--with-map-tools
104
CONFIGURE_ARGS+=	--with-map-tools
102
STRIP_FILES+=		${STAGEDIR}${PREFIX}/bin/ftimes-cat ${STAGEDIR}${PREFIX}/bin/ftimes-xpa ${STAGEDIR}${PREFIX}/bin/hashcp ${STAGEDIR}${PREFIX}/bin/tarmap
105
STRIP_FILES+=		${STAGEDIR}${PREFIX}/bin/ftimes-cat ${STAGEDIR}${PREFIX}/bin/ftimes-xpa ${STAGEDIR}${PREFIX}/bin/hashcp ${STAGEDIR}${PREFIX}/bin/tarmap
106
INSTALL_PERL5_LIBS=	yes
103
.else
107
.else
104
PLIST_SUB+=		MAP_TOOLS="@comment "
108
PLIST_SUB+=		MAP_TOOLS="@comment "
105
.endif
109
.endif
Lines 117-126 Link Here
117
CONFIGURE_ARGS+=	--enable-xmagic
121
CONFIGURE_ARGS+=	--enable-xmagic
118
.else
122
.else
119
PLIST_SUB+=		XMAGIC="@comment "
123
PLIST_SUB+=		XMAGIC="@comment "
124
CONFIGURE_ARGS+=	--disable-xmagic
120
.endif
125
.endif
121
126
127
.if ${INSTALL_PERL5_LIBS}
128
PLIST_SUB+=		FTIMES_PERL5_LIBS=""
129
USE_PERL5+=		fixpacklist
130
.else
131
PLIST_SUB+=		FTIMES_PERL5_LIBS="@comment "
132
.endif
133
122
post-configure:
134
post-configure:
123
	${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' ${WRKSRC}/lib/perl/Makefile
135
	if [ "${INSTALL_PERL5_LIBS}" = "yes" ] ; then ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' ${WRKSRC}/lib/perl/Makefile ; fi
124
136
125
post-install:
137
post-install:
126
	${STRIP_CMD} ${STRIP_FILES}
138
	${STRIP_CMD} ${STRIP_FILES}
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (ftimes-3.10.0.tgz) = 3bd4a66c685e365d0dc4f74edaf220808530d75e78fa0246c7727d5597e95af2
1
SHA256 (ftimes-3.11.0.tgz) = 70178e80c4ea7a8ce65404dd85a4bf5958a78f6a60c48f1fd06f78741c200f64
2
SIZE (ftimes-3.10.0.tgz) = 643517
2
SIZE (ftimes-3.11.0.tgz) = 653540
(-)files/patch-configure (+10 lines)
Line 0 Link Here
1
--- configure.orig	2014-08-17 13:35:11.932131244 -0400
2
+++ configure	2014-08-17 13:35:37.032505938 -0400
3
@@ -5760,6 +5760,7 @@
4
 tests/hipdig/common/dig/Makefile
5
 tests/hipdig/common/dig/test_1/Makefile
6
 "
7
+  install_lib_perl="1"
8
 else
9
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10
 $as_echo "no" >&6; }
(-)files/patch-etc__xmagic__xmagic.base (-90 lines)
Lines 1-90 Link Here
1
--- etc/xmagic/xmagic.base.orig	2013-04-09 13:34:18.000000000 -0400
2
+++ etc/xmagic/xmagic.base	2013-04-09 13:38:03.000000000 -0400
3
@@ -648,66 +648,66 @@
4
 0 string = \x23\x20PaCkAgE\x20DaTaStReAm package/svr4
5
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
6
 # XMagic -- ae script
7
-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/ae) script/ae: path="%s";
8
+0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/ae) script/ae: path="%s";
9
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
10
 # XMagic -- ash script
11
-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/ash) script/ash: path="%s";
12
+0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/ash) script/ash: path="%s";
13
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
14
 # XMagic -- awk script
15
-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/awk) script/awk: path="%s";
16
+0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/awk) script/awk: path="%s";
17
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
18
 # XMagic -- bash script
19
-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/bash) script/bash: path="%s";
20
+0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/bash) script/bash: path="%s";
21
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
22
 # XMagic -- csh script
23
-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/csh) script/csh: path="%s";
24
+0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/csh) script/csh: path="%s";
25
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
26
 # XMagic -- env script
27
-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/env) script/env: path="%s";
28
->&0 regexp =~ ^#![\x20\t]*(?:/(?:opt|usr)(?:/local)?)?/bin/env[\x20\t]+(ae|(?:[ackz]|ba|tcl?|wi)?sh|[gn]?awk|lua|perl|php|python|rc|ruby) interpreter="%s";
29
+0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/env) script/env: path="%s";
30
+>&0 regexp =~ ^\x23![\x20\t]*(?:/(?:opt|usr)(?:/local)?)?/bin/env[\x20\t]+(ae|(?:[ackz]|ba|tcl?|wi)?sh|[gn]?awk|lua|perl|php|python|rc|ruby) interpreter="%s";
31
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
32
 # XMagic -- gawk script
33
-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/gawk) script/gawk: path="%s";
34
+0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/gawk) script/gawk: path="%s";
35
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
36
 # XMagic -- ksh script
37
-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/ksh) script/ksh: path="%s";
38
+0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/ksh) script/ksh: path="%s";
39
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
40
 # XMagic -- lua script
41
-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/lua) script/lua: path="%s";
42
+0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/lua) script/lua: path="%s";
43
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
44
 # XMagic -- nawk script
45
-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/nawk) script/nawk: path="%s";
46
+0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/nawk) script/nawk: path="%s";
47
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
48
 # XMagic -- perl script
49
-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/perl) script/perl: path="%s";
50
+0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/perl) script/perl: path="%s";
51
 0 regexp =~ (?:eval[\x20\t]+["'][(]exit[\x20\t]+[$][?][)][\x20\t]+&&[\x20\t]+)?eval[\x20\t]+["']exec[\x20\t]+((?:(?:/(?:opt|usr)(?:/local)?)?/bin/)?perl)[\x20\t]+ script/perl: path="%s"; eval="yes";
52
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
53
 # XMagic -- php script
54
-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/php) script/php: path="%s";
55
+0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/php) script/php: path="%s";
56
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
57
 # XMagic -- python script
58
-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/python) script/python: path="%s";
59
+0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/python) script/python: path="%s";
60
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
61
 # XMagic -- rc script
62
-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/rc) script/rc: path="%s";
63
+0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/rc) script/rc: path="%s";
64
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
65
 # XMagic -- ruby script
66
-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/ruby) script/ruby: path="%s";
67
+0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/ruby) script/ruby: path="%s";
68
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
69
 # XMagic -- sh script
70
-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/sh) script/sh: path="%s";
71
+0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/sh) script/sh: path="%s";
72
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
73
 # XMagic -- tclsh script
74
-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/tclsh) script/tclsh: path="%s";
75
+0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/tclsh) script/tclsh: path="%s";
76
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
77
 # XMagic -- tcsh script
78
-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/tcsh) script/tcsh: path="%s";
79
+0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/tcsh) script/tcsh: path="%s";
80
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
81
 # XMagic -- wish script
82
-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/wish) script/wish: path="%s";
83
+0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/wish) script/wish: path="%s";
84
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
85
 # XMagic -- zsh script
86
-0 regexp =~ ^#![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/zsh) script/zsh: path="%s";
87
+0 regexp =~ ^\x23![\x20\t]*((?:/(?:opt|usr)(?:/local)?)?/bin/zsh) script/zsh: path="%s";
88
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
89
 # XMagic -- btsnoop
90
 0 string = btsnoop\0 sniffer/btsnoop:
(-)pkg-plist (-7 / +9 lines)
Lines 20-25 Link Here
20
%%HASHDIG_TOOLS%%bin/hashdig-resolve-sunsolve.pl
20
%%HASHDIG_TOOLS%%bin/hashdig-resolve-sunsolve.pl
21
%%HASHDIG_TOOLS%%bin/hashdig-stat.pl
21
%%HASHDIG_TOOLS%%bin/hashdig-stat.pl
22
%%HASHDIG_TOOLS%%bin/hashdig-weed.pl
22
%%HASHDIG_TOOLS%%bin/hashdig-weed.pl
23
%%MAP_TOOLS%%bin/ftimes-bimvl
23
%%MAP_TOOLS%%bin/ftimes-cat
24
%%MAP_TOOLS%%bin/ftimes-cat
24
%%MAP_TOOLS%%bin/ftimes-cmp2dbi.pl
25
%%MAP_TOOLS%%bin/ftimes-cmp2dbi.pl
25
%%MAP_TOOLS%%bin/ftimes-cmp2diff
26
%%MAP_TOOLS%%bin/ftimes-cmp2diff
Lines 40-48 Link Here
40
etc/ftimes-dig.cfg.sample
41
etc/ftimes-dig.cfg.sample
41
etc/ftimes-get.cfg.sample
42
etc/ftimes-get.cfg.sample
42
etc/ftimes-map.cfg.sample
43
etc/ftimes-map.cfg.sample
43
%%SITE_PERL%%/%%PERL_ARCH%%/auto/FTimes/.packlist
44
%%FTIMES_PERL5_LIBS%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/FTimes/.packlist
44
%%SITE_PERL%%/FTimes/EadRoutines.pm
45
%%FTIMES_PERL5_LIBS%%%%SITE_PERL%%/FTimes/EadRoutines.pm
45
%%SITE_PERL%%/FTimes/Properties.pm
46
%%FTIMES_PERL5_LIBS%%%%SITE_PERL%%/FTimes/Properties.pm
46
man/man1/ftimes.1.gz
47
man/man1/ftimes.1.gz
47
%%DBM_TOOLS%%man/man1/ftimes-dbm-bash.1.gz
48
%%DBM_TOOLS%%man/man1/ftimes-dbm-bash.1.gz
48
%%DBM_TOOLS%%man/man1/ftimes-dbm-dump.1.gz
49
%%DBM_TOOLS%%man/man1/ftimes-dbm-dump.1.gz
Lines 66-71 Link Here
66
%%HASHDIG_TOOLS%%man/man1/hashdig-resolve-sunsolve.1.gz
67
%%HASHDIG_TOOLS%%man/man1/hashdig-resolve-sunsolve.1.gz
67
%%HASHDIG_TOOLS%%man/man1/hashdig-stat.1.gz
68
%%HASHDIG_TOOLS%%man/man1/hashdig-stat.1.gz
68
%%HASHDIG_TOOLS%%man/man1/hashdig-weed.1.gz
69
%%HASHDIG_TOOLS%%man/man1/hashdig-weed.1.gz
70
%%MAP_TOOLS%%man/man1/ftimes-bimvl.1.gz
69
%%MAP_TOOLS%%man/man1/ftimes-cat.1.gz
71
%%MAP_TOOLS%%man/man1/ftimes-cat.1.gz
70
%%MAP_TOOLS%%man/man1/ftimes-cmp2dbi.1.gz
72
%%MAP_TOOLS%%man/man1/ftimes-cmp2dbi.1.gz
71
%%MAP_TOOLS%%man/man1/ftimes-cmp2diff.1.gz
73
%%MAP_TOOLS%%man/man1/ftimes-cmp2diff.1.gz
Lines 81-87 Link Here
81
%%MAP_TOOLS%%man/man1/hashcp.1.gz
83
%%MAP_TOOLS%%man/man1/hashcp.1.gz
82
%%MAP_TOOLS%%man/man1/tarmap.1.gz
84
%%MAP_TOOLS%%man/man1/tarmap.1.gz
83
%%MAP_TOOLS%%man/man1/zipmap.1.gz
85
%%MAP_TOOLS%%man/man1/zipmap.1.gz
84
man/man3/FTimes::EadRoutines.3.gz
86
%%FTIMES_PERL5_LIBS%%man/man3/FTimes::EadRoutines.3.gz
85
man/man3/FTimes::Properties.3.gz
87
%%FTIMES_PERL5_LIBS%%man/man3/FTimes::Properties.3.gz
86
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FTimes
88
%%FTIMES_PERL5_LIBS%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FTimes
87
@dirrm %%SITE_PERL%%/FTimes
89
%%FTIMES_PERL5_LIBS%%@dirrm %%SITE_PERL%%/FTimes

Return to bug 192615