diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile index c9ab06cedbc..dd86cc0a567 100644 --- a/archivers/gtar/Makefile +++ b/archivers/gtar/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.42 2006/12/23 20:24:42 sturm Exp $ +# $OpenBSD: Makefile,v 1.43 2007/06/10 19:27:18 naddy Exp $ COMMENT= "GNU version of the traditional tar archiver" -DISTNAME= tar-1.16.1 +DISTNAME= tar-1.17 PKGNAME= g${DISTNAME} CATEGORIES= archivers HOMEPAGE= http://www.gnu.org/software/tar/ @@ -15,7 +15,6 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -FAKE= all MASTER_SITES= ${MASTER_SITE_GNU:=tar/} EXTRACT_SUFX= .tar.bz2 @@ -24,8 +23,8 @@ RUN_DEPENDS= :bzip2-*:archivers/bzip2 CONFIGURE_STYLE=gnu CONFIGURE_ARGS= --program-prefix=g -CONFIGURE_ENV= CPPFLAGS="-I${DEPBASE}/include" \ - LDFLAGS="-L${DEPBASE}/lib ${LDSTATIC}" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib ${LDSTATIC}" \ DEFAULT_ARCHIVE=/dev/rst0 \ DEFAULT_RMT_COMMAND=/etc/rmt MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux diff --git a/archivers/gtar/distinfo b/archivers/gtar/distinfo index 2ac8224b6b1..cb8b201dfc7 100644 --- a/archivers/gtar/distinfo +++ b/archivers/gtar/distinfo @@ -1,5 +1,5 @@ -MD5 (tar-1.16.1.tar.bz2) = 1RWTRhxe8ffjcTTyIzi7ng== -RMD160 (tar-1.16.1.tar.bz2) = JxNKDFUS83qOBjhDumF1o54tohs= -SHA1 (tar-1.16.1.tar.bz2) = qzzLwJ2h3AQPuSoN6FrjT8cLA6k= -SHA256 (tar-1.16.1.tar.bz2) = XIQwBJNBQsyF3s9K4PX4uLVog00+I/FWgZOzg2Qi0rs= -SIZE (tar-1.16.1.tar.bz2) = 1793624 +MD5 (tar-1.17.tar.bz2) = xsTxwHXb8PdcKXN/qljykA== +RMD160 (tar-1.17.tar.bz2) = 9GcekJwf+PrFMdQ4tQpKGXBJvEU= +SHA1 (tar-1.17.tar.bz2) = l/S2e/iNuh1FGh7DdfGM+qPJ828= +SHA256 (tar-1.17.tar.bz2) = GfkCHdpRoWKV5HBugIcOcfhxB2deUcF2pJHroPxMpJI= +SIZE (tar-1.17.tar.bz2) = 1882911 diff --git a/archivers/gtar/patches/patch-configure b/archivers/gtar/patches/patch-configure index 7e0da8f1959..8585e875c2a 100644 --- a/archivers/gtar/patches/patch-configure +++ b/archivers/gtar/patches/patch-configure @@ -1,7 +1,16 @@ -$OpenBSD: patch-configure,v 1.3 2006/12/14 20:29:00 naddy Exp $ ---- configure.orig Fri Dec 8 15:03:47 2006 -+++ configure Wed Dec 13 15:32:44 2006 -@@ -36587,7 +36587,7 @@ DEFAULT_ARCHIVE_FORMAT!$DEFAULT_ARCHIVE_ +$OpenBSD: patch-configure,v 1.4 2007/06/10 19:27:19 naddy Exp $ +--- configure.orig Sun Jun 10 16:09:55 2007 ++++ configure Sun Jun 10 16:10:47 2007 +@@ -38556,7 +38556,7 @@ FCNTL_H!$FCNTL_H$ac_delim + ABSOLUTE_FLOAT_H!$ABSOLUTE_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 + ABSOLUTE_SYS_TIME_H!$ABSOLUTE_SYS_TIME_H$ac_delim + HAVE_SYS_TIME_H!$HAVE_SYS_TIME_H$ac_delim +@@ -38759,7 +38759,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 @@ -10,12 +19,3 @@ $OpenBSD: patch-configure,v 1.3 2006/12/14 20:29:00 naddy Exp $ LTLIBICONV!$LTLIBICONV$ac_delim USE_NLS!$USE_NLS$ac_delim MSGFMT!$MSGFMT$ac_delim -@@ -36599,7 +36599,7 @@ XGETTEXT_015!$XGETTEXT_015$ac_delim - MSGMERGE!$MSGMERGE$ac_delim - INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim - INTLLIBS!$INTLLIBS$ac_delim --LIBINTL!$LIBINTL$ac_delim -+LIBINTL!$LTLIBINTL$ac_delim - LTLIBINTL!$LTLIBINTL$ac_delim - POSUB!$POSUB$ac_delim - AUTOM4TE!$AUTOM4TE$ac_delim diff --git a/archivers/gtar/patches/patch-lib_Makefile_in b/archivers/gtar/patches/patch-lib_Makefile_in deleted file mode 100644 index f7708c881c7..00000000000 --- a/archivers/gtar/patches/patch-lib_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib_Makefile_in,v 1.7 2006/12/14 20:29:00 naddy Exp $ ---- lib/Makefile.in.orig Fri Dec 8 15:03:59 2006 -+++ lib/Makefile.in Wed Dec 13 15:32:44 2006 -@@ -799,7 +799,7 @@ info-am: - - install-data-am: - --install-exec-am: install-exec-local -+install-exec-am: - - install-info: install-info-am - diff --git a/archivers/gtar/patches/patch-tests_testsuite b/archivers/gtar/patches/patch-tests_testsuite index 399a5d5f9ae..d74d17c1a58 100644 --- a/archivers/gtar/patches/patch-tests_testsuite +++ b/archivers/gtar/patches/patch-tests_testsuite @@ -1,58 +1,12 @@ -$OpenBSD: patch-tests_testsuite,v 1.1 2006/12/14 20:29:00 naddy Exp $ ---- tests/testsuite.orig Thu Dec 14 14:27:42 2006 -+++ tests/testsuite Thu Dec 14 14:31:23 2006 -@@ -2253,8 +2253,9 @@ fi +$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"; printf "jeden\\\\ndwa ++echo >>"$at_stdout"; /bin/echo "jeden\\ndwa trzy -+ " | $at_diff - "$at_stdout" || at_failed=: case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; -@@ -2366,8 +2367,9 @@ 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"; printf "jeden\\\\ndwa - trzy -+ - " | $at_diff - "$at_stdout" || at_failed=: - case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; -@@ -2479,8 +2481,9 @@ 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"; printf "jeden\\\\ndwa - trzy -+ - " | $at_diff - "$at_stdout" || at_failed=: - case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; -@@ -2592,8 +2595,9 @@ 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"; printf "jeden\\\\ndwa - trzy -+ - " | $at_diff - "$at_stdout" || at_failed=: - case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; -@@ -2705,8 +2709,9 @@ 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"; printf "jeden\\\\ndwa - trzy -+ - " | $at_diff - "$at_stdout" || at_failed=: - case $at_status in - 77) echo 77 > "$at_status_file"; exit 77;; diff --git a/archivers/gtar/pkg/PLIST b/archivers/gtar/pkg/PLIST index 950f322ffc8..9b07640cb58 100644 --- a/archivers/gtar/pkg/PLIST +++ b/archivers/gtar/pkg/PLIST @@ -1,8 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.21 2006/12/14 20:29:00 naddy Exp $ +@comment $OpenBSD: PLIST,v 1.22 2007/06/10 19:27:19 naddy Exp $ bin/gtar -libexec/grmt -@endfake @info info/tar.info +@comment lib/charset.alias +libexec/grmt share/locale/bg/LC_MESSAGES/tar.mo share/locale/cs/LC_MESSAGES/tar.mo share/locale/da/LC_MESSAGES/tar.mo @@ -10,6 +10,9 @@ 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 share/locale/ga/LC_MESSAGES/tar.mo