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).

16 files changed, 130 insertions, 290 deletions

diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 893fc6bedde0..996d5eb01ca0 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -7,15 +7,15 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
 CATEGORIES?=	misc 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
 COMMENT=	Utilities for the KDE integrated X11 desktop
 
+LIB_DEPENDS=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp
 RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 
 CONFLICTS=	kgpg-*
@@ -39,28 +39,14 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
 #klaptop needs APM, which is i386 only
 .if ${MACHINE_ARCH} != "i386"
-WITHOUT_KLAPTOP	=yes
-.endif # ${MACHINE_ARCH} == "alpha"
+WITHOUT_KLAPTOP=yes
+.endif
 
 .if defined(WITHOUT_KLAPTOP)
 DO_NOT_COMPILE+=klaptopdaemon
 .else
-PLIST_APPEND+=	plist.klaptop
-.endif # defined(WITHOUT_KLAPTOP)
-
-# kfloppy is a mostly broken, non-standard, linux-centric pain...
-.if !defined(WITH_KFLOPPY)
-DO_NOT_COMPILE+=kfloppy
-.else
-PLIST_APPEND+=	plist.kfloppy
-.endif # !defined(WITH_KFLOPPY)
-
-.if defined(DO_NOT_COMPILE)
-CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
-.endif # defined(DO_NOT_COMPILE)
-
-.include <bsd.port.pre.mk>
+PLIST_APPEND+=  plist.klaptop
+.endif
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index d41de8f317f4..c54c6de2918f 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdeutils-3.2.0.tar.bz2) = 988480b534c1fab9003f624edb87e7a7
+MD5 (KDE/kdeutils-3.2.1.tar.bz2) = 152030a2912609997d73d7af0bb96d52
+SIZE (KDE/kdeutils-3.2.1.tar.bz2) = 2577558
diff --git a/deskutils/kcharselect/files/plist.base b/deskutils/kcharselect/files/plist.base
index f4fcd9bf5741..acafdf202094 100644
--- a/deskutils/kcharselect/files/plist.base
+++ b/deskutils/kcharselect/files/plist.base
@@ -6,6 +6,7 @@ bin/kdepasswd
 bin/kdessh
 bin/kdf
 bin/kedit
+bin/kfloppy
 bin/kgpg
 bin/khexedit
 bin/kjots
@@ -58,6 +59,8 @@ lib/kde3/ksim_panelextension.la
 lib/kde3/ksim_panelextension.so
 lib/kde3/ksim_sensors.la
 lib/kde3/ksim_sensors.so
+lib/kde3/ksim_snmp.la
+lib/kde3/ksim_snmp.so
 lib/kde3/libarkpart.la
 lib/kde3/libarkpart.so
 lib/kde3/libkbyteseditwidget.la
@@ -80,6 +83,7 @@ lib/libksimcore.so
 lib/libksimcore.so.1
 share/applications/kde/KCharSelect.desktop
 share/applications/kde/KEdit.desktop
+share/applications/kde/KFloppy.desktop
 share/applications/kde/Kjots.desktop
 share/applications/kde/ark.desktop
 share/applications/kde/irkick.desktop
@@ -252,6 +256,7 @@ share/apps/kregexpeditor/predefined/general/spaces.regexp
 share/apps/ksim/monitors/DFree.desktop
 share/apps/ksim/monitors/Lm_sensors.desktop
 share/apps/ksim/monitors/Net.desktop
+share/apps/ksim/monitors/Snmp.desktop
 share/apps/ksim/monitors/cpu.desktop
 share/apps/ksim/monitors/disk.desktop
 share/apps/ksim/pics/clock.png
@@ -392,6 +397,7 @@ share/doc/HTML/en/kwallet/index.cache.bz2
 share/doc/HTML/en/kwallet/index.docbook
 share/icons/crystalsvg/128x128/apps/ark.png
 share/icons/crystalsvg/128x128/apps/kdf.png
+share/icons/crystalsvg/128x128/apps/kfloppy.png
 share/icons/crystalsvg/128x128/apps/ktimer.png
 share/icons/crystalsvg/128x128/apps/kwalletmanager.png
 share/icons/crystalsvg/128x128/apps/kwikdisk.png
@@ -401,6 +407,7 @@ share/icons/crystalsvg/16x16/apps/kcharselect.png
 share/icons/crystalsvg/16x16/apps/kcmdf.png
 share/icons/crystalsvg/16x16/apps/kdf.png
 share/icons/crystalsvg/16x16/apps/kedit.png
+share/icons/crystalsvg/16x16/apps/kfloppy.png
 share/icons/crystalsvg/16x16/apps/kgpg.png
 share/icons/crystalsvg/16x16/apps/khexedit.png
 share/icons/crystalsvg/16x16/apps/kjots.png
@@ -416,6 +423,7 @@ share/icons/crystalsvg/32x32/apps/kcalc.png
 share/icons/crystalsvg/32x32/apps/kcmdf.png
 share/icons/crystalsvg/32x32/apps/kdf.png
 share/icons/crystalsvg/32x32/apps/kedit.png
+share/icons/crystalsvg/32x32/apps/kfloppy.png
 share/icons/crystalsvg/32x32/apps/kgpg.png
 share/icons/crystalsvg/32x32/apps/khexedit.png
 share/icons/crystalsvg/32x32/apps/kjots.png
@@ -428,6 +436,7 @@ share/icons/crystalsvg/48x48/apps/kcalc.png
 share/icons/crystalsvg/48x48/apps/kcharselect.png
 share/icons/crystalsvg/48x48/apps/kdf.png
 share/icons/crystalsvg/48x48/apps/kedit.png
+share/icons/crystalsvg/48x48/apps/kfloppy.png
 share/icons/crystalsvg/48x48/apps/kgpg.png
 share/icons/crystalsvg/48x48/apps/khexedit.png
 share/icons/crystalsvg/48x48/apps/kjots.png
@@ -439,6 +448,7 @@ share/icons/crystalsvg/64x64/apps/ark.png
 share/icons/crystalsvg/64x64/apps/kcalc.png
 share/icons/crystalsvg/64x64/apps/kdf.png
 share/icons/crystalsvg/64x64/apps/kedit.png
+share/icons/crystalsvg/64x64/apps/kfloppy.png
 share/icons/crystalsvg/64x64/apps/kjots.png
 share/icons/crystalsvg/64x64/apps/kwalletmanager.png
 share/icons/crystalsvg/64x64/apps/kwikdisk.png
diff --git a/deskutils/kcharselect/files/plist.kfloppy b/deskutils/kcharselect/files/plist.kfloppy
deleted file mode 100644
index 3b985d193d36..000000000000
--- a/deskutils/kcharselect/files/plist.kfloppy
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/kfloppy
-share/applications/kde/KFloppy.desktop
-share/icons/crystalsvg/128x128/apps/kfloppy.png
-share/icons/crystalsvg/16x16/apps/kfloppy.png
-share/icons/crystalsvg/32x32/apps/kfloppy.png
-share/icons/crystalsvg/48x48/apps/kfloppy.png
-share/icons/crystalsvg/64x64/apps/kfloppy.png
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index 755b6d1ad517..5ad99ec867b3 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -7,16 +7,15 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	deskutils mail news 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
 COMMENT=	Personal Information Management tools for KDE
 
-CONFLICTS=	kdenetwork-3.1*
+CONFLICTS=	kdenetwork-3.1.*
 
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
@@ -31,27 +30,54 @@ INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 KDE_BUILD_PLIST=yes
 
-.if exists(${LOCALBASE}/bin/pilot-link)
+OPTIONS=	KPILOT "Build KPilot, hotsync software for KDE" off \
+		GNOKII "KAdressbook import/export for Nokia phones" off
+
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/bin/pilot-xfer)
+.	if !defined(WITH_KPILOT)
+KPILOT_OVERRIDE=yes
 WITH_KPILOT=	yes
+.	endif
 .endif
 
 .if exists(${LOCALBASE}/bin/gnokii)
+.	if !defined(WITH_GNOKII)
+GNOKII_OVERRIDE=yes
 WITH_GNOKII=	yes
+.	endif
 .endif
 
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.pre.mk>
-
 .if defined(WITH_GNOKII)
-LIB_DEPENDS+=	gnokii.1:${PORTSDIR}/comms/gnokii
+LIB_DEPENDS+=	gnokii:${PORTSDIR}/comms/gnokii
 .endif # defined ($(WITH_GNOKII))
 
 .if defined(WITH_KPILOT)
-LIB_DEPENDS=	mal:${PORTSDIR}/palm/libmal \
+LIB_DEPENDS+=	mal:${PORTSDIR}/palm/libmal \
 		pisock:${PORTSDIR}/palm/pilot-link
 PLIST_APPEND+=	plist.kpilot
 .endif # defined ($(WITH_KPILOT))
 
+pre-everything::
+.if defined(KPILOT_OVERRIDE)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "*******************************************************"
+	@${ECHO_MSG} "* pilot-link is installed but WITH_KPILOT is not set! *"
+	@${ECHO_MSG} "*     WITH_KPILOT has been enabled automatically.     *"
+	@${ECHO_MSG} "*******************************************************"
+	@${ECHO_MSG}
+.endif
+.if defined(GNOKII_OVERRIDE)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "*******************************************************"
+	@${ECHO_MSG} "*    gnokii is installed but WITH_GNOKII is not set!  *"
+	@${ECHO_MSG} "*      WITH_GNOKII has been enabled automatically.    *"
+	@${ECHO_MSG} "*******************************************************"
+	@${ECHO_MSG}
+.endif
+
 pre-configure:
 	${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|-lgnokii|-lgnokii -liconv -lintl|' ${WRKSRC}/configure
diff --git a/deskutils/kdepim3/distinfo b/deskutils/kdepim3/distinfo
index 3146352b8068..37c9dede25a2 100644
--- a/deskutils/kdepim3/distinfo
+++ b/deskutils/kdepim3/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdepim-3.2.0.tar.bz2) = 657a61e0f3d90d2afec3820e77f81306
+MD5 (KDE/kdepim-3.2.1.tar.bz2) = 362bec23869328a85845e0501020c938
+SIZE (KDE/kdepim-3.2.1.tar.bz2) = 7754558
diff --git a/deskutils/kdepim3/files/patch-kmail-kmfilter.cpp b/deskutils/kdepim3/files/patch-kmail-kmfilter.cpp
deleted file mode 100644
index a2f23954cf93..000000000000
--- a/deskutils/kdepim3/files/patch-kmail-kmfilter.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
---- kmail/kmfilter.cpp.orig	Sun Nov 30 10:49:22 2003
-+++ kmail/kmfilter.cpp	Thu Feb  5 13:33:53 2004
-@@ -147,9 +147,18 @@
-   // that the pattern is purified.
-   mPattern.readConfig(config);
- 
--  if (bPopFilter)
-+  if (bPopFilter) {
-     // get the action description...
--    mAction = (KMPopFilterAction) config->readNumEntry( "action" );
-+    QString action = config->readEntry( "action" );
-+    if ( action == "down" )
-+      mAction = Down;
-+    else if ( action == "later" )
-+      mAction = Later;
-+    else if ( action == "delete" )
-+      mAction = Delete;
-+    else
-+      mAction = NoAction;
-+  }
-   else {
-     QStringList sets = config->readListEntry("apply-on");
-     if ( sets.isEmpty() && !config->hasKey("apply-on") ) {
-@@ -210,7 +219,19 @@
-   mPattern.writeConfig(config);
- 
-   if (bPopFilter) {
--    config->writeEntry( "action", mAction );
-+    switch ( mAction ) {
-+    case Down:
-+      config->writeEntry( "action", "down" );
-+      break;
-+    case Later:
-+      config->writeEntry( "action", "later" );
-+      break;
-+    case Delete:
-+      config->writeEntry( "action", "delete" );
-+      break;
-+    default:
-+      config->writeEntry( "action", "" );
-+    }
-   } else {
-     QStringList sets;
-     if ( bApplyOnInbound )
diff --git a/deskutils/kdepim3/files/patch-kmail-kmfolderimap.cpp b/deskutils/kdepim3/files/patch-kmail-kmfolderimap.cpp
deleted file mode 100644
index c27ffe4117aa..000000000000
--- a/deskutils/kdepim3/files/patch-kmail-kmfolderimap.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
---- kmail/kmfolderimap.cpp.orig	Sat Jan 17 13:55:08 2004
-+++ kmail/kmfolderimap.cpp	Thu Feb  5 13:33:38 2004
-@@ -1207,7 +1207,16 @@
- {
-   KURL url = mAccount->getUrl();
-   KMFolderImap *msg_parent = static_cast<KMFolderImap*>(msg->parent());
--  url.setPath(msg_parent->imapPath() + ";UID=" + msg->headerField("X-UID"));
-+  QString uid = msg->headerField("X-UID");
-+  /* If the uid is empty the delete job below will nuke all mail in the 
-+     folder, so we better safeguard against that. See ::expungeFolder, as
-+     to why. :( */
-+  if ( uid.isEmpty() ) {
-+     kdDebug( 5006 ) << "KMFolderImap::deleteMessage: Attempt to delete "
-+                        "an empty UID. Aborting."  << endl;
-+     return;
-+  }
-+  url.setPath(msg_parent->imapPath() + ";UID=" + uid );
-   if ( mAccount->makeConnection() != ImapAccountBase::Connected )
-     return;
-   KIO::SimpleJob *job = KIO::file_delete(url, FALSE);
-@@ -1228,7 +1237,11 @@
-   KMFolderImap *msg_parent = static_cast<KMFolderImap*>(msgList.first()->parent());
-   for ( QStringList::Iterator it = sets.begin(); it != sets.end(); ++it )
-   {
--    url.setPath(msg_parent->imapPath() + ";UID=" + *it);
-+    QString uid = *it;
-+    // Don't delete with no uid, that nukes the folder. Should not happen, but
-+    // better safe than sorry.
-+    if ( uid.isEmpty() ) continue;
-+    url.setPath(msg_parent->imapPath() + ";UID=" + uid);
-     if ( mAccount->makeConnection() != ImapAccountBase::Connected )
-       return;
-     KIO::SimpleJob *job = KIO::file_delete(url, FALSE);
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 755b6d1ad517..5ad99ec867b3 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -7,16 +7,15 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	deskutils mail news 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
 COMMENT=	Personal Information Management tools for KDE
 
-CONFLICTS=	kdenetwork-3.1*
+CONFLICTS=	kdenetwork-3.1.*
 
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
@@ -31,27 +30,54 @@ INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 KDE_BUILD_PLIST=yes
 
-.if exists(${LOCALBASE}/bin/pilot-link)
+OPTIONS=	KPILOT "Build KPilot, hotsync software for KDE" off \
+		GNOKII "KAdressbook import/export for Nokia phones" off
+
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/bin/pilot-xfer)
+.	if !defined(WITH_KPILOT)
+KPILOT_OVERRIDE=yes
 WITH_KPILOT=	yes
+.	endif
 .endif
 
 .if exists(${LOCALBASE}/bin/gnokii)
+.	if !defined(WITH_GNOKII)
+GNOKII_OVERRIDE=yes
 WITH_GNOKII=	yes
+.	endif
 .endif
 
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.pre.mk>
-
 .if defined(WITH_GNOKII)
-LIB_DEPENDS+=	gnokii.1:${PORTSDIR}/comms/gnokii
+LIB_DEPENDS+=	gnokii:${PORTSDIR}/comms/gnokii
 .endif # defined ($(WITH_GNOKII))
 
 .if defined(WITH_KPILOT)
-LIB_DEPENDS=	mal:${PORTSDIR}/palm/libmal \
+LIB_DEPENDS+=	mal:${PORTSDIR}/palm/libmal \
 		pisock:${PORTSDIR}/palm/pilot-link
 PLIST_APPEND+=	plist.kpilot
 .endif # defined ($(WITH_KPILOT))
 
+pre-everything::
+.if defined(KPILOT_OVERRIDE)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "*******************************************************"
+	@${ECHO_MSG} "* pilot-link is installed but WITH_KPILOT is not set! *"
+	@${ECHO_MSG} "*     WITH_KPILOT has been enabled automatically.     *"
+	@${ECHO_MSG} "*******************************************************"
+	@${ECHO_MSG}
+.endif
+.if defined(GNOKII_OVERRIDE)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "*******************************************************"
+	@${ECHO_MSG} "*    gnokii is installed but WITH_GNOKII is not set!  *"
+	@${ECHO_MSG} "*      WITH_GNOKII has been enabled automatically.    *"
+	@${ECHO_MSG} "*******************************************************"
+	@${ECHO_MSG}
+.endif
+
 pre-configure:
 	${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|-lgnokii|-lgnokii -liconv -lintl|' ${WRKSRC}/configure
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index 3146352b8068..37c9dede25a2 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdepim-3.2.0.tar.bz2) = 657a61e0f3d90d2afec3820e77f81306
+MD5 (KDE/kdepim-3.2.1.tar.bz2) = 362bec23869328a85845e0501020c938
+SIZE (KDE/kdepim-3.2.1.tar.bz2) = 7754558
diff --git a/deskutils/kdepim4/files/patch-kmail-kmfilter.cpp b/deskutils/kdepim4/files/patch-kmail-kmfilter.cpp
deleted file mode 100644
index a2f23954cf93..000000000000
--- a/deskutils/kdepim4/files/patch-kmail-kmfilter.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
---- kmail/kmfilter.cpp.orig	Sun Nov 30 10:49:22 2003
-+++ kmail/kmfilter.cpp	Thu Feb  5 13:33:53 2004
-@@ -147,9 +147,18 @@
-   // that the pattern is purified.
-   mPattern.readConfig(config);
- 
--  if (bPopFilter)
-+  if (bPopFilter) {
-     // get the action description...
--    mAction = (KMPopFilterAction) config->readNumEntry( "action" );
-+    QString action = config->readEntry( "action" );
-+    if ( action == "down" )
-+      mAction = Down;
-+    else if ( action == "later" )
-+      mAction = Later;
-+    else if ( action == "delete" )
-+      mAction = Delete;
-+    else
-+      mAction = NoAction;
-+  }
-   else {
-     QStringList sets = config->readListEntry("apply-on");
-     if ( sets.isEmpty() && !config->hasKey("apply-on") ) {
-@@ -210,7 +219,19 @@
-   mPattern.writeConfig(config);
- 
-   if (bPopFilter) {
--    config->writeEntry( "action", mAction );
-+    switch ( mAction ) {
-+    case Down:
-+      config->writeEntry( "action", "down" );
-+      break;
-+    case Later:
-+      config->writeEntry( "action", "later" );
-+      break;
-+    case Delete:
-+      config->writeEntry( "action", "delete" );
-+      break;
-+    default:
-+      config->writeEntry( "action", "" );
-+    }
-   } else {
-     QStringList sets;
-     if ( bApplyOnInbound )
diff --git a/deskutils/kdepim4/files/patch-kmail-kmfolderimap.cpp b/deskutils/kdepim4/files/patch-kmail-kmfolderimap.cpp
deleted file mode 100644
index c27ffe4117aa..000000000000
--- a/deskutils/kdepim4/files/patch-kmail-kmfolderimap.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
---- kmail/kmfolderimap.cpp.orig	Sat Jan 17 13:55:08 2004
-+++ kmail/kmfolderimap.cpp	Thu Feb  5 13:33:38 2004
-@@ -1207,7 +1207,16 @@
- {
-   KURL url = mAccount->getUrl();
-   KMFolderImap *msg_parent = static_cast<KMFolderImap*>(msg->parent());
--  url.setPath(msg_parent->imapPath() + ";UID=" + msg->headerField("X-UID"));
-+  QString uid = msg->headerField("X-UID");
-+  /* If the uid is empty the delete job below will nuke all mail in the 
-+     folder, so we better safeguard against that. See ::expungeFolder, as
-+     to why. :( */
-+  if ( uid.isEmpty() ) {
-+     kdDebug( 5006 ) << "KMFolderImap::deleteMessage: Attempt to delete "
-+                        "an empty UID. Aborting."  << endl;
-+     return;
-+  }
-+  url.setPath(msg_parent->imapPath() + ";UID=" + uid );
-   if ( mAccount->makeConnection() != ImapAccountBase::Connected )
-     return;
-   KIO::SimpleJob *job = KIO::file_delete(url, FALSE);
-@@ -1228,7 +1237,11 @@
-   KMFolderImap *msg_parent = static_cast<KMFolderImap*>(msgList.first()->parent());
-   for ( QStringList::Iterator it = sets.begin(); it != sets.end(); ++it )
-   {
--    url.setPath(msg_parent->imapPath() + ";UID=" + *it);
-+    QString uid = *it;
-+    // Don't delete with no uid, that nukes the folder. Should not happen, but
-+    // better safe than sorry.
-+    if ( uid.isEmpty() ) continue;
-+    url.setPath(msg_parent->imapPath() + ";UID=" + uid);
-     if ( mAccount->makeConnection() != ImapAccountBase::Connected )
-       return;
-     KIO::SimpleJob *job = KIO::file_delete(url, FALSE);
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index 755b6d1ad517..5ad99ec867b3 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -7,16 +7,15 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	deskutils mail news 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
 COMMENT=	Personal Information Management tools for KDE
 
-CONFLICTS=	kdenetwork-3.1*
+CONFLICTS=	kdenetwork-3.1.*
 
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
@@ -31,27 +30,54 @@ INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 KDE_BUILD_PLIST=yes
 
-.if exists(${LOCALBASE}/bin/pilot-link)
+OPTIONS=	KPILOT "Build KPilot, hotsync software for KDE" off \
+		GNOKII "KAdressbook import/export for Nokia phones" off
+
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/bin/pilot-xfer)
+.	if !defined(WITH_KPILOT)
+KPILOT_OVERRIDE=yes
 WITH_KPILOT=	yes
+.	endif
 .endif
 
 .if exists(${LOCALBASE}/bin/gnokii)
+.	if !defined(WITH_GNOKII)
+GNOKII_OVERRIDE=yes
 WITH_GNOKII=	yes
+.	endif
 .endif
 
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.pre.mk>
-
 .if defined(WITH_GNOKII)
-LIB_DEPENDS+=	gnokii.1:${PORTSDIR}/comms/gnokii
+LIB_DEPENDS+=	gnokii:${PORTSDIR}/comms/gnokii
 .endif # defined ($(WITH_GNOKII))
 
 .if defined(WITH_KPILOT)
-LIB_DEPENDS=	mal:${PORTSDIR}/palm/libmal \
+LIB_DEPENDS+=	mal:${PORTSDIR}/palm/libmal \
 		pisock:${PORTSDIR}/palm/pilot-link
 PLIST_APPEND+=	plist.kpilot
 .endif # defined ($(WITH_KPILOT))
 
+pre-everything::
+.if defined(KPILOT_OVERRIDE)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "*******************************************************"
+	@${ECHO_MSG} "* pilot-link is installed but WITH_KPILOT is not set! *"
+	@${ECHO_MSG} "*     WITH_KPILOT has been enabled automatically.     *"
+	@${ECHO_MSG} "*******************************************************"
+	@${ECHO_MSG}
+.endif
+.if defined(GNOKII_OVERRIDE)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "*******************************************************"
+	@${ECHO_MSG} "*    gnokii is installed but WITH_GNOKII is not set!  *"
+	@${ECHO_MSG} "*      WITH_GNOKII has been enabled automatically.    *"
+	@${ECHO_MSG} "*******************************************************"
+	@${ECHO_MSG}
+.endif
+
 pre-configure:
 	${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|-lgnokii|-lgnokii -liconv -lintl|' ${WRKSRC}/configure
diff --git a/deskutils/kdepim44/distinfo b/deskutils/kdepim44/distinfo
index 3146352b8068..37c9dede25a2 100644
--- a/deskutils/kdepim44/distinfo
+++ b/deskutils/kdepim44/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdepim-3.2.0.tar.bz2) = 657a61e0f3d90d2afec3820e77f81306
+MD5 (KDE/kdepim-3.2.1.tar.bz2) = 362bec23869328a85845e0501020c938
+SIZE (KDE/kdepim-3.2.1.tar.bz2) = 7754558
diff --git a/deskutils/kdepim44/files/patch-kmail-kmfilter.cpp b/deskutils/kdepim44/files/patch-kmail-kmfilter.cpp
deleted file mode 100644
index a2f23954cf93..000000000000
--- a/deskutils/kdepim44/files/patch-kmail-kmfilter.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
---- kmail/kmfilter.cpp.orig	Sun Nov 30 10:49:22 2003
-+++ kmail/kmfilter.cpp	Thu Feb  5 13:33:53 2004
-@@ -147,9 +147,18 @@
-   // that the pattern is purified.
-   mPattern.readConfig(config);
- 
--  if (bPopFilter)
-+  if (bPopFilter) {
-     // get the action description...
--    mAction = (KMPopFilterAction) config->readNumEntry( "action" );
-+    QString action = config->readEntry( "action" );
-+    if ( action == "down" )
-+      mAction = Down;
-+    else if ( action == "later" )
-+      mAction = Later;
-+    else if ( action == "delete" )
-+      mAction = Delete;
-+    else
-+      mAction = NoAction;
-+  }
-   else {
-     QStringList sets = config->readListEntry("apply-on");
-     if ( sets.isEmpty() && !config->hasKey("apply-on") ) {
-@@ -210,7 +219,19 @@
-   mPattern.writeConfig(config);
- 
-   if (bPopFilter) {
--    config->writeEntry( "action", mAction );
-+    switch ( mAction ) {
-+    case Down:
-+      config->writeEntry( "action", "down" );
-+      break;
-+    case Later:
-+      config->writeEntry( "action", "later" );
-+      break;
-+    case Delete:
-+      config->writeEntry( "action", "delete" );
-+      break;
-+    default:
-+      config->writeEntry( "action", "" );
-+    }
-   } else {
-     QStringList sets;
-     if ( bApplyOnInbound )
diff --git a/deskutils/kdepim44/files/patch-kmail-kmfolderimap.cpp b/deskutils/kdepim44/files/patch-kmail-kmfolderimap.cpp
deleted file mode 100644
index c27ffe4117aa..000000000000
--- a/deskutils/kdepim44/files/patch-kmail-kmfolderimap.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
---- kmail/kmfolderimap.cpp.orig	Sat Jan 17 13:55:08 2004
-+++ kmail/kmfolderimap.cpp	Thu Feb  5 13:33:38 2004
-@@ -1207,7 +1207,16 @@
- {
-   KURL url = mAccount->getUrl();
-   KMFolderImap *msg_parent = static_cast<KMFolderImap*>(msg->parent());
--  url.setPath(msg_parent->imapPath() + ";UID=" + msg->headerField("X-UID"));
-+  QString uid = msg->headerField("X-UID");
-+  /* If the uid is empty the delete job below will nuke all mail in the 
-+     folder, so we better safeguard against that. See ::expungeFolder, as
-+     to why. :( */
-+  if ( uid.isEmpty() ) {
-+     kdDebug( 5006 ) << "KMFolderImap::deleteMessage: Attempt to delete "
-+                        "an empty UID. Aborting."  << endl;
-+     return;
-+  }
-+  url.setPath(msg_parent->imapPath() + ";UID=" + uid );
-   if ( mAccount->makeConnection() != ImapAccountBase::Connected )
-     return;
-   KIO::SimpleJob *job = KIO::file_delete(url, FALSE);
-@@ -1228,7 +1237,11 @@
-   KMFolderImap *msg_parent = static_cast<KMFolderImap*>(msgList.first()->parent());
-   for ( QStringList::Iterator it = sets.begin(); it != sets.end(); ++it )
-   {
--    url.setPath(msg_parent->imapPath() + ";UID=" + *it);
-+    QString uid = *it;
-+    // Don't delete with no uid, that nukes the folder. Should not happen, but
-+    // better safe than sorry.
-+    if ( uid.isEmpty() ) continue;
-+    url.setPath(msg_parent->imapPath() + ";UID=" + uid);
-     if ( mAccount->makeConnection() != ImapAccountBase::Connected )
-       return;
-     KIO::SimpleJob *job = KIO::file_delete(url, FALSE);