Please welcome Qt3/KDE3 to our ports tree. This includes work since the

original versions of these ports, so some PORTREVISIONs were bumped.  See
http://freebsd.kde.org/ and mailing lists linked to from there for info
on the packages generated to test these ports.

bsd.kde.mk has already been updated a few days ago to work with these.

Some patches applied to fix a few bugs were:

deskutils/kdepim3:
        [1] Remove kpilot from build because it wasn't ready at release.
editors/koffice-kde3:
        [2] Fix compile time bugs for FreeBSD.
misc/kdeedu3:
        [3] Fix compile problem with kvoctrain.
x11/kdebase3:
        [4] Fix KDM CPU usage and login bug.

Some caveats:
        * All PLISTs are broken for deinstall due to script bug that I
          didn't notice until very recently.  This will be fixed when I
          commit an update tomorrow.  These ports should still install
          perfectly fine though.  They should also deinstall without
          giving errors, but will leave directories behind.
        * You can't install this with any other version of QT or KDE
          already installed.  I am not sure the checks are 100% working,
          but fixes for these will be forthcoming.  This is mainly due
          to a policy decision made by kde@ to make QT/KDE ports install
          the way the rest of the world expects it to while also still
          conforming to FreeBSD's hier(7).  For reference on this decision,
          please consult the KDE/FreeBSD mailing list archives.  This
          decision fixes 2-year-old bug reports relating to how we handled
          this for KDE2 vs KDE1.

Submitted by:   [1] Adrian de Groot <adridg@cs.kun.nl>,
                [2] David Faure <faure@kde.org>,
                    Andy Fawcett <andy@athame.co.uk>
                    Lauri Watts <lauri@kde.org>
                [3] Lauri Watts <lauri@kde.org>
                [4] Alan Eldridge <alane@geeksrus.net>
                    Oswald Buddenhagen <ossi@kde.org>
Reviewed by:    kde

6 files changed, 10 insertions, 222 deletions

diff --git a/x11-themes/kdeartwork3/Makefile b/x11-themes/kdeartwork3/Makefile
index 4e672bc89eae..4f96c4b99360 100644
--- a/x11-themes/kdeartwork3/Makefile
+++ b/x11-themes/kdeartwork3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdeartwork
-PORTVERSION=	2.2.2
+PORTVERSION=	3.0
 CATEGORIES=	x11-wm kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -14,32 +14,14 @@ DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 
-BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
-		automake14:${PORTSDIR}/devel/automake14
-
-USE_KDELIBS_VER=2
+USE_KDEBASE_VER=3
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=
+CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500029
-_NO_KDE_OBJPRELINK=yes
-.endif
-
-.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
-
-pre-configure:
-	${MKDIR} ${WRKSRC}/auto-bin
-.for AC in autoconf autoheader
-	${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC}
-.endfor
-.for AM in automake aclocal
-	${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
-.endfor
-	cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
-		${GMAKE} -f Makefile.cvs
-
 .include <bsd.port.post.mk>
diff --git a/x11-themes/kdeartwork3/distinfo b/x11-themes/kdeartwork3/distinfo
index 67c7c335c2dc..9b596b5b02ab 100644
--- a/x11-themes/kdeartwork3/distinfo
+++ b/x11-themes/kdeartwork3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeartwork-2.2.2.tar.bz2) = afaa475ba7d353453a5fa83d59b9f5e9
+MD5 (KDE/kdeartwork-3.0.tar.bz2) = 0ed66cfed5ce65a6fb54e37e8f232e44
diff --git a/x11-themes/kdeartwork3/pkg-plist b/x11-themes/kdeartwork3/pkg-plist
index 8914a9c30836..e69de29bb2d1 100644
--- a/x11-themes/kdeartwork3/pkg-plist
+++ b/x11-themes/kdeartwork3/pkg-plist
@@ -1,88 +0,0 @@
-lib/b3style.la
-lib/b3style.so
-lib/ksgistyle.la
-lib/ksgistyle.so
-lib/kstephighcolor.la
-lib/kstephighcolor.so
-share/apps/kstyle/themes/b3.themerc
-share/apps/kstyle/themes/ksgistyle.themerc
-share/apps/kstyle/themes/kstep-highcolor.themerc
-share/apps/kwin/icewm-themes/MenschMaschine/closeA.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/closeI.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/default.theme
-share/apps/kwin/icewm-themes/MenschMaschine/frameAB.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameABL.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameABR.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameAL.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameAR.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameAT.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameATL.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameATR.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameIB.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameIBL.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameIBR.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameIL.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameIR.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameIT.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameITL.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameITR.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/maximizeA.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/maximizeI.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/menuButtonA.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/menuButtonI.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/minimizeA.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/minimizeI.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/restoreA.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/restoreI.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/titleAB.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/titleAL.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/titleAM.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/titleAR.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/titleAT.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/titleIB.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/titleIL.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/titleIM.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/titleIR.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/titleIT.xpm
-share/apps/kwin/icewm-themes/Model/closeA.xpm
-share/apps/kwin/icewm-themes/Model/closeI.xpm
-share/apps/kwin/icewm-themes/Model/default.theme
-share/apps/kwin/icewm-themes/Model/frameAB.xpm
-share/apps/kwin/icewm-themes/Model/frameABL.xpm
-share/apps/kwin/icewm-themes/Model/frameABR.xpm
-share/apps/kwin/icewm-themes/Model/frameAL.xpm
-share/apps/kwin/icewm-themes/Model/frameAR.xpm
-share/apps/kwin/icewm-themes/Model/frameAT.xpm
-share/apps/kwin/icewm-themes/Model/frameATL.xpm
-share/apps/kwin/icewm-themes/Model/frameATR.xpm
-share/apps/kwin/icewm-themes/Model/frameIB.xpm
-share/apps/kwin/icewm-themes/Model/frameIBL.xpm
-share/apps/kwin/icewm-themes/Model/frameIBR.xpm
-share/apps/kwin/icewm-themes/Model/frameIL.xpm
-share/apps/kwin/icewm-themes/Model/frameIR.xpm
-share/apps/kwin/icewm-themes/Model/frameIT.xpm
-share/apps/kwin/icewm-themes/Model/frameITL.xpm
-share/apps/kwin/icewm-themes/Model/frameITR.xpm
-share/apps/kwin/icewm-themes/Model/maximizeA.xpm
-share/apps/kwin/icewm-themes/Model/maximizeI.xpm
-share/apps/kwin/icewm-themes/Model/menuButtonA.xpm
-share/apps/kwin/icewm-themes/Model/menuButtonI.xpm
-share/apps/kwin/icewm-themes/Model/minimizeA.xpm
-share/apps/kwin/icewm-themes/Model/minimizeI.xpm
-share/apps/kwin/icewm-themes/Model/restoreA.xpm
-share/apps/kwin/icewm-themes/Model/restoreI.xpm
-share/apps/kwin/icewm-themes/Model/titleAB.xpm
-share/apps/kwin/icewm-themes/Model/titleAL.xpm
-share/apps/kwin/icewm-themes/Model/titleAM.xpm
-share/apps/kwin/icewm-themes/Model/titleAT.xpm
-share/apps/kwin/icewm-themes/Model/titleIB.xpm
-share/apps/kwin/icewm-themes/Model/titleIL.xpm
-share/apps/kwin/icewm-themes/Model/titleIM.xpm
-share/apps/kwin/icewm-themes/Model/titleIT.xpm
-share/sounds/KDE_Logout_new.wav
-share/sounds/KDE_Startup_new.wav
-@dirrm share/sounds
-@dirrm share/apps/kwin/icewm-themes/Model
-@dirrm share/apps/kwin/icewm-themes/MenschMaschine
-@dirrm share/apps/kwin/icewm-themes
-@dirrm share/apps/kwin
diff --git a/x11-themes/kdeartwork4/Makefile b/x11-themes/kdeartwork4/Makefile
index 4e672bc89eae..4f96c4b99360 100644
--- a/x11-themes/kdeartwork4/Makefile
+++ b/x11-themes/kdeartwork4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdeartwork
-PORTVERSION=	2.2.2
+PORTVERSION=	3.0
 CATEGORIES=	x11-wm kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -14,32 +14,14 @@ DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 
-BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
-		automake14:${PORTSDIR}/devel/automake14
-
-USE_KDELIBS_VER=2
+USE_KDEBASE_VER=3
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=
+CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500029
-_NO_KDE_OBJPRELINK=yes
-.endif
-
-.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
-
-pre-configure:
-	${MKDIR} ${WRKSRC}/auto-bin
-.for AC in autoconf autoheader
-	${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC}
-.endfor
-.for AM in automake aclocal
-	${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
-.endfor
-	cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
-		${GMAKE} -f Makefile.cvs
-
 .include <bsd.port.post.mk>
diff --git a/x11-themes/kdeartwork4/distinfo b/x11-themes/kdeartwork4/distinfo
index 67c7c335c2dc..9b596b5b02ab 100644
--- a/x11-themes/kdeartwork4/distinfo
+++ b/x11-themes/kdeartwork4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeartwork-2.2.2.tar.bz2) = afaa475ba7d353453a5fa83d59b9f5e9
+MD5 (KDE/kdeartwork-3.0.tar.bz2) = 0ed66cfed5ce65a6fb54e37e8f232e44
diff --git a/x11-themes/kdeartwork4/pkg-plist b/x11-themes/kdeartwork4/pkg-plist
index 8914a9c30836..e69de29bb2d1 100644
--- a/x11-themes/kdeartwork4/pkg-plist
+++ b/x11-themes/kdeartwork4/pkg-plist
@@ -1,88 +0,0 @@
-lib/b3style.la
-lib/b3style.so
-lib/ksgistyle.la
-lib/ksgistyle.so
-lib/kstephighcolor.la
-lib/kstephighcolor.so
-share/apps/kstyle/themes/b3.themerc
-share/apps/kstyle/themes/ksgistyle.themerc
-share/apps/kstyle/themes/kstep-highcolor.themerc
-share/apps/kwin/icewm-themes/MenschMaschine/closeA.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/closeI.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/default.theme
-share/apps/kwin/icewm-themes/MenschMaschine/frameAB.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameABL.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameABR.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameAL.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameAR.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameAT.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameATL.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameATR.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameIB.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameIBL.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameIBR.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameIL.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameIR.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameIT.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameITL.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/frameITR.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/maximizeA.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/maximizeI.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/menuButtonA.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/menuButtonI.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/minimizeA.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/minimizeI.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/restoreA.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/restoreI.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/titleAB.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/titleAL.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/titleAM.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/titleAR.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/titleAT.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/titleIB.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/titleIL.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/titleIM.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/titleIR.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/titleIT.xpm
-share/apps/kwin/icewm-themes/Model/closeA.xpm
-share/apps/kwin/icewm-themes/Model/closeI.xpm
-share/apps/kwin/icewm-themes/Model/default.theme
-share/apps/kwin/icewm-themes/Model/frameAB.xpm
-share/apps/kwin/icewm-themes/Model/frameABL.xpm
-share/apps/kwin/icewm-themes/Model/frameABR.xpm
-share/apps/kwin/icewm-themes/Model/frameAL.xpm
-share/apps/kwin/icewm-themes/Model/frameAR.xpm
-share/apps/kwin/icewm-themes/Model/frameAT.xpm
-share/apps/kwin/icewm-themes/Model/frameATL.xpm
-share/apps/kwin/icewm-themes/Model/frameATR.xpm
-share/apps/kwin/icewm-themes/Model/frameIB.xpm
-share/apps/kwin/icewm-themes/Model/frameIBL.xpm
-share/apps/kwin/icewm-themes/Model/frameIBR.xpm
-share/apps/kwin/icewm-themes/Model/frameIL.xpm
-share/apps/kwin/icewm-themes/Model/frameIR.xpm
-share/apps/kwin/icewm-themes/Model/frameIT.xpm
-share/apps/kwin/icewm-themes/Model/frameITL.xpm
-share/apps/kwin/icewm-themes/Model/frameITR.xpm
-share/apps/kwin/icewm-themes/Model/maximizeA.xpm
-share/apps/kwin/icewm-themes/Model/maximizeI.xpm
-share/apps/kwin/icewm-themes/Model/menuButtonA.xpm
-share/apps/kwin/icewm-themes/Model/menuButtonI.xpm
-share/apps/kwin/icewm-themes/Model/minimizeA.xpm
-share/apps/kwin/icewm-themes/Model/minimizeI.xpm
-share/apps/kwin/icewm-themes/Model/restoreA.xpm
-share/apps/kwin/icewm-themes/Model/restoreI.xpm
-share/apps/kwin/icewm-themes/Model/titleAB.xpm
-share/apps/kwin/icewm-themes/Model/titleAL.xpm
-share/apps/kwin/icewm-themes/Model/titleAM.xpm
-share/apps/kwin/icewm-themes/Model/titleAT.xpm
-share/apps/kwin/icewm-themes/Model/titleIB.xpm
-share/apps/kwin/icewm-themes/Model/titleIL.xpm
-share/apps/kwin/icewm-themes/Model/titleIM.xpm
-share/apps/kwin/icewm-themes/Model/titleIT.xpm
-share/sounds/KDE_Logout_new.wav
-share/sounds/KDE_Startup_new.wav
-@dirrm share/sounds
-@dirrm share/apps/kwin/icewm-themes/Model
-@dirrm share/apps/kwin/icewm-themes/MenschMaschine
-@dirrm share/apps/kwin/icewm-themes
-@dirrm share/apps/kwin