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

for FreeBSD. The official KDE 4.1.0 release notes can be found at
http://www.kde.org/announcements/4.1/.

Some note:

* Prefix
KDE4 will be install into a custom prefixes namely ${LOCALBASE}/kde4.
KDE4 and KDE3 can co-exist

* Sound
For sound to work, it is necessary to have dbus and hal enabled
in your system. Please see the respective documentation on how
to enable these.

For more Informations see the HEADS UP at ports@ and kde-freebsd@
or our wiki page http://wiki.freebsd.org/KDE4/Install.

Have fun!

5 files changed, 87 insertions, 118 deletions

diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile
index b5f068dc2be6..15e5de7bc6c9 100644
--- a/sysutils/kdeadmin4/Makefile
+++ b/sysutils/kdeadmin4/Makefile
@@ -1,38 +1,42 @@
-# -*-mode: makefile-*-
-# New ports collection makefile for:	kdeadmin
-# Date created:				2 November 2001
-# Whom:					will@cvs.kde.org
+# New ports collection Makefile for:	kdeadmin
+# Date created:				2008-01-30
+# Whom:					Martin Wilke <miwi@FreeBSD.org>
 #
 # $FreeBSD$
-#
 
 PORTNAME=	kdeadmin
-PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
-CATEGORIES=	sysutils kde
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	sysutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	KDE applications related to system administration
+COMMENT=	KDE Admin applications
+
+RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
-USE_KDELIBS_VER=3
-PREFIX=		${KDE_PREFIX}
+LATEST_LINK=	${PORTNAME}4
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_AUTOTOOLS=  libtool:15
+USE_QT_VER=	4
+USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4
+KDE4_BUILDENV=	yes
+USE_OPENSSL=	yes
+QT_COMPONENTS=	corelib opengl moc rcc dbus qt3support designer network svg qtestlib \
+		network uic3 porting
+#USE_OPENLDAP=	yes
+
+# dirty hack should fix in upstream?
+LDFLAGS=	-lcrypt
 
-USE_LDCONFIG=	yes
-LDCONFIG_DIRS+=	%%PREFIX%%/lib/kde3
+CMAKE_ARGS+=	-DBUILD_kpackage:BOOL=Off \
+		-DBUILD_lilo-config:BOOL=Off
 
 post-patch:
+	${MKDIR} ${WRKSRC}
 	${REINPLACE_CMD} -e \
-	's|pkgconfigdir =.*|pkgconfigdir = ${LOCALBASE}/libdata/pkgconfig|g' \
-		${WRKSRC}/knetworkconf/backends/Makefile.in
-	${REINPLACE_CMD} -e 's|INDEX-5|${INDEXFILE}|g' \
-		${WRKSRC}/kpackage/fbsdInterface.cpp
+	's,$${LIB_INSTALL_DIR}/pkgconfig,libdata/pkgconfig,' \
+	${WRKSRC}/../knetworkconf/backends/CMakeLists.txt
 
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.mk>
diff --git a/sysutils/kdeadmin4/distinfo b/sysutils/kdeadmin4/distinfo
index ab98e68d1b5c..5f07e31be37e 100644
--- a/sysutils/kdeadmin4/distinfo
+++ b/sysutils/kdeadmin4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeadmin-3.5.8.tar.bz2) = 324a44d854a92177e71954f9264c98a8
-SHA256 (KDE/kdeadmin-3.5.8.tar.bz2) = 501c8dd591d112e4641b802dee175037616da7f492c865cccb13bb3aadcd6aea
-SIZE (KDE/kdeadmin-3.5.8.tar.bz2) = 2123522
+MD5 (KDE/kdeadmin-4.1.0.tar.bz2) = c814d39956c605a8cc60016a26a9401f
+SHA256 (KDE/kdeadmin-4.1.0.tar.bz2) = 64f2f375964984f39337fe1d48265ea94f482a76cbc10557690abdb54d75ed75
+SIZE (KDE/kdeadmin-4.1.0.tar.bz2) = 1843759
diff --git a/sysutils/kdeadmin4/files/patch-knetworkconf_backends-Makefile.in b/sysutils/kdeadmin4/files/patch-knetworkconf_backends-Makefile.in
deleted file mode 100644
index cd8d5d0ad7ca..000000000000
--- a/sysutils/kdeadmin4/files/patch-knetworkconf_backends-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- knetworkconf/backends/Makefile.in.orig	Sat Aug  5 18:14:28 2006
-+++ knetworkconf/backends/Makefile.in	Sat Aug  5 18:15:45 2006
-@@ -369,7 +369,6 @@
- 
- CLEANFILES = $(backends) $(perl_libs) system-tools-backends.pc
- pkgconfigdir = $(libdir)/pkgconfig
--pkgconfig_DATA = system-tools-backends.pc
- #>- all: all-am
- #>+ 1
- all: docs-am  all-am
diff --git a/sysutils/kdeadmin4/pkg-descr b/sysutils/kdeadmin4/pkg-descr
index 135da9083383..5d4443ab662b 100644
--- a/sysutils/kdeadmin4/pkg-descr
+++ b/sysutils/kdeadmin4/pkg-descr
@@ -1,2 +1 @@
-A collection of applications related to system administration,
-such as crontab editor, master.passwd editor, package manager, etc.
+KDEAdmin tools for KDE4.
diff --git a/sysutils/kdeadmin4/pkg-plist b/sysutils/kdeadmin4/pkg-plist
index 0b731e586329..a20c47878111 100644
--- a/sysutils/kdeadmin4/pkg-plist
+++ b/sysutils/kdeadmin4/pkg-plist
@@ -1,21 +1,10 @@
-bin/kcron
-bin/kpackage
+bin/ksystemlog
 bin/kuser
-bin/secpolicy
-lib/kde3/kcm_knetworkconfmodule.a
-lib/kde3/kcm_knetworkconfmodule.la
-lib/kde3/kcm_knetworkconfmodule.so
-lib/kde3/kfile_deb.a
-lib/kde3/kfile_deb.la
-lib/kde3/kfile_deb.so
-lib/kde3/kfile_rpm.a
-lib/kde3/kfile_rpm.la
-lib/kde3/kfile_rpm.so
-share/applications/kde/kcm_knetworkconfmodule.desktop
-share/applications/kde/kcron.desktop
-share/applications/kde/kpackage.desktop
-share/applications/kde/kuser.desktop
-share/apps/kcron/kcronui.rc
+lib/kde4/kcm_cron.so
+lib/kde4/kcm_knetworkconfmodule.so
+libdata/pkgconfig/system-tools-backends.pc
+share/applications/kde4/ksystemlog.desktop
+share/applications/kde4/kuser.desktop
 share/apps/knetworkconf/backends/debug.pl
 share/apps/knetworkconf/backends/file.pl
 share/apps/knetworkconf/backends/general.pl
@@ -42,42 +31,15 @@ share/apps/knetworkconf/pixmaps/mandriva.png
 share/apps/knetworkconf/pixmaps/openna.png
 share/apps/knetworkconf/pixmaps/pld.png
 share/apps/knetworkconf/pixmaps/redhat.png
-share/apps/knetworkconf/pixmaps/rpath.png
 share/apps/knetworkconf/pixmaps/slackware.png
+share/apps/knetworkconf/pixmaps/specifix.png
 share/apps/knetworkconf/pixmaps/suse.png
 share/apps/knetworkconf/pixmaps/turbolinux.png
 share/apps/knetworkconf/pixmaps/vine.png
 share/apps/knetworkconf/pixmaps/yoper.png
-share/apps/kpackage/kpackageui.rc
-share/apps/kpackage/pics/bnew.png
-share/apps/kpackage/pics/bsd.png
-share/apps/kpackage/pics/bupdated.png
-share/apps/kpackage/pics/cross.png
-share/apps/kpackage/pics/dbad.png
-share/apps/kpackage/pics/deb.png
-share/apps/kpackage/pics/dnew.png
-share/apps/kpackage/pics/dupdated.png
-share/apps/kpackage/pics/ftin.xpm
-share/apps/kpackage/pics/ftout.xpm
-share/apps/kpackage/pics/kiss.png
-share/apps/kpackage/pics/knew.png
-share/apps/kpackage/pics/kupdated.png
-share/apps/kpackage/pics/noball.png
-share/apps/kpackage/pics/ptick.png
-share/apps/kpackage/pics/question.png
-share/apps/kpackage/pics/rnew.png
-share/apps/kpackage/pics/rpm.png
-share/apps/kpackage/pics/rupdated.png
-share/apps/kpackage/pics/slack.png
-share/apps/kpackage/pics/snew.png
-share/apps/kpackage/pics/supdated.png
-share/apps/kpackage/pics/tick.png
-share/apps/kuser/icons/crystalsvg/22x22/actions/add_group.png
-share/apps/kuser/icons/crystalsvg/22x22/actions/add_user.png
-share/apps/kuser/icons/crystalsvg/22x22/actions/delete_group.png
-share/apps/kuser/icons/crystalsvg/22x22/actions/delete_user.png
-share/apps/kuser/icons/crystalsvg/22x22/actions/edit_group.png
-share/apps/kuser/icons/crystalsvg/22x22/actions/edit_user.png
+share/apps/ksystemlog/ksystemlogui.rc
+share/apps/kuser/icons/oxygen/22x22/actions/user-group-delete.png
+share/apps/kuser/icons/oxygen/22x22/actions/user-group-properties.png
 share/apps/kuser/kuserui.rc
 share/apps/kuser/pics/group.png
 share/apps/kuser/pics/user.png
@@ -90,9 +52,6 @@ share/doc/HTML/en/kcron/kcronstart.png
 share/doc/HTML/en/kcron/newtask.png
 share/doc/HTML/en/kcron/newvariable.png
 share/doc/HTML/en/kcron/print.png
-share/doc/HTML/en/kdat/common
-share/doc/HTML/en/kdat/index.cache.bz2
-share/doc/HTML/en/kdat/index.docbook
 share/doc/HTML/en/knetworkconf/01.png
 share/doc/HTML/en/knetworkconf/02.png
 share/doc/HTML/en/knetworkconf/03.png
@@ -107,75 +66,92 @@ share/doc/HTML/en/knetworkconf/about1.png
 share/doc/HTML/en/knetworkconf/common
 share/doc/HTML/en/knetworkconf/index.cache.bz2
 share/doc/HTML/en/knetworkconf/index.docbook
-share/doc/HTML/en/kpackage/bsdloc.png
 share/doc/HTML/en/kpackage/common
-share/doc/HTML/en/kpackage/debaptloc.png
-share/doc/HTML/en/kpackage/debloc.png
 share/doc/HTML/en/kpackage/handle.png
 share/doc/HTML/en/kpackage/index.cache.bz2
 share/doc/HTML/en/kpackage/index.docbook
 share/doc/HTML/en/kpackage/install.png
 share/doc/HTML/en/kpackage/left.png
 share/doc/HTML/en/kpackage/right-change.png
+share/doc/HTML/en/kpackage/right-dep.png
 share/doc/HTML/en/kpackage/right-files.png
 share/doc/HTML/en/kpackage/right-prop.png
 share/doc/HTML/en/kpackage/root-prompt.png
-share/doc/HTML/en/kpackage/rpmloc.png
 share/doc/HTML/en/kpackage/search.png
 share/doc/HTML/en/kpackage/searchf.png
 share/doc/HTML/en/kpackage/searchl.png
-share/doc/HTML/en/kpackage/slackloc.png
 share/doc/HTML/en/kpackage/uninstall.png
-share/doc/HTML/en/ksysv/common
-share/doc/HTML/en/ksysv/index.cache.bz2
-share/doc/HTML/en/ksysv/index.docbook
+share/doc/HTML/en/ksystemlog/common
+share/doc/HTML/en/ksystemlog/filter-process.png
+share/doc/HTML/en/ksystemlog/first-opening.png
+share/doc/HTML/en/ksystemlog/groupby-hour.png
+share/doc/HTML/en/ksystemlog/index.cache.bz2
+share/doc/HTML/en/ksystemlog/index.docbook
+share/doc/HTML/en/ksystemlog/main-screen.png
 share/doc/HTML/en/kuser/common
 share/doc/HTML/en/kuser/index.cache.bz2
 share/doc/HTML/en/kuser/index.docbook
 share/doc/HTML/en/kuser/kuser.png
-share/doc/HTML/en/lilo-config/common
-share/doc/HTML/en/lilo-config/index.cache.bz2
-share/doc/HTML/en/lilo-config/index.docbook
-share/icons/hicolor/128x128/apps/kpackage.png
+share/icons/hicolor/128x128/apps/ksystemlog.png
 share/icons/hicolor/128x128/apps/kuser.png
-share/icons/hicolor/16x16/apps/kcron.png
 share/icons/hicolor/16x16/apps/knetworkconf.png
-share/icons/hicolor/16x16/apps/kpackage.png
+share/icons/hicolor/16x16/apps/ksystemlog.png
 share/icons/hicolor/16x16/apps/kuser.png
 share/icons/hicolor/22x22/actions/network_connected_lan_knc.png
 share/icons/hicolor/22x22/actions/network_disconnected_lan.png
 share/icons/hicolor/22x22/actions/network_disconnected_wlan.png
 share/icons/hicolor/22x22/actions/network_traffic_wlan.png
-share/icons/hicolor/22x22/apps/kcron.png
 share/icons/hicolor/22x22/apps/knetworkconf.png
-share/icons/hicolor/22x22/apps/kpackage.png
+share/icons/hicolor/22x22/apps/ksystemlog.png
 share/icons/hicolor/22x22/apps/kuser.png
-share/icons/hicolor/32x32/apps/kcron.png
 share/icons/hicolor/32x32/apps/knetworkconf.png
-share/icons/hicolor/32x32/apps/kpackage.png
+share/icons/hicolor/32x32/apps/ksystemlog.png
 share/icons/hicolor/32x32/apps/kuser.png
-share/icons/hicolor/48x48/apps/kpackage.png
+share/icons/hicolor/48x48/apps/ksystemlog.png
 share/icons/hicolor/48x48/apps/kuser.png
-share/icons/hicolor/64x64/apps/kpackage.png
+share/icons/hicolor/64x64/apps/ksystemlog.png
 share/icons/hicolor/64x64/apps/kuser.png
-share/services/kfile_deb.desktop
-share/services/kfile_rpm.desktop
-@dirrm share/doc/HTML/en/lilo-config
+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/ksysv
+@dirrm share/doc/HTML/en/ksystemlog
 @dirrm share/doc/HTML/en/kpackage
 @dirrm share/doc/HTML/en/knetworkconf
-@dirrm share/doc/HTML/en/kdat
 @dirrm share/doc/HTML/en/kcron
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
+@dirrmtry share/config.kcfg
 @dirrm share/apps/kuser/pics
-@dirrm share/apps/kuser/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kuser/icons/crystalsvg/22x22
-@dirrm share/apps/kuser/icons/crystalsvg
+@dirrm share/apps/kuser/icons/oxygen/22x22/actions
+@dirrm share/apps/kuser/icons/oxygen/22x22
+@dirrm share/apps/kuser/icons/oxygen
 @dirrm share/apps/kuser/icons
 @dirrm share/apps/kuser
-@dirrm share/apps/kpackage/pics
-@dirrm share/apps/kpackage
+@dirrm share/apps/ksystemlog
 @dirrm share/apps/knetworkconf/pixmaps
 @dirrm share/apps/knetworkconf/backends
 @dirrm share/apps/knetworkconf
-@dirrm share/apps/kcron
+@dirrmtry share/apps
+@dirrmtry share/applications/kde4
+@dirrmtry share/applications
+@dirrmtry lib/kde4