The KDE FreeBSD team is proud to announce the release of KDE 4.2.0

for FreeBSD. The official KDE 4.2.0 (Codename: "The Answer") release
notes can be found at:
http://kde.org/announcements/4.2/index.php.

New supported languages include Arabic, Icelandic, Basque,
Hebrew, Romanian, Tajik and several Indian languages (Bengali India,
Gujarati, Kannada, Maithili, Marathi) indicating a rise in popularity in
this part of Asia.

New ports for KDE 4.2.0:
arabic/kde4-l10n		Arabic
hebrew/kde4-l10n		Hebrew
misc/kde4-l10n-bn_IN		Bengali (India)
misc/kde4-l10n-eu		Basque
misc/kde4-l10n-gu		Gujarati
misc/kde4-l10n-is		Icelandic
misc/kde4-l10n-kn		Kannada
misc/kde4-l10n-mai		Maithili
misc/kde4-l10n-mr		Marathi
misc/kde4-l10n-ro		Romanian
misc/kde4-l10n-tg		Tajik
math/eigen2			Lightweight library for vector and matrix math
graphics/kipi-plugins-kde4	KDE4 kipi graphics plugins
sysutils/policykit-kde		PolicyKit manager for KDE

Unfortunately FreeBSD 6.4 support is dropped.

We'd like to say thanks for feedback and help to:
	Matt Tosto, Kris Moore, stickibit, David Johnson, Markus Brueffer,
	David Naylor, Thomas Schlesinger, Warren Liddell, Thomas Abthorpe,
	Diego Depaoli, Mats Andreassen, portmgr for exp-run and repocopies.

3 files changed, 9 insertions, 35 deletions

diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile
index f11d2d794728..3b613b129be0 100644
--- a/sysutils/kdeadmin4/Makefile
+++ b/sysutils/kdeadmin4/Makefile
@@ -8,7 +8,7 @@ PORTNAME=	kdeadmin
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	sysutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -27,17 +27,17 @@ QT_COMPONENTS=	corelib opengl dbus qt3support designer network svg qtestlib \
 		network porting_build qmake_build moc_build rcc_build \
 		uic_build uic3_build
 #USE_OPENLDAP=	yes
-
-# dirty hack should fix in upstream?
-LDFLAGS=	-lcrypt
+PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 CMAKE_ARGS+=	-DBUILD_kpackage:BOOL=Off \
 		-DBUILD_lilo-config:BOOL=Off
 
-post-patch:
+post-extract:
 	${MKDIR} ${WRKSRC}
+
+post-patch:
 	${REINPLACE_CMD} -e \
 	's,$${LIB_INSTALL_DIR}/pkgconfig,libdata/pkgconfig,' \
-	${WRKSRC}/../knetworkconf/backends/CMakeLists.txt
+	${PATCH_WRKSRC}/knetworkconf/backends/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/sysutils/kdeadmin4/distinfo b/sysutils/kdeadmin4/distinfo
index 5c17033cece6..5c44dda1e7bd 100644
--- a/sysutils/kdeadmin4/distinfo
+++ b/sysutils/kdeadmin4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeadmin-4.1.4.tar.bz2) = c3194bc30daacae33322993f2dba0074
-SHA256 (KDE/kdeadmin-4.1.4.tar.bz2) = 97b75cfde0065e6a773b19a9577134fb3a73adde8ef7200a374aedd0e03f5328
-SIZE (KDE/kdeadmin-4.1.4.tar.bz2) = 1840943
+MD5 (KDE/kdeadmin-4.2.0.tar.bz2) = 2c5b33477b5679bcd9fdbc1f8017e6fb
+SHA256 (KDE/kdeadmin-4.2.0.tar.bz2) = e8ba0b3c4ca2083277b1edab1fe3098e9c2f1cfe8d0a0404611ef8e98fcf9099
+SIZE (KDE/kdeadmin-4.2.0.tar.bz2) = 1923292
diff --git a/sysutils/kdeadmin4/pkg-plist b/sysutils/kdeadmin4/pkg-plist
index 798020214e83..04d92cac0d9a 100644
--- a/sysutils/kdeadmin4/pkg-plist
+++ b/sysutils/kdeadmin4/pkg-plist
@@ -114,33 +114,11 @@ share/icons/hicolor/64x64/apps/kuser.png
 share/icons/hicolor/scalable/apps/ksystemlog.svgz
 share/kde4/services/kcm_cron.desktop
 share/kde4/services/kcm_knetworkconfmodule.desktop
-@dirrmtry share/kde4/services
-@dirrmtry share/kde4
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/22x22/apps
-@dirrmtry share/icons/hicolor/22x22/actions
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor/128x128/apps
-@dirrmtry share/icons/hicolor/128x128
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
 @dirrm share/doc/HTML/en/kuser
 @dirrm share/doc/HTML/en/ksystemlog
 @dirrm share/doc/HTML/en/kpackage
 @dirrm share/doc/HTML/en/kcron
 @dirrm share/doc/HTML/en/kcontrol/knetworkconf
-@dirrmtry share/doc/HTML/en
-@dirrmtry share/doc/HTML
-@dirrmtry share/config.kcfg
 @dirrm share/apps/kuser/pics
 @dirrm share/apps/kuser/icons/oxygen/22x22/actions
 @dirrm share/apps/kuser/icons/oxygen/22x22
@@ -151,7 +129,3 @@ share/kde4/services/kcm_knetworkconfmodule.desktop
 @dirrm share/apps/knetworkconf/pixmaps
 @dirrm share/apps/knetworkconf/backends
 @dirrm share/apps/knetworkconf
-@dirrmtry share/apps
-@dirrmtry share/applications/kde4
-@dirrmtry share/applications
-@dirrmtry lib/kde4