16 files changed, 30 insertions, 16 deletions

diff --git a/MOVED b/MOVED
index 590daca4b12f..3830a746087b 100644
--- a/MOVED
+++ b/MOVED
@@ -4165,3 +4165,4 @@ devel/eric||2009-09-16|Removed: obsoleted by devel/eric4
 devel/p5-Algorithm-MDiff||2009-09-16|Has expired: the module was removed from CPAN
 devel/p5-Data-Postponed||2009-09-16|Has expired: the module was removed from CPAN
 net/asterisk12-addons||2009-09-16|Has expired: does not build
+archivers/lzmautils-devel|archivers/xz|2009-09-21|Project was renamed
diff --git a/archivers/Makefile b/archivers/Makefile
index 8007e85ae082..470ba140fd01 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -73,7 +73,6 @@
     SUBDIR += lzma
     SUBDIR += lzmalib
     SUBDIR += lzmautils
-    SUBDIR += lzmautils-devel
     SUBDIR += lzo
     SUBDIR += lzo2
     SUBDIR += lzop
@@ -186,6 +185,7 @@
     SUBDIR += xdms
     SUBDIR += xmill
     SUBDIR += xpk
+    SUBDIR += xz
     SUBDIR += zip
     SUBDIR += zipios++
     SUBDIR += zipmix
diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index cb1d5883b5c5..cd2e60f24298 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -16,7 +17,7 @@ COMMENT=	Utilities for the KDE4 integrated X11 Desktop
 
 LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4 \
 		zip.1:${PORTSDIR}/archivers/libzip \
-		lzma.0:${PORTSDIR}/archivers/lzmautils-devel \
+		lzma.0:${PORTSDIR}/archivers/xz \
 		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
 		qca.2:${PORTSDIR}/devel/qca
 RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
diff --git a/archivers/py-liblzma/Makefile b/archivers/py-liblzma/Makefile
index 37cd6a7ec223..07ac08a7da71 100644
--- a/archivers/py-liblzma/Makefile
+++ b/archivers/py-liblzma/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	liblzma
 PORTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	archivers python
 MASTER_SITES=	${MASTER_SITE_CHEESESHOP}source/p/pyliblzma/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +16,7 @@ MAINTAINER=	dragonsa@highveldmail.co.za
 COMMENT=	Python binding for the LZMA compression library
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkg-config
-LIB_DEPENDS=	lzma.0:${PORTSDIR}/archivers/lzmautils-devel
+LIB_DEPENDS=	lzma.0:${PORTSDIR}/archivers/xz
 
 USE_BZIP2=	yes
 USE_PYTHON=	2.6+
diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile
index cb1d5883b5c5..cd2e60f24298 100644
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -16,7 +17,7 @@ COMMENT=	Utilities for the KDE4 integrated X11 Desktop
 
 LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4 \
 		zip.1:${PORTSDIR}/archivers/libzip \
-		lzma.0:${PORTSDIR}/archivers/lzmautils-devel \
+		lzma.0:${PORTSDIR}/archivers/xz \
 		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
 		qca.2:${PORTSDIR}/devel/qca
 RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index cb1d5883b5c5..cd2e60f24298 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -16,7 +17,7 @@ COMMENT=	Utilities for the KDE4 integrated X11 Desktop
 
 LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4 \
 		zip.1:${PORTSDIR}/archivers/libzip \
-		lzma.0:${PORTSDIR}/archivers/lzmautils-devel \
+		lzma.0:${PORTSDIR}/archivers/xz \
 		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
 		qca.2:${PORTSDIR}/devel/qca
 RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index cb1d5883b5c5..cd2e60f24298 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -16,7 +17,7 @@ COMMENT=	Utilities for the KDE4 integrated X11 Desktop
 
 LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4 \
 		zip.1:${PORTSDIR}/archivers/libzip \
-		lzma.0:${PORTSDIR}/archivers/lzmautils-devel \
+		lzma.0:${PORTSDIR}/archivers/xz \
 		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
 		qca.2:${PORTSDIR}/devel/qca
 RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index cb1d5883b5c5..cd2e60f24298 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -16,7 +17,7 @@ COMMENT=	Utilities for the KDE4 integrated X11 Desktop
 
 LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4 \
 		zip.1:${PORTSDIR}/archivers/libzip \
-		lzma.0:${PORTSDIR}/archivers/lzmautils-devel \
+		lzma.0:${PORTSDIR}/archivers/xz \
 		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
 		qca.2:${PORTSDIR}/devel/qca
 RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index cb1d5883b5c5..cd2e60f24298 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -16,7 +17,7 @@ COMMENT=	Utilities for the KDE4 integrated X11 Desktop
 
 LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4 \
 		zip.1:${PORTSDIR}/archivers/libzip \
-		lzma.0:${PORTSDIR}/archivers/lzmautils-devel \
+		lzma.0:${PORTSDIR}/archivers/xz \
 		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
 		qca.2:${PORTSDIR}/devel/qca
 RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile
index cb1d5883b5c5..cd2e60f24298 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -16,7 +17,7 @@ COMMENT=	Utilities for the KDE4 integrated X11 Desktop
 
 LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4 \
 		zip.1:${PORTSDIR}/archivers/libzip \
-		lzma.0:${PORTSDIR}/archivers/lzmautils-devel \
+		lzma.0:${PORTSDIR}/archivers/xz \
 		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
 		qca.2:${PORTSDIR}/devel/qca
 RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index cb1d5883b5c5..cd2e60f24298 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -16,7 +17,7 @@ COMMENT=	Utilities for the KDE4 integrated X11 Desktop
 
 LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4 \
 		zip.1:${PORTSDIR}/archivers/libzip \
-		lzma.0:${PORTSDIR}/archivers/lzmautils-devel \
+		lzma.0:${PORTSDIR}/archivers/xz \
 		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
 		qca.2:${PORTSDIR}/devel/qca
 RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index cb1d5883b5c5..cd2e60f24298 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -16,7 +17,7 @@ COMMENT=	Utilities for the KDE4 integrated X11 Desktop
 
 LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4 \
 		zip.1:${PORTSDIR}/archivers/libzip \
-		lzma.0:${PORTSDIR}/archivers/lzmautils-devel \
+		lzma.0:${PORTSDIR}/archivers/xz \
 		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
 		qca.2:${PORTSDIR}/devel/qca
 RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index cb1d5883b5c5..cd2e60f24298 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -16,7 +17,7 @@ COMMENT=	Utilities for the KDE4 integrated X11 Desktop
 
 LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4 \
 		zip.1:${PORTSDIR}/archivers/libzip \
-		lzma.0:${PORTSDIR}/archivers/lzmautils-devel \
+		lzma.0:${PORTSDIR}/archivers/xz \
 		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
 		qca.2:${PORTSDIR}/devel/qca
 RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 6cd9ebd08127..fd89157e1731 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdebase-runtime
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -16,7 +17,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for the KDE system
 
-LIB_DEPENDS=	lzma.0:${PORTSDIR}/archivers/lzmautils-devel \
+LIB_DEPENDS=	lzma.0:${PORTSDIR}/archivers/xz \
 		xine.1:${PORTSDIR}/multimedia/libxine \
 		slp.1:${PORTSDIR}/net/openslp
 
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 6cd9ebd08127..fd89157e1731 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdebase-runtime
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -16,7 +17,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for the KDE system
 
-LIB_DEPENDS=	lzma.0:${PORTSDIR}/archivers/lzmautils-devel \
+LIB_DEPENDS=	lzma.0:${PORTSDIR}/archivers/xz \
 		xine.1:${PORTSDIR}/multimedia/libxine \
 		slp.1:${PORTSDIR}/net/openslp
 
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 7d1c3bd2bdc7..24c1e767bab0 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -33,7 +33,7 @@ LIB_DEPENDS=	searchclient:${PORTSDIR}/deskutils/strigi \
 		idn:${PORTSDIR}/dns/libidn \
 		utempter:${PORTSDIR}/sysutils/libutempter \
 		hal.1:${PORTSDIR}/sysutils/hal \
-		lzma.0:${PORTSDIR}/archivers/lzmautils-devel \
+		lzma.0:${PORTSDIR}/archivers/xz \
 		smbclient.0:${PORTSDIR}/net/samba-libsmbclient
 RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
 		showrgb:${PORTSDIR}/x11/rgb \