5 files changed, 8 insertions, 166 deletions

diff --git a/archivers/xz/Makefile b/archivers/xz/Makefile
index 35453e412795..516a7377ea24 100644
--- a/archivers/xz/Makefile
+++ b/archivers/xz/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	xz
-PORTVERSION=	4.999.9
-PORTREVISION=	1
+PORTVERSION=	5.0.0
 CATEGORIES=	archivers
 MASTER_SITES=	http://tukaani.org/xz/
-DISTNAME=	${PORTNAME}-${PORTVERSION}beta
 
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	LZMA compression and decompression tools
@@ -22,8 +20,9 @@ USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS=	--enable-dynamic=yes
-CONFIGURE_ARGS+=--disable-nls	# no translations available
+# As we want to use xz for extraction of port's distfiles,
+# it cannot depend on gettext.
+CONFIGURE_ARGS=	--disable-nls
 
 # pick up assembly language optimizations
 CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-portbld-freebsd${OSREL}
diff --git a/archivers/xz/distinfo b/archivers/xz/distinfo
index 403df8cc880e..132a6613e368 100644
--- a/archivers/xz/distinfo
+++ b/archivers/xz/distinfo
@@ -1,3 +1,2 @@
-MD5 (xz-4.999.9beta.tar.gz) = f2073579b6da2fe35d453adee1aaf1b2
-SHA256 (xz-4.999.9beta.tar.gz) = fa3901d1c034842da47fec1a24a9b5a5bd435f5ecfbb444c168512e2daddb86f
-SIZE (xz-4.999.9beta.tar.gz) = 1037541
+SHA256 (xz-5.0.0.tar.gz) = eba9211990a642fc2c35ea02618b710c7fa898d78ccca48b546a07bdde03c44d
+SIZE (xz-5.0.0.tar.gz) = 1232154
diff --git a/archivers/xz/files/patch-configure b/archivers/xz/files/patch-configure
deleted file mode 100644
index 5dd0f9141250..000000000000
--- a/archivers/xz/files/patch-configure
+++ /dev/null
@@ -1,110 +0,0 @@
---- /tmp/configure	2010-06-01 15:06:19.000000000 +0200
-+++ configure	2010-06-01 15:06:40.813799251 +0200
-@@ -15182,7 +15182,7 @@
- 
- 
- # If any of these headers are missing, things should still work correctly:
--for ac_header in sys/param.h sys/sysctl.h byteswap.h
-+for ac_header in sys/param.h sys/sysctl.h byteswap.h sys/endian.h
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
-@@ -15296,6 +15296,98 @@
- 
- 	fi
- 
-+if test x$ac_cv_header_sys_endian_h = xyes ; then
-+
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if bswap16 is available" >&5
-+$as_echo_n "checking if bswap16 is available... " >&6; }
-+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+#include <sys/endian.h>
-+int
-+main(void)
-+{
-+	bswap16(42);
-+	return 0;
-+}
-+
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+
-+
-+$as_echo "#define HAVE_BSWAP16 1" >>confdefs.h
-+
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+
-+
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if bswap32 is available" >&5
-+$as_echo_n "checking if bswap32 is available... " >&6; }
-+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+#include <sys/endian.h>
-+int
-+main(void)
-+{
-+	bswap32(42);
-+	return 0;
-+}
-+
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+
-+
-+$as_echo "#define HAVE_BSWAP32 1" >>confdefs.h
-+
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+
-+
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if bswap64 is available" >&5
-+$as_echo_n "checking if bswap64 is available... " >&6; }
-+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+#include <sys/endian.h>
-+int
-+main(void)
-+{
-+	bswap64(42);
-+	return 0;
-+}
-+
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+
-+
-+$as_echo "#define HAVE_BSWAP64 1" >>confdefs.h
-+
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+
-+	fi
- 
- ###############################################################################
- # Checks for typedefs, structures, and compiler characteristics.
diff --git a/archivers/xz/files/patch-src_common_bswap.h b/archivers/xz/files/patch-src_common_bswap.h
deleted file mode 100644
index b12c98edc824..000000000000
--- a/archivers/xz/files/patch-src_common_bswap.h
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/common/bswap.h.orig	2009-09-29 20:25:24.000000000 +0200
-+++ src/common/bswap.h	2009-09-29 20:27:50.000000000 +0200
-@@ -23,21 +23,35 @@
- #ifdef HAVE_BYTESWAP_H
- #	include <byteswap.h>
- #endif
-+#ifdef HAVE_SYS_ENDIAN_H
-+#	include <sys/endian.h>
-+#endif
- 
- #ifndef HAVE_BSWAP_16
-+#	ifdef HAVE_BSWAP16
-+#	define bswap_16 bswap16
-+#	else
- #	define bswap_16(num) \
- 		(((num) << 8) | ((num) >> 8))
-+#	endif
- #endif
- 
- #ifndef HAVE_BSWAP_32
-+#	ifdef HAVE_BSWAP32
-+#	define bswap_32 bswap32
-+#	else
- #	define bswap_32(num) \
- 		( (((num) << 24)                       ) \
- 		| (((num) <<  8) & UINT32_C(0x00FF0000)) \
- 		| (((num) >>  8) & UINT32_C(0x0000FF00)) \
- 		| (((num) >> 24)                       ) )
-+#	endif
- #endif
- 
- #ifndef HAVE_BSWAP_64
-+#	ifdef HAVE_BSWAP64
-+#	define bswap_64 bswap64
-+#	else
- #	define bswap_64(num) \
- 		( (((num) << 56)                               ) \
- 		| (((num) << 40) & UINT64_C(0x00FF000000000000)) \
-@@ -47,6 +61,7 @@
- 		| (((num) >> 24) & UINT64_C(0x0000000000FF0000)) \
- 		| (((num) >> 40) & UINT64_C(0x000000000000FF00)) \
- 		| (((num) >> 56)                               ) )
-+#	endif
- #endif
- 
- #endif
diff --git a/archivers/xz/pkg-plist b/archivers/xz/pkg-plist
index 92d0fe9d460d..02349ba7d9d6 100644
--- a/archivers/xz/pkg-plist
+++ b/archivers/xz/pkg-plist
@@ -29,16 +29,16 @@ include/lzma/check.h
 include/lzma/container.h
 include/lzma/delta.h
 include/lzma/filter.h
+include/lzma/hardware.h
 include/lzma/index.h
 include/lzma/index_hash.h
 include/lzma/lzma.h
 include/lzma/stream_flags.h
-include/lzma/subblock.h
 include/lzma/version.h
 include/lzma/vli.h
 lib/liblzma.a
 lib/liblzma.la
 lib/liblzma.so
-lib/liblzma.so.0
+lib/liblzma.so.5
 libdata/pkgconfig/liblzma.pc
 @dirrm include/lzma