Update to 1.22 which adds --xz/-J support for xz compression.
(xz itself will be imported once there is a stable release.)
This commit is contained in:
naddy
parent
1e192eed8c
commit
b7dd7b9606
@ -1,15 +1,15 @@
|
||||
# $OpenBSD: Makefile,v 1.48 2008/12/30 17:37:05 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.49 2009/03/10 14:54:16 naddy Exp $
|
||||
|
||||
COMMENT= GNU version of the traditional tape archiver
|
||||
|
||||
DISTNAME= tar-1.21
|
||||
DISTNAME= tar-1.22
|
||||
PKGNAME= g${DISTNAME}
|
||||
CATEGORIES= archivers
|
||||
HOMEPAGE= http://www.gnu.org/software/tar/
|
||||
|
||||
MAINTAINER= Christian Weisgerber <naddy@openbsd.org>
|
||||
|
||||
# GPLv3
|
||||
# GPLv3+
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
@ -19,10 +19,9 @@ MASTER_SITES= ${MASTER_SITE_GNU:=tar/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
MODULES= devel/gettext
|
||||
BUILD_DEPENDS= ::devel/autoconf/${AUTOCONF_VERSION} # autom4te
|
||||
RUN_DEPENDS= ::archivers/bzip2 ::archivers/lzma ::archivers/lzop
|
||||
# Add xz once the lzma/xz confusion has settled down
|
||||
RUN_DEPENDS= ::archivers/bzip2 ::archivers/lzop
|
||||
|
||||
AUTOCONF_VERSION=2.61
|
||||
CONFIGURE_STYLE=gnu
|
||||
CONFIGURE_ARGS= --program-prefix=g
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
@ -31,15 +30,13 @@ 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?=
|
||||
|
||||
.if ${FLAVOR:L:Mstatic}
|
||||
LDSTATIC= -static
|
||||
MODULES=
|
||||
BUILD_DEPENDS= :gettext->=0.16.1:devel/gettext
|
||||
BUILD_DEPENDS= :gettext->=0.17:devel/gettext
|
||||
CONFIGURE_ENV+= SHLIBEXT=""
|
||||
.else
|
||||
LDSTATIC=
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
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
|
||||
MD5 (tar-1.22.tar.bz2) = B/pRcCf0JruA9fX/kbY1hQ==
|
||||
RMD160 (tar-1.22.tar.bz2) = YkNnkuR1hvAKmqj16qyHuc5h1QM=
|
||||
SHA1 (tar-1.22.tar.bz2) = ypmmrecwj5KTvbBASMszXlLGMhU=
|
||||
SHA256 (tar-1.22.tar.bz2) = PO+2fxl6P49SNZmf50nO0IiUZqcd3LyW/dyoTl1Tqk0=
|
||||
SIZE (tar-1.22.tar.bz2) = 2094575
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$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
|
||||
$OpenBSD: patch-configure,v 1.9 2009/03/10 14:54:16 naddy Exp $
|
||||
--- configure.orig Thu Mar 5 08:05:20 2009
|
||||
+++ configure Mon Mar 9 17:47:29 2009
|
||||
@@ -39521,7 +39521,7 @@ fi
|
||||
echo "${ECHO_T}$acl_cv_rpath" >&6; }
|
||||
wl="$acl_cv_wl"
|
||||
acl_libext="$acl_cv_libext"
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
$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
|
||||
@ -1,31 +0,0 @@
|
||||
$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
|
||||
@ -1,33 +0,0 @@
|
||||
$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
|
||||
Loading…
Reference in New Issue
Block a user