- Update to 4.999.8

PR:		130416
Submitted by:	David Naylor <naylor.b.david@gmail.com> (maintainer)

6 files changed, 50 insertions, 60 deletions

diff --git a/archivers/lzmautils-devel/Makefile b/archivers/lzmautils-devel/Makefile
index c46710e822ba..1226a31013c0 100644
--- a/archivers/lzmautils-devel/Makefile
+++ b/archivers/lzmautils-devel/Makefile
@@ -6,28 +6,31 @@
 #
 
 PORTNAME=	lzmautils
-DISTVERSION=	4.999.3alpha
+DISTVERSION=	4.999.8
 CATEGORIES=	archivers
-MASTER_SITES=	http://tukaani.org/lzma/
-PKGNAMESUFFIX?=	-devel
-DISTNAME=	lzma-${DISTVERSION}
+MASTER_SITES=	http://tukaani.org/xz/
+PKGNAMESUFFIX=	-devel
+DISTNAME=	xz-${DISTVERSION}beta
 
-MAINTAINER=	naylor.b.david@gmail.com
+MAINTAINER=	dragonsa@highveldmail.co.za
 COMMENT=	LZMA compression and decompression tools
 
-CONFLICTS=	lzma-[0-9]* lzmautils-4.[0-3]* lzmautils-[0-3]*
+CONFLICTS=	lzma-[0-9]* lzmautils-4.[0-3]* lzmautils-[0-3]* lzmalib-[0-9]*
 
-USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack
 
+CONFIGURE_ARGS+=	--disable-static --disable-nls  # No translations apparent
+
+.if defined(WITHOUT_THREADS)
+CONFIGURE_ARGS+=	--disable-threads
+.endif
+
 MAN1=		lzdiff.1 lzgrep.1 lzmore.1
-MLINKS=		lzma.1 unlzma.1 \
-		lzma.1 lzcat.1 \
-		lzdiff.1 lzcmp.1 \
+MLINKS=		lzdiff.1 lzcmp.1 \
 		lzgrep.1 lzegrep.1 \
 		lzgrep.1 lzfgrep.1 \
-		lzmore.1 lzless.1			
+		lzmore.1 lzless.1
 
 .include <bsd.port.mk>
diff --git a/archivers/lzmautils-devel/distinfo b/archivers/lzmautils-devel/distinfo
index 607b520eabbf..bae20c423812 100644
--- a/archivers/lzmautils-devel/distinfo
+++ b/archivers/lzmautils-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (lzma-4.999.3alpha.tar.gz) = 23b0d73bda022964a9dfc7787c5fb918
-SHA256 (lzma-4.999.3alpha.tar.gz) = 33e6705a71224923975a5545c75f121cc56788c7b107f59a290d43b4f035a279
-SIZE (lzma-4.999.3alpha.tar.gz) = 877574
+MD5 (xz-4.999.8beta.tar.gz) = f00967331a487e88d51207fe17c56f52
+SHA256 (xz-4.999.8beta.tar.gz) = 059da5a9fe51c28b38f67e5b8063a451c516f37fbb268177fd1081b70dd97f53
+SIZE (xz-4.999.8beta.tar.gz) = 879382
diff --git a/archivers/lzmautils-devel/pkg-plist b/archivers/lzmautils-devel/pkg-plist
index 13acbac298be..f58fe5ca8b52 100644
--- a/archivers/lzmautils-devel/pkg-plist
+++ b/archivers/lzmautils-devel/pkg-plist
@@ -9,35 +9,27 @@ bin/lzma
 bin/lzmadec
 bin/lzmore
 bin/unlzma
+bin/unxz
+bin/xz
+bin/xzcat
+bin/xzdec
 include/lzma.h
-include/lzma/alignment.h
-include/lzma/alone.h
-include/lzma/auto.h
 include/lzma/base.h
+include/lzma/bcj.h
 include/lzma/block.h
 include/lzma/check.h
-include/lzma/copy.h
+include/lzma/container.h
 include/lzma/delta.h
-include/lzma/easy.h
-include/lzma/extra.h
 include/lzma/filter.h
 include/lzma/index.h
-include/lzma/info.h
-include/lzma/init.h
+include/lzma/index_hash.h
 include/lzma/lzma.h
-include/lzma/memlimit.h
-include/lzma/metadata.h
-include/lzma/raw.h
-include/lzma/simple.h
-include/lzma/stream.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
-share/locale/fi/LC_MESSAGES/lzma.mo
-libdata/pkgconfig/lzma.pc
+libdata/pkgconfig/liblzma.pc
 @dirrm include/lzma
diff --git a/archivers/xz/Makefile b/archivers/xz/Makefile
index c46710e822ba..1226a31013c0 100644
--- a/archivers/xz/Makefile
+++ b/archivers/xz/Makefile
@@ -6,28 +6,31 @@
 #
 
 PORTNAME=	lzmautils
-DISTVERSION=	4.999.3alpha
+DISTVERSION=	4.999.8
 CATEGORIES=	archivers
-MASTER_SITES=	http://tukaani.org/lzma/
-PKGNAMESUFFIX?=	-devel
-DISTNAME=	lzma-${DISTVERSION}
+MASTER_SITES=	http://tukaani.org/xz/
+PKGNAMESUFFIX=	-devel
+DISTNAME=	xz-${DISTVERSION}beta
 
-MAINTAINER=	naylor.b.david@gmail.com
+MAINTAINER=	dragonsa@highveldmail.co.za
 COMMENT=	LZMA compression and decompression tools
 
-CONFLICTS=	lzma-[0-9]* lzmautils-4.[0-3]* lzmautils-[0-3]*
+CONFLICTS=	lzma-[0-9]* lzmautils-4.[0-3]* lzmautils-[0-3]* lzmalib-[0-9]*
 
-USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack
 
+CONFIGURE_ARGS+=	--disable-static --disable-nls  # No translations apparent
+
+.if defined(WITHOUT_THREADS)
+CONFIGURE_ARGS+=	--disable-threads
+.endif
+
 MAN1=		lzdiff.1 lzgrep.1 lzmore.1
-MLINKS=		lzma.1 unlzma.1 \
-		lzma.1 lzcat.1 \
-		lzdiff.1 lzcmp.1 \
+MLINKS=		lzdiff.1 lzcmp.1 \
 		lzgrep.1 lzegrep.1 \
 		lzgrep.1 lzfgrep.1 \
-		lzmore.1 lzless.1			
+		lzmore.1 lzless.1
 
 .include <bsd.port.mk>
diff --git a/archivers/xz/distinfo b/archivers/xz/distinfo
index 607b520eabbf..bae20c423812 100644
--- a/archivers/xz/distinfo
+++ b/archivers/xz/distinfo
@@ -1,3 +1,3 @@
-MD5 (lzma-4.999.3alpha.tar.gz) = 23b0d73bda022964a9dfc7787c5fb918
-SHA256 (lzma-4.999.3alpha.tar.gz) = 33e6705a71224923975a5545c75f121cc56788c7b107f59a290d43b4f035a279
-SIZE (lzma-4.999.3alpha.tar.gz) = 877574
+MD5 (xz-4.999.8beta.tar.gz) = f00967331a487e88d51207fe17c56f52
+SHA256 (xz-4.999.8beta.tar.gz) = 059da5a9fe51c28b38f67e5b8063a451c516f37fbb268177fd1081b70dd97f53
+SIZE (xz-4.999.8beta.tar.gz) = 879382
diff --git a/archivers/xz/pkg-plist b/archivers/xz/pkg-plist
index 13acbac298be..f58fe5ca8b52 100644
--- a/archivers/xz/pkg-plist
+++ b/archivers/xz/pkg-plist
@@ -9,35 +9,27 @@ bin/lzma
 bin/lzmadec
 bin/lzmore
 bin/unlzma
+bin/unxz
+bin/xz
+bin/xzcat
+bin/xzdec
 include/lzma.h
-include/lzma/alignment.h
-include/lzma/alone.h
-include/lzma/auto.h
 include/lzma/base.h
+include/lzma/bcj.h
 include/lzma/block.h
 include/lzma/check.h
-include/lzma/copy.h
+include/lzma/container.h
 include/lzma/delta.h
-include/lzma/easy.h
-include/lzma/extra.h
 include/lzma/filter.h
 include/lzma/index.h
-include/lzma/info.h
-include/lzma/init.h
+include/lzma/index_hash.h
 include/lzma/lzma.h
-include/lzma/memlimit.h
-include/lzma/metadata.h
-include/lzma/raw.h
-include/lzma/simple.h
-include/lzma/stream.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
-share/locale/fi/LC_MESSAGES/lzma.mo
-libdata/pkgconfig/lzma.pc
+libdata/pkgconfig/liblzma.pc
 @dirrm include/lzma