Remove two patches: one disabled a test that however succeeds on

NetBSD-current and Solaris 10 (tested by tez@), the other one was
adding a --no-unlink-first option that was added because NetBSD's
version of tar had made --unlink-first default. Since this default
was changed quite some time ago and the option never was in upstream,
remove it.

Bump PKGREVISION.

4 files changed, 3 insertions, 54 deletions

diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile
index 1b92bbe7578..386e6cb5e3c 100644
--- a/archivers/gtar-base/Makefile
+++ b/archivers/gtar-base/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.67 2010/12/15 20:37:38 tez Exp $
+# $NetBSD: Makefile,v 1.68 2010/12/15 22:16:25 wiz Exp $
 
 DISTNAME=	tar-1.25
 PKGNAME=	gtar-base-1.25
-PKGREVISION=	1
+PKGREVISION=	2
 SVR4_PKGNAME=	gtarb
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GNU:=tar/}
diff --git a/archivers/gtar-base/distinfo b/archivers/gtar-base/distinfo
index ef84bd8fe3a..7b41ede9829 100644
--- a/archivers/gtar-base/distinfo
+++ b/archivers/gtar-base/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.27 2010/12/15 20:37:38 tez Exp $
+$NetBSD: distinfo,v 1.28 2010/12/15 22:16:25 wiz Exp $
 
 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
 SHA1 (patch-al) = 53056a3b20a40aac0e04a1137856c5b47a7d6e0c
 SHA1 (patch-am) = aec3b1496c227a64b098d0f3666ff9be4e4b10b5
 SHA1 (patch-an) = 75c83efad6f197e82b9f1966c1034c393e749930
diff --git a/archivers/gtar-base/patches/patch-ab b/archivers/gtar-base/patches/patch-ab
deleted file mode 100644
index 4d51aabdf05..00000000000
--- a/archivers/gtar-base/patches/patch-ab
+++ /dev/null
@@ -1,34 +0,0 @@
-$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-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,
-+  NO_UNLINK_FIRST_OPTION,
-   NO_SEEK_OPTION,
-   NO_UNQUOTE_OPTION,
-   NO_WILDCARDS_MATCH_SLASH_OPTION,
-@@ -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 },
-+  {"no-unlink-first", NO_UNLINK_FIRST_OPTION, 0, 0,
-+   N_("don't remove each file prior to extracting"), GRID+1 },
-   {"numeric-owner", NUMERIC_OWNER_OPTION, 0, 0,
-    N_("always use numbers for user/group names"), GRID+1 },
-   {"preserve-permissions", 'p', 0, 0,
-@@ -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 'T':
-       update_argv (arg, state);
-       /* Indicate we've been given -T option. This is for backward
diff --git a/archivers/gtar-base/patches/patch-af b/archivers/gtar-base/patches/patch-af
deleted file mode 100644
index ff060c73ace..00000000000
--- a/archivers/gtar-base/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.7 2010/12/12 13:10:40 wiz Exp $
-
-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 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.