Changes 1.26: * Fix the --verify option, which broke in version 1.24. * Fix storing long sparse file names in PAX archives. * Fix correctness of --atime-preserve=replace. * Work around POSIX incompatibilities on FreeBSD, NetBSD and Tru64. * Fix bug with --one-file-system --listed-incremental.diff -r1.40 -r1.41 pkgsrc/archivers/gtar/Makefile
(adam)
@@ -1,21 +1,21 @@ | @@ -1,21 +1,21 @@ | |||
1 | # $NetBSD: Makefile,v 1.40 2010/12/12 13:10:39 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.41 2011/05/11 07:49:58 adam Exp $ | |
2 | 2 | |||
3 | DISTNAME= gtar-1.25 | 3 | DISTNAME= gtar-1.26 | |
4 | CATEGORIES= archivers | 4 | CATEGORIES= archivers | |
5 | MASTER_SITES= # empty | 5 | MASTER_SITES= # empty | |
6 | DISTFILES= # empty | 6 | DISTFILES= # empty | |
7 | 7 | |||
8 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
9 | HOMEPAGE= http://www.gnu.org/software/tar/tar.html | 9 | HOMEPAGE= http://www.gnu.org/software/tar/tar.html | |
10 | COMMENT= The "meta-package" for the GNU tape archiver (tar) | 10 | COMMENT= The "meta-package" for the GNU tape archiver (tar) | |
11 | LICENSE= gnu-gpl-v3 AND gnu-fdl-v1.1 | 11 | LICENSE= gnu-gpl-v3 AND gnu-fdl-v1.1 | |
12 | 12 | |||
13 | META_PACKAGE= yes | 13 | META_PACKAGE= yes | |
14 | 14 | |||
15 | DEPENDS+= gtar-base-1.25{,nb*}:../../archivers/gtar-base | 15 | DEPENDS+= gtar-base-${PKGVERSION_NOREV}{,nb*}:../../archivers/gtar-base | |
16 | DEPENDS+= gtar-info-1.25{,nb*}:../../archivers/gtar-info | 16 | DEPENDS+= gtar-info-${PKGVERSION_NOREV}{,nb*}:../../archivers/gtar-info | |
17 | 17 | |||
18 | PKG_INSTALLATION_TYPES= overwrite pkgviews | 18 | PKG_INSTALLATION_TYPES= overwrite pkgviews | |
19 | PKG_DESTDIR_SUPPORT= user-destdir | 19 | PKG_DESTDIR_SUPPORT= user-destdir | |
20 | 20 | |||
21 | .include "../../mk/bsd.pkg.mk" | 21 | .include "../../mk/bsd.pkg.mk" |
@@ -1,72 +1,72 @@ | @@ -1,72 +1,72 @@ | |||
1 | # $NetBSD: Makefile,v 1.70 2011/04/22 13:42:49 obache Exp $ | 1 | # $NetBSD: Makefile,v 1.71 2011/05/11 07:49:58 adam Exp $ | |
2 | 2 | |||
3 | DISTNAME= tar-1.25 | 3 | DISTNAME= tar-1.26 | |
4 | PKGNAME= gtar-base-1.25 | 4 | PKGNAME= ${DISTNAME:S/tar/gtar-base/} | |
5 | PKGREVISION= 4 | |||
6 | SVR4_PKGNAME= gtarb | 5 | SVR4_PKGNAME= gtarb | |
7 | CATEGORIES= archivers | 6 | CATEGORIES= archivers | |
8 | MASTER_SITES= ${MASTER_SITE_GNU:=tar/} | 7 | MASTER_SITES= ${MASTER_SITE_GNU:=tar/} | |
8 | EXTRACT_SUFX= .tar.bz2 | |||
9 | 9 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 10 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= http://www.gnu.org/software/tar/tar.html | 11 | HOMEPAGE= http://www.gnu.org/software/tar/tar.html | |
12 | COMMENT= The GNU tape archiver with remote magnetic tape support | 12 | COMMENT= The GNU tape archiver with remote magnetic tape support | |
13 | LICENSE= gnu-gpl-v3 | 13 | LICENSE= gnu-gpl-v3 | |
14 | 14 | |||
15 | CONFLICTS= gcpio-[0-9]* | 15 | CONFLICTS= gcpio-[0-9]* | |
16 | 16 | |||
17 | PKG_DESTDIR_SUPPORT= user-destdir | 17 | PKG_DESTDIR_SUPPORT= user-destdir | |
18 | PKG_INSTALLATION_TYPES= overwrite pkgviews | 18 | PKG_INSTALLATION_TYPES= overwrite pkgviews | |
19 | 19 | |||
20 | USE_FEATURES= snprintf | 20 | USE_FEATURES= snprintf | |
21 | USE_PKGLOCALEDIR= yes | |||
21 | USE_TOOLS+= msgfmt | 22 | USE_TOOLS+= msgfmt | |
22 | USE_PKGLOCALEDIR= YES | 23 | GNU_CONFIGURE= yes | |
23 | GNU_CONFIGURE= YES | 24 | ||
24 | INSTALLATION_DIRS= ${PKGMANDIR}/man1 | 25 | INSTALLATION_DIRS= ${PKGMANDIR}/man1 | |
25 | 26 | |||
26 | .include "../../mk/bsd.prefs.mk" | 27 | .include "../../mk/bsd.prefs.mk" | |
27 | 28 | |||
28 | .if defined(GNU_PROGRAM_PREFIX) && ${GNU_PROGRAM_PREFIX} != "" | 29 | .if defined(GNU_PROGRAM_PREFIX) && ${GNU_PROGRAM_PREFIX} != "" | |
29 | GTAR_PROGRAM_PREFIX?= ${GNU_PROGRAM_PREFIX} | 30 | GTAR_PROGRAM_PREFIX?= ${GNU_PROGRAM_PREFIX} | |
30 | .else | 31 | .else | |
31 | GTAR_PROGRAM_PREFIX?= g | 32 | GTAR_PROGRAM_PREFIX?= g | |
32 | .endif | 33 | .endif | |
33 | 34 | |||
34 | .if ${GTAR_PROGRAM_PREFIX} == "" | 35 | .if ${GTAR_PROGRAM_PREFIX} == "" | |
35 | # pax installs a "tar" also | 36 | # pax installs a "tar" also | |
36 | CONFLICTS+= pax-[0-9]* | 37 | CONFLICTS+= pax-[0-9]* | |
37 | .else | 38 | .else | |
38 | CONFIGURE_ARGS+= --program-prefix=${GTAR_PROGRAM_PREFIX:Q} | 39 | CONFIGURE_ARGS+= --program-prefix=${GTAR_PROGRAM_PREFIX:Q} | |
39 | .endif | 40 | .endif | |
40 | 41 | |||
41 | # lie to configure about gettext -- it does not need GNU gettext | 42 | # lie to configure about gettext -- it does not need GNU gettext | |
42 | CONFIGURE_ENV+= gt_cv_func_gnugettext2_libintl=yes | 43 | CONFIGURE_ENV+= gt_cv_func_gnugettext2_libintl=yes | |
43 | ||||
44 | # allow configure to run as root | 44 | # allow configure to run as root | |
45 | CONFIGURE_ENV+= FORCE_UNSAFE_CONFIGURE=1 | 45 | CONFIGURE_ENV+= FORCE_UNSAFE_CONFIGURE=1 | |
46 | 46 | |||
47 | PLIST_SUBST+= GTAR_PROGRAM_PREFIX=${GTAR_PROGRAM_PREFIX:Q} | 47 | PLIST_SUBST+= GTAR_PROGRAM_PREFIX=${GTAR_PROGRAM_PREFIX:Q} | |
48 | BUILD_DEFS+= GNU_PROGRAM_PREFIX | 48 | BUILD_DEFS+= GNU_PROGRAM_PREFIX | |
49 | BUILD_DEFS+= GTAR_PROGRAM_PREFIX | 49 | BUILD_DEFS+= GTAR_PROGRAM_PREFIX | |
50 | PLIST_VARS+= gtar rmt | 50 | PLIST_VARS+= gtar rmt | |
51 | 51 | |||
52 | TEST_TARGET= check | 52 | TEST_TARGET= check | |
53 | 53 | |||
54 | .if ${GTAR_PROGRAM_PREFIX} != "g" | 54 | .if ${GTAR_PROGRAM_PREFIX} != "g" | |
55 | PLIST.gtar= yes | 55 | PLIST.gtar= yes | |
56 | .endif | 56 | .endif | |
57 | 57 | |||
58 | # don't include rmt if gtar won't build it | 58 | # don't include rmt if gtar won't build it | |
59 | .if ${OPSYS} != "Interix" | 59 | .if ${OPSYS} != "Interix" && ${OPSYS} != "Darwin" | |
60 | PLIST.rmt= yes | 60 | PLIST.rmt= yes | |
61 | .endif | 61 | .endif | |
62 | 62 | |||
63 | # XXX see similar hack in coreutils. | 63 | # XXX see similar hack in coreutils. | |
64 | .if ${OPSYS} != "Linux" | 64 | .if ${OPSYS} != "Linux" | |
65 | CONFIGURE_ENV+= gt_cv_func_gnugettext3_libintl=yes | 65 | CONFIGURE_ENV+= gt_cv_func_gnugettext3_libintl=yes | |
66 | .endif | 66 | .endif | |
67 | 67 | |||
68 | post-install: | 68 | post-install: | |
69 | ${INSTALL_MAN} ${FILESDIR}/gtar.1 \ | 69 | ${INSTALL_MAN} ${FILESDIR}/gtar.1 \ | |
70 | ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${GTAR_PROGRAM_PREFIX}tar.1 | 70 | ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${GTAR_PROGRAM_PREFIX}tar.1 | |
71 | .if ${GTAR_PROGRAM_PREFIX} != "g" | 71 | .if ${GTAR_PROGRAM_PREFIX} != "g" | |
72 | ${LN} -sf ${DESTDIR}${GTAR_PROGRAM_PREFIX}tar ${DESTDIR}${PREFIX}/bin/"gtar" | 72 | ${LN} -sf ${DESTDIR}${GTAR_PROGRAM_PREFIX}tar ${DESTDIR}${PREFIX}/bin/"gtar" |
@@ -1,11 +1,6 @@ | @@ -1,11 +1,6 @@ | |||
1 | $NetBSD: distinfo,v 1.29 2010/12/16 10:12:53 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.30 2011/05/11 07:49:58 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (tar-1.25.tar.gz) = 28bcf4cfcb32805afead8a6259158064d96359fb | 3 | SHA1 (tar-1.26.tar.bz2) = 70f298c3cd997b694864c55e6d8655324c87a0cc | |
4 | RMD160 (tar-1.25.tar.gz) = 8013ed400958cc8e9d605f5541e52e413bf878dc | 4 | RMD160 (tar-1.26.tar.bz2) = d507dc5a57a823701cae5cdd2b98aba48ec74d3f | |
5 | Size (tar-1.25.tar.gz) = 3400086 bytes | 5 | Size (tar-1.26.tar.bz2) = 2339773 bytes | |
6 | SHA1 (patch-aa) = 976d0caa9dd67c04a3c1b40ca5d5bea91bc9fcdf | 6 | SHA1 (patch-ad) = f3a988a6b675a389d8d307fe1a90dde81ba98df5 | |
7 | SHA1 (patch-ab) = ce8f4a5b0a20a5c7da44f06b0e55115e27f7d7e0 | |||
8 | SHA1 (patch-ad) = 5573bd0e8aaf71b8a23d8b031c61b48c97b3fa97 | |||
9 | SHA1 (patch-al) = 53056a3b20a40aac0e04a1137856c5b47a7d6e0c | |||
10 | SHA1 (patch-am) = aec3b1496c227a64b098d0f3666ff9be4e4b10b5 | |||
11 | SHA1 (patch-an) = 75c83efad6f197e82b9f1966c1034c393e749930 |
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | $NetBSD: patch-ad,v 1.10 2010/12/12 13:10:40 wiz Exp $ | 1 | $NetBSD: patch-ad,v 1.11 2011/05/11 07:49:59 adam Exp $ | |
2 | 2 | |||
3 | Don't install documentation with this package, it is in | 3 | Don't install documentation with this package, it is in | |
4 | gtar-info (to reduce dependencies when gtar is used for | 4 | gtar-info (to reduce dependencies when gtar is used for | |
5 | bootstrapping). | 5 | bootstrapping). | |
6 | 6 | |||
7 | --- Makefile.in.orig 2010-11-07 13:53:49.000000000 +0000 | 7 | --- Makefile.in.orig 2010-11-07 13:53:49.000000000 +0000 | |
8 | +++ Makefile.in | 8 | +++ Makefile.in | |
9 | @@ -947,7 +947,7 @@ top_builddir = @top_builddir@ | 9 | @@ -1028,7 +1028,7 @@ top_builddir = @top_builddir@ | |
10 | top_srcdir = @top_srcdir@ | 10 | top_srcdir = @top_srcdir@ | |
11 | ACLOCAL_AMFLAGS = -I m4 | 11 | ACLOCAL_AMFLAGS = -I m4 | |
12 | EXTRA_DIST = ChangeLog.1 Make.rules | 12 | EXTRA_DIST = ChangeLog.1 Make.rules | |
13 | -SUBDIRS = doc gnu lib rmt src scripts po tests | 13 | -SUBDIRS = doc gnu lib rmt src scripts po tests | |
14 | +SUBDIRS = gnu lib rmt src scripts po tests | 14 | +SUBDIRS = gnu lib rmt src scripts po tests | |
15 | gen_start_date = 2009-03-06 | 15 | gen_start_date = 2009-03-06 | |
16 | prev_change_log = ChangeLog.CVS | 16 | prev_change_log = ChangeLog.CVS | |
17 | changelog_dir = . | 17 | changelog_dir = . |
@@ -1,27 +1,27 @@ | @@ -1,27 +1,27 @@ | |||
1 | # $NetBSD: Makefile,v 1.29 2010/12/12 13:10:40 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.30 2011/05/11 07:49:59 adam Exp $ | |
2 | # | |||
3 | 2 | |||
4 | DISTNAME= tar-1.25 | 3 | DISTNAME= tar-1.26 | |
5 | PKGNAME= gtar-info-1.25 | 4 | PKGNAME= ${DISTNAME:S/tar/gtar-info/} | |
6 | SVR4_PKGNAME= gtari | 5 | SVR4_PKGNAME= gtari | |
7 | CATEGORIES= archivers | 6 | CATEGORIES= archivers | |
8 | MASTER_SITES= ${MASTER_SITE_GNU:=tar/} | 7 | MASTER_SITES= ${MASTER_SITE_GNU:=tar/} | |
8 | EXTRACT_SUFX= .tar.bz2 | |||
9 | 9 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 10 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= http://www.gnu.org/software/tar/tar.html | 11 | HOMEPAGE= http://www.gnu.org/software/tar/tar.html | |
12 | COMMENT= Info format documentation for the GNU tape archiver | 12 | COMMENT= Info format documentation for the GNU tape archiver | |
13 | LICENSE= gnu-fdl-v1.1 | 13 | LICENSE= gnu-fdl-v1.1 | |
14 | 14 | |||
15 | PKG_DESTDIR_SUPPORT= user-destdir | 15 | PKG_DESTDIR_SUPPORT= user-destdir | |
16 | PKG_INSTALLATION_TYPES= overwrite pkgviews | 16 | PKG_INSTALLATION_TYPES= overwrite pkgviews | |
17 | 17 | |||
18 | NO_CONFIGURE= yes | 18 | NO_CONFIGURE= yes | |
19 | NO_BUILD= yes | 19 | NO_BUILD= yes | |
20 | INFO_FILES= yes | 20 | INFO_FILES= yes | |
21 | 21 | |||
22 | INSTALLATION_DIRS= ${PKGINFODIR} | 22 | INSTALLATION_DIRS= ${PKGINFODIR} | |
23 | 23 | |||
24 | do-install: | 24 | do-install: | |
25 | ${INSTALL_DATA} ${WRKSRC}/doc/tar.info ${DESTDIR}${PREFIX}/${PKGINFODIR} | 25 | ${INSTALL_DATA} ${WRKSRC}/doc/tar.info ${DESTDIR}${PREFIX}/${PKGINFODIR} | |
26 | 26 | |||
27 | .include "../../mk/bsd.pkg.mk" | 27 | .include "../../mk/bsd.pkg.mk" |
@@ -1,5 +1,5 @@ | @@ -1,5 +1,5 @@ | |||
1 | $NetBSD: distinfo,v 1.10 2010/12/12 13:10:40 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.11 2011/05/11 07:49:59 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (tar-1.25.tar.gz) = 28bcf4cfcb32805afead8a6259158064d96359fb | 3 | SHA1 (tar-1.26.tar.bz2) = 70f298c3cd997b694864c55e6d8655324c87a0cc | |
4 | RMD160 (tar-1.25.tar.gz) = 8013ed400958cc8e9d605f5541e52e413bf878dc | 4 | RMD160 (tar-1.26.tar.bz2) = d507dc5a57a823701cae5cdd2b98aba48ec74d3f | |
5 | Size (tar-1.25.tar.gz) = 3400086 bytes | 5 | Size (tar-1.26.tar.bz2) = 2339773 bytes |