summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorlofi <lofi@FreeBSD.org>2004-03-09 19:41:12 +0000
committerlofi <lofi@FreeBSD.org>2004-03-09 19:41:12 +0000
commit344150edd9e7a3101f87e63d531bdae2b9dbb21f (patch)
treeaa2a54a33e5e6163905ac68a0a01153dd9038687 /x11
parent0bf4cb87335558d7d6c7a77212d01366ca69ca07 (diff)
downloadFreeBSD-ports-344150edd9e7a3101f87e63d531bdae2b9dbb21f.zip
FreeBSD-ports-344150edd9e7a3101f87e63d531bdae2b9dbb21f.tar.gz
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).
Diffstat (limited to 'x11')
-rw-r--r--x11/kde3/Makefile.kde28
-rw-r--r--x11/kde3/scripts/configure.kde32
-rw-r--r--x11/kde4-baseapps/Makefile41
-rw-r--r--x11/kde4-baseapps/distinfo3
-rw-r--r--x11/kde4-baseapps/files/patch-kcontrol-arts.cpp55
-rw-r--r--x11/kde4-baseapps/files/patch-kdm-kfrontend-Makefile.in12
-rw-r--r--x11/kde4-baseapps/files/plist.base35
-rw-r--r--x11/kde4-baseapps/files/plist.base.rm1
-rw-r--r--x11/kde4-runtime/Makefile41
-rw-r--r--x11/kde4-runtime/distinfo3
-rw-r--r--x11/kde4-runtime/files/patch-kcontrol-arts.cpp55
-rw-r--r--x11/kde4-runtime/files/patch-kdm-kfrontend-Makefile.in12
-rw-r--r--x11/kde4-runtime/files/plist.base35
-rw-r--r--x11/kde4-runtime/files/plist.base.rm1
-rw-r--r--x11/kde4-workspace/Makefile41
-rw-r--r--x11/kde4-workspace/distinfo3
-rw-r--r--x11/kde4-workspace/files/patch-kcontrol-arts.cpp55
-rw-r--r--x11/kde4-workspace/files/patch-kdm-kfrontend-Makefile.in12
-rw-r--r--x11/kde4-workspace/files/plist.base35
-rw-r--r--x11/kde4-workspace/files/plist.base.rm1
-rw-r--r--x11/kde4/Makefile.kde28
-rw-r--r--x11/kde4/scripts/configure.kde32
-rw-r--r--x11/kdebase3/Makefile41
-rw-r--r--x11/kdebase3/distinfo3
-rw-r--r--x11/kdebase3/files/patch-kcontrol-arts.cpp55
-rw-r--r--x11/kdebase3/files/patch-kdm-kfrontend-Makefile.in12
-rw-r--r--x11/kdebase3/files/plist.base35
-rw-r--r--x11/kdebase3/files/plist.base.rm1
-rw-r--r--x11/kdebase4-runtime/Makefile41
-rw-r--r--x11/kdebase4-runtime/distinfo3
-rw-r--r--x11/kdebase4-runtime/files/patch-kcontrol-arts.cpp55
-rw-r--r--x11/kdebase4-runtime/files/patch-kdm-kfrontend-Makefile.in12
-rw-r--r--x11/kdebase4-runtime/files/plist.base35
-rw-r--r--x11/kdebase4-runtime/files/plist.base.rm1
-rw-r--r--x11/kdebase4-workspace/Makefile41
-rw-r--r--x11/kdebase4-workspace/distinfo3
-rw-r--r--x11/kdebase4-workspace/files/patch-kcontrol-arts.cpp55
-rw-r--r--x11/kdebase4-workspace/files/patch-kdm-kfrontend-Makefile.in12
-rw-r--r--x11/kdebase4-workspace/files/plist.base35
-rw-r--r--x11/kdebase4-workspace/files/plist.base.rm1
-rw-r--r--x11/kdebase4/Makefile41
-rw-r--r--x11/kdebase4/distinfo3
-rw-r--r--x11/kdebase4/files/patch-kcontrol-arts.cpp55
-rw-r--r--x11/kdebase4/files/patch-kdm-kfrontend-Makefile.in12
-rw-r--r--x11/kdebase4/files/plist.base35
-rw-r--r--x11/kdebase4/files/plist.base.rm1
-rw-r--r--x11/kdelibs3/Makefile4
-rw-r--r--x11/kdelibs3/distinfo3
-rw-r--r--x11/kdelibs3/files/plist.base.rm288
-rw-r--r--x11/kdelibs3/pkg-plist (renamed from x11/kdelibs3/files/plist.base)401
-rw-r--r--x11/kdelibs4/Makefile4
-rw-r--r--x11/kdelibs4/distinfo3
-rw-r--r--x11/kdelibs4/files/plist.base.rm288
-rw-r--r--x11/kdelibs4/pkg-plist (renamed from x11/kdelibs4/files/plist.base)401
54 files changed, 1428 insertions, 1053 deletions
diff --git a/x11/kde3/Makefile.kde b/x11/kde3/Makefile.kde
index 1950b4f..b814385 100644
--- a/x11/kde3/Makefile.kde
+++ b/x11/kde3/Makefile.kde
@@ -92,6 +92,34 @@ CONFIGURE_ARGS+= --with-xinerama
.endif
.endif # !defined(_NO_KDE_XINERAMA)
+.if defined(KDE_SPLIT)
+KDE_SPLIT_VER?= ${KDE_VERSION}
+# needed for case where src dir name != doc dir name
+KDE_DOC_SPLIT?= ${KDE_SPLIT}
+DISTNAME?= ${KDE_SPLIT_DIST}-${KDE_SPLIT_VER}
+USE_REINPLACE= yes
+.endif
+# This must always be defined.
+SPLITDEP_PREFIX?= ${PREFIX}/share/applications
+
+# Targets section
+.if defined(KDE_SPLIT)
+kde-split:
+ ${ECHO} "${KDE_SPLIT} doc" > ${WRKSRC}/inst-apps
+ ${REINPLACE_CMD} \
+ "s,^SUBDIRS =.*${KDE_DOC_SPLIT}.*$$,SUBDIRS =\. ${KDE_DOC_SPLIT},g" \
+ ${WRKSRC}/doc/Makefile.in
+
+kde-split-postinstall:
+ ${TOUCH} ${SPLITDEP_PREFIX}/${PKGNAME}
+
+.if !defined(KDE_SPLIT_NONSTANDARD)
+pre-configure: kde-split
+post-install: kde-split-postinstall
+.endif
+.endif
+
+
.if defined(KDE_I18N)
_NO_KDE_FIXPTHREAD= yes
.endif
diff --git a/x11/kde3/scripts/configure.kde3 b/x11/kde3/scripts/configure.kde3
index f42984b..bb2f49bf 100644
--- a/x11/kde3/scripts/configure.kde3
+++ b/x11/kde3/scripts/configure.kde3
@@ -99,7 +99,7 @@ Please select what additional KDE modules you would like to install.\n\n" \
## two files to get the delta and set that as shell variables.
if [ -s $tempselection ]; then
- ${CAT} $tempselection | ${SED} -E -e 's/KDEACCESS./KDEACCESSIBILITY/g' -e 's/[[:space:]]+/ /g' \
+ ${CAT} $tempselection | ${SED} -E -e 's/[[:space:]]+/ /g' \
-e 's/"//g' | ${TR} '[:space:]' '\n' > $tempprocessed
set `/usr/bin/comm -23 $tempallmodules $tempprocessed`
fi
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 7d257dd..595550d 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 5d536db..666a941 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 e0e5a92..df11b25 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 0000000..a81fd6d
--- /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 a4a50be..a2ca93f 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 9dce67c..cea00d6 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
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 7d257dd..595550d 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/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-runtime/distinfo b/x11/kde4-runtime/distinfo
index 5d536db..666a941 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/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-runtime/files/patch-kcontrol-arts.cpp b/x11/kde4-runtime/files/patch-kcontrol-arts.cpp
index e0e5a92..df11b25 100644
--- a/x11/kde4-runtime/files/patch-kcontrol-arts.cpp
+++ b/x11/kde4-runtime/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-runtime/files/patch-kdm-kfrontend-Makefile.in b/x11/kde4-runtime/files/patch-kdm-kfrontend-Makefile.in
new file mode 100644
index 0000000..a81fd6d
--- /dev/null
+++ b/x11/kde4-runtime/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-runtime/files/plist.base b/x11/kde4-runtime/files/plist.base
index a4a50be..a2ca93f 100644
--- a/x11/kde4-runtime/files/plist.base
+++ b/x11/kde4-runtime/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-runtime/files/plist.base.rm b/x11/kde4-runtime/files/plist.base.rm
index 9dce67c..cea00d6 100644
--- a/x11/kde4-runtime/files/plist.base.rm
+++ b/x11/kde4-runtime/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
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 7d257dd..595550d 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/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-workspace/distinfo b/x11/kde4-workspace/distinfo
index 5d536db..666a941 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/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-workspace/files/patch-kcontrol-arts.cpp b/x11/kde4-workspace/files/patch-kcontrol-arts.cpp
index e0e5a92..df11b25 100644
--- a/x11/kde4-workspace/files/patch-kcontrol-arts.cpp
+++ b/x11/kde4-workspace/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-workspace/files/patch-kdm-kfrontend-Makefile.in b/x11/kde4-workspace/files/patch-kdm-kfrontend-Makefile.in
new file mode 100644
index 0000000..a81fd6d
--- /dev/null
+++ b/x11/kde4-workspace/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-workspace/files/plist.base b/x11/kde4-workspace/files/plist.base
index a4a50be..a2ca93f 100644
--- a/x11/kde4-workspace/files/plist.base
+++ b/x11/kde4-workspace/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-workspace/files/plist.base.rm b/x11/kde4-workspace/files/plist.base.rm
index 9dce67c..cea00d6 100644
--- a/x11/kde4-workspace/files/plist.base.rm
+++ b/x11/kde4-workspace/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
diff --git a/x11/kde4/Makefile.kde b/x11/kde4/Makefile.kde
index 1950b4f..b814385 100644
--- a/x11/kde4/Makefile.kde
+++ b/x11/kde4/Makefile.kde
@@ -92,6 +92,34 @@ CONFIGURE_ARGS+= --with-xinerama
.endif
.endif # !defined(_NO_KDE_XINERAMA)
+.if defined(KDE_SPLIT)
+KDE_SPLIT_VER?= ${KDE_VERSION}
+# needed for case where src dir name != doc dir name
+KDE_DOC_SPLIT?= ${KDE_SPLIT}
+DISTNAME?= ${KDE_SPLIT_DIST}-${KDE_SPLIT_VER}
+USE_REINPLACE= yes
+.endif
+# This must always be defined.
+SPLITDEP_PREFIX?= ${PREFIX}/share/applications
+
+# Targets section
+.if defined(KDE_SPLIT)
+kde-split:
+ ${ECHO} "${KDE_SPLIT} doc" > ${WRKSRC}/inst-apps
+ ${REINPLACE_CMD} \
+ "s,^SUBDIRS =.*${KDE_DOC_SPLIT}.*$$,SUBDIRS =\. ${KDE_DOC_SPLIT},g" \
+ ${WRKSRC}/doc/Makefile.in
+
+kde-split-postinstall:
+ ${TOUCH} ${SPLITDEP_PREFIX}/${PKGNAME}
+
+.if !defined(KDE_SPLIT_NONSTANDARD)
+pre-configure: kde-split
+post-install: kde-split-postinstall
+.endif
+.endif
+
+
.if defined(KDE_I18N)
_NO_KDE_FIXPTHREAD= yes
.endif
diff --git a/x11/kde4/scripts/configure.kde3 b/x11/kde4/scripts/configure.kde3
index f42984b..bb2f49bf 100644
--- a/x11/kde4/scripts/configure.kde3
+++ b/x11/kde4/scripts/configure.kde3
@@ -99,7 +99,7 @@ Please select what additional KDE modules you would like to install.\n\n" \
## two files to get the delta and set that as shell variables.
if [ -s $tempselection ]; then
- ${CAT} $tempselection | ${SED} -E -e 's/KDEACCESS./KDEACCESSIBILITY/g' -e 's/[[:space:]]+/ /g' \
+ ${CAT} $tempselection | ${SED} -E -e 's/[[:space:]]+/ /g' \
-e 's/"//g' | ${TR} '[:space:]' '\n' > $tempprocessed
set `/usr/bin/comm -23 $tempallmodules $tempprocessed`
fi
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 7d257dd..595550d 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/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/kdebase3/distinfo b/x11/kdebase3/distinfo
index 5d536db..666a941 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/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/kdebase3/files/patch-kcontrol-arts.cpp b/x11/kdebase3/files/patch-kcontrol-arts.cpp
index e0e5a92..df11b25 100644
--- a/x11/kdebase3/files/patch-kcontrol-arts.cpp
+++ b/x11/kdebase3/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/kdebase3/files/patch-kdm-kfrontend-Makefile.in b/x11/kdebase3/files/patch-kdm-kfrontend-Makefile.in
new file mode 100644
index 0000000..a81fd6d
--- /dev/null
+++ b/x11/kdebase3/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/kdebase3/files/plist.base b/x11/kdebase3/files/plist.base
index a4a50be..a2ca93f 100644
--- a/x11/kdebase3/files/plist.base
+++ b/x11/kdebase3/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/kdebase3/files/plist.base.rm b/x11/kdebase3/files/plist.base.rm
index 9dce67c..cea00d6 100644
--- a/x11/kdebase3/files/plist.base.rm
+++ b/x11/kdebase3/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
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 7d257dd..595550d 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/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/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo
index 5d536db..666a941 100644
--- a/x11/kdebase4-runtime/distinfo
+++ b/x11/kdebase4-runtime/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/kdebase4-runtime/files/patch-kcontrol-arts.cpp b/x11/kdebase4-runtime/files/patch-kcontrol-arts.cpp
index e0e5a92..df11b25 100644
--- a/x11/kdebase4-runtime/files/patch-kcontrol-arts.cpp
+++ b/x11/kdebase4-runtime/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/kdebase4-runtime/files/patch-kdm-kfrontend-Makefile.in b/x11/kdebase4-runtime/files/patch-kdm-kfrontend-Makefile.in
new file mode 100644
index 0000000..a81fd6d
--- /dev/null
+++ b/x11/kdebase4-runtime/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/kdebase4-runtime/files/plist.base b/x11/kdebase4-runtime/files/plist.base
index a4a50be..a2ca93f 100644
--- a/x11/kdebase4-runtime/files/plist.base
+++ b/x11/kdebase4-runtime/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/kdebase4-runtime/files/plist.base.rm b/x11/kdebase4-runtime/files/plist.base.rm
index 9dce67c..cea00d6 100644
--- a/x11/kdebase4-runtime/files/plist.base.rm
+++ b/x11/kdebase4-runtime/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
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 7d257dd..595550d 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/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/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index 5d536db..666a941 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/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/kdebase4-workspace/files/patch-kcontrol-arts.cpp b/x11/kdebase4-workspace/files/patch-kcontrol-arts.cpp
index e0e5a92..df11b25 100644
--- a/x11/kdebase4-workspace/files/patch-kcontrol-arts.cpp
+++ b/x11/kdebase4-workspace/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/kdebase4-workspace/files/patch-kdm-kfrontend-Makefile.in b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-Makefile.in
new file mode 100644
index 0000000..a81fd6d
--- /dev/null
+++ b/x11/kdebase4-workspace/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/kdebase4-workspace/files/plist.base b/x11/kdebase4-workspace/files/plist.base
index a4a50be..a2ca93f 100644
--- a/x11/kdebase4-workspace/files/plist.base
+++ b/x11/kdebase4-workspace/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/kdebase4-workspace/files/plist.base.rm b/x11/kdebase4-workspace/files/plist.base.rm
index 9dce67c..cea00d6 100644
--- a/x11/kdebase4-workspace/files/plist.base.rm
+++ b/x11/kdebase4-workspace/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
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 7d257dd..595550d 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/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/kdebase4/distinfo b/x11/kdebase4/distinfo
index 5d536db..666a941 100644
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/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/kdebase4/files/patch-kcontrol-arts.cpp b/x11/kdebase4/files/patch-kcontrol-arts.cpp
index e0e5a92..df11b25 100644
--- a/x11/kdebase4/files/patch-kcontrol-arts.cpp
+++ b/x11/kdebase4/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/kdebase4/files/patch-kdm-kfrontend-Makefile.in b/x11/kdebase4/files/patch-kdm-kfrontend-Makefile.in
new file mode 100644
index 0000000..a81fd6d
--- /dev/null
+++ b/x11/kdebase4/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/kdebase4/files/plist.base b/x11/kdebase4/files/plist.base
index a4a50be..a2ca93f 100644
--- a/x11/kdebase4/files/plist.base
+++ b/x11/kdebase4/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/kdebase4/files/plist.base.rm b/x11/kdebase4/files/plist.base.rm
index 9dce67c..cea00d6 100644
--- a/x11/kdebase4/files/plist.base.rm
+++ b/x11/kdebase4/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
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 14ff46b..1f670be 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -10,7 +10,7 @@ PORTNAME= kdelibs
PORTVERSION= ${KDE_VERSION}
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
@@ -48,8 +48,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--disable-ltdl-install \
--enable-mt
-KDE_BUILD_PLIST= yes
-
FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/tcvn-0.enc
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index c2897e1..fb6fef9 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdelibs-3.2.0.tar.bz2) = 24be0d558725f4d3441fb9d580129720
+MD5 (KDE/kdelibs-3.2.1.tar.bz2) = 50ae60072c1fc4ae4e41694bc2325dcb
+SIZE (KDE/kdelibs-3.2.1.tar.bz2) = 12597050
diff --git a/x11/kdelibs3/files/plist.base.rm b/x11/kdelibs3/files/plist.base.rm
deleted file mode 100644
index e4fc7ef..0000000
--- a/x11/kdelibs3/files/plist.base.rm
+++ /dev/null
@@ -1,288 +0,0 @@
-@unexec /bin/rmdir %D/share/icons/crystalsvg/32x32/actions/kde || true
-@unexec /bin/rmdir %D/share/icons/crystalsvg/22x22/actions/kde || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kio/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kdeui/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kdeprint/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kdefx/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kdecore/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kate/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/arts/html || true
-@dirrm share/servicetypes
-@dirrm share/services/kresources/kabc
-@dirrm share/services/kresources
-@dirrm share/services/kded
-@dirrm share/services
-@dirrm share/mimelnk/video
-@dirrm share/mimelnk/text
-@dirrm share/mimelnk/multipart
-@dirrm share/mimelnk/model
-@dirrm share/mimelnk/message
-@dirrm share/mimelnk/inode
-@dirrm share/mimelnk/image
-@dirrm share/mimelnk/audio
-@dirrm share/mimelnk/application
-@dirrm share/mimelnk/all
-@dirrm share/mimelnk
-@dirrm share/locale
-@dirrm share/icons/hicolor
-@dirrm share/icons/crystalsvg/scalable/mimetypes
-@dirrm share/icons/crystalsvg/scalable/filesystems
-@dirrm share/icons/crystalsvg/scalable/devices
-@dirrm share/icons/crystalsvg/scalable/apps
-@dirrm share/icons/crystalsvg/scalable
-@dirrm share/icons/crystalsvg/64x64/mimetypes
-@dirrm share/icons/crystalsvg/64x64/filesystems
-@dirrm share/icons/crystalsvg/64x64/devices
-@dirrm share/icons/crystalsvg/64x64/actions
-@dirrm share/icons/crystalsvg/64x64
-@dirrm share/icons/crystalsvg/48x48/mimetypes
-@dirrm share/icons/crystalsvg/48x48/filesystems
-@dirrm share/icons/crystalsvg/48x48/devices
-@dirrm share/icons/crystalsvg/48x48/actions
-@dirrm share/icons/crystalsvg/48x48
-@dirrm share/icons/crystalsvg/32x32/mimetypes
-@dirrm share/icons/crystalsvg/32x32/filesystems
-@dirrm share/icons/crystalsvg/32x32/devices
-@dirrm share/icons/crystalsvg/32x32/actions
-@dirrm share/icons/crystalsvg/32x32
-@dirrm share/icons/crystalsvg/22x22/mimetypes
-@dirrm share/icons/crystalsvg/22x22/filesystems
-@dirrm share/icons/crystalsvg/22x22/actions
-@dirrm share/icons/crystalsvg/22x22
-@dirrm share/icons/crystalsvg/16x16/mimetypes
-@dirrm share/icons/crystalsvg/16x16/filesystems
-@dirrm share/icons/crystalsvg/16x16/devices
-@dirrm share/icons/crystalsvg/16x16/actions
-@dirrm share/icons/crystalsvg/16x16
-@dirrm share/icons/crystalsvg/128x128/mimetypes
-@dirrm share/icons/crystalsvg/128x128/filesystems
-@dirrm share/icons/crystalsvg/128x128/devices
-@dirrm share/icons/crystalsvg/128x128
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
-@dirrm share/doc/HTML/en/kdelibs-apidocs/libkmid
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kwallet
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kutils
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kresources
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kparts
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kmdi
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kjs
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kio
-@dirrm share/doc/HTML/en/kdelibs-apidocs/khtml
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kdeui
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kdeprint
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kdefx
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kdecore
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kate
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kabc
-@dirrm share/doc/HTML/en/kdelibs-apidocs/interfaces
-@dirrm share/doc/HTML/en/kdelibs-apidocs/dcop
-@dirrm share/doc/HTML/en/kdelibs-apidocs/arts
-@dirrm share/doc/HTML/en/kdelibs-apidocs
-@dirrm share/doc/HTML/en/common
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
-@dirrm share/config/ui
-@dirrm share/config/colors
-@dirrm share/config
-@dirrm share/autostart
-@dirrm share/apps/proxyscout
-@dirrm share/apps/ktexteditor_kdatatool
-@dirrm share/apps/ktexteditor_isearch
-@dirrm share/apps/ktexteditor_insertfile
-@dirrm share/apps/kstyle/themes
-@dirrm share/apps/kstyle/pixmaps/riscos
-@dirrm share/apps/kstyle/pixmaps
-@dirrm share/apps/kstyle
-@dirrm share/apps/kssl
-@dirrm share/apps/ksgmltools2/docbook/xsl/tools/profile
-@dirrm share/apps/ksgmltools2/docbook/xsl/tools/olink
-@dirrm share/apps/ksgmltools2/docbook/xsl/tools
-@dirrm share/apps/ksgmltools2/docbook/xsl/params
-@dirrm share/apps/ksgmltools2/docbook/xsl/lib
-@dirrm share/apps/ksgmltools2/docbook/xsl/images/callouts
-@dirrm share/apps/ksgmltools2/docbook/xsl/images
-@dirrm share/apps/ksgmltools2/docbook/xsl/html
-@dirrm share/apps/ksgmltools2/docbook/xsl/common
-@dirrm share/apps/ksgmltools2/docbook/xsl
-@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent
-@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.2
-@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent
-@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.1.2
-@dirrm share/apps/ksgmltools2/docbook
-@dirrm share/apps/ksgmltools2/customization/zh-TW/entities
-@dirrm share/apps/ksgmltools2/customization/zh-TW
-@dirrm share/apps/ksgmltools2/customization/xx/entities
-@dirrm share/apps/ksgmltools2/customization/xx
-@dirrm share/apps/ksgmltools2/customization/xsl
-@dirrm share/apps/ksgmltools2/customization/xh/entities
-@dirrm share/apps/ksgmltools2/customization/xh
-@dirrm share/apps/ksgmltools2/customization/wa/entities
-@dirrm share/apps/ksgmltools2/customization/wa
-@dirrm share/apps/ksgmltools2/customization/uk/entities
-@dirrm share/apps/ksgmltools2/customization/uk
-@dirrm share/apps/ksgmltools2/customization/tr/entities
-@dirrm share/apps/ksgmltools2/customization/tr
-@dirrm share/apps/ksgmltools2/customization/sv/entities
-@dirrm share/apps/ksgmltools2/customization/sv
-@dirrm share/apps/ksgmltools2/customization/sr/entities
-@dirrm share/apps/ksgmltools2/customization/sr
-@dirrm share/apps/ksgmltools2/customization/sl/entities
-@dirrm share/apps/ksgmltools2/customization/sl
-@dirrm share/apps/ksgmltools2/customization/sk/entities
-@dirrm share/apps/ksgmltools2/customization/sk
-@dirrm share/apps/ksgmltools2/customization/ru/entities
-@dirrm share/apps/ksgmltools2/customization/ru
-@dirrm share/apps/ksgmltools2/customization/ro/entities
-@dirrm share/apps/ksgmltools2/customization/ro
-@dirrm share/apps/ksgmltools2/customization/pt/entities
-@dirrm share/apps/ksgmltools2/customization/pt-BR/entities
-@dirrm share/apps/ksgmltools2/customization/pt-BR
-@dirrm share/apps/ksgmltools2/customization/pt
-@dirrm share/apps/ksgmltools2/customization/pl/entities
-@dirrm share/apps/ksgmltools2/customization/pl
-@dirrm share/apps/ksgmltools2/customization/obsolete
-@dirrm share/apps/ksgmltools2/customization/no/entities
-@dirrm share/apps/ksgmltools2/customization/no
-@dirrm share/apps/ksgmltools2/customization/nn/entities
-@dirrm share/apps/ksgmltools2/customization/nn
-@dirrm share/apps/ksgmltools2/customization/nl/entities
-@dirrm share/apps/ksgmltools2/customization/nl
-@dirrm share/apps/ksgmltools2/customization/lt/entities
-@dirrm share/apps/ksgmltools2/customization/lt
-@dirrm share/apps/ksgmltools2/customization/ko/entities
-@dirrm share/apps/ksgmltools2/customization/ko
-@dirrm share/apps/ksgmltools2/customization/ja/entities
-@dirrm share/apps/ksgmltools2/customization/ja
-@dirrm share/apps/ksgmltools2/customization/it/entities
-@dirrm share/apps/ksgmltools2/customization/it
-@dirrm share/apps/ksgmltools2/customization/id/entities
-@dirrm share/apps/ksgmltools2/customization/id
-@dirrm share/apps/ksgmltools2/customization/hu/entities
-@dirrm share/apps/ksgmltools2/customization/hu
-@dirrm share/apps/ksgmltools2/customization/he/entities
-@dirrm share/apps/ksgmltools2/customization/he
-@dirrm share/apps/ksgmltools2/customization/fr/entities
-@dirrm share/apps/ksgmltools2/customization/fr
-@dirrm share/apps/ksgmltools2/customization/fo/entities
-@dirrm share/apps/ksgmltools2/customization/fo
-@dirrm share/apps/ksgmltools2/customization/fi/entities
-@dirrm share/apps/ksgmltools2/customization/fi
-@dirrm share/apps/ksgmltools2/customization/et/entities
-@dirrm share/apps/ksgmltools2/customization/et
-@dirrm share/apps/ksgmltools2/customization/es/entities
-@dirrm share/apps/ksgmltools2/customization/es
-@dirrm share/apps/ksgmltools2/customization/entities
-@dirrm share/apps/ksgmltools2/customization/en/entities
-@dirrm share/apps/ksgmltools2/customization/en-GB/entities
-@dirrm share/apps/ksgmltools2/customization/en-GB
-@dirrm share/apps/ksgmltools2/customization/en
-@dirrm share/apps/ksgmltools2/customization/el/entities
-@dirrm share/apps/ksgmltools2/customization/el
-@dirrm share/apps/ksgmltools2/customization/dtd
-@dirrm share/apps/ksgmltools2/customization/de/entities
-@dirrm share/apps/ksgmltools2/customization/de
-@dirrm share/apps/ksgmltools2/customization/da/entities
-@dirrm share/apps/ksgmltools2/customization/da
-@dirrm share/apps/ksgmltools2/customization/cs/entities
-@dirrm share/apps/ksgmltools2/customization/cs
-@dirrm share/apps/ksgmltools2/customization/ca/entities
-@dirrm share/apps/ksgmltools2/customization/ca
-@dirrm share/apps/ksgmltools2/customization/bg/entities
-@dirrm share/apps/ksgmltools2/customization/bg
-@dirrm share/apps/ksgmltools2/customization/af/entities
-@dirrm share/apps/ksgmltools2/customization/af
-@dirrm share/apps/ksgmltools2/customization
-@dirrm share/apps/ksgmltools2
-@dirrm share/apps/knotify
-@dirrm share/apps/kjava
-@dirrm share/apps/kio_uiserver/icons/crystalsvg/16x16/apps
-@dirrm share/apps/kio_uiserver/icons/crystalsvg/16x16
-@dirrm share/apps/kio_uiserver/icons/crystalsvg
-@dirrm share/apps/kio_uiserver/icons
-@dirrm share/apps/kio_uiserver
-@dirrm share/apps/khtml/icons/crystalsvg/64x64/actions
-@dirrm share/apps/khtml/icons/crystalsvg/64x64
-@dirrm share/apps/khtml/icons/crystalsvg/48x48/actions
-@dirrm share/apps/khtml/icons/crystalsvg/48x48
-@dirrm share/apps/khtml/icons/crystalsvg/32x32/actions
-@dirrm share/apps/khtml/icons/crystalsvg/32x32
-@dirrm share/apps/khtml/icons/crystalsvg/22x22/actions
-@dirrm share/apps/khtml/icons/crystalsvg/22x22
-@dirrm share/apps/khtml/icons/crystalsvg/16x16/actions
-@dirrm share/apps/khtml/icons/crystalsvg/16x16
-@dirrm share/apps/khtml/icons/crystalsvg/128x128/actions
-@dirrm share/apps/khtml/icons/crystalsvg/128x128
-@dirrm share/apps/khtml/icons/crystalsvg
-@dirrm share/apps/khtml/icons
-@dirrm share/apps/khtml/css
-@dirrm share/apps/khtml
-@dirrm share/apps/kdewidgets/pics
-@dirrm share/apps/kdewidgets
-@dirrm share/apps/kdeui/pics
-@dirrm share/apps/kdeui
-@dirrm share/apps/kdeprint/tools
-@dirrm share/apps/kdeprint/plugins
-@dirrm share/apps/kdeprint/pics
-@dirrm share/apps/kdeprint/icons/crystalsvg/64x64/apps
-@dirrm share/apps/kdeprint/icons/crystalsvg/64x64
-@dirrm share/apps/kdeprint/icons/crystalsvg/48x48/apps
-@dirrm share/apps/kdeprint/icons/crystalsvg/48x48
-@dirrm share/apps/kdeprint/icons/crystalsvg/32x32/apps
-@dirrm share/apps/kdeprint/icons/crystalsvg/32x32/actions
-@dirrm share/apps/kdeprint/icons/crystalsvg/32x32
-@dirrm share/apps/kdeprint/icons/crystalsvg/22x22/apps
-@dirrm share/apps/kdeprint/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kdeprint/icons/crystalsvg/22x22
-@dirrm share/apps/kdeprint/icons/crystalsvg/16x16/apps
-@dirrm share/apps/kdeprint/icons/crystalsvg/16x16/actions
-@dirrm share/apps/kdeprint/icons/crystalsvg/16x16
-@dirrm share/apps/kdeprint/icons/crystalsvg
-@dirrm share/apps/kdeprint/icons
-@dirrm share/apps/kdeprint/filters
-@dirrm share/apps/kdeprint
-@dirrm share/apps/kconf_update
-@dirrm share/apps/kcm_componentchooser
-@dirrm share/apps/kcertpart
-@dirrm share/apps/katepart/syntax
-@dirrm share/apps/katepart
-@dirrm share/apps/kabc/formats
-@dirrm share/apps/kabc
-@dirrm share/apps/dcopidlng
-@dirrm share/apps/LICENSES
-@dirrm share/apps
-@dirrm share/applications/kde
-@dirrm share/applications
-@dirrm lib/kde3/plugins/styles
-@dirrm lib/kde3/plugins/designer
-@dirrm lib/kde3/plugins
-@dirrm lib/kde3
-@dirrm include/libkmid
-@dirrm include/ktexteditor
-@dirrm include/ksettings
-@dirrm include/kresources
-@dirrm include/kparts
-@dirrm include/kmediaplayer
-@dirrm include/kjs
-@dirrm include/kio
-@dirrm include/khexedit
-@dirrm include/kdesu
-@dirrm include/kdeprint/lpr
-@dirrm include/kdeprint
-@dirrm include/kate
-@dirrm include/kabc
-@dirrm include/dom
-@dirrm include/arts
-@dirrm etc/xdg/menus
-@dirrm etc/xdg
diff --git a/x11/kdelibs3/files/plist.base b/x11/kdelibs3/pkg-plist
index c5e29a3..c307ba1 100644
--- a/x11/kdelibs3/files/plist.base
+++ b/x11/kdelibs3/pkg-plist
@@ -665,6 +665,8 @@ include/renamedlgplugin.h
include/scriptclientinterface.h
include/scriptinterface.h
include/scriptmanager.h
+lib/kde3/cupsdconf.la
+lib/kde3/cupsdconf.so
lib/kde3/dcopserver.la
lib/kde3/dcopserver.so
lib/kde3/kabc_dir.la
@@ -767,10 +769,14 @@ lib/kde3/libkatepart.la
lib/kde3/libkatepart.so
lib/kde3/libkcertpart.la
lib/kde3/libkcertpart.so
+lib/kde3/libkdeprint_management_module.la
+lib/kde3/libkdeprint_management_module.so
lib/kde3/libkhtmlpart.la
lib/kde3/libkhtmlpart.so
lib/kde3/libkmultipart.la
lib/kde3/libkmultipart.so
+lib/kde3/libshellscript.la
+lib/kde3/libshellscript.so
lib/kde3/plugins/designer/kdewidgets.la
lib/kde3/plugins/designer/kdewidgets.so
lib/kde3/plugins/styles/highcolor.la
@@ -787,8 +793,6 @@ lib/libDCOP.so.6
lib/libartskde.la
lib/libartskde.so
lib/libartskde.so.3
-lib/libcupsdconf.la
-lib/libcupsdconf.so
lib/libkabc.la
lib/libkabc.so
lib/libkabc.so.3
@@ -817,6 +821,8 @@ lib/libkdefakes_nonpic.a
lib/libkdefx.la
lib/libkdefx.so
lib/libkdefx.so.6
+lib/libkdeinit_cupsdconf.la
+lib/libkdeinit_cupsdconf.so
lib/libkdeinit_dcopserver.la
lib/libkdeinit_dcopserver.so
lib/libkdeinit_kaddprinterwizard.la
@@ -898,9 +904,6 @@ lib/libkwalletbackend.so.1
lib/libkwalletclient.la
lib/libkwalletclient.so
lib/libkwalletclient.so.1
-lib/libshellscript.la
-lib/libshellscript.so
-lib/libshellscript.so.0
lib/libvcard.la
lib/libvcard.so
lib/libvcard.so.0
@@ -1169,6 +1172,7 @@ share/apps/khtml/css/quirks.css
share/apps/khtml/icons/crystalsvg/128x128/actions/bug.png
share/apps/khtml/icons/crystalsvg/16x16/actions/bug.png
share/apps/khtml/icons/crystalsvg/16x16/actions/images_display.png
+share/apps/khtml/icons/crystalsvg/16x16/actions/wallet_open.png
share/apps/khtml/icons/crystalsvg/22x22/actions/bug.png
share/apps/khtml/icons/crystalsvg/22x22/actions/dbgnext.png
share/apps/khtml/icons/crystalsvg/22x22/actions/dbgrun.png
@@ -2440,6 +2444,7 @@ share/config/kthemestylerc
share/config/language.codes
share/config/ui/kprintpreviewui.rc
share/config/ui/ui_standards.rc
+share/cups/model/postscript.ppd.gz
share/doc/HTML/en/common/1.png
share/doc/HTML/en/common/10.png
share/doc/HTML/en/common/2.png
@@ -2587,6 +2592,7 @@ share/icons/crystalsvg/16x16/actions/2rightarrow.png
share/icons/crystalsvg/16x16/actions/2uparrow.png
share/icons/crystalsvg/16x16/actions/about_kde.png
share/icons/crystalsvg/16x16/actions/airbrush.png
+share/icons/crystalsvg/16x16/actions/apply.png
share/icons/crystalsvg/16x16/actions/attach.png
share/icons/crystalsvg/16x16/actions/back.png
share/icons/crystalsvg/16x16/actions/blend.png
@@ -2965,6 +2971,7 @@ share/icons/crystalsvg/22x22/actions/2rightarrow.png
share/icons/crystalsvg/22x22/actions/2uparrow.png
share/icons/crystalsvg/22x22/actions/about_kde.png
share/icons/crystalsvg/22x22/actions/airbrush.png
+share/icons/crystalsvg/22x22/actions/apply.png
share/icons/crystalsvg/22x22/actions/attach.png
share/icons/crystalsvg/22x22/actions/back.png
share/icons/crystalsvg/22x22/actions/blend.png
@@ -3264,6 +3271,7 @@ share/icons/crystalsvg/32x32/actions/2leftarrow.png
share/icons/crystalsvg/32x32/actions/2rightarrow.png
share/icons/crystalsvg/32x32/actions/2uparrow.png
share/icons/crystalsvg/32x32/actions/about_kde.png
+share/icons/crystalsvg/32x32/actions/apply.png
share/icons/crystalsvg/32x32/actions/attach.png
share/icons/crystalsvg/32x32/actions/back.png
share/icons/crystalsvg/32x32/actions/blend.png
@@ -4145,7 +4153,6 @@ share/mimelnk/application/x-lzop.desktop
share/mimelnk/application/x-magicpoint.desktop
share/mimelnk/application/x-msaccess.desktop
share/mimelnk/application/x-msdos-program.desktop
-share/mimelnk/application/x-mswinurl.desktop
share/mimelnk/application/x-mswrite.desktop
share/mimelnk/application/x-object.desktop
share/mimelnk/application/x-ogg.desktop
@@ -4271,6 +4278,7 @@ share/mimelnk/text/x-log.desktop
share/mimelnk/text/x-lyx.desktop
share/mimelnk/text/x-makefile.desktop
share/mimelnk/text/x-moc.desktop
+share/mimelnk/text/x-mswinurl.desktop
share/mimelnk/text/x-objcsrc.desktop
share/mimelnk/text/x-pascal.desktop
share/mimelnk/text/x-perl.desktop
@@ -4342,6 +4350,7 @@ share/services/ppm.kimgio
share/services/rlogin.protocol
share/services/rtsp.protocol
share/services/shellscript.desktop
+share/services/ssh.protocol
share/services/telnet.protocol
share/services/tga.kimgio
share/services/tiff.kimgio
@@ -4374,23 +4383,389 @@ share/servicetypes/ktexteditorplugin.desktop
share/servicetypes/kurifilterplugin.desktop
share/servicetypes/renamedlgplugin.desktop
share/servicetypes/scriptinterface.desktop
+@exec /bin/mkdir -p %D/share/icons/crystalsvg/32x32/actions/kde
+@exec /bin/mkdir -p %D/share/icons/crystalsvg/32x32/actions/kde
+@exec /bin/mkdir -p %D/share/icons/crystalsvg/32x32/actions/kde
+@exec /bin/mkdir -p %D/share/icons/crystalsvg/22x22/actions/kde
+@exec /bin/mkdir -p %D/share/icons/crystalsvg/22x22/actions/kde
+@exec /bin/mkdir -p %D/share/icons/crystalsvg/22x22/actions/kde
+@exec /bin/mkdir -p %D/share/icons/crystalsvg/32x32/actions/kde
+@exec /bin/mkdir -p %D/share/icons/crystalsvg/22x22/actions/kde
+@exec /bin/mkdir -p %D/share/icons/crystalsvg/32x32/actions/kde
+@exec /bin/mkdir -p %D/share/icons/crystalsvg/22x22/actions/kde
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeui/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeui/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeprint/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeprint/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdefx/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdefx/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdecore/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdecore/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kate/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kate/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdefx/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdecore/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeui/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeprint/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kate/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdecore/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdefx/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeprint/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdecore/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeui/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeprint/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kate/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdefx/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdecore/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeui/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html
-@exec /bin/mkdir -p %D/share/icons/crystalsvg/22x22/actions/kde
-@exec /bin/mkdir -p %D/share/icons/crystalsvg/32x32/actions/kde
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeprint/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kate/html
+@dirrm share/servicetypes
+@dirrm share/services/kresources/kabc
+@dirrm share/services/kresources
+@dirrm share/services/kded
+@dirrm share/services
+@dirrm share/mimelnk/video
+@dirrm share/mimelnk/text
+@dirrm share/mimelnk/multipart
+@dirrm share/mimelnk/model
+@dirrm share/mimelnk/message
+@dirrm share/mimelnk/inode
+@dirrm share/mimelnk/image
+@dirrm share/mimelnk/audio
+@dirrm share/mimelnk/application
+@dirrm share/mimelnk/all
+@dirrm share/mimelnk
+@dirrm share/icons/hicolor
+@dirrm share/icons/crystalsvg/scalable/mimetypes
+@dirrm share/icons/crystalsvg/scalable/filesystems
+@dirrm share/icons/crystalsvg/scalable/devices
+@dirrm share/icons/crystalsvg/scalable/apps
+@dirrm share/icons/crystalsvg/scalable
+@dirrm share/icons/crystalsvg/64x64/mimetypes
+@dirrm share/icons/crystalsvg/64x64/filesystems
+@dirrm share/icons/crystalsvg/64x64/devices
+@dirrm share/icons/crystalsvg/64x64/actions
+@dirrm share/icons/crystalsvg/64x64
+@dirrm share/icons/crystalsvg/48x48/mimetypes
+@dirrm share/icons/crystalsvg/48x48/filesystems
+@dirrm share/icons/crystalsvg/48x48/devices
+@dirrm share/icons/crystalsvg/48x48/actions
+@dirrm share/icons/crystalsvg/48x48
+@dirrm share/icons/crystalsvg/32x32/mimetypes
+@dirrm share/icons/crystalsvg/32x32/filesystems
+@dirrm share/icons/crystalsvg/32x32/devices
+@dirrm share/icons/crystalsvg/32x32/actions/kde
+@dirrm share/icons/crystalsvg/32x32/actions
+@dirrm share/icons/crystalsvg/32x32
+@dirrm share/icons/crystalsvg/22x22/mimetypes
+@dirrm share/icons/crystalsvg/22x22/filesystems
+@dirrm share/icons/crystalsvg/22x22/actions/kde
+@dirrm share/icons/crystalsvg/22x22/actions
+@dirrm share/icons/crystalsvg/22x22
+@dirrm share/icons/crystalsvg/16x16/mimetypes
+@dirrm share/icons/crystalsvg/16x16/filesystems
+@dirrm share/icons/crystalsvg/16x16/devices
+@dirrm share/icons/crystalsvg/16x16/actions
+@dirrm share/icons/crystalsvg/16x16
+@dirrm share/icons/crystalsvg/128x128/mimetypes
+@dirrm share/icons/crystalsvg/128x128/filesystems
+@dirrm share/icons/crystalsvg/128x128/devices
+@dirrm share/icons/crystalsvg/128x128
+@dirrm share/icons/crystalsvg
+@dirrm share/icons
+@dirrm share/doc/HTML/en/kdelibs-apidocs/libkmid/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/libkmid
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kwallet/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kwallet
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kutils/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kutils
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kresources/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kresources
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kparts/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kparts
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kmdi/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kmdi
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kjs/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kjs
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kio/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kio
+@dirrm share/doc/HTML/en/kdelibs-apidocs/khtml/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/khtml
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kdeui/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kdeui
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kdeprint/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kdeprint
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kdefx/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kdefx
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kdecore/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kdecore
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kate/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kate
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kabc/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kabc
+@dirrm share/doc/HTML/en/kdelibs-apidocs/interfaces/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/interfaces
+@dirrm share/doc/HTML/en/kdelibs-apidocs/dcop/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/dcop
+@dirrm share/doc/HTML/en/kdelibs-apidocs/arts/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/arts
+@dirrm share/doc/HTML/en/kdelibs-apidocs
+@dirrm share/doc/HTML/en/common
+@dirrm share/doc/HTML/en
+@dirrm share/doc/HTML
+@dirrm share/config/ui
+@dirrm share/config/colors
+@dirrm share/config
+@dirrm share/autostart
+@dirrm share/apps/proxyscout
+@dirrm share/apps/ktexteditor_kdatatool
+@dirrm share/apps/ktexteditor_isearch
+@dirrm share/apps/ktexteditor_insertfile
+@dirrm share/apps/kstyle/themes
+@dirrm share/apps/kstyle/pixmaps/riscos
+@dirrm share/apps/kstyle/pixmaps
+@dirrm share/apps/kstyle
+@dirrm share/apps/kssl
+@dirrm share/apps/ksgmltools2/docbook/xsl/tools/profile
+@dirrm share/apps/ksgmltools2/docbook/xsl/tools/olink
+@dirrm share/apps/ksgmltools2/docbook/xsl/tools
+@dirrm share/apps/ksgmltools2/docbook/xsl/params
+@dirrm share/apps/ksgmltools2/docbook/xsl/lib
+@dirrm share/apps/ksgmltools2/docbook/xsl/images/callouts
+@dirrm share/apps/ksgmltools2/docbook/xsl/images
+@dirrm share/apps/ksgmltools2/docbook/xsl/html
+@dirrm share/apps/ksgmltools2/docbook/xsl/common
+@dirrm share/apps/ksgmltools2/docbook/xsl
+@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent
+@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.2
+@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent
+@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.1.2
+@dirrm share/apps/ksgmltools2/docbook
+@dirrm share/apps/ksgmltools2/customization/zh-TW/entities
+@dirrm share/apps/ksgmltools2/customization/zh-TW
+@dirrm share/apps/ksgmltools2/customization/xx/entities
+@dirrm share/apps/ksgmltools2/customization/xx
+@dirrm share/apps/ksgmltools2/customization/xsl
+@dirrm share/apps/ksgmltools2/customization/xh/entities
+@dirrm share/apps/ksgmltools2/customization/xh
+@dirrm share/apps/ksgmltools2/customization/wa/entities
+@dirrm share/apps/ksgmltools2/customization/wa
+@dirrm share/apps/ksgmltools2/customization/uk/entities
+@dirrm share/apps/ksgmltools2/customization/uk
+@dirrm share/apps/ksgmltools2/customization/tr/entities
+@dirrm share/apps/ksgmltools2/customization/tr
+@dirrm share/apps/ksgmltools2/customization/sv/entities
+@dirrm share/apps/ksgmltools2/customization/sv
+@dirrm share/apps/ksgmltools2/customization/sr/entities
+@dirrm share/apps/ksgmltools2/customization/sr
+@dirrm share/apps/ksgmltools2/customization/sl/entities
+@dirrm share/apps/ksgmltools2/customization/sl
+@dirrm share/apps/ksgmltools2/customization/sk/entities
+@dirrm share/apps/ksgmltools2/customization/sk
+@dirrm share/apps/ksgmltools2/customization/ru/entities
+@dirrm share/apps/ksgmltools2/customization/ru
+@dirrm share/apps/ksgmltools2/customization/ro/entities
+@dirrm share/apps/ksgmltools2/customization/ro
+@dirrm share/apps/ksgmltools2/customization/pt/entities
+@dirrm share/apps/ksgmltools2/customization/pt-BR/entities
+@dirrm share/apps/ksgmltools2/customization/pt-BR
+@dirrm share/apps/ksgmltools2/customization/pt
+@dirrm share/apps/ksgmltools2/customization/pl/entities
+@dirrm share/apps/ksgmltools2/customization/pl
+@dirrm share/apps/ksgmltools2/customization/obsolete
+@dirrm share/apps/ksgmltools2/customization/no/entities
+@dirrm share/apps/ksgmltools2/customization/no
+@dirrm share/apps/ksgmltools2/customization/nn/entities
+@dirrm share/apps/ksgmltools2/customization/nn
+@dirrm share/apps/ksgmltools2/customization/nl/entities
+@dirrm share/apps/ksgmltools2/customization/nl
+@dirrm share/apps/ksgmltools2/customization/lt/entities
+@dirrm share/apps/ksgmltools2/customization/lt
+@dirrm share/apps/ksgmltools2/customization/ko/entities
+@dirrm share/apps/ksgmltools2/customization/ko
+@dirrm share/apps/ksgmltools2/customization/ja/entities
+@dirrm share/apps/ksgmltools2/customization/ja
+@dirrm share/apps/ksgmltools2/customization/it/entities
+@dirrm share/apps/ksgmltools2/customization/it
+@dirrm share/apps/ksgmltools2/customization/id/entities
+@dirrm share/apps/ksgmltools2/customization/id
+@dirrm share/apps/ksgmltools2/customization/hu/entities
+@dirrm share/apps/ksgmltools2/customization/hu
+@dirrm share/apps/ksgmltools2/customization/he/entities
+@dirrm share/apps/ksgmltools2/customization/he
+@dirrm share/apps/ksgmltools2/customization/fr/entities
+@dirrm share/apps/ksgmltools2/customization/fr
+@dirrm share/apps/ksgmltools2/customization/fo/entities
+@dirrm share/apps/ksgmltools2/customization/fo
+@dirrm share/apps/ksgmltools2/customization/fi/entities
+@dirrm share/apps/ksgmltools2/customization/fi
+@dirrm share/apps/ksgmltools2/customization/et/entities
+@dirrm share/apps/ksgmltools2/customization/et
+@dirrm share/apps/ksgmltools2/customization/es/entities
+@dirrm share/apps/ksgmltools2/customization/es
+@dirrm share/apps/ksgmltools2/customization/entities
+@dirrm share/apps/ksgmltools2/customization/en/entities
+@dirrm share/apps/ksgmltools2/customization/en-GB/entities
+@dirrm share/apps/ksgmltools2/customization/en-GB
+@dirrm share/apps/ksgmltools2/customization/en
+@dirrm share/apps/ksgmltools2/customization/el/entities
+@dirrm share/apps/ksgmltools2/customization/el
+@dirrm share/apps/ksgmltools2/customization/dtd
+@dirrm share/apps/ksgmltools2/customization/de/entities
+@dirrm share/apps/ksgmltools2/customization/de
+@dirrm share/apps/ksgmltools2/customization/da/entities
+@dirrm share/apps/ksgmltools2/customization/da
+@dirrm share/apps/ksgmltools2/customization/cs/entities
+@dirrm share/apps/ksgmltools2/customization/cs
+@dirrm share/apps/ksgmltools2/customization/ca/entities
+@dirrm share/apps/ksgmltools2/customization/ca
+@dirrm share/apps/ksgmltools2/customization/bg/entities
+@dirrm share/apps/ksgmltools2/customization/bg
+@dirrm share/apps/ksgmltools2/customization/af/entities
+@dirrm share/apps/ksgmltools2/customization/af
+@dirrm share/apps/ksgmltools2/customization
+@dirrm share/apps/ksgmltools2
+@dirrm share/apps/knotify
+@dirrm share/apps/kjava
+@dirrm share/apps/kio_uiserver/icons/crystalsvg/16x16/apps
+@dirrm share/apps/kio_uiserver/icons/crystalsvg/16x16
+@dirrm share/apps/kio_uiserver/icons/crystalsvg
+@dirrm share/apps/kio_uiserver/icons
+@dirrm share/apps/kio_uiserver
+@dirrm share/apps/khtml/icons/crystalsvg/64x64/actions
+@dirrm share/apps/khtml/icons/crystalsvg/64x64
+@dirrm share/apps/khtml/icons/crystalsvg/48x48/actions
+@dirrm share/apps/khtml/icons/crystalsvg/48x48
+@dirrm share/apps/khtml/icons/crystalsvg/32x32/actions
+@dirrm share/apps/khtml/icons/crystalsvg/32x32
+@dirrm share/apps/khtml/icons/crystalsvg/22x22/actions
+@dirrm share/apps/khtml/icons/crystalsvg/22x22
+@dirrm share/apps/khtml/icons/crystalsvg/16x16/actions
+@dirrm share/apps/khtml/icons/crystalsvg/16x16
+@dirrm share/apps/khtml/icons/crystalsvg/128x128/actions
+@dirrm share/apps/khtml/icons/crystalsvg/128x128
+@dirrm share/apps/khtml/icons/crystalsvg
+@dirrm share/apps/khtml/icons
+@dirrm share/apps/khtml/css
+@dirrm share/apps/khtml
+@dirrm share/apps/kdewidgets/pics
+@dirrm share/apps/kdewidgets
+@dirrm share/apps/kdeui/pics
+@dirrm share/apps/kdeui
+@dirrm share/apps/kdeprint/tools
+@dirrm share/apps/kdeprint/plugins
+@dirrm share/apps/kdeprint/pics
+@dirrm share/apps/kdeprint/icons/crystalsvg/64x64/apps
+@dirrm share/apps/kdeprint/icons/crystalsvg/64x64
+@dirrm share/apps/kdeprint/icons/crystalsvg/48x48/apps
+@dirrm share/apps/kdeprint/icons/crystalsvg/48x48
+@dirrm share/apps/kdeprint/icons/crystalsvg/32x32/apps
+@dirrm share/apps/kdeprint/icons/crystalsvg/32x32/actions
+@dirrm share/apps/kdeprint/icons/crystalsvg/32x32
+@dirrm share/apps/kdeprint/icons/crystalsvg/22x22/apps
+@dirrm share/apps/kdeprint/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kdeprint/icons/crystalsvg/22x22
+@dirrm share/apps/kdeprint/icons/crystalsvg/16x16/apps
+@dirrm share/apps/kdeprint/icons/crystalsvg/16x16/actions
+@dirrm share/apps/kdeprint/icons/crystalsvg/16x16
+@dirrm share/apps/kdeprint/icons/crystalsvg
+@dirrm share/apps/kdeprint/icons
+@dirrm share/apps/kdeprint/filters
+@dirrm share/apps/kdeprint
+@dirrm share/apps/kconf_update
+@dirrm share/apps/kcm_componentchooser
+@dirrm share/apps/kcertpart
+@dirrm share/apps/katepart/syntax
+@dirrm share/apps/katepart
+@dirrm share/apps/kabc/formats
+@dirrm share/apps/kabc
+@dirrm share/apps/dcopidlng
+@dirrm share/apps/LICENSES
+@dirrm share/apps
+@dirrm share/applications/kde
+@dirrm share/applications
+@dirrm lib/kde3/plugins/styles
+@dirrm lib/kde3/plugins/designer
+@dirrm lib/kde3/plugins
+@dirrm lib/kde3
+@dirrm include/libkmid
+@dirrm include/ktexteditor
+@dirrm include/ksettings
+@dirrm include/kresources
+@dirrm include/kparts
+@dirrm include/kmediaplayer
+@dirrm include/kjs
+@dirrm include/kio
+@dirrm include/khexedit
+@dirrm include/kdesu
+@dirrm include/kdeprint/lpr
+@dirrm include/kdeprint
+@dirrm include/kate
+@dirrm include/kabc
+@dirrm include/dom
+@dirrm etc/xdg/menus
+@dirrm etc/xdg
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 14ff46b..1f670be 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -10,7 +10,7 @@ PORTNAME= kdelibs
PORTVERSION= ${KDE_VERSION}
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
@@ -48,8 +48,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--disable-ltdl-install \
--enable-mt
-KDE_BUILD_PLIST= yes
-
FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/tcvn-0.enc
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index c2897e1..fb6fef9 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdelibs-3.2.0.tar.bz2) = 24be0d558725f4d3441fb9d580129720
+MD5 (KDE/kdelibs-3.2.1.tar.bz2) = 50ae60072c1fc4ae4e41694bc2325dcb
+SIZE (KDE/kdelibs-3.2.1.tar.bz2) = 12597050
diff --git a/x11/kdelibs4/files/plist.base.rm b/x11/kdelibs4/files/plist.base.rm
deleted file mode 100644
index e4fc7ef..0000000
--- a/x11/kdelibs4/files/plist.base.rm
+++ /dev/null
@@ -1,288 +0,0 @@
-@unexec /bin/rmdir %D/share/icons/crystalsvg/32x32/actions/kde || true
-@unexec /bin/rmdir %D/share/icons/crystalsvg/22x22/actions/kde || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kio/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kdeui/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kdeprint/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kdefx/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kdecore/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kate/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/arts/html || true
-@dirrm share/servicetypes
-@dirrm share/services/kresources/kabc
-@dirrm share/services/kresources
-@dirrm share/services/kded
-@dirrm share/services
-@dirrm share/mimelnk/video
-@dirrm share/mimelnk/text
-@dirrm share/mimelnk/multipart
-@dirrm share/mimelnk/model
-@dirrm share/mimelnk/message
-@dirrm share/mimelnk/inode
-@dirrm share/mimelnk/image
-@dirrm share/mimelnk/audio
-@dirrm share/mimelnk/application
-@dirrm share/mimelnk/all
-@dirrm share/mimelnk
-@dirrm share/locale
-@dirrm share/icons/hicolor
-@dirrm share/icons/crystalsvg/scalable/mimetypes
-@dirrm share/icons/crystalsvg/scalable/filesystems
-@dirrm share/icons/crystalsvg/scalable/devices
-@dirrm share/icons/crystalsvg/scalable/apps
-@dirrm share/icons/crystalsvg/scalable
-@dirrm share/icons/crystalsvg/64x64/mimetypes
-@dirrm share/icons/crystalsvg/64x64/filesystems
-@dirrm share/icons/crystalsvg/64x64/devices
-@dirrm share/icons/crystalsvg/64x64/actions
-@dirrm share/icons/crystalsvg/64x64
-@dirrm share/icons/crystalsvg/48x48/mimetypes
-@dirrm share/icons/crystalsvg/48x48/filesystems
-@dirrm share/icons/crystalsvg/48x48/devices
-@dirrm share/icons/crystalsvg/48x48/actions
-@dirrm share/icons/crystalsvg/48x48
-@dirrm share/icons/crystalsvg/32x32/mimetypes
-@dirrm share/icons/crystalsvg/32x32/filesystems
-@dirrm share/icons/crystalsvg/32x32/devices
-@dirrm share/icons/crystalsvg/32x32/actions
-@dirrm share/icons/crystalsvg/32x32
-@dirrm share/icons/crystalsvg/22x22/mimetypes
-@dirrm share/icons/crystalsvg/22x22/filesystems
-@dirrm share/icons/crystalsvg/22x22/actions
-@dirrm share/icons/crystalsvg/22x22
-@dirrm share/icons/crystalsvg/16x16/mimetypes
-@dirrm share/icons/crystalsvg/16x16/filesystems
-@dirrm share/icons/crystalsvg/16x16/devices
-@dirrm share/icons/crystalsvg/16x16/actions
-@dirrm share/icons/crystalsvg/16x16
-@dirrm share/icons/crystalsvg/128x128/mimetypes
-@dirrm share/icons/crystalsvg/128x128/filesystems
-@dirrm share/icons/crystalsvg/128x128/devices
-@dirrm share/icons/crystalsvg/128x128
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
-@dirrm share/doc/HTML/en/kdelibs-apidocs/libkmid
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kwallet
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kutils
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kresources
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kparts
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kmdi
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kjs
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kio
-@dirrm share/doc/HTML/en/kdelibs-apidocs/khtml
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kdeui
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kdeprint
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kdefx
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kdecore
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kate
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kabc
-@dirrm share/doc/HTML/en/kdelibs-apidocs/interfaces
-@dirrm share/doc/HTML/en/kdelibs-apidocs/dcop
-@dirrm share/doc/HTML/en/kdelibs-apidocs/arts
-@dirrm share/doc/HTML/en/kdelibs-apidocs
-@dirrm share/doc/HTML/en/common
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
-@dirrm share/config/ui
-@dirrm share/config/colors
-@dirrm share/config
-@dirrm share/autostart
-@dirrm share/apps/proxyscout
-@dirrm share/apps/ktexteditor_kdatatool
-@dirrm share/apps/ktexteditor_isearch
-@dirrm share/apps/ktexteditor_insertfile
-@dirrm share/apps/kstyle/themes
-@dirrm share/apps/kstyle/pixmaps/riscos
-@dirrm share/apps/kstyle/pixmaps
-@dirrm share/apps/kstyle
-@dirrm share/apps/kssl
-@dirrm share/apps/ksgmltools2/docbook/xsl/tools/profile
-@dirrm share/apps/ksgmltools2/docbook/xsl/tools/olink
-@dirrm share/apps/ksgmltools2/docbook/xsl/tools
-@dirrm share/apps/ksgmltools2/docbook/xsl/params
-@dirrm share/apps/ksgmltools2/docbook/xsl/lib
-@dirrm share/apps/ksgmltools2/docbook/xsl/images/callouts
-@dirrm share/apps/ksgmltools2/docbook/xsl/images
-@dirrm share/apps/ksgmltools2/docbook/xsl/html
-@dirrm share/apps/ksgmltools2/docbook/xsl/common
-@dirrm share/apps/ksgmltools2/docbook/xsl
-@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent
-@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.2
-@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent
-@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.1.2
-@dirrm share/apps/ksgmltools2/docbook
-@dirrm share/apps/ksgmltools2/customization/zh-TW/entities
-@dirrm share/apps/ksgmltools2/customization/zh-TW
-@dirrm share/apps/ksgmltools2/customization/xx/entities
-@dirrm share/apps/ksgmltools2/customization/xx
-@dirrm share/apps/ksgmltools2/customization/xsl
-@dirrm share/apps/ksgmltools2/customization/xh/entities
-@dirrm share/apps/ksgmltools2/customization/xh
-@dirrm share/apps/ksgmltools2/customization/wa/entities
-@dirrm share/apps/ksgmltools2/customization/wa
-@dirrm share/apps/ksgmltools2/customization/uk/entities
-@dirrm share/apps/ksgmltools2/customization/uk
-@dirrm share/apps/ksgmltools2/customization/tr/entities
-@dirrm share/apps/ksgmltools2/customization/tr
-@dirrm share/apps/ksgmltools2/customization/sv/entities
-@dirrm share/apps/ksgmltools2/customization/sv
-@dirrm share/apps/ksgmltools2/customization/sr/entities
-@dirrm share/apps/ksgmltools2/customization/sr
-@dirrm share/apps/ksgmltools2/customization/sl/entities
-@dirrm share/apps/ksgmltools2/customization/sl
-@dirrm share/apps/ksgmltools2/customization/sk/entities
-@dirrm share/apps/ksgmltools2/customization/sk
-@dirrm share/apps/ksgmltools2/customization/ru/entities
-@dirrm share/apps/ksgmltools2/customization/ru
-@dirrm share/apps/ksgmltools2/customization/ro/entities
-@dirrm share/apps/ksgmltools2/customization/ro
-@dirrm share/apps/ksgmltools2/customization/pt/entities
-@dirrm share/apps/ksgmltools2/customization/pt-BR/entities
-@dirrm share/apps/ksgmltools2/customization/pt-BR
-@dirrm share/apps/ksgmltools2/customization/pt
-@dirrm share/apps/ksgmltools2/customization/pl/entities
-@dirrm share/apps/ksgmltools2/customization/pl
-@dirrm share/apps/ksgmltools2/customization/obsolete
-@dirrm share/apps/ksgmltools2/customization/no/entities
-@dirrm share/apps/ksgmltools2/customization/no
-@dirrm share/apps/ksgmltools2/customization/nn/entities
-@dirrm share/apps/ksgmltools2/customization/nn
-@dirrm share/apps/ksgmltools2/customization/nl/entities
-@dirrm share/apps/ksgmltools2/customization/nl
-@dirrm share/apps/ksgmltools2/customization/lt/entities
-@dirrm share/apps/ksgmltools2/customization/lt
-@dirrm share/apps/ksgmltools2/customization/ko/entities
-@dirrm share/apps/ksgmltools2/customization/ko
-@dirrm share/apps/ksgmltools2/customization/ja/entities
-@dirrm share/apps/ksgmltools2/customization/ja
-@dirrm share/apps/ksgmltools2/customization/it/entities
-@dirrm share/apps/ksgmltools2/customization/it
-@dirrm share/apps/ksgmltools2/customization/id/entities
-@dirrm share/apps/ksgmltools2/customization/id
-@dirrm share/apps/ksgmltools2/customization/hu/entities
-@dirrm share/apps/ksgmltools2/customization/hu
-@dirrm share/apps/ksgmltools2/customization/he/entities
-@dirrm share/apps/ksgmltools2/customization/he
-@dirrm share/apps/ksgmltools2/customization/fr/entities
-@dirrm share/apps/ksgmltools2/customization/fr
-@dirrm share/apps/ksgmltools2/customization/fo/entities
-@dirrm share/apps/ksgmltools2/customization/fo
-@dirrm share/apps/ksgmltools2/customization/fi/entities
-@dirrm share/apps/ksgmltools2/customization/fi
-@dirrm share/apps/ksgmltools2/customization/et/entities
-@dirrm share/apps/ksgmltools2/customization/et
-@dirrm share/apps/ksgmltools2/customization/es/entities
-@dirrm share/apps/ksgmltools2/customization/es
-@dirrm share/apps/ksgmltools2/customization/entities
-@dirrm share/apps/ksgmltools2/customization/en/entities
-@dirrm share/apps/ksgmltools2/customization/en-GB/entities
-@dirrm share/apps/ksgmltools2/customization/en-GB
-@dirrm share/apps/ksgmltools2/customization/en
-@dirrm share/apps/ksgmltools2/customization/el/entities
-@dirrm share/apps/ksgmltools2/customization/el
-@dirrm share/apps/ksgmltools2/customization/dtd
-@dirrm share/apps/ksgmltools2/customization/de/entities
-@dirrm share/apps/ksgmltools2/customization/de
-@dirrm share/apps/ksgmltools2/customization/da/entities
-@dirrm share/apps/ksgmltools2/customization/da
-@dirrm share/apps/ksgmltools2/customization/cs/entities
-@dirrm share/apps/ksgmltools2/customization/cs
-@dirrm share/apps/ksgmltools2/customization/ca/entities
-@dirrm share/apps/ksgmltools2/customization/ca
-@dirrm share/apps/ksgmltools2/customization/bg/entities
-@dirrm share/apps/ksgmltools2/customization/bg
-@dirrm share/apps/ksgmltools2/customization/af/entities
-@dirrm share/apps/ksgmltools2/customization/af
-@dirrm share/apps/ksgmltools2/customization
-@dirrm share/apps/ksgmltools2
-@dirrm share/apps/knotify
-@dirrm share/apps/kjava
-@dirrm share/apps/kio_uiserver/icons/crystalsvg/16x16/apps
-@dirrm share/apps/kio_uiserver/icons/crystalsvg/16x16
-@dirrm share/apps/kio_uiserver/icons/crystalsvg
-@dirrm share/apps/kio_uiserver/icons
-@dirrm share/apps/kio_uiserver
-@dirrm share/apps/khtml/icons/crystalsvg/64x64/actions
-@dirrm share/apps/khtml/icons/crystalsvg/64x64
-@dirrm share/apps/khtml/icons/crystalsvg/48x48/actions
-@dirrm share/apps/khtml/icons/crystalsvg/48x48
-@dirrm share/apps/khtml/icons/crystalsvg/32x32/actions
-@dirrm share/apps/khtml/icons/crystalsvg/32x32
-@dirrm share/apps/khtml/icons/crystalsvg/22x22/actions
-@dirrm share/apps/khtml/icons/crystalsvg/22x22
-@dirrm share/apps/khtml/icons/crystalsvg/16x16/actions
-@dirrm share/apps/khtml/icons/crystalsvg/16x16
-@dirrm share/apps/khtml/icons/crystalsvg/128x128/actions
-@dirrm share/apps/khtml/icons/crystalsvg/128x128
-@dirrm share/apps/khtml/icons/crystalsvg
-@dirrm share/apps/khtml/icons
-@dirrm share/apps/khtml/css
-@dirrm share/apps/khtml
-@dirrm share/apps/kdewidgets/pics
-@dirrm share/apps/kdewidgets
-@dirrm share/apps/kdeui/pics
-@dirrm share/apps/kdeui
-@dirrm share/apps/kdeprint/tools
-@dirrm share/apps/kdeprint/plugins
-@dirrm share/apps/kdeprint/pics
-@dirrm share/apps/kdeprint/icons/crystalsvg/64x64/apps
-@dirrm share/apps/kdeprint/icons/crystalsvg/64x64
-@dirrm share/apps/kdeprint/icons/crystalsvg/48x48/apps
-@dirrm share/apps/kdeprint/icons/crystalsvg/48x48
-@dirrm share/apps/kdeprint/icons/crystalsvg/32x32/apps
-@dirrm share/apps/kdeprint/icons/crystalsvg/32x32/actions
-@dirrm share/apps/kdeprint/icons/crystalsvg/32x32
-@dirrm share/apps/kdeprint/icons/crystalsvg/22x22/apps
-@dirrm share/apps/kdeprint/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kdeprint/icons/crystalsvg/22x22
-@dirrm share/apps/kdeprint/icons/crystalsvg/16x16/apps
-@dirrm share/apps/kdeprint/icons/crystalsvg/16x16/actions
-@dirrm share/apps/kdeprint/icons/crystalsvg/16x16
-@dirrm share/apps/kdeprint/icons/crystalsvg
-@dirrm share/apps/kdeprint/icons
-@dirrm share/apps/kdeprint/filters
-@dirrm share/apps/kdeprint
-@dirrm share/apps/kconf_update
-@dirrm share/apps/kcm_componentchooser
-@dirrm share/apps/kcertpart
-@dirrm share/apps/katepart/syntax
-@dirrm share/apps/katepart
-@dirrm share/apps/kabc/formats
-@dirrm share/apps/kabc
-@dirrm share/apps/dcopidlng
-@dirrm share/apps/LICENSES
-@dirrm share/apps
-@dirrm share/applications/kde
-@dirrm share/applications
-@dirrm lib/kde3/plugins/styles
-@dirrm lib/kde3/plugins/designer
-@dirrm lib/kde3/plugins
-@dirrm lib/kde3
-@dirrm include/libkmid
-@dirrm include/ktexteditor
-@dirrm include/ksettings
-@dirrm include/kresources
-@dirrm include/kparts
-@dirrm include/kmediaplayer
-@dirrm include/kjs
-@dirrm include/kio
-@dirrm include/khexedit
-@dirrm include/kdesu
-@dirrm include/kdeprint/lpr
-@dirrm include/kdeprint
-@dirrm include/kate
-@dirrm include/kabc
-@dirrm include/dom
-@dirrm include/arts
-@dirrm etc/xdg/menus
-@dirrm etc/xdg
diff --git a/x11/kdelibs4/files/plist.base b/x11/kdelibs4/pkg-plist
index c5e29a3..c307ba1 100644
--- a/x11/kdelibs4/files/plist.base
+++ b/x11/kdelibs4/pkg-plist
@@ -665,6 +665,8 @@ include/renamedlgplugin.h
include/scriptclientinterface.h
include/scriptinterface.h
include/scriptmanager.h
+lib/kde3/cupsdconf.la
+lib/kde3/cupsdconf.so
lib/kde3/dcopserver.la
lib/kde3/dcopserver.so
lib/kde3/kabc_dir.la
@@ -767,10 +769,14 @@ lib/kde3/libkatepart.la
lib/kde3/libkatepart.so
lib/kde3/libkcertpart.la
lib/kde3/libkcertpart.so
+lib/kde3/libkdeprint_management_module.la
+lib/kde3/libkdeprint_management_module.so
lib/kde3/libkhtmlpart.la
lib/kde3/libkhtmlpart.so
lib/kde3/libkmultipart.la
lib/kde3/libkmultipart.so
+lib/kde3/libshellscript.la
+lib/kde3/libshellscript.so
lib/kde3/plugins/designer/kdewidgets.la
lib/kde3/plugins/designer/kdewidgets.so
lib/kde3/plugins/styles/highcolor.la
@@ -787,8 +793,6 @@ lib/libDCOP.so.6
lib/libartskde.la
lib/libartskde.so
lib/libartskde.so.3
-lib/libcupsdconf.la
-lib/libcupsdconf.so
lib/libkabc.la
lib/libkabc.so
lib/libkabc.so.3
@@ -817,6 +821,8 @@ lib/libkdefakes_nonpic.a
lib/libkdefx.la
lib/libkdefx.so
lib/libkdefx.so.6
+lib/libkdeinit_cupsdconf.la
+lib/libkdeinit_cupsdconf.so
lib/libkdeinit_dcopserver.la
lib/libkdeinit_dcopserver.so
lib/libkdeinit_kaddprinterwizard.la
@@ -898,9 +904,6 @@ lib/libkwalletbackend.so.1
lib/libkwalletclient.la
lib/libkwalletclient.so
lib/libkwalletclient.so.1
-lib/libshellscript.la
-lib/libshellscript.so
-lib/libshellscript.so.0
lib/libvcard.la
lib/libvcard.so
lib/libvcard.so.0
@@ -1169,6 +1172,7 @@ share/apps/khtml/css/quirks.css
share/apps/khtml/icons/crystalsvg/128x128/actions/bug.png
share/apps/khtml/icons/crystalsvg/16x16/actions/bug.png
share/apps/khtml/icons/crystalsvg/16x16/actions/images_display.png
+share/apps/khtml/icons/crystalsvg/16x16/actions/wallet_open.png
share/apps/khtml/icons/crystalsvg/22x22/actions/bug.png
share/apps/khtml/icons/crystalsvg/22x22/actions/dbgnext.png
share/apps/khtml/icons/crystalsvg/22x22/actions/dbgrun.png
@@ -2440,6 +2444,7 @@ share/config/kthemestylerc
share/config/language.codes
share/config/ui/kprintpreviewui.rc
share/config/ui/ui_standards.rc
+share/cups/model/postscript.ppd.gz
share/doc/HTML/en/common/1.png
share/doc/HTML/en/common/10.png
share/doc/HTML/en/common/2.png
@@ -2587,6 +2592,7 @@ share/icons/crystalsvg/16x16/actions/2rightarrow.png
share/icons/crystalsvg/16x16/actions/2uparrow.png
share/icons/crystalsvg/16x16/actions/about_kde.png
share/icons/crystalsvg/16x16/actions/airbrush.png
+share/icons/crystalsvg/16x16/actions/apply.png
share/icons/crystalsvg/16x16/actions/attach.png
share/icons/crystalsvg/16x16/actions/back.png
share/icons/crystalsvg/16x16/actions/blend.png
@@ -2965,6 +2971,7 @@ share/icons/crystalsvg/22x22/actions/2rightarrow.png
share/icons/crystalsvg/22x22/actions/2uparrow.png
share/icons/crystalsvg/22x22/actions/about_kde.png
share/icons/crystalsvg/22x22/actions/airbrush.png
+share/icons/crystalsvg/22x22/actions/apply.png
share/icons/crystalsvg/22x22/actions/attach.png
share/icons/crystalsvg/22x22/actions/back.png
share/icons/crystalsvg/22x22/actions/blend.png
@@ -3264,6 +3271,7 @@ share/icons/crystalsvg/32x32/actions/2leftarrow.png
share/icons/crystalsvg/32x32/actions/2rightarrow.png
share/icons/crystalsvg/32x32/actions/2uparrow.png
share/icons/crystalsvg/32x32/actions/about_kde.png
+share/icons/crystalsvg/32x32/actions/apply.png
share/icons/crystalsvg/32x32/actions/attach.png
share/icons/crystalsvg/32x32/actions/back.png
share/icons/crystalsvg/32x32/actions/blend.png
@@ -4145,7 +4153,6 @@ share/mimelnk/application/x-lzop.desktop
share/mimelnk/application/x-magicpoint.desktop
share/mimelnk/application/x-msaccess.desktop
share/mimelnk/application/x-msdos-program.desktop
-share/mimelnk/application/x-mswinurl.desktop
share/mimelnk/application/x-mswrite.desktop
share/mimelnk/application/x-object.desktop
share/mimelnk/application/x-ogg.desktop
@@ -4271,6 +4278,7 @@ share/mimelnk/text/x-log.desktop
share/mimelnk/text/x-lyx.desktop
share/mimelnk/text/x-makefile.desktop
share/mimelnk/text/x-moc.desktop
+share/mimelnk/text/x-mswinurl.desktop
share/mimelnk/text/x-objcsrc.desktop
share/mimelnk/text/x-pascal.desktop
share/mimelnk/text/x-perl.desktop
@@ -4342,6 +4350,7 @@ share/services/ppm.kimgio
share/services/rlogin.protocol
share/services/rtsp.protocol
share/services/shellscript.desktop
+share/services/ssh.protocol
share/services/telnet.protocol
share/services/tga.kimgio
share/services/tiff.kimgio
@@ -4374,23 +4383,389 @@ share/servicetypes/ktexteditorplugin.desktop
share/servicetypes/kurifilterplugin.desktop
share/servicetypes/renamedlgplugin.desktop
share/servicetypes/scriptinterface.desktop
+@exec /bin/mkdir -p %D/share/icons/crystalsvg/32x32/actions/kde
+@exec /bin/mkdir -p %D/share/icons/crystalsvg/32x32/actions/kde
+@exec /bin/mkdir -p %D/share/icons/crystalsvg/32x32/actions/kde
+@exec /bin/mkdir -p %D/share/icons/crystalsvg/22x22/actions/kde
+@exec /bin/mkdir -p %D/share/icons/crystalsvg/22x22/actions/kde
+@exec /bin/mkdir -p %D/share/icons/crystalsvg/22x22/actions/kde
+@exec /bin/mkdir -p %D/share/icons/crystalsvg/32x32/actions/kde
+@exec /bin/mkdir -p %D/share/icons/crystalsvg/22x22/actions/kde
+@exec /bin/mkdir -p %D/share/icons/crystalsvg/32x32/actions/kde
+@exec /bin/mkdir -p %D/share/icons/crystalsvg/22x22/actions/kde
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeui/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeui/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeprint/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeprint/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdefx/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdefx/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdecore/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdecore/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kate/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kate/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdefx/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdecore/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeui/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeprint/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kate/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdecore/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdefx/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeprint/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdecore/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeui/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeprint/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kate/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdefx/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdecore/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeui/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html
-@exec /bin/mkdir -p %D/share/icons/crystalsvg/22x22/actions/kde
-@exec /bin/mkdir -p %D/share/icons/crystalsvg/32x32/actions/kde
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeprint/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kate/html
+@dirrm share/servicetypes
+@dirrm share/services/kresources/kabc
+@dirrm share/services/kresources
+@dirrm share/services/kded
+@dirrm share/services
+@dirrm share/mimelnk/video
+@dirrm share/mimelnk/text
+@dirrm share/mimelnk/multipart
+@dirrm share/mimelnk/model
+@dirrm share/mimelnk/message
+@dirrm share/mimelnk/inode
+@dirrm share/mimelnk/image
+@dirrm share/mimelnk/audio
+@dirrm share/mimelnk/application
+@dirrm share/mimelnk/all
+@dirrm share/mimelnk
+@dirrm share/icons/hicolor
+@dirrm share/icons/crystalsvg/scalable/mimetypes
+@dirrm share/icons/crystalsvg/scalable/filesystems
+@dirrm share/icons/crystalsvg/scalable/devices
+@dirrm share/icons/crystalsvg/scalable/apps
+@dirrm share/icons/crystalsvg/scalable
+@dirrm share/icons/crystalsvg/64x64/mimetypes
+@dirrm share/icons/crystalsvg/64x64/filesystems
+@dirrm share/icons/crystalsvg/64x64/devices
+@dirrm share/icons/crystalsvg/64x64/actions
+@dirrm share/icons/crystalsvg/64x64
+@dirrm share/icons/crystalsvg/48x48/mimetypes
+@dirrm share/icons/crystalsvg/48x48/filesystems
+@dirrm share/icons/crystalsvg/48x48/devices
+@dirrm share/icons/crystalsvg/48x48/actions
+@dirrm share/icons/crystalsvg/48x48
+@dirrm share/icons/crystalsvg/32x32/mimetypes
+@dirrm share/icons/crystalsvg/32x32/filesystems
+@dirrm share/icons/crystalsvg/32x32/devices
+@dirrm share/icons/crystalsvg/32x32/actions/kde
+@dirrm share/icons/crystalsvg/32x32/actions
+@dirrm share/icons/crystalsvg/32x32
+@dirrm share/icons/crystalsvg/22x22/mimetypes
+@dirrm share/icons/crystalsvg/22x22/filesystems
+@dirrm share/icons/crystalsvg/22x22/actions/kde
+@dirrm share/icons/crystalsvg/22x22/actions
+@dirrm share/icons/crystalsvg/22x22
+@dirrm share/icons/crystalsvg/16x16/mimetypes
+@dirrm share/icons/crystalsvg/16x16/filesystems
+@dirrm share/icons/crystalsvg/16x16/devices
+@dirrm share/icons/crystalsvg/16x16/actions
+@dirrm share/icons/crystalsvg/16x16
+@dirrm share/icons/crystalsvg/128x128/mimetypes
+@dirrm share/icons/crystalsvg/128x128/filesystems
+@dirrm share/icons/crystalsvg/128x128/devices
+@dirrm share/icons/crystalsvg/128x128
+@dirrm share/icons/crystalsvg
+@dirrm share/icons
+@dirrm share/doc/HTML/en/kdelibs-apidocs/libkmid/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/libkmid
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kwallet/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kwallet
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kutils/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kutils
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kresources/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kresources
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kparts/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kparts
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kmdi/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kmdi
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kjs/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kjs
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kio/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kio
+@dirrm share/doc/HTML/en/kdelibs-apidocs/khtml/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/khtml
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kdeui/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kdeui
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kdeprint/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kdeprint
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kdefx/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kdefx
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kdecore/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kdecore
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kate/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kate
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kabc/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kabc
+@dirrm share/doc/HTML/en/kdelibs-apidocs/interfaces/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/interfaces
+@dirrm share/doc/HTML/en/kdelibs-apidocs/dcop/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/dcop
+@dirrm share/doc/HTML/en/kdelibs-apidocs/arts/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/arts
+@dirrm share/doc/HTML/en/kdelibs-apidocs
+@dirrm share/doc/HTML/en/common
+@dirrm share/doc/HTML/en
+@dirrm share/doc/HTML
+@dirrm share/config/ui
+@dirrm share/config/colors
+@dirrm share/config
+@dirrm share/autostart
+@dirrm share/apps/proxyscout
+@dirrm share/apps/ktexteditor_kdatatool
+@dirrm share/apps/ktexteditor_isearch
+@dirrm share/apps/ktexteditor_insertfile
+@dirrm share/apps/kstyle/themes
+@dirrm share/apps/kstyle/pixmaps/riscos
+@dirrm share/apps/kstyle/pixmaps
+@dirrm share/apps/kstyle
+@dirrm share/apps/kssl
+@dirrm share/apps/ksgmltools2/docbook/xsl/tools/profile
+@dirrm share/apps/ksgmltools2/docbook/xsl/tools/olink
+@dirrm share/apps/ksgmltools2/docbook/xsl/tools
+@dirrm share/apps/ksgmltools2/docbook/xsl/params
+@dirrm share/apps/ksgmltools2/docbook/xsl/lib
+@dirrm share/apps/ksgmltools2/docbook/xsl/images/callouts
+@dirrm share/apps/ksgmltools2/docbook/xsl/images
+@dirrm share/apps/ksgmltools2/docbook/xsl/html
+@dirrm share/apps/ksgmltools2/docbook/xsl/common
+@dirrm share/apps/ksgmltools2/docbook/xsl
+@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent
+@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.2
+@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent
+@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.1.2
+@dirrm share/apps/ksgmltools2/docbook
+@dirrm share/apps/ksgmltools2/customization/zh-TW/entities
+@dirrm share/apps/ksgmltools2/customization/zh-TW
+@dirrm share/apps/ksgmltools2/customization/xx/entities
+@dirrm share/apps/ksgmltools2/customization/xx
+@dirrm share/apps/ksgmltools2/customization/xsl
+@dirrm share/apps/ksgmltools2/customization/xh/entities
+@dirrm share/apps/ksgmltools2/customization/xh
+@dirrm share/apps/ksgmltools2/customization/wa/entities
+@dirrm share/apps/ksgmltools2/customization/wa
+@dirrm share/apps/ksgmltools2/customization/uk/entities
+@dirrm share/apps/ksgmltools2/customization/uk
+@dirrm share/apps/ksgmltools2/customization/tr/entities
+@dirrm share/apps/ksgmltools2/customization/tr
+@dirrm share/apps/ksgmltools2/customization/sv/entities
+@dirrm share/apps/ksgmltools2/customization/sv
+@dirrm share/apps/ksgmltools2/customization/sr/entities
+@dirrm share/apps/ksgmltools2/customization/sr
+@dirrm share/apps/ksgmltools2/customization/sl/entities
+@dirrm share/apps/ksgmltools2/customization/sl
+@dirrm share/apps/ksgmltools2/customization/sk/entities
+@dirrm share/apps/ksgmltools2/customization/sk
+@dirrm share/apps/ksgmltools2/customization/ru/entities
+@dirrm share/apps/ksgmltools2/customization/ru
+@dirrm share/apps/ksgmltools2/customization/ro/entities
+@dirrm share/apps/ksgmltools2/customization/ro
+@dirrm share/apps/ksgmltools2/customization/pt/entities
+@dirrm share/apps/ksgmltools2/customization/pt-BR/entities
+@dirrm share/apps/ksgmltools2/customization/pt-BR
+@dirrm share/apps/ksgmltools2/customization/pt
+@dirrm share/apps/ksgmltools2/customization/pl/entities
+@dirrm share/apps/ksgmltools2/customization/pl
+@dirrm share/apps/ksgmltools2/customization/obsolete
+@dirrm share/apps/ksgmltools2/customization/no/entities
+@dirrm share/apps/ksgmltools2/customization/no
+@dirrm share/apps/ksgmltools2/customization/nn/entities
+@dirrm share/apps/ksgmltools2/customization/nn
+@dirrm share/apps/ksgmltools2/customization/nl/entities
+@dirrm share/apps/ksgmltools2/customization/nl
+@dirrm share/apps/ksgmltools2/customization/lt/entities
+@dirrm share/apps/ksgmltools2/customization/lt
+@dirrm share/apps/ksgmltools2/customization/ko/entities
+@dirrm share/apps/ksgmltools2/customization/ko
+@dirrm share/apps/ksgmltools2/customization/ja/entities
+@dirrm share/apps/ksgmltools2/customization/ja
+@dirrm share/apps/ksgmltools2/customization/it/entities
+@dirrm share/apps/ksgmltools2/customization/it
+@dirrm share/apps/ksgmltools2/customization/id/entities
+@dirrm share/apps/ksgmltools2/customization/id
+@dirrm share/apps/ksgmltools2/customization/hu/entities
+@dirrm share/apps/ksgmltools2/customization/hu
+@dirrm share/apps/ksgmltools2/customization/he/entities
+@dirrm share/apps/ksgmltools2/customization/he
+@dirrm share/apps/ksgmltools2/customization/fr/entities
+@dirrm share/apps/ksgmltools2/customization/fr
+@dirrm share/apps/ksgmltools2/customization/fo/entities
+@dirrm share/apps/ksgmltools2/customization/fo
+@dirrm share/apps/ksgmltools2/customization/fi/entities
+@dirrm share/apps/ksgmltools2/customization/fi
+@dirrm share/apps/ksgmltools2/customization/et/entities
+@dirrm share/apps/ksgmltools2/customization/et
+@dirrm share/apps/ksgmltools2/customization/es/entities
+@dirrm share/apps/ksgmltools2/customization/es
+@dirrm share/apps/ksgmltools2/customization/entities
+@dirrm share/apps/ksgmltools2/customization/en/entities
+@dirrm share/apps/ksgmltools2/customization/en-GB/entities
+@dirrm share/apps/ksgmltools2/customization/en-GB
+@dirrm share/apps/ksgmltools2/customization/en
+@dirrm share/apps/ksgmltools2/customization/el/entities
+@dirrm share/apps/ksgmltools2/customization/el
+@dirrm share/apps/ksgmltools2/customization/dtd
+@dirrm share/apps/ksgmltools2/customization/de/entities
+@dirrm share/apps/ksgmltools2/customization/de
+@dirrm share/apps/ksgmltools2/customization/da/entities
+@dirrm share/apps/ksgmltools2/customization/da
+@dirrm share/apps/ksgmltools2/customization/cs/entities
+@dirrm share/apps/ksgmltools2/customization/cs
+@dirrm share/apps/ksgmltools2/customization/ca/entities
+@dirrm share/apps/ksgmltools2/customization/ca
+@dirrm share/apps/ksgmltools2/customization/bg/entities
+@dirrm share/apps/ksgmltools2/customization/bg
+@dirrm share/apps/ksgmltools2/customization/af/entities
+@dirrm share/apps/ksgmltools2/customization/af
+@dirrm share/apps/ksgmltools2/customization
+@dirrm share/apps/ksgmltools2
+@dirrm share/apps/knotify
+@dirrm share/apps/kjava
+@dirrm share/apps/kio_uiserver/icons/crystalsvg/16x16/apps
+@dirrm share/apps/kio_uiserver/icons/crystalsvg/16x16
+@dirrm share/apps/kio_uiserver/icons/crystalsvg
+@dirrm share/apps/kio_uiserver/icons
+@dirrm share/apps/kio_uiserver
+@dirrm share/apps/khtml/icons/crystalsvg/64x64/actions
+@dirrm share/apps/khtml/icons/crystalsvg/64x64
+@dirrm share/apps/khtml/icons/crystalsvg/48x48/actions
+@dirrm share/apps/khtml/icons/crystalsvg/48x48
+@dirrm share/apps/khtml/icons/crystalsvg/32x32/actions
+@dirrm share/apps/khtml/icons/crystalsvg/32x32
+@dirrm share/apps/khtml/icons/crystalsvg/22x22/actions
+@dirrm share/apps/khtml/icons/crystalsvg/22x22
+@dirrm share/apps/khtml/icons/crystalsvg/16x16/actions
+@dirrm share/apps/khtml/icons/crystalsvg/16x16
+@dirrm share/apps/khtml/icons/crystalsvg/128x128/actions
+@dirrm share/apps/khtml/icons/crystalsvg/128x128
+@dirrm share/apps/khtml/icons/crystalsvg
+@dirrm share/apps/khtml/icons
+@dirrm share/apps/khtml/css
+@dirrm share/apps/khtml
+@dirrm share/apps/kdewidgets/pics
+@dirrm share/apps/kdewidgets
+@dirrm share/apps/kdeui/pics
+@dirrm share/apps/kdeui
+@dirrm share/apps/kdeprint/tools
+@dirrm share/apps/kdeprint/plugins
+@dirrm share/apps/kdeprint/pics
+@dirrm share/apps/kdeprint/icons/crystalsvg/64x64/apps
+@dirrm share/apps/kdeprint/icons/crystalsvg/64x64
+@dirrm share/apps/kdeprint/icons/crystalsvg/48x48/apps
+@dirrm share/apps/kdeprint/icons/crystalsvg/48x48
+@dirrm share/apps/kdeprint/icons/crystalsvg/32x32/apps
+@dirrm share/apps/kdeprint/icons/crystalsvg/32x32/actions
+@dirrm share/apps/kdeprint/icons/crystalsvg/32x32
+@dirrm share/apps/kdeprint/icons/crystalsvg/22x22/apps
+@dirrm share/apps/kdeprint/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kdeprint/icons/crystalsvg/22x22
+@dirrm share/apps/kdeprint/icons/crystalsvg/16x16/apps
+@dirrm share/apps/kdeprint/icons/crystalsvg/16x16/actions
+@dirrm share/apps/kdeprint/icons/crystalsvg/16x16
+@dirrm share/apps/kdeprint/icons/crystalsvg
+@dirrm share/apps/kdeprint/icons
+@dirrm share/apps/kdeprint/filters
+@dirrm share/apps/kdeprint
+@dirrm share/apps/kconf_update
+@dirrm share/apps/kcm_componentchooser
+@dirrm share/apps/kcertpart
+@dirrm share/apps/katepart/syntax
+@dirrm share/apps/katepart
+@dirrm share/apps/kabc/formats
+@dirrm share/apps/kabc
+@dirrm share/apps/dcopidlng
+@dirrm share/apps/LICENSES
+@dirrm share/apps
+@dirrm share/applications/kde
+@dirrm share/applications
+@dirrm lib/kde3/plugins/styles
+@dirrm lib/kde3/plugins/designer
+@dirrm lib/kde3/plugins
+@dirrm lib/kde3
+@dirrm include/libkmid
+@dirrm include/ktexteditor
+@dirrm include/ksettings
+@dirrm include/kresources
+@dirrm include/kparts
+@dirrm include/kmediaplayer
+@dirrm include/kjs
+@dirrm include/kio
+@dirrm include/khexedit
+@dirrm include/kdesu
+@dirrm include/kdeprint/lpr
+@dirrm include/kdeprint
+@dirrm include/kate
+@dirrm include/kabc
+@dirrm include/dom
+@dirrm etc/xdg/menus
+@dirrm etc/xdg
OpenPOWER on IntegriCloud