diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile index 7b9677ac53f..6a6a7cca069 100644 --- a/archivers/gtar/Makefile +++ b/archivers/gtar/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.45 2007/09/01 21:05:21 naddy Exp $ +# $OpenBSD: Makefile,v 1.46 2007/10/22 16:33:41 naddy Exp $ COMMENT= GNU version of the traditional tape archiver -DISTNAME= tar-1.18 -PKGNAME= g${DISTNAME}p0 +DISTNAME= tar-1.19 +PKGNAME= g${DISTNAME} CATEGORIES= archivers HOMEPAGE= http://www.gnu.org/software/tar/ @@ -36,6 +36,7 @@ FLAVOR?= LDSTATIC= -static MODULES= BUILD_DEPENDS= :gettext->=0.16.1:devel/gettext +CONFIGURE_ENV+= SHLIBEXT="" .else LDSTATIC= WANTLIB= c diff --git a/archivers/gtar/distinfo b/archivers/gtar/distinfo index 4d27a5279aa..f72f47b5fab 100644 --- a/archivers/gtar/distinfo +++ b/archivers/gtar/distinfo @@ -1,5 +1,5 @@ -MD5 (tar-1.18.tar.bz2) = cBcCCNfBu5q0ASBXlDS2ow== -RMD160 (tar-1.18.tar.bz2) = Ep4aU+07WA9e/FgmIqkP38nRBfU= -SHA1 (tar-1.18.tar.bz2) = W1B4yykUkv/rT7E0F5/G/9ISHGY= -SHA256 (tar-1.18.tar.bz2) = RJRO4EJ8jg2NuqC4+QAHOnRWgZYQzFIcU2MMPrEXz14= -SIZE (tar-1.18.tar.bz2) = 1877207 +MD5 (tar-1.19.tar.bz2) = vMLhmxmCO5q2jJRYYGenkg== +RMD160 (tar-1.19.tar.bz2) = MC2BTBsdaoB0qdJuIC61koS2dbA= +SHA1 (tar-1.19.tar.bz2) = HG6+rbZh2AAE5z4PW2SgYZUHbhM= +SHA256 (tar-1.19.tar.bz2) = xpDUbad7HuB7fHWN5G1tB9ppinXmPtPo+D4/yo+AnLQ= +SIZE (tar-1.19.tar.bz2) = 1882486 diff --git a/archivers/gtar/patches/patch-configure b/archivers/gtar/patches/patch-configure index 4af82f5dc6d..75237d6a4d2 100644 --- a/archivers/gtar/patches/patch-configure +++ b/archivers/gtar/patches/patch-configure @@ -1,21 +1,12 @@ -$OpenBSD: patch-configure,v 1.5 2007/08/25 19:49:01 naddy Exp $ ---- configure.orig Fri Jun 29 13:02:47 2007 -+++ configure Wed Aug 15 17:06:22 2007 -@@ -40213,7 +40213,7 @@ FCNTL_H!$FCNTL_H$ac_delim - NEXT_FLOAT_H!$NEXT_FLOAT_H$ac_delim - FLOAT_H!$FLOAT_H$ac_delim - FNMATCH_H!$FNMATCH_H$ac_delim --LIBINTL!$LIBINTL$ac_delim -+LIBINTL!$LTLIBINTL$ac_delim - LTLIBINTL!$LTLIBINTL$ac_delim - NEXT_SYS_TIME_H!$NEXT_SYS_TIME_H$ac_delim - HAVE_SYS_TIME_H!$HAVE_SYS_TIME_H$ac_delim -@@ -40418,7 +40418,7 @@ DEFAULT_ARCHIVE_FORMAT!$DEFAULT_ARCHIVE_FORMAT$ac_deli - DEFAULT_ARCHIVE!$DEFAULT_ARCHIVE$ac_delim - DEFAULT_BLOCKING!$DEFAULT_BLOCKING$ac_delim - DEFAULT_QUOTING_STYLE!$DEFAULT_QUOTING_STYLE$ac_delim --LIBICONV!$LIBICONV$ac_delim -+LIBICONV!$LTLIBICONV$ac_delim - LTLIBICONV!$LTLIBICONV$ac_delim - USE_NLS!$USE_NLS$ac_delim - _ACEOF +$OpenBSD: patch-configure,v 1.6 2007/10/22 16:33:41 naddy Exp $ +--- configure.orig Mon Oct 22 17:11:20 2007 ++++ configure Mon Oct 22 17:13:26 2007 +@@ -33394,7 +33394,7 @@ fi + echo "${ECHO_T}$acl_cv_rpath" >&6; } + wl="$acl_cv_wl" + acl_libext="$acl_cv_libext" +- acl_shlibext="$acl_cv_shlibext" ++ acl_shlibext="${SHLIBEXT-$acl_cv_shlibext}" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" diff --git a/archivers/gtar/patches/patch-src_names_c b/archivers/gtar/patches/patch-src_names_c deleted file mode 100644 index fc05312e7fc..00000000000 --- a/archivers/gtar/patches/patch-src_names_c +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_names_c,v 1.1 2007/09/01 21:05:21 naddy Exp $ ---- src/names.c.orig Wed Jun 27 15:30:32 2007 -+++ src/names.c Sat Sep 1 21:58:57 2007 -@@ -1012,11 +1012,10 @@ contains_dot_dot (char const *name) - if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2])) - return 1; - -- do -+ while (! ISSLASH (*p)) - { - if (! *p++) - return 0; - } -- while (! ISSLASH (*p)); - } - } diff --git a/archivers/gtar/patches/patch-tests_testsuite b/archivers/gtar/patches/patch-tests_testsuite deleted file mode 100644 index d74d17c1a58..00000000000 --- a/archivers/gtar/patches/patch-tests_testsuite +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-tests_testsuite,v 1.2 2007/06/10 19:27:19 naddy Exp $ ---- tests/testsuite.orig Sun Jun 10 19:20:07 2007 -+++ tests/testsuite Sun Jun 10 19:20:18 2007 -@@ -2254,7 +2254,7 @@ fi - at_failed=false - echo >>"$at_stderr"; echo "tar: file-list: file name read contains nul character - " | $at_diff - "$at_stderr" || at_failed=: --echo >>"$at_stdout"; echo "jeden\\ndwa -+echo >>"$at_stdout"; /bin/echo "jeden\\ndwa - trzy - " | $at_diff - "$at_stdout" || at_failed=: - case $at_status in