aboutsummaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/kde3/Makefile.kde8
-rw-r--r--x11/kde4-baseapps/Makefile33
-rw-r--r--x11/kde4-baseapps/distinfo2
-rw-r--r--x11/kde4-baseapps/files/patch-ksysguard-CPU.c24
-rw-r--r--x11/kde4-baseapps/files/patch-ksysguard-ProcessList.c15
-rw-r--r--x11/kde4-baseapps/files/plist.base13
-rw-r--r--x11/kde4-baseapps/files/plist.base.rm2
-rw-r--r--x11/kde4-baseapps/files/plist.mkfontdir2
-rw-r--r--x11/kde4-baseapps/files/plist.motif1
-rw-r--r--x11/kde4-runtime/Makefile33
-rw-r--r--x11/kde4-runtime/distinfo2
-rw-r--r--x11/kde4-runtime/files/patch-ksysguard-CPU.c24
-rw-r--r--x11/kde4-runtime/files/patch-ksysguard-ProcessList.c15
-rw-r--r--x11/kde4-runtime/files/plist.base13
-rw-r--r--x11/kde4-runtime/files/plist.base.rm2
-rw-r--r--x11/kde4-runtime/files/plist.mkfontdir2
-rw-r--r--x11/kde4-runtime/files/plist.motif1
-rw-r--r--x11/kde4-workspace/Makefile33
-rw-r--r--x11/kde4-workspace/distinfo2
-rw-r--r--x11/kde4-workspace/files/patch-ksysguard-CPU.c24
-rw-r--r--x11/kde4-workspace/files/patch-ksysguard-ProcessList.c15
-rw-r--r--x11/kde4-workspace/files/plist.base13
-rw-r--r--x11/kde4-workspace/files/plist.base.rm2
-rw-r--r--x11/kde4-workspace/files/plist.mkfontdir2
-rw-r--r--x11/kde4-workspace/files/plist.motif1
-rw-r--r--x11/kde4/Makefile.kde8
-rw-r--r--x11/kdebase3/Makefile33
-rw-r--r--x11/kdebase3/distinfo2
-rw-r--r--x11/kdebase3/files/patch-ksysguard-CPU.c24
-rw-r--r--x11/kdebase3/files/patch-ksysguard-ProcessList.c15
-rw-r--r--x11/kdebase3/files/plist.base13
-rw-r--r--x11/kdebase3/files/plist.base.rm2
-rw-r--r--x11/kdebase3/files/plist.mkfontdir2
-rw-r--r--x11/kdebase3/files/plist.motif1
-rw-r--r--x11/kdebase4-runtime/Makefile33
-rw-r--r--x11/kdebase4-runtime/distinfo2
-rw-r--r--x11/kdebase4-runtime/files/patch-ksysguard-CPU.c24
-rw-r--r--x11/kdebase4-runtime/files/patch-ksysguard-ProcessList.c15
-rw-r--r--x11/kdebase4-runtime/files/plist.base13
-rw-r--r--x11/kdebase4-runtime/files/plist.base.rm2
-rw-r--r--x11/kdebase4-runtime/files/plist.mkfontdir2
-rw-r--r--x11/kdebase4-runtime/files/plist.motif1
-rw-r--r--x11/kdebase4-workspace/Makefile33
-rw-r--r--x11/kdebase4-workspace/distinfo2
-rw-r--r--x11/kdebase4-workspace/files/patch-ksysguard-CPU.c24
-rw-r--r--x11/kdebase4-workspace/files/patch-ksysguard-ProcessList.c15
-rw-r--r--x11/kdebase4-workspace/files/plist.base13
-rw-r--r--x11/kdebase4-workspace/files/plist.base.rm2
-rw-r--r--x11/kdebase4-workspace/files/plist.mkfontdir2
-rw-r--r--x11/kdebase4-workspace/files/plist.motif1
-rw-r--r--x11/kdebase4/Makefile33
-rw-r--r--x11/kdebase4/distinfo2
-rw-r--r--x11/kdebase4/files/patch-ksysguard-CPU.c24
-rw-r--r--x11/kdebase4/files/patch-ksysguard-ProcessList.c15
-rw-r--r--x11/kdebase4/files/plist.base13
-rw-r--r--x11/kdebase4/files/plist.base.rm2
-rw-r--r--x11/kdebase4/files/plist.mkfontdir2
-rw-r--r--x11/kdebase4/files/plist.motif1
-rw-r--r--x11/kdelibs3/Makefile26
-rw-r--r--x11/kdelibs3/distinfo2
-rw-r--r--x11/kdelibs3/files/patch-kio::kio::kzip.cpp59
-rw-r--r--x11/kdelibs3/files/patch-kioslave::http::http.cc126
-rw-r--r--x11/kdelibs3/files/plist.base (renamed from x11/kdelibs3/pkg-plist)263
-rw-r--r--x11/kdelibs3/files/plist.base.rm262
-rw-r--r--x11/kdelibs3/files/plist.ldap3
-rw-r--r--x11/kdelibs4/Makefile26
-rw-r--r--x11/kdelibs4/distinfo2
-rw-r--r--x11/kdelibs4/files/patch-kio::kio::kzip.cpp59
-rw-r--r--x11/kdelibs4/files/patch-kioslave::http::http.cc126
-rw-r--r--x11/kdelibs4/files/plist.base (renamed from x11/kdelibs4/pkg-plist)263
-rw-r--r--x11/kdelibs4/files/plist.base.rm262
-rw-r--r--x11/kdelibs4/files/plist.ldap3
72 files changed, 1144 insertions, 998 deletions
diff --git a/x11/kde3/Makefile.kde b/x11/kde3/Makefile.kde
index 9319e0e2fe89..eb7b256a4a02 100644
--- a/x11/kde3/Makefile.kde
+++ b/x11/kde3/Makefile.kde
@@ -79,8 +79,14 @@ STRIP=''
.if !defined(_NO_KDE_NON_I386_OPTS)
.if ${MACHINE_ARCH} == "alpha"
CFLAGS= -O0 ${KDE_CFLAGS}
+.endif # ${MACHINE_ARCH} == "alpha"
+.endif # !defined(_NO_KDE_NON_I386_OPTS)
+
+.if !defined(_NO_KDE_XINERAMA)
+.if !defined(WITHOUT_XINERAMA)
+CONFIGURE_ARGS+= --with-xinerama
.endif
-.endif
+.endif # !defined(_NO_KDE_XINERAMA)
kde-version-check:
.if exists(${LOCALBASE}/include/kfm.h)
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 3fe945cc9002..1ae4170f6ed5 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
@@ -17,6 +17,8 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= This package provides the basic applications for the KDE system
+BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
KDE_BUILD_PLIST=yes
@@ -34,7 +36,6 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no
CONFIGURE_ARGS+=--disable-ltdl-install \
--without-ldap \
--disable-closure \
- ${XINERAMA} \
--without-java \
--with-qt-dir=${X11BASE} \
--with-xdmdir=${X11BASE}/lib/X11/xdm
@@ -42,14 +43,15 @@ CONFIGURE_ARGS+=--disable-ltdl-install \
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/bin/mkfontdir)
-PLIST_APPEND+= plist.mkfontdir
-.endif # exists(${X11BASE}/bin/mkfontdir)
-
.if exists(${X11BASE}/include/Xm/Xm.h)
WITH_MOTIF= yes
.endif # exists(${X11BASE}/include/Xm/Xm.h)
+.if defined(WITHOUT_MOTIF)
+.undef WITH_MOTIF
+CONFIGURE_ARGS+= --without-motif
+.endif # defined(WITHOUT_MOTIF)
+
.if defined(WITH_MOTIF)
USE_MOTIF= yes
PLIST_APPEND+= plist.motif
@@ -63,25 +65,6 @@ pre-extract::
@${ECHO_MSG}
.endif # defined(WITH_MOTIF)
-.if exists(${X11BASE}/lib/libfontconfig.so.1)
-WITH_FONTCONFIG=yes
-.endif
-
-.if defined(WITH_FONTCONFIG)
-LIB_DEPENDS+= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
-.endif
-
-.if defined(WITHOUT_XINERAMA)
-XINERAMA= --without-xinerama
-.else
-XINERAMA= --with-xinerama
-pre-extract::
- @${ECHO_MSG}
- @${ECHO_MSG} "If you don't want to compile with Xinerama support,"
- @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITHOUT_XINERAMA=yes\""
- @${ECHO_MSG}
-.endif # defined(WITH_XINERAMA)
-
post-extract:
@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo
index db90433b7878..b902fe692aaa 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdebase-3.1.tar.bz2) = 02f0583c7de93cdc458101a7575455b4
+MD5 (KDE/kdebase-3.1.1.tar.bz2) = f360add935d13be629b43a2a280b759f
diff --git a/x11/kde4-baseapps/files/patch-ksysguard-CPU.c b/x11/kde4-baseapps/files/patch-ksysguard-CPU.c
deleted file mode 100644
index 584110b5e9d1..000000000000
--- a/x11/kde4-baseapps/files/patch-ksysguard-CPU.c
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: ksysguard/ksysguardd/FreeBSD/CPU.c
-===================================================================
-RCS file: /home/kde/kdebase/ksysguard/ksysguardd/FreeBSD/CPU.c,v
-retrieving revision 1.9
-diff -u -5 -p -d -r1.9 CPU.c
---- ksysguard/ksysguardd/FreeBSD/CPU.c 17 Oct 2002 10:04:02 -0000 1.9
-+++ ksysguard/ksysguardd/FreeBSD/CPU.c 3 Mar 2003 07:11:28 -0000
-@@ -19,11 +19,16 @@
-
- $Id: CPU.c,v 1.9 2002/10/17 10:04:02 garbanzo Exp $
- */
-
- #include <sys/types.h>
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500101
- #include <sys/dkstat.h>
-+#else
-+#include <sys/resource.h>
-+#endif
- #include <sys/sysctl.h>
-
- #include <devstat.h>
- #include <fcntl.h>
- #include <nlist.h>
diff --git a/x11/kde4-baseapps/files/patch-ksysguard-ProcessList.c b/x11/kde4-baseapps/files/patch-ksysguard-ProcessList.c
deleted file mode 100644
index 55e0c2a12753..000000000000
--- a/x11/kde4-baseapps/files/patch-ksysguard-ProcessList.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- ksysguard/ksysguardd/FreeBSD/ProcessList.c.orig Sun Feb 9 18:54:36 2003
-+++ ksysguard/ksysguardd/FreeBSD/ProcessList.c Sun Feb 9 18:54:51 2003
-@@ -224,10 +224,8 @@
-
- #if __FreeBSD_version >= 500015
- ps->userLoad = p.ki_pctcpu / 100;
-- ps->vmSize = (p.ki_vmspace->vm_tsize +
-- p.ki_vmspace->vm_dsize +
-- p.ki_vmspace->vm_ssize) * getpagesize();
-- ps->vmRss = p.ki_vmspace->vm_rssize * getpagesize();
-+ ps->vmSize = p.ki_size;
-+ ps->vmRss = p.ki_rssize;
- strncpy(ps->name,p.ki_comm? p.ki_comm:"????",sizeof(ps->name));
- strcpy(ps->status,(p.ki_stat>=1)&&(p.ki_stat<=5)? statuses[p.ki_stat-1]:"????");
- #else
diff --git a/x11/kde4-baseapps/files/plist.base b/x11/kde4-baseapps/files/plist.base
index f5b360ba4b3c..80a9509368eb 100644
--- a/x11/kde4-baseapps/files/plist.base
+++ b/x11/kde4-baseapps/files/plist.base
@@ -463,19 +463,28 @@ lib/libtaskmanager.la
lib/libtaskmanager.so
lib/libtaskmanager.so.1
share/applnk/.directory
+share/applnk/.hidden/battery.desktop
+share/applnk/.hidden/bwarning.desktop
+share/applnk/.hidden/cwarning.desktop
share/applnk/.hidden/fileappearance.desktop
share/applnk/.hidden/filebehavior.desktop
share/applnk/.hidden/filepreviews.desktop
+share/applnk/.hidden/kcmkonq.desktop
share/applnk/.hidden/kcmkonsole.desktop
+share/applnk/.hidden/kcmkxmlrpcd.desktop
share/applnk/.hidden/kicker_config.desktop
share/applnk/.hidden/kicker_config_appearance.desktop
share/applnk/.hidden/konqfilemgr.desktop
+share/applnk/.hidden/konqhtml.desktop
share/applnk/.hidden/kwinactions.desktop
share/applnk/.hidden/kwinadvanced.desktop
share/applnk/.hidden/kwinfocus.desktop
share/applnk/.hidden/kwinmoving.desktop
share/applnk/.hidden/midi.desktop
+share/applnk/.hidden/power.desktop
share/applnk/.hidden/smb.desktop
+share/applnk/.hidden/socks.desktop
+share/applnk/.hidden/virtualdesktops.desktop
share/applnk/Applications/.directory
share/applnk/Development/.directory
share/applnk/Editors/.directory
@@ -598,6 +607,7 @@ share/applnk/Settings/System/kcmfontinst.desktop
share/applnk/Settings/System/kcmhelpcenter.desktop
share/applnk/Settings/System/kdm.desktop
share/applnk/Settings/WebBrowsing/khtml_appearance.desktop
+share/applnk/Settings/WebBrowsing/nsplugin.desktop
share/applnk/Settings/WebBrowsing/smb.desktop
share/applnk/Settings/email.desktop
share/applnk/Settingsmenu/.directory
@@ -1935,6 +1945,8 @@ share/doc/HTML/en/kwrite/index.docbook
share/fonts/9x15.pcf.gz
share/fonts/console8x16.pcf.gz
share/fonts/console8x8.pcf.gz
+share/fonts/fonts.dir
+share/fonts/override/fonts.dir
share/icons/crystalsvg/128x128/apps/access.png
share/icons/crystalsvg/128x128/apps/acroread.png
share/icons/crystalsvg/128x128/apps/applixware.png
@@ -2146,6 +2158,7 @@ share/icons/crystalsvg/16x16/apps/xpaint.png
share/icons/crystalsvg/16x16/apps/xv.png
share/icons/crystalsvg/16x16/devices/print_printer.png
share/icons/crystalsvg/16x16/filesystems/folder_print2.png
+share/icons/crystalsvg/22x22/apps/klipper.png
share/icons/crystalsvg/22x22/apps/kvirc.png
share/icons/crystalsvg/22x22/apps/nedit.png
share/icons/crystalsvg/32x32/apps/access.png
diff --git a/x11/kde4-baseapps/files/plist.base.rm b/x11/kde4-baseapps/files/plist.base.rm
index a80f5dedafd5..11b2e7678783 100644
--- a/x11/kde4-baseapps/files/plist.base.rm
+++ b/x11/kde4-baseapps/files/plist.base.rm
@@ -237,7 +237,6 @@
@dirrm share/doc/HTML/en/kate
@dirrm share/doc/HTML/en
@dirrm share/doc/HTML
-@dirrm share/doc
@dirrm share/config/kdm
@dirrm share/config
@dirrm share/autostart
@@ -453,4 +452,3 @@
@dirrm include/kwin
@dirrm include/ksgrd
@dirrm include/kate
-@dirrm etc
diff --git a/x11/kde4-baseapps/files/plist.mkfontdir b/x11/kde4-baseapps/files/plist.mkfontdir
deleted file mode 100644
index fc9aa28d2513..000000000000
--- a/x11/kde4-baseapps/files/plist.mkfontdir
+++ /dev/null
@@ -1,2 +0,0 @@
-share/fonts/fonts.dir
-share/fonts/override/fonts.dir
diff --git a/x11/kde4-baseapps/files/plist.motif b/x11/kde4-baseapps/files/plist.motif
index 3f0feec2459a..ede17101761e 100644
--- a/x11/kde4-baseapps/files/plist.motif
+++ b/x11/kde4-baseapps/files/plist.motif
@@ -3,4 +3,3 @@ bin/nspluginviewer
lib/libnsplugin.la
lib/libnsplugin.so
lib/libnsplugin.so.1
-share/applnk/Settings/WebBrowsing/nsplugin.desktop
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 3fe945cc9002..1ae4170f6ed5 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
@@ -17,6 +17,8 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= This package provides the basic applications for the KDE system
+BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
KDE_BUILD_PLIST=yes
@@ -34,7 +36,6 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no
CONFIGURE_ARGS+=--disable-ltdl-install \
--without-ldap \
--disable-closure \
- ${XINERAMA} \
--without-java \
--with-qt-dir=${X11BASE} \
--with-xdmdir=${X11BASE}/lib/X11/xdm
@@ -42,14 +43,15 @@ CONFIGURE_ARGS+=--disable-ltdl-install \
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/bin/mkfontdir)
-PLIST_APPEND+= plist.mkfontdir
-.endif # exists(${X11BASE}/bin/mkfontdir)
-
.if exists(${X11BASE}/include/Xm/Xm.h)
WITH_MOTIF= yes
.endif # exists(${X11BASE}/include/Xm/Xm.h)
+.if defined(WITHOUT_MOTIF)
+.undef WITH_MOTIF
+CONFIGURE_ARGS+= --without-motif
+.endif # defined(WITHOUT_MOTIF)
+
.if defined(WITH_MOTIF)
USE_MOTIF= yes
PLIST_APPEND+= plist.motif
@@ -63,25 +65,6 @@ pre-extract::
@${ECHO_MSG}
.endif # defined(WITH_MOTIF)
-.if exists(${X11BASE}/lib/libfontconfig.so.1)
-WITH_FONTCONFIG=yes
-.endif
-
-.if defined(WITH_FONTCONFIG)
-LIB_DEPENDS+= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
-.endif
-
-.if defined(WITHOUT_XINERAMA)
-XINERAMA= --without-xinerama
-.else
-XINERAMA= --with-xinerama
-pre-extract::
- @${ECHO_MSG}
- @${ECHO_MSG} "If you don't want to compile with Xinerama support,"
- @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITHOUT_XINERAMA=yes\""
- @${ECHO_MSG}
-.endif # defined(WITH_XINERAMA)
-
post-extract:
@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index db90433b7878..b902fe692aaa 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdebase-3.1.tar.bz2) = 02f0583c7de93cdc458101a7575455b4
+MD5 (KDE/kdebase-3.1.1.tar.bz2) = f360add935d13be629b43a2a280b759f
diff --git a/x11/kde4-runtime/files/patch-ksysguard-CPU.c b/x11/kde4-runtime/files/patch-ksysguard-CPU.c
deleted file mode 100644
index 584110b5e9d1..000000000000
--- a/x11/kde4-runtime/files/patch-ksysguard-CPU.c
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: ksysguard/ksysguardd/FreeBSD/CPU.c
-===================================================================
-RCS file: /home/kde/kdebase/ksysguard/ksysguardd/FreeBSD/CPU.c,v
-retrieving revision 1.9
-diff -u -5 -p -d -r1.9 CPU.c
---- ksysguard/ksysguardd/FreeBSD/CPU.c 17 Oct 2002 10:04:02 -0000 1.9
-+++ ksysguard/ksysguardd/FreeBSD/CPU.c 3 Mar 2003 07:11:28 -0000
-@@ -19,11 +19,16 @@
-
- $Id: CPU.c,v 1.9 2002/10/17 10:04:02 garbanzo Exp $
- */
-
- #include <sys/types.h>
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500101
- #include <sys/dkstat.h>
-+#else
-+#include <sys/resource.h>
-+#endif
- #include <sys/sysctl.h>
-
- #include <devstat.h>
- #include <fcntl.h>
- #include <nlist.h>
diff --git a/x11/kde4-runtime/files/patch-ksysguard-ProcessList.c b/x11/kde4-runtime/files/patch-ksysguard-ProcessList.c
deleted file mode 100644
index 55e0c2a12753..000000000000
--- a/x11/kde4-runtime/files/patch-ksysguard-ProcessList.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- ksysguard/ksysguardd/FreeBSD/ProcessList.c.orig Sun Feb 9 18:54:36 2003
-+++ ksysguard/ksysguardd/FreeBSD/ProcessList.c Sun Feb 9 18:54:51 2003
-@@ -224,10 +224,8 @@
-
- #if __FreeBSD_version >= 500015
- ps->userLoad = p.ki_pctcpu / 100;
-- ps->vmSize = (p.ki_vmspace->vm_tsize +
-- p.ki_vmspace->vm_dsize +
-- p.ki_vmspace->vm_ssize) * getpagesize();
-- ps->vmRss = p.ki_vmspace->vm_rssize * getpagesize();
-+ ps->vmSize = p.ki_size;
-+ ps->vmRss = p.ki_rssize;
- strncpy(ps->name,p.ki_comm? p.ki_comm:"????",sizeof(ps->name));
- strcpy(ps->status,(p.ki_stat>=1)&&(p.ki_stat<=5)? statuses[p.ki_stat-1]:"????");
- #else
diff --git a/x11/kde4-runtime/files/plist.base b/x11/kde4-runtime/files/plist.base
index f5b360ba4b3c..80a9509368eb 100644
--- a/x11/kde4-runtime/files/plist.base
+++ b/x11/kde4-runtime/files/plist.base
@@ -463,19 +463,28 @@ lib/libtaskmanager.la
lib/libtaskmanager.so
lib/libtaskmanager.so.1
share/applnk/.directory
+share/applnk/.hidden/battery.desktop
+share/applnk/.hidden/bwarning.desktop
+share/applnk/.hidden/cwarning.desktop
share/applnk/.hidden/fileappearance.desktop
share/applnk/.hidden/filebehavior.desktop
share/applnk/.hidden/filepreviews.desktop
+share/applnk/.hidden/kcmkonq.desktop
share/applnk/.hidden/kcmkonsole.desktop
+share/applnk/.hidden/kcmkxmlrpcd.desktop
share/applnk/.hidden/kicker_config.desktop
share/applnk/.hidden/kicker_config_appearance.desktop
share/applnk/.hidden/konqfilemgr.desktop
+share/applnk/.hidden/konqhtml.desktop
share/applnk/.hidden/kwinactions.desktop
share/applnk/.hidden/kwinadvanced.desktop
share/applnk/.hidden/kwinfocus.desktop
share/applnk/.hidden/kwinmoving.desktop
share/applnk/.hidden/midi.desktop
+share/applnk/.hidden/power.desktop
share/applnk/.hidden/smb.desktop
+share/applnk/.hidden/socks.desktop
+share/applnk/.hidden/virtualdesktops.desktop
share/applnk/Applications/.directory
share/applnk/Development/.directory
share/applnk/Editors/.directory
@@ -598,6 +607,7 @@ share/applnk/Settings/System/kcmfontinst.desktop
share/applnk/Settings/System/kcmhelpcenter.desktop
share/applnk/Settings/System/kdm.desktop
share/applnk/Settings/WebBrowsing/khtml_appearance.desktop
+share/applnk/Settings/WebBrowsing/nsplugin.desktop
share/applnk/Settings/WebBrowsing/smb.desktop
share/applnk/Settings/email.desktop
share/applnk/Settingsmenu/.directory
@@ -1935,6 +1945,8 @@ share/doc/HTML/en/kwrite/index.docbook
share/fonts/9x15.pcf.gz
share/fonts/console8x16.pcf.gz
share/fonts/console8x8.pcf.gz
+share/fonts/fonts.dir
+share/fonts/override/fonts.dir
share/icons/crystalsvg/128x128/apps/access.png
share/icons/crystalsvg/128x128/apps/acroread.png
share/icons/crystalsvg/128x128/apps/applixware.png
@@ -2146,6 +2158,7 @@ share/icons/crystalsvg/16x16/apps/xpaint.png
share/icons/crystalsvg/16x16/apps/xv.png
share/icons/crystalsvg/16x16/devices/print_printer.png
share/icons/crystalsvg/16x16/filesystems/folder_print2.png
+share/icons/crystalsvg/22x22/apps/klipper.png
share/icons/crystalsvg/22x22/apps/kvirc.png
share/icons/crystalsvg/22x22/apps/nedit.png
share/icons/crystalsvg/32x32/apps/access.png
diff --git a/x11/kde4-runtime/files/plist.base.rm b/x11/kde4-runtime/files/plist.base.rm
index a80f5dedafd5..11b2e7678783 100644
--- a/x11/kde4-runtime/files/plist.base.rm
+++ b/x11/kde4-runtime/files/plist.base.rm
@@ -237,7 +237,6 @@
@dirrm share/doc/HTML/en/kate
@dirrm share/doc/HTML/en
@dirrm share/doc/HTML
-@dirrm share/doc
@dirrm share/config/kdm
@dirrm share/config
@dirrm share/autostart
@@ -453,4 +452,3 @@
@dirrm include/kwin
@dirrm include/ksgrd
@dirrm include/kate
-@dirrm etc
diff --git a/x11/kde4-runtime/files/plist.mkfontdir b/x11/kde4-runtime/files/plist.mkfontdir
deleted file mode 100644
index fc9aa28d2513..000000000000
--- a/x11/kde4-runtime/files/plist.mkfontdir
+++ /dev/null
@@ -1,2 +0,0 @@
-share/fonts/fonts.dir
-share/fonts/override/fonts.dir
diff --git a/x11/kde4-runtime/files/plist.motif b/x11/kde4-runtime/files/plist.motif
index 3f0feec2459a..ede17101761e 100644
--- a/x11/kde4-runtime/files/plist.motif
+++ b/x11/kde4-runtime/files/plist.motif
@@ -3,4 +3,3 @@ bin/nspluginviewer
lib/libnsplugin.la
lib/libnsplugin.so
lib/libnsplugin.so.1
-share/applnk/Settings/WebBrowsing/nsplugin.desktop
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 3fe945cc9002..1ae4170f6ed5 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
@@ -17,6 +17,8 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= This package provides the basic applications for the KDE system
+BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
KDE_BUILD_PLIST=yes
@@ -34,7 +36,6 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no
CONFIGURE_ARGS+=--disable-ltdl-install \
--without-ldap \
--disable-closure \
- ${XINERAMA} \
--without-java \
--with-qt-dir=${X11BASE} \
--with-xdmdir=${X11BASE}/lib/X11/xdm
@@ -42,14 +43,15 @@ CONFIGURE_ARGS+=--disable-ltdl-install \
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/bin/mkfontdir)
-PLIST_APPEND+= plist.mkfontdir
-.endif # exists(${X11BASE}/bin/mkfontdir)
-
.if exists(${X11BASE}/include/Xm/Xm.h)
WITH_MOTIF= yes
.endif # exists(${X11BASE}/include/Xm/Xm.h)
+.if defined(WITHOUT_MOTIF)
+.undef WITH_MOTIF
+CONFIGURE_ARGS+= --without-motif
+.endif # defined(WITHOUT_MOTIF)
+
.if defined(WITH_MOTIF)
USE_MOTIF= yes
PLIST_APPEND+= plist.motif
@@ -63,25 +65,6 @@ pre-extract::
@${ECHO_MSG}
.endif # defined(WITH_MOTIF)
-.if exists(${X11BASE}/lib/libfontconfig.so.1)
-WITH_FONTCONFIG=yes
-.endif
-
-.if defined(WITH_FONTCONFIG)
-LIB_DEPENDS+= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
-.endif
-
-.if defined(WITHOUT_XINERAMA)
-XINERAMA= --without-xinerama
-.else
-XINERAMA= --with-xinerama
-pre-extract::
- @${ECHO_MSG}
- @${ECHO_MSG} "If you don't want to compile with Xinerama support,"
- @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITHOUT_XINERAMA=yes\""
- @${ECHO_MSG}
-.endif # defined(WITH_XINERAMA)
-
post-extract:
@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index db90433b7878..b902fe692aaa 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdebase-3.1.tar.bz2) = 02f0583c7de93cdc458101a7575455b4
+MD5 (KDE/kdebase-3.1.1.tar.bz2) = f360add935d13be629b43a2a280b759f
diff --git a/x11/kde4-workspace/files/patch-ksysguard-CPU.c b/x11/kde4-workspace/files/patch-ksysguard-CPU.c
deleted file mode 100644
index 584110b5e9d1..000000000000
--- a/x11/kde4-workspace/files/patch-ksysguard-CPU.c
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: ksysguard/ksysguardd/FreeBSD/CPU.c
-===================================================================
-RCS file: /home/kde/kdebase/ksysguard/ksysguardd/FreeBSD/CPU.c,v
-retrieving revision 1.9
-diff -u -5 -p -d -r1.9 CPU.c
---- ksysguard/ksysguardd/FreeBSD/CPU.c 17 Oct 2002 10:04:02 -0000 1.9
-+++ ksysguard/ksysguardd/FreeBSD/CPU.c 3 Mar 2003 07:11:28 -0000
-@@ -19,11 +19,16 @@
-
- $Id: CPU.c,v 1.9 2002/10/17 10:04:02 garbanzo Exp $
- */
-
- #include <sys/types.h>
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500101
- #include <sys/dkstat.h>
-+#else
-+#include <sys/resource.h>
-+#endif
- #include <sys/sysctl.h>
-
- #include <devstat.h>
- #include <fcntl.h>
- #include <nlist.h>
diff --git a/x11/kde4-workspace/files/patch-ksysguard-ProcessList.c b/x11/kde4-workspace/files/patch-ksysguard-ProcessList.c
deleted file mode 100644
index 55e0c2a12753..000000000000
--- a/x11/kde4-workspace/files/patch-ksysguard-ProcessList.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- ksysguard/ksysguardd/FreeBSD/ProcessList.c.orig Sun Feb 9 18:54:36 2003
-+++ ksysguard/ksysguardd/FreeBSD/ProcessList.c Sun Feb 9 18:54:51 2003
-@@ -224,10 +224,8 @@
-
- #if __FreeBSD_version >= 500015
- ps->userLoad = p.ki_pctcpu / 100;
-- ps->vmSize = (p.ki_vmspace->vm_tsize +
-- p.ki_vmspace->vm_dsize +
-- p.ki_vmspace->vm_ssize) * getpagesize();
-- ps->vmRss = p.ki_vmspace->vm_rssize * getpagesize();
-+ ps->vmSize = p.ki_size;
-+ ps->vmRss = p.ki_rssize;
- strncpy(ps->name,p.ki_comm? p.ki_comm:"????",sizeof(ps->name));
- strcpy(ps->status,(p.ki_stat>=1)&&(p.ki_stat<=5)? statuses[p.ki_stat-1]:"????");
- #else
diff --git a/x11/kde4-workspace/files/plist.base b/x11/kde4-workspace/files/plist.base
index f5b360ba4b3c..80a9509368eb 100644
--- a/x11/kde4-workspace/files/plist.base
+++ b/x11/kde4-workspace/files/plist.base
@@ -463,19 +463,28 @@ lib/libtaskmanager.la
lib/libtaskmanager.so
lib/libtaskmanager.so.1
share/applnk/.directory
+share/applnk/.hidden/battery.desktop
+share/applnk/.hidden/bwarning.desktop
+share/applnk/.hidden/cwarning.desktop
share/applnk/.hidden/fileappearance.desktop
share/applnk/.hidden/filebehavior.desktop
share/applnk/.hidden/filepreviews.desktop
+share/applnk/.hidden/kcmkonq.desktop
share/applnk/.hidden/kcmkonsole.desktop
+share/applnk/.hidden/kcmkxmlrpcd.desktop
share/applnk/.hidden/kicker_config.desktop
share/applnk/.hidden/kicker_config_appearance.desktop
share/applnk/.hidden/konqfilemgr.desktop
+share/applnk/.hidden/konqhtml.desktop
share/applnk/.hidden/kwinactions.desktop
share/applnk/.hidden/kwinadvanced.desktop
share/applnk/.hidden/kwinfocus.desktop
share/applnk/.hidden/kwinmoving.desktop
share/applnk/.hidden/midi.desktop
+share/applnk/.hidden/power.desktop
share/applnk/.hidden/smb.desktop
+share/applnk/.hidden/socks.desktop
+share/applnk/.hidden/virtualdesktops.desktop
share/applnk/Applications/.directory
share/applnk/Development/.directory
share/applnk/Editors/.directory
@@ -598,6 +607,7 @@ share/applnk/Settings/System/kcmfontinst.desktop
share/applnk/Settings/System/kcmhelpcenter.desktop
share/applnk/Settings/System/kdm.desktop
share/applnk/Settings/WebBrowsing/khtml_appearance.desktop
+share/applnk/Settings/WebBrowsing/nsplugin.desktop
share/applnk/Settings/WebBrowsing/smb.desktop
share/applnk/Settings/email.desktop
share/applnk/Settingsmenu/.directory
@@ -1935,6 +1945,8 @@ share/doc/HTML/en/kwrite/index.docbook
share/fonts/9x15.pcf.gz
share/fonts/console8x16.pcf.gz
share/fonts/console8x8.pcf.gz
+share/fonts/fonts.dir
+share/fonts/override/fonts.dir
share/icons/crystalsvg/128x128/apps/access.png
share/icons/crystalsvg/128x128/apps/acroread.png
share/icons/crystalsvg/128x128/apps/applixware.png
@@ -2146,6 +2158,7 @@ share/icons/crystalsvg/16x16/apps/xpaint.png
share/icons/crystalsvg/16x16/apps/xv.png
share/icons/crystalsvg/16x16/devices/print_printer.png
share/icons/crystalsvg/16x16/filesystems/folder_print2.png
+share/icons/crystalsvg/22x22/apps/klipper.png
share/icons/crystalsvg/22x22/apps/kvirc.png
share/icons/crystalsvg/22x22/apps/nedit.png
share/icons/crystalsvg/32x32/apps/access.png
diff --git a/x11/kde4-workspace/files/plist.base.rm b/x11/kde4-workspace/files/plist.base.rm
index a80f5dedafd5..11b2e7678783 100644
--- a/x11/kde4-workspace/files/plist.base.rm
+++ b/x11/kde4-workspace/files/plist.base.rm
@@ -237,7 +237,6 @@
@dirrm share/doc/HTML/en/kate
@dirrm share/doc/HTML/en
@dirrm share/doc/HTML
-@dirrm share/doc
@dirrm share/config/kdm
@dirrm share/config
@dirrm share/autostart
@@ -453,4 +452,3 @@
@dirrm include/kwin
@dirrm include/ksgrd
@dirrm include/kate
-@dirrm etc
diff --git a/x11/kde4-workspace/files/plist.mkfontdir b/x11/kde4-workspace/files/plist.mkfontdir
deleted file mode 100644
index fc9aa28d2513..000000000000
--- a/x11/kde4-workspace/files/plist.mkfontdir
+++ /dev/null
@@ -1,2 +0,0 @@
-share/fonts/fonts.dir
-share/fonts/override/fonts.dir
diff --git a/x11/kde4-workspace/files/plist.motif b/x11/kde4-workspace/files/plist.motif
index 3f0feec2459a..ede17101761e 100644
--- a/x11/kde4-workspace/files/plist.motif
+++ b/x11/kde4-workspace/files/plist.motif
@@ -3,4 +3,3 @@ bin/nspluginviewer
lib/libnsplugin.la
lib/libnsplugin.so
lib/libnsplugin.so.1
-share/applnk/Settings/WebBrowsing/nsplugin.desktop
diff --git a/x11/kde4/Makefile.kde b/x11/kde4/Makefile.kde
index 9319e0e2fe89..eb7b256a4a02 100644
--- a/x11/kde4/Makefile.kde
+++ b/x11/kde4/Makefile.kde
@@ -79,8 +79,14 @@ STRIP=''
.if !defined(_NO_KDE_NON_I386_OPTS)
.if ${MACHINE_ARCH} == "alpha"
CFLAGS= -O0 ${KDE_CFLAGS}
+.endif # ${MACHINE_ARCH} == "alpha"
+.endif # !defined(_NO_KDE_NON_I386_OPTS)
+
+.if !defined(_NO_KDE_XINERAMA)
+.if !defined(WITHOUT_XINERAMA)
+CONFIGURE_ARGS+= --with-xinerama
.endif
-.endif
+.endif # !defined(_NO_KDE_XINERAMA)
kde-version-check:
.if exists(${LOCALBASE}/include/kfm.h)
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 3fe945cc9002..1ae4170f6ed5 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
@@ -17,6 +17,8 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= This package provides the basic applications for the KDE system
+BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
KDE_BUILD_PLIST=yes
@@ -34,7 +36,6 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no
CONFIGURE_ARGS+=--disable-ltdl-install \
--without-ldap \
--disable-closure \
- ${XINERAMA} \
--without-java \
--with-qt-dir=${X11BASE} \
--with-xdmdir=${X11BASE}/lib/X11/xdm
@@ -42,14 +43,15 @@ CONFIGURE_ARGS+=--disable-ltdl-install \
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/bin/mkfontdir)
-PLIST_APPEND+= plist.mkfontdir
-.endif # exists(${X11BASE}/bin/mkfontdir)
-
.if exists(${X11BASE}/include/Xm/Xm.h)
WITH_MOTIF= yes
.endif # exists(${X11BASE}/include/Xm/Xm.h)
+.if defined(WITHOUT_MOTIF)
+.undef WITH_MOTIF
+CONFIGURE_ARGS+= --without-motif
+.endif # defined(WITHOUT_MOTIF)
+
.if defined(WITH_MOTIF)
USE_MOTIF= yes
PLIST_APPEND+= plist.motif
@@ -63,25 +65,6 @@ pre-extract::
@${ECHO_MSG}
.endif # defined(WITH_MOTIF)
-.if exists(${X11BASE}/lib/libfontconfig.so.1)
-WITH_FONTCONFIG=yes
-.endif
-
-.if defined(WITH_FONTCONFIG)
-LIB_DEPENDS+= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
-.endif
-
-.if defined(WITHOUT_XINERAMA)
-XINERAMA= --without-xinerama
-.else
-XINERAMA= --with-xinerama
-pre-extract::
- @${ECHO_MSG}
- @${ECHO_MSG} "If you don't want to compile with Xinerama support,"
- @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITHOUT_XINERAMA=yes\""
- @${ECHO_MSG}
-.endif # defined(WITH_XINERAMA)
-
post-extract:
@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index db90433b7878..b902fe692aaa 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdebase-3.1.tar.bz2) = 02f0583c7de93cdc458101a7575455b4
+MD5 (KDE/kdebase-3.1.1.tar.bz2) = f360add935d13be629b43a2a280b759f
diff --git a/x11/kdebase3/files/patch-ksysguard-CPU.c b/x11/kdebase3/files/patch-ksysguard-CPU.c
deleted file mode 100644
index 584110b5e9d1..000000000000
--- a/x11/kdebase3/files/patch-ksysguard-CPU.c
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: ksysguard/ksysguardd/FreeBSD/CPU.c
-===================================================================
-RCS file: /home/kde/kdebase/ksysguard/ksysguardd/FreeBSD/CPU.c,v
-retrieving revision 1.9
-diff -u -5 -p -d -r1.9 CPU.c
---- ksysguard/ksysguardd/FreeBSD/CPU.c 17 Oct 2002 10:04:02 -0000 1.9
-+++ ksysguard/ksysguardd/FreeBSD/CPU.c 3 Mar 2003 07:11:28 -0000
-@@ -19,11 +19,16 @@
-
- $Id: CPU.c,v 1.9 2002/10/17 10:04:02 garbanzo Exp $
- */
-
- #include <sys/types.h>
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500101
- #include <sys/dkstat.h>
-+#else
-+#include <sys/resource.h>
-+#endif
- #include <sys/sysctl.h>
-
- #include <devstat.h>
- #include <fcntl.h>
- #include <nlist.h>
diff --git a/x11/kdebase3/files/patch-ksysguard-ProcessList.c b/x11/kdebase3/files/patch-ksysguard-ProcessList.c
deleted file mode 100644
index 55e0c2a12753..000000000000
--- a/x11/kdebase3/files/patch-ksysguard-ProcessList.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- ksysguard/ksysguardd/FreeBSD/ProcessList.c.orig Sun Feb 9 18:54:36 2003
-+++ ksysguard/ksysguardd/FreeBSD/ProcessList.c Sun Feb 9 18:54:51 2003
-@@ -224,10 +224,8 @@
-
- #if __FreeBSD_version >= 500015
- ps->userLoad = p.ki_pctcpu / 100;
-- ps->vmSize = (p.ki_vmspace->vm_tsize +
-- p.ki_vmspace->vm_dsize +
-- p.ki_vmspace->vm_ssize) * getpagesize();
-- ps->vmRss = p.ki_vmspace->vm_rssize * getpagesize();
-+ ps->vmSize = p.ki_size;
-+ ps->vmRss = p.ki_rssize;
- strncpy(ps->name,p.ki_comm? p.ki_comm:"????",sizeof(ps->name));
- strcpy(ps->status,(p.ki_stat>=1)&&(p.ki_stat<=5)? statuses[p.ki_stat-1]:"????");
- #else
diff --git a/x11/kdebase3/files/plist.base b/x11/kdebase3/files/plist.base
index f5b360ba4b3c..80a9509368eb 100644
--- a/x11/kdebase3/files/plist.base
+++ b/x11/kdebase3/files/plist.base
@@ -463,19 +463,28 @@ lib/libtaskmanager.la
lib/libtaskmanager.so
lib/libtaskmanager.so.1
share/applnk/.directory
+share/applnk/.hidden/battery.desktop
+share/applnk/.hidden/bwarning.desktop
+share/applnk/.hidden/cwarning.desktop
share/applnk/.hidden/fileappearance.desktop
share/applnk/.hidden/filebehavior.desktop
share/applnk/.hidden/filepreviews.desktop
+share/applnk/.hidden/kcmkonq.desktop
share/applnk/.hidden/kcmkonsole.desktop
+share/applnk/.hidden/kcmkxmlrpcd.desktop
share/applnk/.hidden/kicker_config.desktop
share/applnk/.hidden/kicker_config_appearance.desktop
share/applnk/.hidden/konqfilemgr.desktop
+share/applnk/.hidden/konqhtml.desktop
share/applnk/.hidden/kwinactions.desktop
share/applnk/.hidden/kwinadvanced.desktop
share/applnk/.hidden/kwinfocus.desktop
share/applnk/.hidden/kwinmoving.desktop
share/applnk/.hidden/midi.desktop
+share/applnk/.hidden/power.desktop
share/applnk/.hidden/smb.desktop
+share/applnk/.hidden/socks.desktop
+share/applnk/.hidden/virtualdesktops.desktop
share/applnk/Applications/.directory
share/applnk/Development/.directory
share/applnk/Editors/.directory
@@ -598,6 +607,7 @@ share/applnk/Settings/System/kcmfontinst.desktop
share/applnk/Settings/System/kcmhelpcenter.desktop
share/applnk/Settings/System/kdm.desktop
share/applnk/Settings/WebBrowsing/khtml_appearance.desktop
+share/applnk/Settings/WebBrowsing/nsplugin.desktop
share/applnk/Settings/WebBrowsing/smb.desktop
share/applnk/Settings/email.desktop
share/applnk/Settingsmenu/.directory
@@ -1935,6 +1945,8 @@ share/doc/HTML/en/kwrite/index.docbook
share/fonts/9x15.pcf.gz
share/fonts/console8x16.pcf.gz
share/fonts/console8x8.pcf.gz
+share/fonts/fonts.dir
+share/fonts/override/fonts.dir
share/icons/crystalsvg/128x128/apps/access.png
share/icons/crystalsvg/128x128/apps/acroread.png
share/icons/crystalsvg/128x128/apps/applixware.png
@@ -2146,6 +2158,7 @@ share/icons/crystalsvg/16x16/apps/xpaint.png
share/icons/crystalsvg/16x16/apps/xv.png
share/icons/crystalsvg/16x16/devices/print_printer.png
share/icons/crystalsvg/16x16/filesystems/folder_print2.png
+share/icons/crystalsvg/22x22/apps/klipper.png
share/icons/crystalsvg/22x22/apps/kvirc.png
share/icons/crystalsvg/22x22/apps/nedit.png
share/icons/crystalsvg/32x32/apps/access.png
diff --git a/x11/kdebase3/files/plist.base.rm b/x11/kdebase3/files/plist.base.rm
index a80f5dedafd5..11b2e7678783 100644
--- a/x11/kdebase3/files/plist.base.rm
+++ b/x11/kdebase3/files/plist.base.rm
@@ -237,7 +237,6 @@
@dirrm share/doc/HTML/en/kate
@dirrm share/doc/HTML/en
@dirrm share/doc/HTML
-@dirrm share/doc
@dirrm share/config/kdm
@dirrm share/config
@dirrm share/autostart
@@ -453,4 +452,3 @@
@dirrm include/kwin
@dirrm include/ksgrd
@dirrm include/kate
-@dirrm etc
diff --git a/x11/kdebase3/files/plist.mkfontdir b/x11/kdebase3/files/plist.mkfontdir
deleted file mode 100644
index fc9aa28d2513..000000000000
--- a/x11/kdebase3/files/plist.mkfontdir
+++ /dev/null
@@ -1,2 +0,0 @@
-share/fonts/fonts.dir
-share/fonts/override/fonts.dir
diff --git a/x11/kdebase3/files/plist.motif b/x11/kdebase3/files/plist.motif
index 3f0feec2459a..ede17101761e 100644
--- a/x11/kdebase3/files/plist.motif
+++ b/x11/kdebase3/files/plist.motif
@@ -3,4 +3,3 @@ bin/nspluginviewer
lib/libnsplugin.la
lib/libnsplugin.so
lib/libnsplugin.so.1
-share/applnk/Settings/WebBrowsing/nsplugin.desktop
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 3fe945cc9002..1ae4170f6ed5 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
@@ -17,6 +17,8 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= This package provides the basic applications for the KDE system
+BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
KDE_BUILD_PLIST=yes
@@ -34,7 +36,6 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no
CONFIGURE_ARGS+=--disable-ltdl-install \
--without-ldap \
--disable-closure \
- ${XINERAMA} \
--without-java \
--with-qt-dir=${X11BASE} \
--with-xdmdir=${X11BASE}/lib/X11/xdm
@@ -42,14 +43,15 @@ CONFIGURE_ARGS+=--disable-ltdl-install \
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/bin/mkfontdir)
-PLIST_APPEND+= plist.mkfontdir
-.endif # exists(${X11BASE}/bin/mkfontdir)
-
.if exists(${X11BASE}/include/Xm/Xm.h)
WITH_MOTIF= yes
.endif # exists(${X11BASE}/include/Xm/Xm.h)
+.if defined(WITHOUT_MOTIF)
+.undef WITH_MOTIF
+CONFIGURE_ARGS+= --without-motif
+.endif # defined(WITHOUT_MOTIF)
+
.if defined(WITH_MOTIF)
USE_MOTIF= yes
PLIST_APPEND+= plist.motif
@@ -63,25 +65,6 @@ pre-extract::
@${ECHO_MSG}
.endif # defined(WITH_MOTIF)
-.if exists(${X11BASE}/lib/libfontconfig.so.1)
-WITH_FONTCONFIG=yes
-.endif
-
-.if defined(WITH_FONTCONFIG)
-LIB_DEPENDS+= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
-.endif
-
-.if defined(WITHOUT_XINERAMA)
-XINERAMA= --without-xinerama
-.else
-XINERAMA= --with-xinerama
-pre-extract::
- @${ECHO_MSG}
- @${ECHO_MSG} "If you don't want to compile with Xinerama support,"
- @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITHOUT_XINERAMA=yes\""
- @${ECHO_MSG}
-.endif # defined(WITH_XINERAMA)
-
post-extract:
@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo
index db90433b7878..b902fe692aaa 100644
--- a/x11/kdebase4-runtime/distinfo
+++ b/x11/kdebase4-runtime/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdebase-3.1.tar.bz2) = 02f0583c7de93cdc458101a7575455b4
+MD5 (KDE/kdebase-3.1.1.tar.bz2) = f360add935d13be629b43a2a280b759f
diff --git a/x11/kdebase4-runtime/files/patch-ksysguard-CPU.c b/x11/kdebase4-runtime/files/patch-ksysguard-CPU.c
deleted file mode 100644
index 584110b5e9d1..000000000000
--- a/x11/kdebase4-runtime/files/patch-ksysguard-CPU.c
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: ksysguard/ksysguardd/FreeBSD/CPU.c
-===================================================================
-RCS file: /home/kde/kdebase/ksysguard/ksysguardd/FreeBSD/CPU.c,v
-retrieving revision 1.9
-diff -u -5 -p -d -r1.9 CPU.c
---- ksysguard/ksysguardd/FreeBSD/CPU.c 17 Oct 2002 10:04:02 -0000 1.9
-+++ ksysguard/ksysguardd/FreeBSD/CPU.c 3 Mar 2003 07:11:28 -0000
-@@ -19,11 +19,16 @@
-
- $Id: CPU.c,v 1.9 2002/10/17 10:04:02 garbanzo Exp $
- */
-
- #include <sys/types.h>
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500101
- #include <sys/dkstat.h>
-+#else
-+#include <sys/resource.h>
-+#endif
- #include <sys/sysctl.h>
-
- #include <devstat.h>
- #include <fcntl.h>
- #include <nlist.h>
diff --git a/x11/kdebase4-runtime/files/patch-ksysguard-ProcessList.c b/x11/kdebase4-runtime/files/patch-ksysguard-ProcessList.c
deleted file mode 100644
index 55e0c2a12753..000000000000
--- a/x11/kdebase4-runtime/files/patch-ksysguard-ProcessList.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- ksysguard/ksysguardd/FreeBSD/ProcessList.c.orig Sun Feb 9 18:54:36 2003
-+++ ksysguard/ksysguardd/FreeBSD/ProcessList.c Sun Feb 9 18:54:51 2003
-@@ -224,10 +224,8 @@
-
- #if __FreeBSD_version >= 500015
- ps->userLoad = p.ki_pctcpu / 100;
-- ps->vmSize = (p.ki_vmspace->vm_tsize +
-- p.ki_vmspace->vm_dsize +
-- p.ki_vmspace->vm_ssize) * getpagesize();
-- ps->vmRss = p.ki_vmspace->vm_rssize * getpagesize();
-+ ps->vmSize = p.ki_size;
-+ ps->vmRss = p.ki_rssize;
- strncpy(ps->name,p.ki_comm? p.ki_comm:"????",sizeof(ps->name));
- strcpy(ps->status,(p.ki_stat>=1)&&(p.ki_stat<=5)? statuses[p.ki_stat-1]:"????");
- #else
diff --git a/x11/kdebase4-runtime/files/plist.base b/x11/kdebase4-runtime/files/plist.base
index f5b360ba4b3c..80a9509368eb 100644
--- a/x11/kdebase4-runtime/files/plist.base
+++ b/x11/kdebase4-runtime/files/plist.base
@@ -463,19 +463,28 @@ lib/libtaskmanager.la
lib/libtaskmanager.so
lib/libtaskmanager.so.1
share/applnk/.directory
+share/applnk/.hidden/battery.desktop
+share/applnk/.hidden/bwarning.desktop
+share/applnk/.hidden/cwarning.desktop
share/applnk/.hidden/fileappearance.desktop
share/applnk/.hidden/filebehavior.desktop
share/applnk/.hidden/filepreviews.desktop
+share/applnk/.hidden/kcmkonq.desktop
share/applnk/.hidden/kcmkonsole.desktop
+share/applnk/.hidden/kcmkxmlrpcd.desktop
share/applnk/.hidden/kicker_config.desktop
share/applnk/.hidden/kicker_config_appearance.desktop
share/applnk/.hidden/konqfilemgr.desktop
+share/applnk/.hidden/konqhtml.desktop
share/applnk/.hidden/kwinactions.desktop
share/applnk/.hidden/kwinadvanced.desktop
share/applnk/.hidden/kwinfocus.desktop
share/applnk/.hidden/kwinmoving.desktop
share/applnk/.hidden/midi.desktop
+share/applnk/.hidden/power.desktop
share/applnk/.hidden/smb.desktop
+share/applnk/.hidden/socks.desktop
+share/applnk/.hidden/virtualdesktops.desktop
share/applnk/Applications/.directory
share/applnk/Development/.directory
share/applnk/Editors/.directory
@@ -598,6 +607,7 @@ share/applnk/Settings/System/kcmfontinst.desktop
share/applnk/Settings/System/kcmhelpcenter.desktop
share/applnk/Settings/System/kdm.desktop
share/applnk/Settings/WebBrowsing/khtml_appearance.desktop
+share/applnk/Settings/WebBrowsing/nsplugin.desktop
share/applnk/Settings/WebBrowsing/smb.desktop
share/applnk/Settings/email.desktop
share/applnk/Settingsmenu/.directory
@@ -1935,6 +1945,8 @@ share/doc/HTML/en/kwrite/index.docbook
share/fonts/9x15.pcf.gz
share/fonts/console8x16.pcf.gz
share/fonts/console8x8.pcf.gz
+share/fonts/fonts.dir
+share/fonts/override/fonts.dir
share/icons/crystalsvg/128x128/apps/access.png
share/icons/crystalsvg/128x128/apps/acroread.png
share/icons/crystalsvg/128x128/apps/applixware.png
@@ -2146,6 +2158,7 @@ share/icons/crystalsvg/16x16/apps/xpaint.png
share/icons/crystalsvg/16x16/apps/xv.png
share/icons/crystalsvg/16x16/devices/print_printer.png
share/icons/crystalsvg/16x16/filesystems/folder_print2.png
+share/icons/crystalsvg/22x22/apps/klipper.png
share/icons/crystalsvg/22x22/apps/kvirc.png
share/icons/crystalsvg/22x22/apps/nedit.png
share/icons/crystalsvg/32x32/apps/access.png
diff --git a/x11/kdebase4-runtime/files/plist.base.rm b/x11/kdebase4-runtime/files/plist.base.rm
index a80f5dedafd5..11b2e7678783 100644
--- a/x11/kdebase4-runtime/files/plist.base.rm
+++ b/x11/kdebase4-runtime/files/plist.base.rm
@@ -237,7 +237,6 @@
@dirrm share/doc/HTML/en/kate
@dirrm share/doc/HTML/en
@dirrm share/doc/HTML
-@dirrm share/doc
@dirrm share/config/kdm
@dirrm share/config
@dirrm share/autostart
@@ -453,4 +452,3 @@
@dirrm include/kwin
@dirrm include/ksgrd
@dirrm include/kate
-@dirrm etc
diff --git a/x11/kdebase4-runtime/files/plist.mkfontdir b/x11/kdebase4-runtime/files/plist.mkfontdir
deleted file mode 100644
index fc9aa28d2513..000000000000
--- a/x11/kdebase4-runtime/files/plist.mkfontdir
+++ /dev/null
@@ -1,2 +0,0 @@
-share/fonts/fonts.dir
-share/fonts/override/fonts.dir
diff --git a/x11/kdebase4-runtime/files/plist.motif b/x11/kdebase4-runtime/files/plist.motif
index 3f0feec2459a..ede17101761e 100644
--- a/x11/kdebase4-runtime/files/plist.motif
+++ b/x11/kdebase4-runtime/files/plist.motif
@@ -3,4 +3,3 @@ bin/nspluginviewer
lib/libnsplugin.la
lib/libnsplugin.so
lib/libnsplugin.so.1
-share/applnk/Settings/WebBrowsing/nsplugin.desktop
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 3fe945cc9002..1ae4170f6ed5 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
@@ -17,6 +17,8 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= This package provides the basic applications for the KDE system
+BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
KDE_BUILD_PLIST=yes
@@ -34,7 +36,6 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no
CONFIGURE_ARGS+=--disable-ltdl-install \
--without-ldap \
--disable-closure \
- ${XINERAMA} \
--without-java \
--with-qt-dir=${X11BASE} \
--with-xdmdir=${X11BASE}/lib/X11/xdm
@@ -42,14 +43,15 @@ CONFIGURE_ARGS+=--disable-ltdl-install \
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/bin/mkfontdir)
-PLIST_APPEND+= plist.mkfontdir
-.endif # exists(${X11BASE}/bin/mkfontdir)
-
.if exists(${X11BASE}/include/Xm/Xm.h)
WITH_MOTIF= yes
.endif # exists(${X11BASE}/include/Xm/Xm.h)
+.if defined(WITHOUT_MOTIF)
+.undef WITH_MOTIF
+CONFIGURE_ARGS+= --without-motif
+.endif # defined(WITHOUT_MOTIF)
+
.if defined(WITH_MOTIF)
USE_MOTIF= yes
PLIST_APPEND+= plist.motif
@@ -63,25 +65,6 @@ pre-extract::
@${ECHO_MSG}
.endif # defined(WITH_MOTIF)
-.if exists(${X11BASE}/lib/libfontconfig.so.1)
-WITH_FONTCONFIG=yes
-.endif
-
-.if defined(WITH_FONTCONFIG)
-LIB_DEPENDS+= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
-.endif
-
-.if defined(WITHOUT_XINERAMA)
-XINERAMA= --without-xinerama
-.else
-XINERAMA= --with-xinerama
-pre-extract::
- @${ECHO_MSG}
- @${ECHO_MSG} "If you don't want to compile with Xinerama support,"
- @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITHOUT_XINERAMA=yes\""
- @${ECHO_MSG}
-.endif # defined(WITH_XINERAMA)
-
post-extract:
@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index db90433b7878..b902fe692aaa 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdebase-3.1.tar.bz2) = 02f0583c7de93cdc458101a7575455b4
+MD5 (KDE/kdebase-3.1.1.tar.bz2) = f360add935d13be629b43a2a280b759f
diff --git a/x11/kdebase4-workspace/files/patch-ksysguard-CPU.c b/x11/kdebase4-workspace/files/patch-ksysguard-CPU.c
deleted file mode 100644
index 584110b5e9d1..000000000000
--- a/x11/kdebase4-workspace/files/patch-ksysguard-CPU.c
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: ksysguard/ksysguardd/FreeBSD/CPU.c
-===================================================================
-RCS file: /home/kde/kdebase/ksysguard/ksysguardd/FreeBSD/CPU.c,v
-retrieving revision 1.9
-diff -u -5 -p -d -r1.9 CPU.c
---- ksysguard/ksysguardd/FreeBSD/CPU.c 17 Oct 2002 10:04:02 -0000 1.9
-+++ ksysguard/ksysguardd/FreeBSD/CPU.c 3 Mar 2003 07:11:28 -0000
-@@ -19,11 +19,16 @@
-
- $Id: CPU.c,v 1.9 2002/10/17 10:04:02 garbanzo Exp $
- */
-
- #include <sys/types.h>
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500101
- #include <sys/dkstat.h>
-+#else
-+#include <sys/resource.h>
-+#endif
- #include <sys/sysctl.h>
-
- #include <devstat.h>
- #include <fcntl.h>
- #include <nlist.h>
diff --git a/x11/kdebase4-workspace/files/patch-ksysguard-ProcessList.c b/x11/kdebase4-workspace/files/patch-ksysguard-ProcessList.c
deleted file mode 100644
index 55e0c2a12753..000000000000
--- a/x11/kdebase4-workspace/files/patch-ksysguard-ProcessList.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- ksysguard/ksysguardd/FreeBSD/ProcessList.c.orig Sun Feb 9 18:54:36 2003
-+++ ksysguard/ksysguardd/FreeBSD/ProcessList.c Sun Feb 9 18:54:51 2003
-@@ -224,10 +224,8 @@
-
- #if __FreeBSD_version >= 500015
- ps->userLoad = p.ki_pctcpu / 100;
-- ps->vmSize = (p.ki_vmspace->vm_tsize +
-- p.ki_vmspace->vm_dsize +
-- p.ki_vmspace->vm_ssize) * getpagesize();
-- ps->vmRss = p.ki_vmspace->vm_rssize * getpagesize();
-+ ps->vmSize = p.ki_size;
-+ ps->vmRss = p.ki_rssize;
- strncpy(ps->name,p.ki_comm? p.ki_comm:"????",sizeof(ps->name));
- strcpy(ps->status,(p.ki_stat>=1)&&(p.ki_stat<=5)? statuses[p.ki_stat-1]:"????");
- #else
diff --git a/x11/kdebase4-workspace/files/plist.base b/x11/kdebase4-workspace/files/plist.base
index f5b360ba4b3c..80a9509368eb 100644
--- a/x11/kdebase4-workspace/files/plist.base
+++ b/x11/kdebase4-workspace/files/plist.base
@@ -463,19 +463,28 @@ lib/libtaskmanager.la
lib/libtaskmanager.so
lib/libtaskmanager.so.1
share/applnk/.directory
+share/applnk/.hidden/battery.desktop
+share/applnk/.hidden/bwarning.desktop
+share/applnk/.hidden/cwarning.desktop
share/applnk/.hidden/fileappearance.desktop
share/applnk/.hidden/filebehavior.desktop
share/applnk/.hidden/filepreviews.desktop
+share/applnk/.hidden/kcmkonq.desktop
share/applnk/.hidden/kcmkonsole.desktop
+share/applnk/.hidden/kcmkxmlrpcd.desktop
share/applnk/.hidden/kicker_config.desktop
share/applnk/.hidden/kicker_config_appearance.desktop
share/applnk/.hidden/konqfilemgr.desktop
+share/applnk/.hidden/konqhtml.desktop
share/applnk/.hidden/kwinactions.desktop
share/applnk/.hidden/kwinadvanced.desktop
share/applnk/.hidden/kwinfocus.desktop
share/applnk/.hidden/kwinmoving.desktop
share/applnk/.hidden/midi.desktop
+share/applnk/.hidden/power.desktop
share/applnk/.hidden/smb.desktop
+share/applnk/.hidden/socks.desktop
+share/applnk/.hidden/virtualdesktops.desktop
share/applnk/Applications/.directory
share/applnk/Development/.directory
share/applnk/Editors/.directory
@@ -598,6 +607,7 @@ share/applnk/Settings/System/kcmfontinst.desktop
share/applnk/Settings/System/kcmhelpcenter.desktop
share/applnk/Settings/System/kdm.desktop
share/applnk/Settings/WebBrowsing/khtml_appearance.desktop
+share/applnk/Settings/WebBrowsing/nsplugin.desktop
share/applnk/Settings/WebBrowsing/smb.desktop
share/applnk/Settings/email.desktop
share/applnk/Settingsmenu/.directory
@@ -1935,6 +1945,8 @@ share/doc/HTML/en/kwrite/index.docbook
share/fonts/9x15.pcf.gz
share/fonts/console8x16.pcf.gz
share/fonts/console8x8.pcf.gz
+share/fonts/fonts.dir
+share/fonts/override/fonts.dir
share/icons/crystalsvg/128x128/apps/access.png
share/icons/crystalsvg/128x128/apps/acroread.png
share/icons/crystalsvg/128x128/apps/applixware.png
@@ -2146,6 +2158,7 @@ share/icons/crystalsvg/16x16/apps/xpaint.png
share/icons/crystalsvg/16x16/apps/xv.png
share/icons/crystalsvg/16x16/devices/print_printer.png
share/icons/crystalsvg/16x16/filesystems/folder_print2.png
+share/icons/crystalsvg/22x22/apps/klipper.png
share/icons/crystalsvg/22x22/apps/kvirc.png
share/icons/crystalsvg/22x22/apps/nedit.png
share/icons/crystalsvg/32x32/apps/access.png
diff --git a/x11/kdebase4-workspace/files/plist.base.rm b/x11/kdebase4-workspace/files/plist.base.rm
index a80f5dedafd5..11b2e7678783 100644
--- a/x11/kdebase4-workspace/files/plist.base.rm
+++ b/x11/kdebase4-workspace/files/plist.base.rm
@@ -237,7 +237,6 @@
@dirrm share/doc/HTML/en/kate
@dirrm share/doc/HTML/en
@dirrm share/doc/HTML
-@dirrm share/doc
@dirrm share/config/kdm
@dirrm share/config
@dirrm share/autostart
@@ -453,4 +452,3 @@
@dirrm include/kwin
@dirrm include/ksgrd
@dirrm include/kate
-@dirrm etc
diff --git a/x11/kdebase4-workspace/files/plist.mkfontdir b/x11/kdebase4-workspace/files/plist.mkfontdir
deleted file mode 100644
index fc9aa28d2513..000000000000
--- a/x11/kdebase4-workspace/files/plist.mkfontdir
+++ /dev/null
@@ -1,2 +0,0 @@
-share/fonts/fonts.dir
-share/fonts/override/fonts.dir
diff --git a/x11/kdebase4-workspace/files/plist.motif b/x11/kdebase4-workspace/files/plist.motif
index 3f0feec2459a..ede17101761e 100644
--- a/x11/kdebase4-workspace/files/plist.motif
+++ b/x11/kdebase4-workspace/files/plist.motif
@@ -3,4 +3,3 @@ bin/nspluginviewer
lib/libnsplugin.la
lib/libnsplugin.so
lib/libnsplugin.so.1
-share/applnk/Settings/WebBrowsing/nsplugin.desktop
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 3fe945cc9002..1ae4170f6ed5 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
@@ -17,6 +17,8 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= This package provides the basic applications for the KDE system
+BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
KDE_BUILD_PLIST=yes
@@ -34,7 +36,6 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no
CONFIGURE_ARGS+=--disable-ltdl-install \
--without-ldap \
--disable-closure \
- ${XINERAMA} \
--without-java \
--with-qt-dir=${X11BASE} \
--with-xdmdir=${X11BASE}/lib/X11/xdm
@@ -42,14 +43,15 @@ CONFIGURE_ARGS+=--disable-ltdl-install \
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/bin/mkfontdir)
-PLIST_APPEND+= plist.mkfontdir
-.endif # exists(${X11BASE}/bin/mkfontdir)
-
.if exists(${X11BASE}/include/Xm/Xm.h)
WITH_MOTIF= yes
.endif # exists(${X11BASE}/include/Xm/Xm.h)
+.if defined(WITHOUT_MOTIF)
+.undef WITH_MOTIF
+CONFIGURE_ARGS+= --without-motif
+.endif # defined(WITHOUT_MOTIF)
+
.if defined(WITH_MOTIF)
USE_MOTIF= yes
PLIST_APPEND+= plist.motif
@@ -63,25 +65,6 @@ pre-extract::
@${ECHO_MSG}
.endif # defined(WITH_MOTIF)
-.if exists(${X11BASE}/lib/libfontconfig.so.1)
-WITH_FONTCONFIG=yes
-.endif
-
-.if defined(WITH_FONTCONFIG)
-LIB_DEPENDS+= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
-.endif
-
-.if defined(WITHOUT_XINERAMA)
-XINERAMA= --without-xinerama
-.else
-XINERAMA= --with-xinerama
-pre-extract::
- @${ECHO_MSG}
- @${ECHO_MSG} "If you don't want to compile with Xinerama support,"
- @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITHOUT_XINERAMA=yes\""
- @${ECHO_MSG}
-.endif # defined(WITH_XINERAMA)
-
post-extract:
@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo
index db90433b7878..b902fe692aaa 100644
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdebase-3.1.tar.bz2) = 02f0583c7de93cdc458101a7575455b4
+MD5 (KDE/kdebase-3.1.1.tar.bz2) = f360add935d13be629b43a2a280b759f
diff --git a/x11/kdebase4/files/patch-ksysguard-CPU.c b/x11/kdebase4/files/patch-ksysguard-CPU.c
deleted file mode 100644
index 584110b5e9d1..000000000000
--- a/x11/kdebase4/files/patch-ksysguard-CPU.c
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: ksysguard/ksysguardd/FreeBSD/CPU.c
-===================================================================
-RCS file: /home/kde/kdebase/ksysguard/ksysguardd/FreeBSD/CPU.c,v
-retrieving revision 1.9
-diff -u -5 -p -d -r1.9 CPU.c
---- ksysguard/ksysguardd/FreeBSD/CPU.c 17 Oct 2002 10:04:02 -0000 1.9
-+++ ksysguard/ksysguardd/FreeBSD/CPU.c 3 Mar 2003 07:11:28 -0000
-@@ -19,11 +19,16 @@
-
- $Id: CPU.c,v 1.9 2002/10/17 10:04:02 garbanzo Exp $
- */
-
- #include <sys/types.h>
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500101
- #include <sys/dkstat.h>
-+#else
-+#include <sys/resource.h>
-+#endif
- #include <sys/sysctl.h>
-
- #include <devstat.h>
- #include <fcntl.h>
- #include <nlist.h>
diff --git a/x11/kdebase4/files/patch-ksysguard-ProcessList.c b/x11/kdebase4/files/patch-ksysguard-ProcessList.c
deleted file mode 100644
index 55e0c2a12753..000000000000
--- a/x11/kdebase4/files/patch-ksysguard-ProcessList.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- ksysguard/ksysguardd/FreeBSD/ProcessList.c.orig Sun Feb 9 18:54:36 2003
-+++ ksysguard/ksysguardd/FreeBSD/ProcessList.c Sun Feb 9 18:54:51 2003
-@@ -224,10 +224,8 @@
-
- #if __FreeBSD_version >= 500015
- ps->userLoad = p.ki_pctcpu / 100;
-- ps->vmSize = (p.ki_vmspace->vm_tsize +
-- p.ki_vmspace->vm_dsize +
-- p.ki_vmspace->vm_ssize) * getpagesize();
-- ps->vmRss = p.ki_vmspace->vm_rssize * getpagesize();
-+ ps->vmSize = p.ki_size;
-+ ps->vmRss = p.ki_rssize;
- strncpy(ps->name,p.ki_comm? p.ki_comm:"????",sizeof(ps->name));
- strcpy(ps->status,(p.ki_stat>=1)&&(p.ki_stat<=5)? statuses[p.ki_stat-1]:"????");
- #else
diff --git a/x11/kdebase4/files/plist.base b/x11/kdebase4/files/plist.base
index f5b360ba4b3c..80a9509368eb 100644
--- a/x11/kdebase4/files/plist.base
+++ b/x11/kdebase4/files/plist.base
@@ -463,19 +463,28 @@ lib/libtaskmanager.la
lib/libtaskmanager.so
lib/libtaskmanager.so.1
share/applnk/.directory
+share/applnk/.hidden/battery.desktop
+share/applnk/.hidden/bwarning.desktop
+share/applnk/.hidden/cwarning.desktop
share/applnk/.hidden/fileappearance.desktop
share/applnk/.hidden/filebehavior.desktop
share/applnk/.hidden/filepreviews.desktop
+share/applnk/.hidden/kcmkonq.desktop
share/applnk/.hidden/kcmkonsole.desktop
+share/applnk/.hidden/kcmkxmlrpcd.desktop
share/applnk/.hidden/kicker_config.desktop
share/applnk/.hidden/kicker_config_appearance.desktop
share/applnk/.hidden/konqfilemgr.desktop
+share/applnk/.hidden/konqhtml.desktop
share/applnk/.hidden/kwinactions.desktop
share/applnk/.hidden/kwinadvanced.desktop
share/applnk/.hidden/kwinfocus.desktop
share/applnk/.hidden/kwinmoving.desktop
share/applnk/.hidden/midi.desktop
+share/applnk/.hidden/power.desktop
share/applnk/.hidden/smb.desktop
+share/applnk/.hidden/socks.desktop
+share/applnk/.hidden/virtualdesktops.desktop
share/applnk/Applications/.directory
share/applnk/Development/.directory
share/applnk/Editors/.directory
@@ -598,6 +607,7 @@ share/applnk/Settings/System/kcmfontinst.desktop
share/applnk/Settings/System/kcmhelpcenter.desktop
share/applnk/Settings/System/kdm.desktop
share/applnk/Settings/WebBrowsing/khtml_appearance.desktop
+share/applnk/Settings/WebBrowsing/nsplugin.desktop
share/applnk/Settings/WebBrowsing/smb.desktop
share/applnk/Settings/email.desktop
share/applnk/Settingsmenu/.directory
@@ -1935,6 +1945,8 @@ share/doc/HTML/en/kwrite/index.docbook
share/fonts/9x15.pcf.gz
share/fonts/console8x16.pcf.gz
share/fonts/console8x8.pcf.gz
+share/fonts/fonts.dir
+share/fonts/override/fonts.dir
share/icons/crystalsvg/128x128/apps/access.png
share/icons/crystalsvg/128x128/apps/acroread.png
share/icons/crystalsvg/128x128/apps/applixware.png
@@ -2146,6 +2158,7 @@ share/icons/crystalsvg/16x16/apps/xpaint.png
share/icons/crystalsvg/16x16/apps/xv.png
share/icons/crystalsvg/16x16/devices/print_printer.png
share/icons/crystalsvg/16x16/filesystems/folder_print2.png
+share/icons/crystalsvg/22x22/apps/klipper.png
share/icons/crystalsvg/22x22/apps/kvirc.png
share/icons/crystalsvg/22x22/apps/nedit.png
share/icons/crystalsvg/32x32/apps/access.png
diff --git a/x11/kdebase4/files/plist.base.rm b/x11/kdebase4/files/plist.base.rm
index a80f5dedafd5..11b2e7678783 100644
--- a/x11/kdebase4/files/plist.base.rm
+++ b/x11/kdebase4/files/plist.base.rm
@@ -237,7 +237,6 @@
@dirrm share/doc/HTML/en/kate
@dirrm share/doc/HTML/en
@dirrm share/doc/HTML
-@dirrm share/doc
@dirrm share/config/kdm
@dirrm share/config
@dirrm share/autostart
@@ -453,4 +452,3 @@
@dirrm include/kwin
@dirrm include/ksgrd
@dirrm include/kate
-@dirrm etc
diff --git a/x11/kdebase4/files/plist.mkfontdir b/x11/kdebase4/files/plist.mkfontdir
deleted file mode 100644
index fc9aa28d2513..000000000000
--- a/x11/kdebase4/files/plist.mkfontdir
+++ /dev/null
@@ -1,2 +0,0 @@
-share/fonts/fonts.dir
-share/fonts/override/fonts.dir
diff --git a/x11/kdebase4/files/plist.motif b/x11/kdebase4/files/plist.motif
index 3f0feec2459a..ede17101761e 100644
--- a/x11/kdebase4/files/plist.motif
+++ b/x11/kdebase4/files/plist.motif
@@ -3,4 +3,3 @@ bin/nspluginviewer
lib/libnsplugin.la
lib/libnsplugin.so
lib/libnsplugin.so.1
-share/applnk/Settings/WebBrowsing/nsplugin.desktop
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 1513169f1c59..680adf019ee1 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
-COMMENT= This is the base set of libraries needed by KDE programs
+COMMENT= This is the base set of libraries needed by KDE programs
BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
@@ -44,29 +44,31 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--disable-ltdl-install \
--enable-mt \
- --enable-cups \
- ${XINERAMA}
+ --enable-cups
FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/tcvn-0.enc
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.pre.mk>
-
+# fam provides a measurable performance increase for file watching
+# operations within KDE
.if exists(${LOCALBASE}/bin/fam)
LIB_DEPENDS+= fam.0:${PORTSDIR}/devel/fam
.endif # exists(${LOCALBASE}/bin/fam)
+# bzip2 is required as a libdepend for the help: kioslave
.if !exists(/usr/bin/bzip2)
LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
.endif # !exists(/usr/bin/bzip2)
-.if defined(WITH_XINERAMA)
-XINERAMA= -with-xinerama
-PKGNAMESUFFIX= -xinerama
-.else
-XINERAMA= -without-xinerama
-.endif # defined(WITH_XINERAMA)
+KDE_BUILD_PLIST= yes
+# kabc (the addressbook backend) can use ldap if it's available
+.if defined(WITH_LDAP) || exists($(LOCALBASE)/lib/libldap.so)
+LIB_DEPENDS+= libldap.so:${PORTSDIR}/net/openldap21
+PLIST_APPEND+= plist.ldap
+.endif
+
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+.include <bsd.port.pre.mk>
pre-configure:
${REINPLACE_CMD} "s, kspell,,g" ${WRKSRC}/doc/Makefile.in
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index fa90e08264bc..a1a6eb15842c 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdelibs-3.1.tar.bz2) = 4b5cb94d5889134ba4e86749e6b5476c
+MD5 (KDE/kdelibs-3.1.1.tar.bz2) = 15eb9412c589126844b277b9e80cfffc
diff --git a/x11/kdelibs3/files/patch-kio::kio::kzip.cpp b/x11/kdelibs3/files/patch-kio::kio::kzip.cpp
new file mode 100644
index 000000000000..1b4b7d35e230
--- /dev/null
+++ b/x11/kdelibs3/files/patch-kio::kio::kzip.cpp
@@ -0,0 +1,59 @@
+--- kio/kio/kzip.cpp.orig Fri Jan 3 05:58:47 2003
++++ kio/kio/kzip.cpp Fri Mar 21 11:13:48 2003
+@@ -332,27 +332,43 @@
+
+ KArchiveEntry* entry;
+ if ( isdir )
+- entry = new KArchiveDirectory( this, entryName, access, time, rootDir()->user(), rootDir()->group(), QString::null );
++ {
++ QString path = QDir::cleanDirPath( name.left( pos ) );
++ KArchiveEntry* ent = rootDir()->entry( path );
++ if ( ent && ent->isDirectory() )
++ {
++ //kdDebug(7040) << "Directory already exists, NOT going to add it again" << endl;
++ entry = 0L;
++ }
++ else
++ {
++ entry = new KArchiveDirectory( this, entryName, access, time, rootDir()->user(), rootDir()->group(), QString::null );
++ //kdDebug(7040) << "KArchiveDirectory created, entryName= " << entryName << ", name=" << name << endl;
++ }
++ }
+ else
+ {
+ entry = new KZipFileEntry( this, entryName, access, time, rootDir()->user(), rootDir()->group(), QString::null,
+- name, dataoffset, ucsize, cmethod, csize );
++ name, dataoffset, ucsize, cmethod, csize );
+ static_cast<KZipFileEntry *>(entry)->setHeaderStart( localheaderoffset );
+- //kdDebug(7040) << "KZipFileEntry created" << endl;
++ //kdDebug(7040) << "KZipFileEntry created, entryName= " << entryName << ", name=" << name << endl;
+ d->m_fileList.append( static_cast<KZipFileEntry *>( entry ) );
+ }
+
+- if ( pos == -1 )
++ if ( entry )
+ {
+- rootDir()->addEntry(entry);
+- }
+- else
+- {
+- // In some tar files we can find dir/./file => call cleanDirPath
+- QString path = QDir::cleanDirPath( name.left( pos ) );
+- // Ensure container directory exists, create otherwise
+- KArchiveDirectory * tdir = findOrCreate( path );
+- tdir->addEntry(entry);
++ if ( pos == -1 )
++ {
++ rootDir()->addEntry(entry);
++ }
++ else
++ {
++ // In some tar files we can find dir/./file => call cleanDirPath
++ QString path = QDir::cleanDirPath( name.left( pos ) );
++ // Ensure container directory exists, create otherwise
++ KArchiveDirectory * tdir = findOrCreate( path );
++ tdir->addEntry(entry);
++ }
+ }
+
+ //calculate offset to next entry
diff --git a/x11/kdelibs3/files/patch-kioslave::http::http.cc b/x11/kdelibs3/files/patch-kioslave::http::http.cc
new file mode 100644
index 000000000000..b2ed6d914d1f
--- /dev/null
+++ b/x11/kdelibs3/files/patch-kioslave::http::http.cc
@@ -0,0 +1,126 @@
+--- kioslave/http/http.cc.orig Sun Mar 2 20:02:28 2003
++++ kioslave/http/http.cc Thu Mar 20 22:05:14 2003
+@@ -438,7 +438,6 @@
+ kdDebug(7113) << "(" << m_pid << ") Unset tunneling flag!" << endl;
+ setEnableSSLTunnel( false );
+ m_bIsTunneled = true;
+- m_bNeedTunnel = false;
+ // Reset the CONNECT response code...
+ m_responseCode = m_prevResponseCode;
+ continue;
+@@ -1936,7 +1935,42 @@
+ // Check the validity of the current connection, if one exists.
+ httpCheckConnection();
+
+- // Determine if this is a POST or GET method
++
++ if ( !m_bIsTunneled && m_bNeedTunnel )
++ {
++ setEnableSSLTunnel( true );
++ // We send a HTTP 1.0 header since some proxies refuse HTTP 1.1 and we don't
++ // need any HTTP 1.1 capabilities for CONNECT - Waba
++ header = QString("CONNECT %1:%2 HTTP/1.0"
++ "\r\n").arg( m_request.hostname).arg(m_request.port);
++
++ // Identify who you are to the proxy server!
++ if (!m_request.userAgent.isEmpty())
++ header += "User-Agent: " + m_request.userAgent + "\r\n";
++
++ /* Add hostname information */
++ header += "Host: ";
++ if (m_state.hostname.find(':') != -1)
++ {
++ // This is an IPv6 (not hostname)
++ header += '[';
++ header += m_state.hostname;
++ header += ']';
++ }
++ else
++ {
++ header += m_state.hostname;
++ }
++
++ if (m_state.port != m_iDefaultPort)
++ header += QString(":%1").arg(m_state.port);
++ header += "\r\n";
++
++ header += proxyAuthenticationHeader();
++ }
++ else
++ {
++ // Determine the kind of method we are handling...
+ switch (m_request.method)
+ {
+ case HTTP_GET:
+@@ -1944,12 +1978,12 @@
+ break;
+ case HTTP_PUT:
+ header = "PUT ";
+- moreData = !m_bNeedTunnel;
++ moreData = true;
+ m_request.bCachedWrite = false; // Do not put any result in the cache
+ break;
+ case HTTP_POST:
+ header = "POST ";
+- moreData = !m_bNeedTunnel;
++ moreData = true;
+ m_request.bCachedWrite = false; // Do not put any result in the cache
+ break;
+ case HTTP_HEAD:
+@@ -2033,40 +2067,6 @@
+ return false;
+ }
+
+- if ( !m_bIsTunneled && m_bNeedTunnel )
+- {
+- setEnableSSLTunnel( true );
+- // We send a HTTP 1.0 header since some proxies refuse HTTP 1.1 and we don't
+- // need any HTTP 1.1 capabilities for CONNECT - Waba
+- header = QString("CONNECT %1:%2 HTTP/1.0"
+- "\r\n").arg( m_request.hostname).arg(m_request.port);
+-
+- // Identify who you are to the proxy server!
+- if (!m_request.userAgent.isEmpty())
+- header += "User-Agent: " + m_request.userAgent + "\r\n";
+-
+- /* Add hostname information */
+- header += "Host: ";
+- if (m_state.hostname.find(':') != -1)
+- {
+- // This is an IPv6 (not hostname)
+- header += '[';
+- header += m_state.hostname;
+- header += ']';
+- }
+- else
+- {
+- header += m_state.hostname;
+- }
+-
+- if (m_state.port != m_iDefaultPort)
+- header += QString(":%1").arg(m_state.port);
+- header += "\r\n";
+-
+- header += proxyAuthenticationHeader();
+- }
+- else
+- {
+ // format the URI
+ if (m_state.doProxy && !m_bIsTunneled)
+ {
+@@ -2271,7 +2271,6 @@
+ // Do we need to authorize to the proxy server ?
+ if ( m_state.doProxy && !m_bIsTunneled )
+ header += proxyAuthenticationHeader();
+- }
+
+ if ( m_protocol == "webdav" || m_protocol == "webdavs" )
+ {
+@@ -2289,6 +2288,7 @@
+ // add extra header elements for WebDAV
+ if ( !davHeader.isNull() )
+ header += davHeader;
++ }
+ }
+
+ kdDebug(7103) << "(" << m_pid << ") ============ Sending Header:" << endl;
diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/files/plist.base
index 3bf527f8d469..f5458c52a237 100644
--- a/x11/kdelibs3/pkg-plist
+++ b/x11/kdelibs3/files/plist.base
@@ -627,6 +627,8 @@ lib/kde3/kio_http.la
lib/kde3/kio_http.so
lib/kde3/kio_metainfo.la
lib/kde3/kio_metainfo.so
+lib/kde3/kjavaappletviewer.la
+lib/kde3/kjavaappletviewer.so
lib/kde3/kjs_html.la
lib/kde3/kjs_html.so
lib/kde3/ktexteditor_insertfile.la
@@ -777,7 +779,9 @@ share/apps/katepart/syntax/javascript.xml
share/apps/katepart/syntax/kbasic.xml
share/apps/katepart/syntax/language.dtd
share/apps/katepart/syntax/latex.xml
+share/apps/katepart/syntax/ldif.xml
share/apps/katepart/syntax/literate-haskell.xml
+share/apps/katepart/syntax/lpc.xml
share/apps/katepart/syntax/mab.xml
share/apps/katepart/syntax/makefile.xml
share/apps/katepart/syntax/mason.xml
@@ -786,6 +790,7 @@ share/apps/katepart/syntax/objectivec.xml
share/apps/katepart/syntax/pascal.xml
share/apps/katepart/syntax/perl.xml
share/apps/katepart/syntax/php.xml
+share/apps/katepart/syntax/picsrc.xml
share/apps/katepart/syntax/postscript.xml
share/apps/katepart/syntax/prolog.xml
share/apps/katepart/syntax/python.xml
@@ -795,6 +800,7 @@ share/apps/katepart/syntax/rsiidl.xml
share/apps/katepart/syntax/ruby.xml
share/apps/katepart/syntax/sather.xml
share/apps/katepart/syntax/scheme.xml
+share/apps/katepart/syntax/sci.xml
share/apps/katepart/syntax/sgml.xml
share/apps/katepart/syntax/sml.xml
share/apps/katepart/syntax/sql-mysql.xml
@@ -802,6 +808,8 @@ share/apps/katepart/syntax/sql-postgresql.xml
share/apps/katepart/syntax/sql.xml
share/apps/katepart/syntax/syntax.template
share/apps/katepart/syntax/tcl.xml
+share/apps/katepart/syntax/uscript.xml
+share/apps/katepart/syntax/velocity.xml
share/apps/katepart/syntax/verilog.xml
share/apps/katepart/syntax/vhdl.xml
share/apps/katepart/syntax/winehq.xml
@@ -3657,6 +3665,7 @@ share/mimelnk/application/x-graphite.desktop
share/mimelnk/application/x-gzip.desktop
share/mimelnk/application/x-hancomword.desktop
share/mimelnk/application/x-jar.desktop
+share/mimelnk/application/x-java-applet.desktop
share/mimelnk/application/x-java.desktop
share/mimelnk/application/x-karbon.desktop
share/mimelnk/application/x-kchart.desktop
@@ -3815,6 +3824,7 @@ share/services/kgzipfilter.desktop
share/services/khtml.desktop
share/services/khtmlimage.desktop
share/services/kio_uiserver.desktop
+share/services/kjavaappletviewer.desktop
share/services/kmailservice.protocol
share/services/kmultipart.desktop
share/services/knotify.desktop
@@ -3858,6 +3868,19 @@ share/servicetypes/ktexteditorplugin.desktop
share/servicetypes/kurifilterplugin.desktop
share/servicetypes/renamedlgplugin.desktop
share/servicetypes/scriptinterface.desktop
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/bg/entities
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/fo/entities
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/lt/entities
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/no-NY/entities
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/stylesheets
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/wa/entities
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/xh/entities
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/xx/entities
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/zh-CN/entities
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/docbook/xsl/indexing
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/docbook/xsl/javahelp
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/docbook/xsl/template
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/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/kabc/html
@@ -3873,243 +3896,3 @@ share/servicetypes/scriptinterface.desktop
@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
-@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/kutils/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kspell/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/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/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/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
-@dirrm share/servicetypes
-@dirrm share/services/kded
-@dirrm share/services
-@dirrm share/mimelnk/video
-@dirrm share/mimelnk/text
-@dirrm share/mimelnk/multipart
-@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/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/actions
-@dirrm share/icons/crystalsvg/22x22
-@dirrm share/icons/crystalsvg/16x16/mimetypes/pdf
-@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
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
-@dirrm share/doc/HTML/en/kdelibs-apidocs/libkmid
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kutils
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kspell
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kparts
-@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/kdefx
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kdecore
-@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
-@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/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.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/xsl
-@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/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/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/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/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
-@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/32x32/apps
-@dirrm share/apps/kdeprint/icons/crystalsvg/32x32/actions
-@dirrm share/apps/kdeprint/icons/crystalsvg/32x32
-@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/plugins
-@dirrm share/apps/kabc/formats
-@dirrm share/apps/kabc
-@dirrm share/apps/LICENSES
-@dirrm share/apps
-@dirrm share/applnk/Settings/Components
-@dirrm share/applnk/Settings
-@dirrm share/applnk
-@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/kparts
-@dirrm include/kmediaplayer
-@dirrm include/kjs
-@dirrm include/kio
-@dirrm include/kdesu
-@dirrm include/kdeprint/lpr
-@dirrm include/kdeprint
-@dirrm include/kate
-@dirrm include/kabc
-@dirrm include/dom
diff --git a/x11/kdelibs3/files/plist.base.rm b/x11/kdelibs3/files/plist.base.rm
new file mode 100644
index 000000000000..279b61cf447a
--- /dev/null
+++ b/x11/kdelibs3/files/plist.base.rm
@@ -0,0 +1,262 @@
+@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/kutils/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kspell/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/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/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/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/apps/ksgmltools2/docbook/xsl/template || true
+@unexec /bin/rmdir %D/share/apps/ksgmltools2/docbook/xsl/javahelp || true
+@unexec /bin/rmdir %D/share/apps/ksgmltools2/docbook/xsl/indexing || true
+@unexec /bin/rmdir %D/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent || true
+@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/zh-CN/entities || true
+@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/xx/entities || true
+@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/xh/entities || true
+@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/wa/entities || true
+@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/stylesheets || true
+@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/no-NY/entities || true
+@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/lt/entities || true
+@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/fo/entities || true
+@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/bg/entities || true
+@dirrm share/servicetypes
+@dirrm share/services/kded
+@dirrm share/services
+@dirrm share/mimelnk/video
+@dirrm share/mimelnk/text
+@dirrm share/mimelnk/multipart
+@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/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/actions
+@dirrm share/icons/crystalsvg/22x22
+@dirrm share/icons/crystalsvg/16x16/mimetypes/pdf
+@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
+@dirrm share/icons/crystalsvg
+@dirrm share/icons
+@dirrm share/doc/HTML/en/kdelibs-apidocs/libkmid
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kutils
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kspell
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kparts
+@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/kdefx
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kdecore
+@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
+@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/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
+@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/zh-CN
+@dirrm share/apps/ksgmltools2/customization/xx
+@dirrm share/apps/ksgmltools2/customization/xsl
+@dirrm share/apps/ksgmltools2/customization/xh
+@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-NY
+@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
+@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
+@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
+@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/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
+@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/32x32/apps
+@dirrm share/apps/kdeprint/icons/crystalsvg/32x32/actions
+@dirrm share/apps/kdeprint/icons/crystalsvg/32x32
+@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/plugins
+@dirrm share/apps/kabc/formats
+@dirrm share/apps/kabc
+@dirrm share/apps/LICENSES
+@dirrm share/apps
+@dirrm share/applnk/Settings/Components
+@dirrm share/applnk/Settings
+@dirrm share/applnk
+@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/kparts
+@dirrm include/kmediaplayer
+@dirrm include/kjs
+@dirrm include/kio
+@dirrm include/kdesu
+@dirrm include/kdeprint/lpr
+@dirrm include/kdeprint
+@dirrm include/kate
+@dirrm include/kabc
+@dirrm include/dom
diff --git a/x11/kdelibs3/files/plist.ldap b/x11/kdelibs3/files/plist.ldap
new file mode 100644
index 000000000000..2f30c7f63e21
--- /dev/null
+++ b/x11/kdelibs3/files/plist.ldap
@@ -0,0 +1,3 @@
+lib/kde3/kabc_ldap.la
+lib/kde3/kabc_ldap.so
+share/apps/kabc/plugins/ldap.desktop
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 1513169f1c59..680adf019ee1 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
-COMMENT= This is the base set of libraries needed by KDE programs
+COMMENT= This is the base set of libraries needed by KDE programs
BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
@@ -44,29 +44,31 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--disable-ltdl-install \
--enable-mt \
- --enable-cups \
- ${XINERAMA}
+ --enable-cups
FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/tcvn-0.enc
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.pre.mk>
-
+# fam provides a measurable performance increase for file watching
+# operations within KDE
.if exists(${LOCALBASE}/bin/fam)
LIB_DEPENDS+= fam.0:${PORTSDIR}/devel/fam
.endif # exists(${LOCALBASE}/bin/fam)
+# bzip2 is required as a libdepend for the help: kioslave
.if !exists(/usr/bin/bzip2)
LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
.endif # !exists(/usr/bin/bzip2)
-.if defined(WITH_XINERAMA)
-XINERAMA= -with-xinerama
-PKGNAMESUFFIX= -xinerama
-.else
-XINERAMA= -without-xinerama
-.endif # defined(WITH_XINERAMA)
+KDE_BUILD_PLIST= yes
+# kabc (the addressbook backend) can use ldap if it's available
+.if defined(WITH_LDAP) || exists($(LOCALBASE)/lib/libldap.so)
+LIB_DEPENDS+= libldap.so:${PORTSDIR}/net/openldap21
+PLIST_APPEND+= plist.ldap
+.endif
+
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+.include <bsd.port.pre.mk>
pre-configure:
${REINPLACE_CMD} "s, kspell,,g" ${WRKSRC}/doc/Makefile.in
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index fa90e08264bc..a1a6eb15842c 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdelibs-3.1.tar.bz2) = 4b5cb94d5889134ba4e86749e6b5476c
+MD5 (KDE/kdelibs-3.1.1.tar.bz2) = 15eb9412c589126844b277b9e80cfffc
diff --git a/x11/kdelibs4/files/patch-kio::kio::kzip.cpp b/x11/kdelibs4/files/patch-kio::kio::kzip.cpp
new file mode 100644
index 000000000000..1b4b7d35e230
--- /dev/null
+++ b/x11/kdelibs4/files/patch-kio::kio::kzip.cpp
@@ -0,0 +1,59 @@
+--- kio/kio/kzip.cpp.orig Fri Jan 3 05:58:47 2003
++++ kio/kio/kzip.cpp Fri Mar 21 11:13:48 2003
+@@ -332,27 +332,43 @@
+
+ KArchiveEntry* entry;
+ if ( isdir )
+- entry = new KArchiveDirectory( this, entryName, access, time, rootDir()->user(), rootDir()->group(), QString::null );
++ {
++ QString path = QDir::cleanDirPath( name.left( pos ) );
++ KArchiveEntry* ent = rootDir()->entry( path );
++ if ( ent && ent->isDirectory() )
++ {
++ //kdDebug(7040) << "Directory already exists, NOT going to add it again" << endl;
++ entry = 0L;
++ }
++ else
++ {
++ entry = new KArchiveDirectory( this, entryName, access, time, rootDir()->user(), rootDir()->group(), QString::null );
++ //kdDebug(7040) << "KArchiveDirectory created, entryName= " << entryName << ", name=" << name << endl;
++ }
++ }
+ else
+ {
+ entry = new KZipFileEntry( this, entryName, access, time, rootDir()->user(), rootDir()->group(), QString::null,
+- name, dataoffset, ucsize, cmethod, csize );
++ name, dataoffset, ucsize, cmethod, csize );
+ static_cast<KZipFileEntry *>(entry)->setHeaderStart( localheaderoffset );
+- //kdDebug(7040) << "KZipFileEntry created" << endl;
++ //kdDebug(7040) << "KZipFileEntry created, entryName= " << entryName << ", name=" << name << endl;
+ d->m_fileList.append( static_cast<KZipFileEntry *>( entry ) );
+ }
+
+- if ( pos == -1 )
++ if ( entry )
+ {
+- rootDir()->addEntry(entry);
+- }
+- else
+- {
+- // In some tar files we can find dir/./file => call cleanDirPath
+- QString path = QDir::cleanDirPath( name.left( pos ) );
+- // Ensure container directory exists, create otherwise
+- KArchiveDirectory * tdir = findOrCreate( path );
+- tdir->addEntry(entry);
++ if ( pos == -1 )
++ {
++ rootDir()->addEntry(entry);
++ }
++ else
++ {
++ // In some tar files we can find dir/./file => call cleanDirPath
++ QString path = QDir::cleanDirPath( name.left( pos ) );
++ // Ensure container directory exists, create otherwise
++ KArchiveDirectory * tdir = findOrCreate( path );
++ tdir->addEntry(entry);
++ }
+ }
+
+ //calculate offset to next entry
diff --git a/x11/kdelibs4/files/patch-kioslave::http::http.cc b/x11/kdelibs4/files/patch-kioslave::http::http.cc
new file mode 100644
index 000000000000..b2ed6d914d1f
--- /dev/null
+++ b/x11/kdelibs4/files/patch-kioslave::http::http.cc
@@ -0,0 +1,126 @@
+--- kioslave/http/http.cc.orig Sun Mar 2 20:02:28 2003
++++ kioslave/http/http.cc Thu Mar 20 22:05:14 2003
+@@ -438,7 +438,6 @@
+ kdDebug(7113) << "(" << m_pid << ") Unset tunneling flag!" << endl;
+ setEnableSSLTunnel( false );
+ m_bIsTunneled = true;
+- m_bNeedTunnel = false;
+ // Reset the CONNECT response code...
+ m_responseCode = m_prevResponseCode;
+ continue;
+@@ -1936,7 +1935,42 @@
+ // Check the validity of the current connection, if one exists.
+ httpCheckConnection();
+
+- // Determine if this is a POST or GET method
++
++ if ( !m_bIsTunneled && m_bNeedTunnel )
++ {
++ setEnableSSLTunnel( true );
++ // We send a HTTP 1.0 header since some proxies refuse HTTP 1.1 and we don't
++ // need any HTTP 1.1 capabilities for CONNECT - Waba
++ header = QString("CONNECT %1:%2 HTTP/1.0"
++ "\r\n").arg( m_request.hostname).arg(m_request.port);
++
++ // Identify who you are to the proxy server!
++ if (!m_request.userAgent.isEmpty())
++ header += "User-Agent: " + m_request.userAgent + "\r\n";
++
++ /* Add hostname information */
++ header += "Host: ";
++ if (m_state.hostname.find(':') != -1)
++ {
++ // This is an IPv6 (not hostname)
++ header += '[';
++ header += m_state.hostname;
++ header += ']';
++ }
++ else
++ {
++ header += m_state.hostname;
++ }
++
++ if (m_state.port != m_iDefaultPort)
++ header += QString(":%1").arg(m_state.port);
++ header += "\r\n";
++
++ header += proxyAuthenticationHeader();
++ }
++ else
++ {
++ // Determine the kind of method we are handling...
+ switch (m_request.method)
+ {
+ case HTTP_GET:
+@@ -1944,12 +1978,12 @@
+ break;
+ case HTTP_PUT:
+ header = "PUT ";
+- moreData = !m_bNeedTunnel;
++ moreData = true;
+ m_request.bCachedWrite = false; // Do not put any result in the cache
+ break;
+ case HTTP_POST:
+ header = "POST ";
+- moreData = !m_bNeedTunnel;
++ moreData = true;
+ m_request.bCachedWrite = false; // Do not put any result in the cache
+ break;
+ case HTTP_HEAD:
+@@ -2033,40 +2067,6 @@
+ return false;
+ }
+
+- if ( !m_bIsTunneled && m_bNeedTunnel )
+- {
+- setEnableSSLTunnel( true );
+- // We send a HTTP 1.0 header since some proxies refuse HTTP 1.1 and we don't
+- // need any HTTP 1.1 capabilities for CONNECT - Waba
+- header = QString("CONNECT %1:%2 HTTP/1.0"
+- "\r\n").arg( m_request.hostname).arg(m_request.port);
+-
+- // Identify who you are to the proxy server!
+- if (!m_request.userAgent.isEmpty())
+- header += "User-Agent: " + m_request.userAgent + "\r\n";
+-
+- /* Add hostname information */
+- header += "Host: ";
+- if (m_state.hostname.find(':') != -1)
+- {
+- // This is an IPv6 (not hostname)
+- header += '[';
+- header += m_state.hostname;
+- header += ']';
+- }
+- else
+- {
+- header += m_state.hostname;
+- }
+-
+- if (m_state.port != m_iDefaultPort)
+- header += QString(":%1").arg(m_state.port);
+- header += "\r\n";
+-
+- header += proxyAuthenticationHeader();
+- }
+- else
+- {
+ // format the URI
+ if (m_state.doProxy && !m_bIsTunneled)
+ {
+@@ -2271,7 +2271,6 @@
+ // Do we need to authorize to the proxy server ?
+ if ( m_state.doProxy && !m_bIsTunneled )
+ header += proxyAuthenticationHeader();
+- }
+
+ if ( m_protocol == "webdav" || m_protocol == "webdavs" )
+ {
+@@ -2289,6 +2288,7 @@
+ // add extra header elements for WebDAV
+ if ( !davHeader.isNull() )
+ header += davHeader;
++ }
+ }
+
+ kdDebug(7103) << "(" << m_pid << ") ============ Sending Header:" << endl;
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/files/plist.base
index 3bf527f8d469..f5458c52a237 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/files/plist.base
@@ -627,6 +627,8 @@ lib/kde3/kio_http.la
lib/kde3/kio_http.so
lib/kde3/kio_metainfo.la
lib/kde3/kio_metainfo.so
+lib/kde3/kjavaappletviewer.la
+lib/kde3/kjavaappletviewer.so
lib/kde3/kjs_html.la
lib/kde3/kjs_html.so
lib/kde3/ktexteditor_insertfile.la
@@ -777,7 +779,9 @@ share/apps/katepart/syntax/javascript.xml
share/apps/katepart/syntax/kbasic.xml
share/apps/katepart/syntax/language.dtd
share/apps/katepart/syntax/latex.xml
+share/apps/katepart/syntax/ldif.xml
share/apps/katepart/syntax/literate-haskell.xml
+share/apps/katepart/syntax/lpc.xml
share/apps/katepart/syntax/mab.xml
share/apps/katepart/syntax/makefile.xml
share/apps/katepart/syntax/mason.xml
@@ -786,6 +790,7 @@ share/apps/katepart/syntax/objectivec.xml
share/apps/katepart/syntax/pascal.xml
share/apps/katepart/syntax/perl.xml
share/apps/katepart/syntax/php.xml
+share/apps/katepart/syntax/picsrc.xml
share/apps/katepart/syntax/postscript.xml
share/apps/katepart/syntax/prolog.xml
share/apps/katepart/syntax/python.xml
@@ -795,6 +800,7 @@ share/apps/katepart/syntax/rsiidl.xml
share/apps/katepart/syntax/ruby.xml
share/apps/katepart/syntax/sather.xml
share/apps/katepart/syntax/scheme.xml
+share/apps/katepart/syntax/sci.xml
share/apps/katepart/syntax/sgml.xml
share/apps/katepart/syntax/sml.xml
share/apps/katepart/syntax/sql-mysql.xml
@@ -802,6 +808,8 @@ share/apps/katepart/syntax/sql-postgresql.xml
share/apps/katepart/syntax/sql.xml
share/apps/katepart/syntax/syntax.template
share/apps/katepart/syntax/tcl.xml
+share/apps/katepart/syntax/uscript.xml
+share/apps/katepart/syntax/velocity.xml
share/apps/katepart/syntax/verilog.xml
share/apps/katepart/syntax/vhdl.xml
share/apps/katepart/syntax/winehq.xml
@@ -3657,6 +3665,7 @@ share/mimelnk/application/x-graphite.desktop
share/mimelnk/application/x-gzip.desktop
share/mimelnk/application/x-hancomword.desktop
share/mimelnk/application/x-jar.desktop
+share/mimelnk/application/x-java-applet.desktop
share/mimelnk/application/x-java.desktop
share/mimelnk/application/x-karbon.desktop
share/mimelnk/application/x-kchart.desktop
@@ -3815,6 +3824,7 @@ share/services/kgzipfilter.desktop
share/services/khtml.desktop
share/services/khtmlimage.desktop
share/services/kio_uiserver.desktop
+share/services/kjavaappletviewer.desktop
share/services/kmailservice.protocol
share/services/kmultipart.desktop
share/services/knotify.desktop
@@ -3858,6 +3868,19 @@ share/servicetypes/ktexteditorplugin.desktop
share/servicetypes/kurifilterplugin.desktop
share/servicetypes/renamedlgplugin.desktop
share/servicetypes/scriptinterface.desktop
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/bg/entities
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/fo/entities
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/lt/entities
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/no-NY/entities
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/stylesheets
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/wa/entities
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/xh/entities
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/xx/entities
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/zh-CN/entities
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/docbook/xsl/indexing
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/docbook/xsl/javahelp
+@exec /bin/mkdir -p %D/share/apps/ksgmltools2/docbook/xsl/template
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/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/kabc/html
@@ -3873,243 +3896,3 @@ share/servicetypes/scriptinterface.desktop
@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
-@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/kutils/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kspell/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/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/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/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
-@dirrm share/servicetypes
-@dirrm share/services/kded
-@dirrm share/services
-@dirrm share/mimelnk/video
-@dirrm share/mimelnk/text
-@dirrm share/mimelnk/multipart
-@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/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/actions
-@dirrm share/icons/crystalsvg/22x22
-@dirrm share/icons/crystalsvg/16x16/mimetypes/pdf
-@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
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
-@dirrm share/doc/HTML/en/kdelibs-apidocs/libkmid
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kutils
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kspell
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kparts
-@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/kdefx
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kdecore
-@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
-@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/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.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/xsl
-@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/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/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/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/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
-@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/32x32/apps
-@dirrm share/apps/kdeprint/icons/crystalsvg/32x32/actions
-@dirrm share/apps/kdeprint/icons/crystalsvg/32x32
-@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/plugins
-@dirrm share/apps/kabc/formats
-@dirrm share/apps/kabc
-@dirrm share/apps/LICENSES
-@dirrm share/apps
-@dirrm share/applnk/Settings/Components
-@dirrm share/applnk/Settings
-@dirrm share/applnk
-@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/kparts
-@dirrm include/kmediaplayer
-@dirrm include/kjs
-@dirrm include/kio
-@dirrm include/kdesu
-@dirrm include/kdeprint/lpr
-@dirrm include/kdeprint
-@dirrm include/kate
-@dirrm include/kabc
-@dirrm include/dom
diff --git a/x11/kdelibs4/files/plist.base.rm b/x11/kdelibs4/files/plist.base.rm
new file mode 100644
index 000000000000..279b61cf447a
--- /dev/null
+++ b/x11/kdelibs4/files/plist.base.rm
@@ -0,0 +1,262 @@
+@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/kutils/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kspell/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/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/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/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/apps/ksgmltools2/docbook/xsl/template || true
+@unexec /bin/rmdir %D/share/apps/ksgmltools2/docbook/xsl/javahelp || true
+@unexec /bin/rmdir %D/share/apps/ksgmltools2/docbook/xsl/indexing || true
+@unexec /bin/rmdir %D/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent || true
+@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/zh-CN/entities || true
+@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/xx/entities || true
+@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/xh/entities || true
+@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/wa/entities || true
+@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/stylesheets || true
+@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/no-NY/entities || true
+@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/lt/entities || true
+@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/fo/entities || true
+@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/bg/entities || true
+@dirrm share/servicetypes
+@dirrm share/services/kded
+@dirrm share/services
+@dirrm share/mimelnk/video
+@dirrm share/mimelnk/text
+@dirrm share/mimelnk/multipart
+@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/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/actions
+@dirrm share/icons/crystalsvg/22x22
+@dirrm share/icons/crystalsvg/16x16/mimetypes/pdf
+@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
+@dirrm share/icons/crystalsvg
+@dirrm share/icons
+@dirrm share/doc/HTML/en/kdelibs-apidocs/libkmid
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kutils
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kspell
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kparts
+@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/kdefx
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kdecore
+@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
+@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/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
+@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/zh-CN
+@dirrm share/apps/ksgmltools2/customization/xx
+@dirrm share/apps/ksgmltools2/customization/xsl
+@dirrm share/apps/ksgmltools2/customization/xh
+@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-NY
+@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
+@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
+@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
+@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/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
+@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/32x32/apps
+@dirrm share/apps/kdeprint/icons/crystalsvg/32x32/actions
+@dirrm share/apps/kdeprint/icons/crystalsvg/32x32
+@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/plugins
+@dirrm share/apps/kabc/formats
+@dirrm share/apps/kabc
+@dirrm share/apps/LICENSES
+@dirrm share/apps
+@dirrm share/applnk/Settings/Components
+@dirrm share/applnk/Settings
+@dirrm share/applnk
+@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/kparts
+@dirrm include/kmediaplayer
+@dirrm include/kjs
+@dirrm include/kio
+@dirrm include/kdesu
+@dirrm include/kdeprint/lpr
+@dirrm include/kdeprint
+@dirrm include/kate
+@dirrm include/kabc
+@dirrm include/dom
diff --git a/x11/kdelibs4/files/plist.ldap b/x11/kdelibs4/files/plist.ldap
new file mode 100644
index 000000000000..2f30c7f63e21
--- /dev/null
+++ b/x11/kdelibs4/files/plist.ldap
@@ -0,0 +1,3 @@
+lib/kde3/kabc_ldap.la
+lib/kde3/kabc_ldap.so
+share/apps/kabc/plugins/ldap.desktop