Update to KDE 3.2.1 / QT 3.3.1

Important changes:
==================

KDE:

- Audio/arts does not install artswrapper anymore, instead it is provided by
  audio/artswrapper. See UPDATING.

- misc/kdeaddons3 is now a metaport with

	editors/kate-plugins
	editors/vimpart
	games/atlantikdesigner
	misc/kaddressbook-plugins
	misc/kfile-plugins
	misc/kicker-applets
	misc/knewsticker-scripts
	misc/konq-plugins
	misc/ksig
	misc/renamedlgplugins
	multimedia/noatun-plugins
	net/kontact-plugins

  as slave ports.

- A number of KDE ports now uses OPTIONS do make various WITH_* options more
  visible.

- Plist fixes

- devel/kdevelop should be able to detect FreeBSD's autoconf/automake now for
  newly created projects.

- kdebase will no longer remove previous KDM configurations. This won't take
  effect during the update from 3.2.0 to 3.2.1 (as deinstalling 3.2.0 will still
  remove the configuration), but subsequent updates will merge old configs.

QT:

- Previous versions of QT could be compiled with debugging-support enabled by
  defining DEBUG. This switch has been renamed to the more unambiguous
  WANT_QT_DEBUG (similar to WANT_KDE_DEBUG in the KDE ports).

6 files changed, 84 insertions, 63 deletions

diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 7d257ddd8199..595550df90f8 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -8,10 +8,9 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 kde
 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
@@ -39,37 +38,53 @@ CONFIGURE_ARGS+=--without-java			\
 		--with-qt-dir=${X11BASE}	\
 		--with-xdmdir=${X11BASE}/lib/X11/xdm
 
+OPTIONS=	ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \
+		MOTIF       "Support Netscape plugins, requires openmotif" on
+
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_MOTIF)
-CONFIGURE_ARGS+=	--without-motif
-.else
+.if exists(${X11BASE}/bin/mwm)
+.	if	!defined(WITH_MOTIF)
+MOTIF_OVERRIDE=	yes
+WITH_MOTIF=	yes
+.	endif
+.endif
+
+.if defined(WITH_ARTSWRAPPER)
+RUN_DEPENDS+=	artswrapper:${PORTSDIR}/audio/artswrapper
+.endif
+
+.if defined(WITH_MOTIF)
 USE_MOTIF=	yes
 PLIST_APPEND+=	plist.motif
+.else
+CONFIGURE_ARGS+=	--without-motif
+.endif
 
-pre-extract::
-	@${ECHO_MSG}
-	@${ECHO_MSG} "If you want to compile WITHOUT Motif support, hit"
-	@${ECHO_MSG} "Ctrl-C right now and use \"make WITHOUT_MOTIF=yes\""
+pre-everything::
+.if defined(MOTIF_OVERRIDE)
 	@${ECHO_MSG}
-	@${ECHO_MSG} "This will DISABLE netscape plugin compatibility."
+	@${ECHO_MSG} "*******************************************************"
+	@${ECHO_MSG} "*  openmotif is installed but WITH_MOTIF is not set!  *"
+	@${ECHO_MSG} "*     WITH_MOTIF has been enabled automatically.      *"
+	@${ECHO_MSG} "*******************************************************"
 	@${ECHO_MSG}
-.endif # defined(WITHOUT_MOTIF)
+.endif
 
 post-extract:
 	@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
 	@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
 
 post-configure:
-	${REINPLACE_CMD} -e "s@genkdmconf --in@genkdmconf --no-old --in@" \
-		${WRKSRC}/kdm/kfrontend/Makefile
 	${REINPLACE_CMD} -e "s@^\s*Exec=.*\$$@Exec=ElectricEyes@" \
 		${WRKSRC}/kappfinder/apps/Graphics/ElectricEyes.desktop
 	${REINPLACE_CMD} -e 's/444/644/g' \
 		${WRKSRC}/kdesktop/init/Templates/Makefile
 
 post-install:
+	${LOCALBASE}/bin/genkdmconf --no-old --in ${PREFIX}/share/config/kdm/default
+	${LOCALBASE}/bin/genkdmconf --no-backup --no-old-scripts --in ${PREFIX}/share/config/kdm
 	${RM} -f ${PREFIX}/share/apps/konsole/linux.desktop
 	${CHMOD} u+s ${PREFIX}/bin/kcheckpass
 	${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \
diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo
index 5d536db80794..666a941bc727 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdebase-3.2.0.tar.bz2) = 9d05be3ccd6cc0294d6153e5d4dfa63a
+MD5 (KDE/kdebase-3.2.1.tar.bz2) = 3a3d89b0b49dbb1eaa9e71c83019bbef
+SIZE (KDE/kdebase-3.2.1.tar.bz2) = 17131336
diff --git a/x11/kde4-baseapps/files/patch-kcontrol-arts.cpp b/x11/kde4-baseapps/files/patch-kcontrol-arts.cpp
index e0e5a92ce25d..df11b254f150 100644
--- a/x11/kde4-baseapps/files/patch-kcontrol-arts.cpp
+++ b/x11/kde4-baseapps/files/patch-kcontrol-arts.cpp
@@ -1,39 +1,20 @@
-Index: kcontrol/arts/arts.cpp
-===================================================================
-RCS file: /home/kde/kdebase/kcontrol/arts/arts.cpp,v
-retrieving revision 1.100
-diff -u -3 -p -r1.100 arts.cpp
---- kcontrol/arts/arts.cpp	8 Nov 2003 23:43:47 -0000	1.100
-+++ kcontrol/arts/arts.cpp	29 Jan 2004 11:59:29 -0000
-@@ -51,6 +51,7 @@
- //#include <kparts/componentfactory.h>
- //#include "midi.h"
- #include "arts.h"
-+#include <arts/artsversion.h>
+--- kcontrol/arts/arts.cpp.orig	Fri Mar  5 12:15:10 2004
++++ kcontrol/arts/arts.cpp	Fri Mar  5 12:08:16 2004
+@@ -541,13 +541,13 @@
  
- extern "C" {
- 	void init_arts();
-@@ -601,7 +602,11 @@ void init_arts()
- 	config->setGroup("Arts");
- 	bool startServer = config->readBoolEntry("StartServer",true);
- 	bool startRealtime = config->readBoolEntry("StartRealtime",true);
-+#if ARTS_MAJOR_VERSION >= 1 && ARTS_MINOR_VERSION >= 2
- 	QString args = config->readEntry("Arguments","-F 10 -S 4096 -s 60 -m artsmessage -c drkonqi -l 3 -f");
-+#else
-+	QString args = config->readEntry("Arguments","-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f");
-+#endif
- 
- 	delete config;
- 
-@@ -652,7 +657,11 @@ QString KArtsModule::createArgs(bool net
- 		args += QChar(' ') + addOptions;
- 
- 	args += QString::fromLatin1(" -m artsmessage");
+ 	connect(checkProcess, SIGNAL(processExited(KProcess*)),
+ 	        this, SLOT(slotArtsdExited(KProcess*)));
+-	checkProcess->start(KProcess::Block);
+-
+-	if (latestProcessStatus == 0)
++	if (checkProcess->start(KProcess::Block) == false)
++		realtimePossible =  false;
++	else if (latestProcessStatus == 0)
+ 		realtimePossible =  true;
+ 	else
+ 		realtimePossible =  false;
+-	
 +
-+#if ARTS_MAJOR_VERSION >= 1 && ARTS_MINOR_VERSION >= 2
- 	args += QString::fromLatin1(" -c drkonqi");
-+#endif
-+
- 	args += QString::fromLatin1(" -l 3");
- 	args += QString::fromLatin1(" -f");
- 
+ 	checked = true;
+ 	
+ 	}
diff --git a/x11/kde4-baseapps/files/patch-kdm-kfrontend-Makefile.in b/x11/kde4-baseapps/files/patch-kdm-kfrontend-Makefile.in
new file mode 100644
index 000000000000..a81fd6da8f38
--- /dev/null
+++ b/x11/kde4-baseapps/files/patch-kdm-kfrontend-Makefile.in
@@ -0,0 +1,12 @@
+--- kdm/kfrontend/Makefile.in.orig	Wed Feb 25 14:57:47 2004
++++ kdm/kfrontend/Makefile.in	Wed Feb 25 14:58:17 2004
+@@ -1149,9 +1149,6 @@
+ 	uninstall-kde_moduleLTLIBRARIES uninstall-recursive
+ 
+ 
+-install-data-local: genkdmconf
+-	./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS)
+-
+ messages:
+ 	$(XGETTEXT) $(kdm_greet_SOURCES) -o $(podir)/kdmgreet.pot
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/x11/kde4-baseapps/files/plist.base b/x11/kde4-baseapps/files/plist.base
index a4a50bea8ee8..a2ca93fb2e3c 100644
--- a/x11/kde4-baseapps/files/plist.base
+++ b/x11/kde4-baseapps/files/plist.base
@@ -1,3 +1,13 @@
+@unexec if cmp -s %D/share/config/kdm/README %D/share/config/kdm/default/README; then rm -f %D/share/config/kdm/README; fi
+@unexec if cmp -s %D/share/config/kdm/Xaccess %D/share/config/kdm/default/Xaccess; then rm -f %D/share/config/kdm/Xaccess; fi
+@unexec if cmp -s %D/share/config/kdm/Xreset %D/share/config/kdm/default/Xreset; then rm -f %D/share/config/kdm/Xreset; fi
+@unexec if cmp -s %D/share/config/kdm/Xservers %D/share/config/kdm/default/Xservers; then rm -f %D/share/config/kdm/Xservers; fi
+@unexec if cmp -s %D/share/config/kdm/Xsession %D/share/config/kdm/default/Xsession; then rm -f %D/share/config/kdm/Xsession; fi
+@unexec if cmp -s %D/share/config/kdm/Xsetup %D/share/config/kdm/default/Xsetup; then rm -f %D/share/config/kdm/Xsetup; fi
+@unexec if cmp -s %D/share/config/kdm/Xstartup %D/share/config/kdm/default/Xstartup; then rm -f %D/share/config/kdm/Xstartup; fi
+@unexec if cmp -s %D/share/config/kdm/Xwilling %D/share/config/kdm/default/Xwilling; then rm -f %D/share/config/kdm/Xwilling; fi
+@unexec if cmp -s %D/share/config/kdm/backgroundrc %D/share/config/kdm/default/backgroundrc; then rm -f %D/share/config/kdm/backgroundrc; fi
+@unexec if cmp -s %D/share/config/kdm/kdmrc %D/share/config/kdm/default/kdmrc; then rm -f %D/share/config/kdm/kdmrc; fi
 bin/appletproxy
 bin/drkonqi
 bin/extensionproxy
@@ -136,7 +146,6 @@ lib/kde3/appletproxy.la
 lib/kde3/appletproxy.so
 lib/kde3/childpanel_panelextension.la
 lib/kde3/childpanel_panelextension.so
-lib/kde3/childpanel_panelextension.so.0
 lib/kde3/clock_panelapplet.la
 lib/kde3/clock_panelapplet.so
 lib/kde3/cursorthumbnail.la
@@ -435,7 +444,6 @@ lib/kde3/kxkb.la
 lib/kde3/kxkb.so
 lib/kde3/launcher_panelapplet.la
 lib/kde3/launcher_panelapplet.so
-lib/kde3/launcher_panelapplet.so.0
 lib/kde3/libkdeprint_part.la
 lib/kde3/libkdeprint_part.so
 lib/kde3/libkfindpart.la
@@ -828,6 +836,7 @@ share/apps/kappfinder/apps/Internet/knews.desktop
 share/apps/kappfinder/apps/Internet/licq.desktop
 share/apps/kappfinder/apps/Internet/mldonkey_gui.desktop
 share/apps/kappfinder/apps/Internet/mozilla-firebird.desktop
+share/apps/kappfinder/apps/Internet/mozilla-firefox.desktop
 share/apps/kappfinder/apps/Internet/mozilla-thunderbird.desktop
 share/apps/kappfinder/apps/Internet/mozilla.desktop
 share/apps/kappfinder/apps/Internet/netscape.desktop
@@ -960,6 +969,7 @@ share/apps/kconf_update/klipper-1-2.pl
 share/apps/kconf_update/klipper-kde31.sh
 share/apps/kconf_update/klipperrc.upd
 share/apps/kconf_update/klippershortcuts.upd
+share/apps/kconf_update/konqueror_gestures_kde321_update.upd
 share/apps/kconf_update/konsole.upd
 share/apps/kconf_update/ksmserver.upd
 share/apps/kconf_update/kuriikwsfilter.upd
@@ -1177,6 +1187,7 @@ share/apps/khelpcenter/plugins/userguide.desktop
 share/apps/khelpcenter/plugins/welcome.desktop
 share/apps/khelpcenter/table-of-contents.xslt
 share/apps/khotkeys/kde32b1.khotkeys
+share/apps/khotkeys/konqueror_gestures_kde321.khotkeys
 share/apps/kicker/applets/clockapplet.desktop
 share/apps/kicker/applets/devicesapplet.desktop
 share/apps/kicker/applets/klipper.desktop
@@ -1582,16 +1593,16 @@ share/autostart/kwrited.desktop
 share/autostart/panel.desktop
 share/config/kdesktop_custom_menu1
 share/config/kdesktop_custom_menu2
-share/config/kdm/README
-share/config/kdm/Xaccess
-share/config/kdm/Xreset
-share/config/kdm/Xservers
-share/config/kdm/Xsession
-share/config/kdm/Xsetup
-share/config/kdm/Xstartup
-share/config/kdm/Xwilling
-share/config/kdm/backgroundrc
-share/config/kdm/kdmrc
+share/config/kdm/default/README
+share/config/kdm/default/Xaccess
+share/config/kdm/default/Xreset
+share/config/kdm/default/Xservers
+share/config/kdm/default/Xsession
+share/config/kdm/default/Xsetup
+share/config/kdm/default/Xstartup
+share/config/kdm/default/Xwilling
+share/config/kdm/default/backgroundrc
+share/config/kdm/default/kdmrc
 share/config/klipperrc
 share/config/konqsidebartng.rc
 share/config/kshorturifilterrc
diff --git a/x11/kde4-baseapps/files/plist.base.rm b/x11/kde4-baseapps/files/plist.base.rm
index 9dce67c3924d..cea00d682fcd 100644
--- a/x11/kde4-baseapps/files/plist.base.rm
+++ b/x11/kde4-baseapps/files/plist.base.rm
@@ -377,6 +377,7 @@
 @dirrm share/doc/HTML/en
 @dirrm share/doc/HTML
 @dirrm share/desktop-directories
+@dirrm share/config/kdm/default
 @dirrm share/config/kdm
 @dirrm share/config
 @dirrm share/autostart