Update to 1.21 which brings

* some new options, e.g. -J for lzma compression and --lzop, * transformation scope flags, * bug fixes Testsuite patches from upstream CVS.
2008-12-30 17:37:05 +00:00 · 2008-12-30 17:37:05 +00:00 · 38bc631dc7
commit 38bc631dc7
parent 9ab85f017e
7 changed files with 105 additions and 17 deletions
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.47 2008/04/18 14:52:25 naddy Exp $
+# $OpenBSD: Makefile,v 1.48 2008/12/30 17:37:05 naddy Exp $

 COMMENT=	GNU version of the traditional tape archiver

-DISTNAME=	tar-1.20
+DISTNAME=	tar-1.21
 PKGNAME=	g${DISTNAME}
 CATEGORIES=	archivers
 HOMEPAGE=	http://www.gnu.org/software/tar/
@ -19,8 +19,10 @@ MASTER_SITES=	${MASTER_SITE_GNU:=tar/}
 EXTRACT_SUFX=	.tar.bz2

 MODULES=	devel/gettext
-RUN_DEPENDS=	::archivers/bzip2 ::archivers/lzma
+BUILD_DEPENDS=	::devel/autoconf/${AUTOCONF_VERSION}	# autom4te
+RUN_DEPENDS=	::archivers/bzip2 ::archivers/lzma ::archivers/lzop

+AUTOCONF_VERSION=2.61
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	--program-prefix=g
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@ -29,6 +31,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		DEFAULT_RMT_COMMAND=/etc/rmt
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux

+MAKE_ENV=	AUTOCONF_VERSION=${AUTOCONF_VERSION}
+
 FLAVORS=	static
 FLAVOR?=

--- a/archivers/gtar/distinfo
+++ b/archivers/gtar/distinfo
@ -1,5 +1,5 @@
-MD5 (tar-1.20.tar.bz2) = Gn4X8nq/WDs7C8BZqCfmiw==
-RMD160 (tar-1.20.tar.bz2) = y1pwjoR0ieU3C4OkM/PoR841nlY=
-SHA1 (tar-1.20.tar.bz2) = TUzaLOhXtep3s53HGCYKsJwUUzU=
-SHA256 (tar-1.20.tar.bz2) = vovzOvta3CN35F2UaT/9RrdfJn+bgI3wxwBuUSEfnes=
-SIZE (tar-1.20.tar.bz2) = 1912591
+MD5 (tar-1.21.tar.bz2) = T5Ao0jHD59e91ljhTnTC0Q==
+RMD160 (tar-1.21.tar.bz2) = MW4xSPCjkrZkI/1z99rhfNLwO5A=
+SHA1 (tar-1.21.tar.bz2) = RWO8go59KF60ZqlYeviOfhVWz4g=
+SHA256 (tar-1.21.tar.bz2) = 3Gxw0gccpKkoRgttaKtQCjLmfVAlUmGg0Xdloweus1A=
+SIZE (tar-1.21.tar.bz2) = 2071237
--- a/archivers/gtar/patches/patch-configure
+++ b/archivers/gtar/patches/patch-configure
@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.7 2008/04/18 14:52:25 naddy Exp $
--- configure.orig	Mon Apr 14 14:05:11 2008
-+++ configure	Wed Apr 16 21:52:27 2008
-@@ -34776,7 +34776,7 @@ fi
+$OpenBSD: patch-configure,v 1.8 2008/12/30 17:37:05 naddy Exp $
+--- configure.orig	Fri Dec 26 23:41:28 2008
+++ configure	Sun Dec 28 14:45:59 2008
+@@ -37152,7 +37152,7 @@ fi
 echo "${ECHO_T}$acl_cv_rpath" >&6; }
   wl="$acl_cv_wl"
   acl_libext="$acl_cv_libext"
--- a/archivers/gtar/patches/patch-tests_pipe_at
+++ b/archivers/gtar/patches/patch-tests_pipe_at
@ -0,0 +1,22 @@
+$OpenBSD: patch-tests_pipe_at,v 1.1 2008/12/30 17:37:05 naddy Exp $
+--- tests/pipe.at.orig	Wed Jun 27 15:30:32 2007
+++ tests/pipe.at	Tue Dec 30 18:19:43 2008
+@@ -30,7 +30,8 @@ AT_SETUP([decompressing from stdin])
+ 
+ AT_KEYWORDS([pipe])
+ 
+-AT_TAR_CHECK([
+AT_TAR_WITH_HOOK([TAR_IGNREC_HOOK],
+[AT_TAR_CHECK([
+ AT_SORT_PREREQ
+ 
+ mkdir directory
+@@ -49,6 +50,7 @@ directory/file1
+ directory/file2
+ separator
+ separator
+-])
+],
+[stderr])])
+ 
+ AT_CLEANUP
--- a/archivers/gtar/patches/patch-tests_shortrec_at
+++ b/archivers/gtar/patches/patch-tests_shortrec_at
@ -0,0 +1,31 @@
+$OpenBSD: patch-tests_shortrec_at,v 1.3 2008/12/30 17:37:05 naddy Exp $
+--- tests/shortrec.at.orig	Wed Jun 27 15:30:32 2007
+++ tests/shortrec.at	Tue Dec 30 18:19:43 2008
+@@ -23,17 +23,22 @@
+ # used to create the archive.
+ 
+ AT_SETUP([short records])
+-AT_KEYWORDS([shortrec.at])
+AT_KEYWORDS([shortrec])
+ 
+-AT_TAR_CHECK([
+AT_TAR_WITH_HOOK([TAR_IGNREC_HOOK],
+[AT_TAR_CHECK([
+ mkdir directory
+ (cd directory && touch a b c d e f g h i j k l m n o p q r)
+-tar -c -b 1 -f - directory | tar -t -f - >/dev/null
+tar -c -b 1 -f - directory | tar -t -f - 
+ tar -c -b 1 -f archive directory
+-tar -t -f archive >/dev/null
+-tar -t -f - < archive >/dev/null
+tar -t -f archive 
+tar -t -f - < archive 
+ 
+ rm -r directory
+],
+[0],
+[ignore],
+[stderr])
+ ])
+ 
+ AT_CLEANUP
--- a/archivers/gtar/patches/patch-tests_testsuite_at
+++ b/archivers/gtar/patches/patch-tests_testsuite_at
@ -0,0 +1,33 @@
+$OpenBSD: patch-tests_testsuite_at,v 1.1 2008/12/30 17:37:05 naddy Exp $
+--- tests/testsuite.at.orig	Thu Jul 31 08:57:51 2008
+++ tests/testsuite.at	Tue Dec 30 18:19:43 2008
+@@ -21,6 +21,7 @@
+ # We need a recent Autotest.
+ m4_version_prereq([2.52g])
+ 
+m4_define([AT_TAR_CHECK_HOOK])
+ m4_define([AT_TAR_CHECK],[
+   AT_XFAIL_IF(test -f $[]XFAILFILE)
+   m4_foreach([FMT],
+@@ -33,9 +34,20 @@ export TEST_TAR_FORMAT
+ TAR_OPTIONS="-H FMT"
+ export TAR_OPTIONS
+ rm -rf *
+-$1)],$2,$3,$4,$5,$6)])
+$1)],$2,$3,$4,$5,$6)
+              AT_TAR_CHECK_HOOK])
+ ])
+ 
+m4_define([AT_TAR_WITH_HOOK],[
+  m4_pushdef([AT_TAR_CHECK_HOOK],[$1])
+  $2
+  
+  m4_popdef([AT_TAR_CHECK_HOOK])])
+
+m4_define([TAR_IGNREC_HOOK],[
+  AT_CHECK([grep -v '^.*tar: Record size = ' stderr; exit 0])
+])
+  
+ m4_define([RE_CHECK],[
+ AT_DATA([$1.re],[$2])
+ awk '{print NR " " $[]0}' $1 > $[]$.1
--- a/archivers/gtar/pkg/PLIST
+++ b/archivers/gtar/pkg/PLIST
@ -1,8 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.23 2008/04/18 14:52:25 naddy Exp $
-bin/gtar
+@comment $OpenBSD: PLIST,v 1.24 2008/12/30 17:37:05 naddy Exp $
+@bin bin/gtar
@info info/tar.info
@comment lib/charset.alias
-libexec/grmt
+@bin libexec/grmt
 share/locale/bg/LC_MESSAGES/tar.mo
 share/locale/cs/LC_MESSAGES/tar.mo
 share/locale/da/LC_MESSAGES/tar.mo
@ -10,8 +10,6 @@ share/locale/de/LC_MESSAGES/tar.mo
 share/locale/el/LC_MESSAGES/tar.mo
 share/locale/es/LC_MESSAGES/tar.mo
 share/locale/et/LC_MESSAGES/tar.mo
-share/locale/eu/
-share/locale/eu/LC_MESSAGES/
 share/locale/eu/LC_MESSAGES/tar.mo
 share/locale/fi/LC_MESSAGES/tar.mo
 share/locale/fr/LC_MESSAGES/tar.mo