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

9 files changed, 31 insertions, 88 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 9470e24ccbd4..9e05b1cbc247 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -137,6 +137,7 @@
     SUBDIR += juno-2
     SUBDIR += kdc2tiff
     SUBDIR += kdegraphics2
+    SUBDIR += kdegraphics3
     SUBDIR += kisomandel
     SUBDIR += kuickshow
     SUBDIR += landscape
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 7e907f21dd23..a849320ab964 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	kdegraphics
-PORTVERSION=	2.2.2
-PORTREVISION=	2
+PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -15,25 +15,22 @@ DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 
-BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
-		automake14:${PORTSDIR}/devel/automake14
-RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu
-
-USE_KDELIBS_VER=2
+USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=
+CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 CONFIGURE_ARGS+=--without-kamera
-
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500029
-_NO_KDE_OBJPRELINK=yes
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL)
+CONFIGURE_ARGS+=--enable-final
+.endif
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG)
+CONFIGURE_ARGS+=--disable-debug
 .endif
 
-.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
+.include <bsd.port.pre.mk>
 
 # temporarily disable kamera, it requires gphoto2
 PLIST_SUB+=	KAMERA="@comment "
@@ -56,20 +53,4 @@ pre-everything::
 	@${ECHO_MSG}
 .endif
 
-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
-	${PERL} -pi -e "s@libkscan_la_LIBADD =@libkscan_la_LIBADD= -lintl@g" ${WRKSRC}/libkscan/Makefile.in
-	${PERL} -pi -e "s@libkcm_kamera_la_LIBADD =@libkcm_kamera_la_LIBADD= -lintl@g" ${WKRSRC}/kamera/kcontrol/Makefile.in
-	${PERL} -pi -e "s@name = item@name=(char*)item@g" ${WRKSRC}/kamera/kcontrol/kamera.cpp
-	find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
-		"s@GPHOTO2_LIBS =@GPHOTO2_LIBS= -lintl@g"
-
 .include <bsd.port.post.mk>
diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo
index 2369e2cdb937..a2d9ff6259d8 100644
--- a/graphics/kdegraphics3/distinfo
+++ b/graphics/kdegraphics3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdegraphics-2.2.2.tar.bz2) = b9341505c6b9de8f018dd9d1896356e9
+MD5 (KDE/kdegraphics-3.0.tar.bz2) = e90e7df47c51c10355b4f034f5e74788
diff --git a/graphics/kdegraphics3/files/patch-font.cpp b/graphics/kdegraphics3/files/patch-font.cpp
deleted file mode 100644
index 6c124a48a8b5..000000000000
--- a/graphics/kdegraphics3/files/patch-font.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdvi/font.cpp	Fri Nov  9 21:20:17 2001
-+++ kdvi/font.cpp.new	Mon Dec 10 22:48:01 2001
-@@ -3,7 +3,6 @@
- 
- #include <kdebug.h>
- #include <klocale.h>
--#include <malloc.h>
- #include <qapplication.h>
- #include <qfile.h>
- #include <stdio.h>
diff --git a/graphics/kdegraphics3/pkg-plist b/graphics/kdegraphics3/pkg-plist
index 13fa5a861549..9e4307a74b95 100644
--- a/graphics/kdegraphics3/pkg-plist
+++ b/graphics/kdegraphics3/pkg-plist
@@ -5,7 +5,7 @@ bin/kfax
 bin/kfract
 bin/kghostview
 bin/kiconedit
-%%SANE%%bin/kooka
+bin/kooka
 bin/kpaint
 bin/kruler
 bin/ksnapshot
@@ -239,8 +239,8 @@ share/icons/locolor/32x32/apps/kcoloredit.png
 @dirrm share/apps/kruler
 @dirrm share/apps/kpaint/toolbar
 @dirrm share/apps/kpaint
-%%SANE%%@dirrm share/apps/kooka/pics
-%%SANE%%@dirrm share/apps/kooka
+@dirrm share/apps/kooka/pics
+@dirrm share/apps/kooka
 @dirrm share/apps/kiconedit/toolbar
 @dirrm share/apps/kiconedit/pics
 @dirrm share/apps/kiconedit
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index 7e907f21dd23..a849320ab964 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	kdegraphics
-PORTVERSION=	2.2.2
-PORTREVISION=	2
+PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -15,25 +15,22 @@ DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 
-BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
-		automake14:${PORTSDIR}/devel/automake14
-RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu
-
-USE_KDELIBS_VER=2
+USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=
+CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 CONFIGURE_ARGS+=--without-kamera
-
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500029
-_NO_KDE_OBJPRELINK=yes
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL)
+CONFIGURE_ARGS+=--enable-final
+.endif
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG)
+CONFIGURE_ARGS+=--disable-debug
 .endif
 
-.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
+.include <bsd.port.pre.mk>
 
 # temporarily disable kamera, it requires gphoto2
 PLIST_SUB+=	KAMERA="@comment "
@@ -56,20 +53,4 @@ pre-everything::
 	@${ECHO_MSG}
 .endif
 
-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
-	${PERL} -pi -e "s@libkscan_la_LIBADD =@libkscan_la_LIBADD= -lintl@g" ${WRKSRC}/libkscan/Makefile.in
-	${PERL} -pi -e "s@libkcm_kamera_la_LIBADD =@libkcm_kamera_la_LIBADD= -lintl@g" ${WKRSRC}/kamera/kcontrol/Makefile.in
-	${PERL} -pi -e "s@name = item@name=(char*)item@g" ${WRKSRC}/kamera/kcontrol/kamera.cpp
-	find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
-		"s@GPHOTO2_LIBS =@GPHOTO2_LIBS= -lintl@g"
-
 .include <bsd.port.post.mk>
diff --git a/graphics/kdegraphics4/distinfo b/graphics/kdegraphics4/distinfo
index 2369e2cdb937..a2d9ff6259d8 100644
--- a/graphics/kdegraphics4/distinfo
+++ b/graphics/kdegraphics4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdegraphics-2.2.2.tar.bz2) = b9341505c6b9de8f018dd9d1896356e9
+MD5 (KDE/kdegraphics-3.0.tar.bz2) = e90e7df47c51c10355b4f034f5e74788
diff --git a/graphics/kdegraphics4/files/patch-font.cpp b/graphics/kdegraphics4/files/patch-font.cpp
deleted file mode 100644
index 6c124a48a8b5..000000000000
--- a/graphics/kdegraphics4/files/patch-font.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdvi/font.cpp	Fri Nov  9 21:20:17 2001
-+++ kdvi/font.cpp.new	Mon Dec 10 22:48:01 2001
-@@ -3,7 +3,6 @@
- 
- #include <kdebug.h>
- #include <klocale.h>
--#include <malloc.h>
- #include <qapplication.h>
- #include <qfile.h>
- #include <stdio.h>
diff --git a/graphics/kdegraphics4/pkg-plist b/graphics/kdegraphics4/pkg-plist
index 13fa5a861549..9e4307a74b95 100644
--- a/graphics/kdegraphics4/pkg-plist
+++ b/graphics/kdegraphics4/pkg-plist
@@ -5,7 +5,7 @@ bin/kfax
 bin/kfract
 bin/kghostview
 bin/kiconedit
-%%SANE%%bin/kooka
+bin/kooka
 bin/kpaint
 bin/kruler
 bin/ksnapshot
@@ -239,8 +239,8 @@ share/icons/locolor/32x32/apps/kcoloredit.png
 @dirrm share/apps/kruler
 @dirrm share/apps/kpaint/toolbar
 @dirrm share/apps/kpaint
-%%SANE%%@dirrm share/apps/kooka/pics
-%%SANE%%@dirrm share/apps/kooka
+@dirrm share/apps/kooka/pics
+@dirrm share/apps/kooka
 @dirrm share/apps/kiconedit/toolbar
 @dirrm share/apps/kiconedit/pics
 @dirrm share/apps/kiconedit