Index: head/archivers/gtar/Makefile =================================================================== --- head/archivers/gtar/Makefile (revision 468821) +++ head/archivers/gtar/Makefile (revision 468822) @@ -1,46 +1,42 @@ # Created by: Andreas Klemm # $FreeBSD$ PORTNAME= tar -PORTVERSION= 1.29 +PORTVERSION= 1.30 CATEGORIES= archivers sysutils MASTER_SITES= GNU PKGNAMEPREFIX= g MAINTAINER= naddy@FreeBSD.org COMMENT= GNU version of the traditional tape archiver LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING INFO= tar USES= charsetfix cpe iconv:${STATIC_ARGS} localbase makeinfo tar:xz CPE_VENDOR= gnu GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-prefix=g CONFIGURE_ENV= DEFAULT_ARCHIVE=/dev/sa0 \ DEFAULT_RMT_COMMAND=/etc/rmt # supply result to skip a test that will abort configure if run as root CONFIGURE_ENV+= gl_cv_func_mknod_works=yes TEST_DEPENDS= autom4te:devel/autoconf TEST_TARGET= check OPTIONS_DEFINE= NLS STATIC OPTIONS_SUB= yes NLS_USES= gettext-runtime:${STATIC_ARGS} NLS_CONFIGURE_ENABLE= nls STATIC_LDFLAGS= -static STATIC_CONFIGURE_ENV= SHLIBEXT="" STATIC_VARS= STATIC_ARGS=build STATIC_VARS_OFF= STATIC_ARGS=lib - -# do not rebuild tar.info -post-patch: - ${TOUCH} -r ${WRKSRC}/doc/stamp-vti ${WRKSRC}/configure .include Index: head/archivers/gtar/distinfo =================================================================== --- head/archivers/gtar/distinfo (revision 468821) +++ head/archivers/gtar/distinfo (revision 468822) @@ -1,3 +1,3 @@ -TIMESTAMP = 1464968876 -SHA256 (tar-1.29.tar.xz) = 402dcfd0022fd7a1f2c5611f5c61af1cd84910a760a44a688e18ddbff4e9f024 -SIZE (tar-1.29.tar.xz) = 1996000 +TIMESTAMP = 1525097977 +SHA256 (tar-1.30.tar.xz) = f1bf92dbb1e1ab27911a861ea8dde8208ee774866c46c0bb6ead41f4d1f4d2d3 +SIZE (tar-1.30.tar.xz) = 2108028 Index: head/archivers/gtar/files/patch-po_Makefile.in.in =================================================================== --- head/archivers/gtar/files/patch-po_Makefile.in.in (revision 468821) +++ head/archivers/gtar/files/patch-po_Makefile.in.in (nonexistent) @@ -1,13 +0,0 @@ -Work around a bug in FreeBSD 9 make(1). -http://docs.freebsd.org/cgi/mid.cgi?slrnmvro62.94q.naddy - ---- po/Makefile.in.in.orig 2016-04-06 04:59:54 UTC -+++ po/Makefile.in.in -@@ -78,6 +78,7 @@ CATALOGS = @CATALOGS@ - POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot - POFILESDEPS_yes = $(POFILESDEPS_) - POFILESDEPS_no = -+PO_DEPENDS_ON_POT = - POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT)) - - DISTFILESDEPS_ = update-po Property changes on: head/archivers/gtar/files/patch-po_Makefile.in.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/archivers/gtar/files/patch-configure =================================================================== --- head/archivers/gtar/files/patch-configure (revision 468821) +++ head/archivers/gtar/files/patch-configure (revision 468822) @@ -1,14 +1,14 @@ Hack to disable shared library detection, so configure won't try to link with "/usr/local/lib/libiconv.so -static". ---- configure.orig 2016-05-16 08:52:00 UTC +--- configure.orig 2017-12-17 11:25:08 UTC +++ configure -@@ -35630,7 +35630,7 @@ fi +@@ -37451,7 +37451,7 @@ fi $as_echo "$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" Index: head/archivers/gtar/files/patch-gnu_error.c =================================================================== --- head/archivers/gtar/files/patch-gnu_error.c (nonexistent) +++ head/archivers/gtar/files/patch-gnu_error.c (revision 468822) @@ -0,0 +1,23 @@ +Fix remfiles01.at and remfiles02.at: error() needs to fetch the +name set by set_program_name(). + +--- gnu/error.c.orig 2017-12-16 21:23:33 UTC ++++ gnu/error.c +@@ -42,8 +42,6 @@ + # define USE_UNLOCKED_IO 0 + # define _GL_ATTRIBUTE_FORMAT_PRINTF(a, b) + # define _GL_ARG_NONNULL(a) +-#else +-# include "getprogname.h" + #endif + + #if USE_UNLOCKED_IO +@@ -119,7 +117,7 @@ int strerror_r (int errnum, char *buf, s + # endif + # endif + +-#define program_name getprogname () ++extern char *program_name; + + # if GNULIB_STRERROR_R_POSIX || HAVE_STRERROR_R || defined strerror_r + # define __strerror_r strerror_r Property changes on: head/archivers/gtar/files/patch-gnu_error.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/gtar/files/patch-src_utf8.c =================================================================== --- head/archivers/gtar/files/patch-src_utf8.c (nonexistent) +++ head/archivers/gtar/files/patch-src_utf8.c (revision 468822) @@ -0,0 +1,14 @@ +Work around an iconv(3) portability issue that trips up sparse07.at. +https://lists.gnu.org/archive/html/bug-tar/2018-04/threads.html + +--- src/utf8.c.orig 2018-04-30 17:25:34 UTC ++++ src/utf8.c +@@ -85,7 +85,7 @@ utf8_convert (bool to_utf, char const *i + ib = (char ICONV_CONST *) input; + rc = iconv (cd, &ib, &inlen, &ob, &outlen); + *ob = 0; +- return rc != -1; ++ return rc == 0; + } + + Property changes on: head/archivers/gtar/files/patch-src_utf8.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/gtar/files/patch-tests_difflink.at =================================================================== --- head/archivers/gtar/files/patch-tests_difflink.at (nonexistent) +++ head/archivers/gtar/files/patch-tests_difflink.at (revision 468822) @@ -0,0 +1,17 @@ +https://git.savannah.gnu.org/cgit/tar.git/commit/?id=847a36f064efed676ae007b1def3c0db364cdddb + +https://lists.gnu.org/archive/html/bug-tar/2018-04/msg00012.html + +--- tests/difflink.at.orig 2017-11-10 03:55:18 UTC ++++ tests/difflink.at +@@ -20,8 +20,8 @@ AT_TAR_CHECK([ + mkdir a + genfile -f a/x + ln -s x a/y +-ln a/y a/z +-tar cf a.tar a ++ln -P a/y a/z ++tar cf a.tar a/x a/y a/z + rm a/z + ln -s x a/z + tar df a.tar Property changes on: head/archivers/gtar/files/patch-tests_difflink.at ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property