aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaddy <naddy@FreeBSD.org>2008-01-16 10:09:33 +0800
committernaddy <naddy@FreeBSD.org>2008-01-16 10:09:33 +0800
commit93bd1fcbea2c1635cdaca05d838725c7df8c9698 (patch)
tree56a6703cdf45f19fc4e0abfa84b590701b231757
parent84d92c106ec997010548ef5745998666b98c6951 (diff)
downloadfreebsd-ports-gnome-93bd1fcbea2c1635cdaca05d838725c7df8c9698.tar.gz
freebsd-ports-gnome-93bd1fcbea2c1635cdaca05d838725c7df8c9698.tar.zst
freebsd-ports-gnome-93bd1fcbea2c1635cdaca05d838725c7df8c9698.zip
Update to 1.19. Changes in this releases:
* new option --exclude-vcs * miscellaneous bug fixes
-rw-r--r--archivers/gtar/Makefile14
-rw-r--r--archivers/gtar/distinfo6
-rw-r--r--archivers/gtar/files/extra-patch-tests_gzip.at15
-rw-r--r--archivers/gtar/files/patch-configure12
-rw-r--r--archivers/gtar/files/patch-src_names.c18
5 files changed, 35 insertions, 30 deletions
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index a4950e31bc49..bb59fd5933c0 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= tar
-PORTVERSION= 1.18
-PORTREVISION= 1
+PORTVERSION= 1.19
CATEGORIES= archivers sysutils
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -41,6 +40,15 @@ CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.endif
+.include <bsd.port.pre.mk>
+
+# after the GNU gzip implementation was replaced with a BSD licensed version
+.if (${OSVERSION} >= 602105) && \
+ (${OSVERSION} < 700000 || ${OSVERSION} >= 700029)
+USE_AUTOTOOLS= autoconf:261:env # autom4te
+EXTRA_PATCHES= ${PATCHDIR}/extra-patch-tests_gzip.at
+.endif
+
# avoid triggering auto framework rebuilds
# FreeBSD 5.5 makeinfo can't rebuild tar.info
post-patch:
@@ -50,4 +58,4 @@ post-patch:
test: build
@cd ${WRKSRC} && ${MAKE} check
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/archivers/gtar/distinfo b/archivers/gtar/distinfo
index b77026900539..db617aac221e 100644
--- a/archivers/gtar/distinfo
+++ b/archivers/gtar/distinfo
@@ -1,3 +1,3 @@
-MD5 (tar-1.18.tar.bz2) = 70170208d7c1bb9ab40120579434b6a3
-SHA256 (tar-1.18.tar.bz2) = 44944ee0427c8e0d8dbaa0b8f900073a7456819610cc521c53630c3eb117cf5e
-SIZE (tar-1.18.tar.bz2) = 1877207
+MD5 (tar-1.19.tar.bz2) = bcc2e19b19823b9ab68c94586067a792
+SHA256 (tar-1.19.tar.bz2) = c690d46da77b1ee07b7c758de46d6d07da698a75e63ed3e8f83e3fca8f809cb4
+SIZE (tar-1.19.tar.bz2) = 1882486
diff --git a/archivers/gtar/files/extra-patch-tests_gzip.at b/archivers/gtar/files/extra-patch-tests_gzip.at
new file mode 100644
index 000000000000..d175d244a782
--- /dev/null
+++ b/archivers/gtar/files/extra-patch-tests_gzip.at
@@ -0,0 +1,15 @@
+
+$FreeBSD$
+
+--- tests/gzip.at.orig
++++ tests/gzip.at
+@@ -32,8 +32,7 @@
+ ],
+ [0],
+ [],
+-[
+-gzip: stdin: unexpected end of file
++[gzip: (stdin): unexpected end of file
+ tar: Child returned status 1
+ tar: Error exit delayed from previous errors
+ ],
diff --git a/archivers/gtar/files/patch-configure b/archivers/gtar/files/patch-configure
index 98a44481c3c7..4b5becc21cfe 100644
--- a/archivers/gtar/files/patch-configure
+++ b/archivers/gtar/files/patch-configure
@@ -3,16 +3,16 @@ $FreeBSD$
--- configure.orig
+++ configure
-@@ -38556,7 +38556,7 @@
- ABSOLUTE_FLOAT_H!$ABSOLUTE_FLOAT_H$ac_delim
- FLOAT_H!$FLOAT_H$ac_delim
- FNMATCH_H!$FNMATCH_H$ac_delim
+@@ -36858,7 +36858,7 @@
+ HAVE_DECL_GETDELIM!$HAVE_DECL_GETDELIM$ac_delim
+ HAVE_DECL_GETLINE!$HAVE_DECL_GETLINE$ac_delim
+ REPLACE_GETLINE!$REPLACE_GETLINE$ac_delim
-LIBINTL!$LIBINTL$ac_delim
+LIBINTL!$LTLIBINTL$ac_delim
LTLIBINTL!$LTLIBINTL$ac_delim
- ABSOLUTE_SYS_TIME_H!$ABSOLUTE_SYS_TIME_H$ac_delim
+ NEXT_SYS_TIME_H!$NEXT_SYS_TIME_H$ac_delim
HAVE_SYS_TIME_H!$HAVE_SYS_TIME_H$ac_delim
-@@ -38759,7 +38759,7 @@
+@@ -37083,7 +37083,7 @@
DEFAULT_ARCHIVE!$DEFAULT_ARCHIVE$ac_delim
DEFAULT_BLOCKING!$DEFAULT_BLOCKING$ac_delim
DEFAULT_QUOTING_STYLE!$DEFAULT_QUOTING_STYLE$ac_delim
diff --git a/archivers/gtar/files/patch-src_names.c b/archivers/gtar/files/patch-src_names.c
deleted file mode 100644
index a49b375cb9e3..000000000000
--- a/archivers/gtar/files/patch-src_names.c
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- src/names.c.orig
-+++ src/names.c
-@@ -1012,11 +1012,10 @@
- if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2]))
- return 1;
-
-- do
-+ while (! ISSLASH (*p))
- {
- if (! *p++)
- return 0;
- }
-- while (! ISSLASH (*p));
- }
- }