Factor out all but one of the build switches of the KDE main module ports

into separate ports. The OPTIONS will remain as of yet and trigger dependencies
now, for easy transition.

Update KOffice to version 1.3.2.

Add patches to fix a number of issues, including:

- fix kxkb on Xorg
- fix kdemultimedia WITH_MPEGLIB (now mpeglib_artsplug) compilation on gcc 3.4.2
  with optimizations greater than -O

Add security related patches and entries to portaudit.txt.

5 files changed, 79 insertions, 175 deletions

diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index f56bc6dbd9e4..a141191c4ea4 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -23,29 +24,24 @@ CONFLICTS=	kgpg-*
 USE_KDELIBS_VER=3
 USE_KDEBASE_VER=3
 PREFIX=		${KDE_PREFIX}
-KDE_BUILD_PLIST=yes
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
-DO_NOT_COMPILE+=kmilo
+DO_NOT_COMPILE+=klaptopdaemon kmilo
 CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 
-CONFLICTS=	kgpg-*
+CONFLICTS=	kgpg-[0-9]*
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
-#klaptop needs APM, which is i386 only
-.if ${MACHINE_ARCH} != "i386"
-WITHOUT_KLAPTOP=yes
-.endif
+.include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_KLAPTOP)
-DO_NOT_COMPILE+=klaptopdaemon
-.else
-PLIST_APPEND+=	plist.klaptop
+#klaptop needs APM, which is i386 only
+.if ${ARCH} == "i386"
+RUN_DEPENDS+=	klaptop_check:${PORTSDIR}/sysutils/klaptopdaemon
 .endif
 
 post-configure:
@@ -53,4 +49,4 @@ post-configure:
 		${WRKSRC}/config.h
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/sweeper/files/plist.base.rm b/sysutils/sweeper/files/plist.base.rm
deleted file mode 100644
index a81794f7c7a6..000000000000
--- a/sysutils/sweeper/files/plist.base.rm
+++ /dev/null
@@ -1,116 +0,0 @@
-@dirrm share/services
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/22x22/apps
-@dirrm share/icons/hicolor/22x22
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
-@dirrm share/icons/hicolor
-@dirrm share/icons/crystalsvg/64x64/apps
-@dirrm share/icons/crystalsvg/64x64
-@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/48x48
-@dirrm share/icons/crystalsvg/32x32/apps
-@dirrm share/icons/crystalsvg/32x32
-@dirrm share/icons/crystalsvg/22x22/apps
-@dirrm share/icons/crystalsvg/22x22
-@dirrm share/icons/crystalsvg/16x16/devices
-@dirrm share/icons/crystalsvg/16x16/apps
-@dirrm share/icons/crystalsvg/16x16
-@dirrm share/icons/crystalsvg/128x128/apps
-@dirrm share/icons/crystalsvg/128x128
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
-@dirrm share/doc/HTML/en/kwallet
-@dirrm share/doc/HTML/en/ktimer
-@dirrm share/doc/HTML/en/ksim
-@dirrm share/doc/HTML/en/kjots
-@dirrm share/doc/HTML/en/kinfocenter/blockdevices
-@dirrm share/doc/HTML/en/kinfocenter
-@dirrm share/doc/HTML/en/khexedit
-@dirrm share/doc/HTML/en/kgpg
-@dirrm share/doc/HTML/en/kfloppy
-@dirrm share/doc/HTML/en/kedit
-@dirrm share/doc/HTML/en/kdf
-@dirrm share/doc/HTML/en/kcontrol/powerctrl
-@dirrm share/doc/HTML/en/kcontrol/laptop
-@dirrm share/doc/HTML/en/kcontrol/kcmlowbatwarn
-@dirrm share/doc/HTML/en/kcontrol/kcmlowbatcrit
-@dirrm share/doc/HTML/en/kcontrol
-@dirrm share/doc/HTML/en/kcmlirc
-@dirrm share/doc/HTML/en/kcharselect
-@dirrm share/doc/HTML/en/kcalc
-@dirrm share/doc/HTML/en/irkick
-@dirrm share/doc/HTML/en/ark
-@dirrm share/doc/HTML/en/KRegExpEditor
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
-@dirrm share/config.kcfg
-@dirrm share/config
-@dirrm share/autostart
-@dirrm share/apps/remotes
-@dirrm share/apps/profiles
-@dirrm share/apps/kwalletmanager/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kwalletmanager/icons/crystalsvg/22x22
-@dirrm share/apps/kwalletmanager/icons/crystalsvg
-@dirrm share/apps/kwalletmanager/icons
-@dirrm share/apps/kwalletmanager
-@dirrm share/apps/ksim/themes/ksim/net
-@dirrm share/apps/ksim/themes/ksim/mail
-@dirrm share/apps/ksim/themes/ksim/host
-@dirrm share/apps/ksim/themes/ksim
-@dirrm share/apps/ksim/themes
-@dirrm share/apps/ksim/pics
-@dirrm share/apps/ksim/monitors
-@dirrm share/apps/ksim
-@dirrm share/apps/kregexpeditor/predefined/general
-@dirrm share/apps/kregexpeditor/predefined
-@dirrm share/apps/kregexpeditor/pics
-@dirrm share/apps/kregexpeditor
-@dirrm share/apps/konqueror/servicemenus
-@dirrm share/apps/konqueror
-@dirrm share/apps/kjots/pics
-@dirrm share/apps/kjots
-@dirrm share/apps/kicker/extensions
-@dirrm share/apps/kicker/applets
-@dirrm share/apps/kicker
-@dirrm share/apps/khexedit/toolbar
-@dirrm share/apps/khexedit
-@dirrm share/apps/kgpg/pics
-@dirrm share/apps/kgpg/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kgpg/icons/crystalsvg/22x22
-@dirrm share/apps/kgpg/icons/crystalsvg/16x16/actions
-@dirrm share/apps/kgpg/icons/crystalsvg/16x16
-@dirrm share/apps/kgpg/icons/crystalsvg
-@dirrm share/apps/kgpg/icons
-@dirrm share/apps/kgpg
-@dirrm share/apps/kedit
-@dirrm share/apps/kdm/pics/users
-@dirrm share/apps/kdm/pics
-@dirrm share/apps/kdm
-@dirrm share/apps/kdf/pics
-@dirrm share/apps/kdf
-@dirrm share/apps/kconf_update
-@dirrm share/apps/kcalc
-@dirrm share/apps/irkick/icons/hicolor/32x32/actions
-@dirrm share/apps/irkick/icons/hicolor/32x32
-@dirrm share/apps/irkick/icons/hicolor/16x16/actions
-@dirrm share/apps/irkick/icons/hicolor/16x16
-@dirrm share/apps/irkick/icons/hicolor
-@dirrm share/apps/irkick/icons
-@dirrm share/apps/irkick
-@dirrm share/apps/ark/icons/crystalsvg/22x22/actions
-@dirrm share/apps/ark/icons/crystalsvg/22x22
-@dirrm share/apps/ark/icons/crystalsvg
-@dirrm share/apps/ark/icons
-@dirrm share/apps/ark
-@dirrm share/apps
-@dirrm share/applications/kde
-@dirrm share/applications
-@dirrm lib/kde3
-@dirrm include/ksim
diff --git a/sysutils/sweeper/files/plist.klaptop b/sysutils/sweeper/files/plist.klaptop
deleted file mode 100644
index 63626bf83973..000000000000
--- a/sysutils/sweeper/files/plist.klaptop
+++ /dev/null
@@ -1,37 +0,0 @@
-bin/klaptop_acpi_helper
-bin/klaptop_check
-lib/kde3/kcm_laptop.la
-lib/kde3/kcm_laptop.so
-lib/kde3/kded_klaptopdaemon.la
-lib/kde3/kded_klaptopdaemon.so
-lib/libkcmlaptop.la
-lib/libkcmlaptop.so
-lib/libkcmlaptop.so.0
-share/applications/kde/laptop.desktop
-share/applications/kde/pcmcia.desktop
-share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt2_laptop_nobattery.png
-share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt2_laptop_nocharge.png
-share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt2_laptop_power.png
-share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt3_laptop_nocharge.png
-share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt3_laptop_power.png
-share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt_laptop_nocharge.png
-share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/alt_laptop_power.png
-share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_charge.png
-share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nobattery.png
-share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nocharge.png
-share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/power.png
-share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_charge.png
-share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_nobattery.png
-share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_nocharge.png
-share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_power.png
-share/apps/klaptopdaemon/icons/crystalsvg/32x32/actions/power.png
-share/icons/crystalsvg/128x128/apps/laptop_battery.png
-share/icons/crystalsvg/16x16/apps/klaptopdaemon.png
-share/icons/crystalsvg/16x16/apps/laptop_battery.png
-share/icons/crystalsvg/16x16/apps/laptop_pcmcia.png
-share/icons/crystalsvg/32x32/apps/laptop_battery.png
-share/icons/crystalsvg/32x32/apps/laptop_pcmcia.png
-share/icons/crystalsvg/48x48/apps/laptop_battery.png
-share/icons/crystalsvg/48x48/apps/laptop_pcmcia.png
-share/icons/crystalsvg/64x64/apps/laptop_battery.png
-share/services/kded/klaptopdaemon.desktop
diff --git a/sysutils/sweeper/files/plist.klaptop.rm b/sysutils/sweeper/files/plist.klaptop.rm
deleted file mode 100644
index fcfdaf029bb3..000000000000
--- a/sysutils/sweeper/files/plist.klaptop.rm
+++ /dev/null
@@ -1,10 +0,0 @@
-@dirrm share/services/kded
-@dirrm share/apps/klaptopdaemon/icons/crystalsvg/32x32/actions
-@dirrm share/apps/klaptopdaemon/icons/crystalsvg/32x32
-@dirrm share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions
-@dirrm share/apps/klaptopdaemon/icons/crystalsvg/22x22
-@dirrm share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions
-@dirrm share/apps/klaptopdaemon/icons/crystalsvg/16x16
-@dirrm share/apps/klaptopdaemon/icons/crystalsvg
-@dirrm share/apps/klaptopdaemon/icons
-@dirrm share/apps/klaptopdaemon
diff --git a/sysutils/sweeper/files/plist.base b/sysutils/sweeper/pkg-plist
index acafdf202094..20f8542acfa2 100644
--- a/sysutils/sweeper/files/plist.base
+++ b/sysutils/sweeper/pkg-plist
@@ -462,3 +462,74 @@ share/services/kbyteseditwidget.desktop
 share/services/kregexpeditorgui.desktop
 share/services/kwallet_config.desktop
 share/services/kwalletmanager_show.desktop
+@dirrm share/icons/hicolor/22x22/apps
+@dirrm share/icons/hicolor/22x22
+@dirrm share/doc/HTML/en/kwallet
+@dirrm share/doc/HTML/en/ktimer
+@dirrm share/doc/HTML/en/ksim
+@dirrm share/doc/HTML/en/kjots
+@dirrm share/doc/HTML/en/kinfocenter/blockdevices
+@dirrm share/doc/HTML/en/khexedit
+@dirrm share/doc/HTML/en/kgpg
+@dirrm share/doc/HTML/en/kfloppy
+@dirrm share/doc/HTML/en/kedit
+@dirrm share/doc/HTML/en/kdf
+@dirrm share/doc/HTML/en/kcontrol/powerctrl
+@dirrm share/doc/HTML/en/kcontrol/laptop
+@dirrm share/doc/HTML/en/kcontrol/kcmlowbatwarn
+@dirrm share/doc/HTML/en/kcontrol/kcmlowbatcrit
+@dirrm share/doc/HTML/en/kcmlirc
+@dirrm share/doc/HTML/en/kcharselect
+@dirrm share/doc/HTML/en/kcalc
+@dirrm share/doc/HTML/en/irkick
+@dirrm share/doc/HTML/en/ark
+@dirrm share/doc/HTML/en/KRegExpEditor
+@dirrm share/config.kcfg
+@dirrm share/apps/remotes
+@dirrm share/apps/profiles
+@dirrm share/apps/kwalletmanager/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kwalletmanager/icons/crystalsvg/22x22
+@dirrm share/apps/kwalletmanager/icons/crystalsvg
+@dirrm share/apps/kwalletmanager/icons
+@dirrm share/apps/kwalletmanager
+@dirrm share/apps/ksim/themes/ksim/net
+@dirrm share/apps/ksim/themes/ksim/mail
+@dirrm share/apps/ksim/themes/ksim/host
+@dirrm share/apps/ksim/themes/ksim
+@dirrm share/apps/ksim/themes
+@dirrm share/apps/ksim/pics
+@dirrm share/apps/ksim/monitors
+@dirrm share/apps/ksim
+@dirrm share/apps/kregexpeditor/predefined/general
+@dirrm share/apps/kregexpeditor/predefined
+@dirrm share/apps/kregexpeditor/pics
+@dirrm share/apps/kregexpeditor
+@dirrm share/apps/kjots/pics
+@dirrm share/apps/kjots
+@dirrm share/apps/khexedit/toolbar
+@dirrm share/apps/khexedit
+@dirrm share/apps/kgpg/pics
+@dirrm share/apps/kgpg/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kgpg/icons/crystalsvg/22x22
+@dirrm share/apps/kgpg/icons/crystalsvg/16x16/actions
+@dirrm share/apps/kgpg/icons/crystalsvg/16x16
+@dirrm share/apps/kgpg/icons/crystalsvg
+@dirrm share/apps/kgpg/icons
+@dirrm share/apps/kgpg
+@dirrm share/apps/kedit
+@dirrm share/apps/kdf/pics
+@dirrm share/apps/kdf
+@dirrm share/apps/kcalc
+@dirrm share/apps/irkick/icons/hicolor/32x32/actions
+@dirrm share/apps/irkick/icons/hicolor/32x32
+@dirrm share/apps/irkick/icons/hicolor/16x16/actions
+@dirrm share/apps/irkick/icons/hicolor/16x16
+@dirrm share/apps/irkick/icons/hicolor
+@dirrm share/apps/irkick/icons
+@dirrm share/apps/irkick
+@dirrm share/apps/ark/icons/crystalsvg/22x22/actions
+@dirrm share/apps/ark/icons/crystalsvg/22x22
+@dirrm share/apps/ark/icons/crystalsvg
+@dirrm share/apps/ark/icons
+@dirrm share/apps/ark
+@dirrm include/ksim