diff options
Diffstat (limited to 'archivers')
-rw-r--r-- | archivers/gtar-base/Makefile | 6 | ||||
-rw-r--r-- | archivers/gtar-base/PLIST | 3 | ||||
-rw-r--r-- | archivers/gtar-base/distinfo | 16 | ||||
-rw-r--r-- | archivers/gtar-base/patches/patch-aa | 15 | ||||
-rw-r--r-- | archivers/gtar-base/patches/patch-ab | 24 | ||||
-rw-r--r-- | archivers/gtar-base/patches/patch-ad | 12 | ||||
-rw-r--r-- | archivers/gtar-base/patches/patch-af | 15 | ||||
-rw-r--r-- | archivers/gtar-info/Makefile | 6 | ||||
-rw-r--r-- | archivers/gtar-info/distinfo | 8 | ||||
-rw-r--r-- | archivers/gtar/Makefile | 8 |
10 files changed, 67 insertions, 46 deletions
diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile index e250c1a8f7c..c28ce34a830 100644 --- a/archivers/gtar-base/Makefile +++ b/archivers/gtar-base/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.65 2010/03/23 19:00:10 tez Exp $ +# $NetBSD: Makefile,v 1.66 2010/12/12 13:10:39 wiz Exp $ -DISTNAME= tar-1.23 -PKGNAME= gtar-base-1.23 +DISTNAME= tar-1.25 +PKGNAME= gtar-base-1.25 SVR4_PKGNAME= gtarb CATEGORIES= archivers MASTER_SITES= ${MASTER_SITE_GNU:=tar/} diff --git a/archivers/gtar-base/PLIST b/archivers/gtar-base/PLIST index ad2cd95730b..8ddca22c547 100644 --- a/archivers/gtar-base/PLIST +++ b/archivers/gtar-base/PLIST @@ -1,9 +1,10 @@ -@comment $NetBSD: PLIST,v 1.13 2008/05/18 01:48:09 tnn Exp $ +@comment $NetBSD: PLIST,v 1.14 2010/12/12 13:10:39 wiz Exp $ bin/${GTAR_PROGRAM_PREFIX}tar ${PLIST.gtar}bin/gtar ${PLIST.rmt}libexec/${GTAR_PROGRAM_PREFIX}rmt man/man1/${GTAR_PROGRAM_PREFIX}tar.1 share/locale/bg/LC_MESSAGES/tar.mo +share/locale/ca/LC_MESSAGES/tar.mo share/locale/cs/LC_MESSAGES/tar.mo share/locale/da/LC_MESSAGES/tar.mo share/locale/de/LC_MESSAGES/tar.mo diff --git a/archivers/gtar-base/distinfo b/archivers/gtar-base/distinfo index 729fe907666..b682f3050d1 100644 --- a/archivers/gtar-base/distinfo +++ b/archivers/gtar-base/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.25 2010/03/23 19:00:10 tez Exp $ +$NetBSD: distinfo,v 1.26 2010/12/12 13:10:39 wiz Exp $ -SHA1 (tar-1.23.tar.gz) = b58a709eb0df611b77e9f381ffc83097306b371c -RMD160 (tar-1.23.tar.gz) = 0750be49398887c48bef0c5bc02bb26e2b075b0b -Size (tar-1.23.tar.gz) = 3193303 bytes -SHA1 (patch-ab) = c18f5e205f92949d1568ca3d484af5e7f51a1da4 -SHA1 (patch-ad) = 05c6ab3826e8b715413ff93e045599be0d8bb126 -SHA1 (patch-af) = 5ffbb0f6fe760f8fafa6eb34340438588b9b5d16 -SHA1 (patch-ag) = 32bd77d6063a1f70d109b3c63ba25b68168ba4d8 +SHA1 (tar-1.25.tar.gz) = 28bcf4cfcb32805afead8a6259158064d96359fb +RMD160 (tar-1.25.tar.gz) = 8013ed400958cc8e9d605f5541e52e413bf878dc +Size (tar-1.25.tar.gz) = 3400086 bytes +SHA1 (patch-aa) = 976d0caa9dd67c04a3c1b40ca5d5bea91bc9fcdf +SHA1 (patch-ab) = fcfa62f76b3ed3a0297962c39ae0de96e335e330 +SHA1 (patch-ad) = 5573bd0e8aaf71b8a23d8b031c61b48c97b3fa97 +SHA1 (patch-af) = 826a3c60c6f5734c87c64c53970d4ae956d51767 diff --git a/archivers/gtar-base/patches/patch-aa b/archivers/gtar-base/patches/patch-aa new file mode 100644 index 00000000000..3d8c49c5eb0 --- /dev/null +++ b/archivers/gtar-base/patches/patch-aa @@ -0,0 +1,15 @@ +$NetBSD: patch-aa,v 1.10 2010/12/12 13:10:40 wiz Exp $ + +Unportable test(1) construct. + +--- configure.orig 2010-12-12 12:26:48.000000000 +0000 ++++ configure +@@ -35225,7 +35225,7 @@ $as_echo "$as_me: failed program was:" > + sed 's/^/| /' conftest.$ac_ext >&5 + + ( exit $ac_status ) +-if test $? == 99 && test x"$FORCE_UNSAFE_CONFIGURE" = x; then ++if test $? = 99 && test x"$FORCE_UNSAFE_CONFIGURE" = x; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { $as_echo "$as_me:$LINENO: error: you should not run configure as root (set FORCE_UNSAFE_CONFIGURE=1 in environment to bypass this check) diff --git a/archivers/gtar-base/patches/patch-ab b/archivers/gtar-base/patches/patch-ab index 33b4a91ddf8..4d51aabdf05 100644 --- a/archivers/gtar-base/patches/patch-ab +++ b/archivers/gtar-base/patches/patch-ab @@ -1,10 +1,10 @@ -$NetBSD: patch-ab,v 1.13 2010/03/23 19:00:10 tez Exp $ +$NetBSD: patch-ab,v 1.14 2010/12/12 13:10:40 wiz Exp $ add --no-unlink-first option to negate --unlink-first option earlier patches made --unlink-first a default, but that was dropped years ago ---- src/tar.c.orig 2010-03-23 12:11:49.133467100 -0500 -+++ src/tar.c 2010-03-23 12:39:58.326191800 -0500 -@@ -299,6 +299,7 @@ +--- src/tar.c.orig 2010-10-24 18:07:55.000000000 +0000 ++++ src/tar.c +@@ -300,6 +300,7 @@ enum NO_RECURSION_OPTION, NO_SAME_OWNER_OPTION, NO_SAME_PERMISSIONS_OPTION, @@ -12,7 +12,7 @@ earlier patches made --unlink-first a default, but that was dropped years ago NO_SEEK_OPTION, NO_UNQUOTE_OPTION, NO_WILDCARDS_MATCH_SLASH_OPTION, -@@ -504,6 +505,8 @@ +@@ -505,6 +506,8 @@ static struct argp_option options[] = { N_("try extracting files with the same ownership as exists in the archive (default for superuser)"), GRID+1 }, {"no-same-owner", NO_SAME_OWNER_OPTION, 0, 0, N_("extract files as yourself (default for ordinary users)"), GRID+1 }, @@ -21,14 +21,14 @@ earlier patches made --unlink-first a default, but that was dropped years ago {"numeric-owner", NUMERIC_OWNER_OPTION, 0, 0, N_("always use numbers for user/group names"), GRID+1 }, {"preserve-permissions", 'p', 0, 0, -@@ -1642,6 +1645,10 @@ - old_files_option = UNLINK_FIRST_OLD_FILES; +@@ -1644,6 +1647,10 @@ parse_opt (int key, char *arg, struct ar + set_subcommand_option (TEST_LABEL_SUBCOMMAND); break; - + + case NO_UNLINK_FIRST_OPTION: + old_files_option = DEFAULT_OLD_FILES; + break; -+ - case UTC_OPTION: - utc_option = true; - break; ++ + case 'T': + update_argv (arg, state); + /* Indicate we've been given -T option. This is for backward diff --git a/archivers/gtar-base/patches/patch-ad b/archivers/gtar-base/patches/patch-ad index dbc101f6e87..2dd609118f9 100644 --- a/archivers/gtar-base/patches/patch-ad +++ b/archivers/gtar-base/patches/patch-ad @@ -1,8 +1,12 @@ -$NetBSD: patch-ad,v 1.9 2010/03/23 19:00:10 tez Exp $ +$NetBSD: patch-ad,v 1.10 2010/12/12 13:10:40 wiz Exp $ ---- Makefile.in.orig 2010-03-23 12:41:47.657803000 -0500 -+++ Makefile.in 2010-03-23 12:42:22.936337700 -0500 -@@ -899,7 +899,7 @@ +Don't install documentation with this package, it is in +gtar-info (to reduce dependencies when gtar is used for +bootstrapping). + +--- Makefile.in.orig 2010-11-07 13:53:49.000000000 +0000 ++++ Makefile.in +@@ -947,7 +947,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = ChangeLog.1 Make.rules diff --git a/archivers/gtar-base/patches/patch-af b/archivers/gtar-base/patches/patch-af index ce00143b8b5..ff060c73ace 100644 --- a/archivers/gtar-base/patches/patch-af +++ b/archivers/gtar-base/patches/patch-af @@ -1,14 +1,15 @@ -$NetBSD: patch-af,v 1.6 2010/03/23 19:00:10 tez Exp $ -skip autotest gzip.at (currently #35 but that changes every release) +$NetBSD: patch-af,v 1.7 2010/12/12 13:10:40 wiz Exp $ ---- tests/testsuite.orig 2010-03-23 13:08:29.122310500 -0500 -+++ tests/testsuite 2010-03-23 13:11:27.216980700 -0500 -@@ -621,7 +621,7 @@ +skip autotest gzip.at (currently #50 but that changes every release) + +--- tests/testsuite.orig 2010-11-07 13:58:10.000000000 +0000 ++++ tests/testsuite +@@ -621,7 +621,7 @@ at_change_dir=false # List of the tested programs. at_tested='tar' # List of the all the test groups. --at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98' -+at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98' +-at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118' ++at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118' # As many question marks as there are digits in the last test group number. # Used to normalize the test group numbers so that `ls' lists them in # numerical order. diff --git a/archivers/gtar-info/Makefile b/archivers/gtar-info/Makefile index baadc2f6b57..600dcbb10a6 100644 --- a/archivers/gtar-info/Makefile +++ b/archivers/gtar-info/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.28 2010/03/23 19:00:10 tez Exp $ +# $NetBSD: Makefile,v 1.29 2010/12/12 13:10:40 wiz Exp $ # -DISTNAME= tar-1.23 -PKGNAME= gtar-info-1.23 +DISTNAME= tar-1.25 +PKGNAME= gtar-info-1.25 SVR4_PKGNAME= gtari CATEGORIES= archivers MASTER_SITES= ${MASTER_SITE_GNU:=tar/} diff --git a/archivers/gtar-info/distinfo b/archivers/gtar-info/distinfo index 14bdeaea383..82b1c542a14 100644 --- a/archivers/gtar-info/distinfo +++ b/archivers/gtar-info/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.9 2010/03/23 19:00:10 tez Exp $ +$NetBSD: distinfo,v 1.10 2010/12/12 13:10:40 wiz Exp $ -SHA1 (tar-1.23.tar.gz) = b58a709eb0df611b77e9f381ffc83097306b371c -RMD160 (tar-1.23.tar.gz) = 0750be49398887c48bef0c5bc02bb26e2b075b0b -Size (tar-1.23.tar.gz) = 3193303 bytes +SHA1 (tar-1.25.tar.gz) = 28bcf4cfcb32805afead8a6259158064d96359fb +RMD160 (tar-1.25.tar.gz) = 8013ed400958cc8e9d605f5541e52e413bf878dc +Size (tar-1.25.tar.gz) = 3400086 bytes diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile index fbfdc49d760..dab13983469 100644 --- a/archivers/gtar/Makefile +++ b/archivers/gtar/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.39 2010/03/23 19:00:10 tez Exp $ +# $NetBSD: Makefile,v 1.40 2010/12/12 13:10:39 wiz Exp $ -DISTNAME= gtar-1.23 +DISTNAME= gtar-1.25 CATEGORIES= archivers MASTER_SITES= # empty DISTFILES= # empty @@ -12,8 +12,8 @@ LICENSE= gnu-gpl-v3 AND gnu-fdl-v1.1 META_PACKAGE= yes -DEPENDS+= gtar-base-1.23{,nb*}:../../archivers/gtar-base -DEPENDS+= gtar-info-1.23{,nb*}:../../archivers/gtar-info +DEPENDS+= gtar-base-1.25{,nb*}:../../archivers/gtar-base +DEPENDS+= gtar-info-1.25{,nb*}:../../archivers/gtar-info PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir |