Replace xz-utils with xz.

5 files changed, 2 insertions, 92 deletions

diff --git a/archivers/Makefile b/archivers/Makefile
index 11e68bc628b..a93592a6e17 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.111 2009/06/08 14:01:37 wiz Exp $
+# $NetBSD: Makefile,v 1.112 2009/07/07 11:09:51 minskim Exp $
 #
 
 COMMENT=	Archivers
@@ -89,7 +89,7 @@ SUBDIR+=	upx
 SUBDIR+=	xbin
 SUBDIR+=	xmill
 SUBDIR+=	xpk
-SUBDIR+=	xz-utils
+SUBDIR+=	xz
 SUBDIR+=	zip
 SUBDIR+=	zip1
 SUBDIR+=	zoo
diff --git a/archivers/xz-utils/DESCR b/archivers/xz-utils/DESCR
deleted file mode 100644
index 180c2d116ee..00000000000
--- a/archivers/xz-utils/DESCR
+++ /dev/null
@@ -1,22 +0,0 @@
-LZMA is a general purporse compression algorithm designed by Igor
-Pavlov as part of 7-Zip. It provides high compression ratio while
-keeping the decompression speed fast.
-
-XZ Utils are an attempt to make LZMA compression easy to use on
-free (as in freedom) operating systems. This is achieved by providing
-tools and libraries which are similar to use than the equivalents
-of the most popular existing compression algorithms.
-
-XZ Utils consist of a few relatively separate parts:
-  * liblzma is an encoder/decoder library with support for several
-    filters (algorithm implementations). The primary filter is
-    LZMA.
-  * libzfile (or whatever the name will be) enables reading from
-    and writing to gzip, bzip2 and LZMA compressed and uncompressed
-    files with an API similar to the standard ANSI-C file I/O.
-    [ NOTE: libzfile is not implemented yet. ]
-  * xz command line tool has almost identical syntax than gzip
-    and bzip2. It makes LZMA easy for average users, but also
-    provides advanced options to finetune the compression settings.
-  * A few shell scripts make diffing and grepping LZMA compressed
-    files easy. The scripts were adapted from gzip and bzip2.
diff --git a/archivers/xz-utils/Makefile b/archivers/xz-utils/Makefile
deleted file mode 100644
index 6290496b365..00000000000
--- a/archivers/xz-utils/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2009/06/08 14:02:50 wiz Exp $
-#
-
-DISTNAME=	xz-4.999.8beta
-CATEGORIES=	archivers
-MASTER_SITES=	http://tukaani.org/xz/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://tukaani.org/xz/
-COMMENT=	XZ utilities
-#LICENSE=	public-domain AND gnu-gpl-v2 AND gnu-lgpl-v2.1
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-GNU_CONFIGURE=		yes
-USE_LIBTOOL=		yes
-PKGCONFIG_OVERRIDE=	src/liblzma/liblzma.pc.in
-
-CONFLICTS=	lzma-[0-9]* lzma-utils-[0-9]*
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/xz-utils/PLIST b/archivers/xz-utils/PLIST
deleted file mode 100644
index 5e433afd16e..00000000000
--- a/archivers/xz-utils/PLIST
+++ /dev/null
@@ -1,40 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:28:18 joerg Exp $
-bin/lzcat
-bin/lzcmp
-bin/lzdiff
-bin/lzegrep
-bin/lzfgrep
-bin/lzgrep
-bin/lzless
-bin/lzma
-bin/lzmadec
-bin/lzmore
-bin/unlzma
-bin/unxz
-bin/xz
-bin/xzcat
-bin/xzdec
-include/lzma.h
-include/lzma/base.h
-include/lzma/bcj.h
-include/lzma/block.h
-include/lzma/check.h
-include/lzma/container.h
-include/lzma/delta.h
-include/lzma/filter.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.la
-lib/pkgconfig/liblzma.pc
-man/man1/lzcmp.1
-man/man1/lzdiff.1
-man/man1/lzegrep.1
-man/man1/lzfgrep.1
-man/man1/lzgrep.1
-man/man1/lzless.1
-man/man1/lzmore.1
diff --git a/archivers/xz-utils/distinfo b/archivers/xz-utils/distinfo
deleted file mode 100644
index cfc44c04e16..00000000000
--- a/archivers/xz-utils/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/06/08 14:01:18 wiz Exp $
-
-SHA1 (xz-4.999.8beta.tar.gz) = d282518518488c37ec268401e1b8247749279c44
-RMD160 (xz-4.999.8beta.tar.gz) = 41303aed49cfb976da54d7e3e88210b4eeaebbbd
-Size (xz-4.999.8beta.tar.gz) = 879382 bytes