From 1aced58dae2e4b271f74d726a0e8f0edcc323838 Mon Sep 17 00:00:00 2001 From: Will Andrews Date: Sat, 15 Jun 2002 16:16:32 +0000 Subject: Upgrade to KDE 3.0.1. The delay in this upgrade is mainly due to the rigorous testing performed on the part of the KDE/FreeBSD Project over the last three weeks. Thanks to everyone who helped test! General changes: [1] Follow KDE2 style by moving KDE core specific macros and the like to x11/kde3/Makefile.kde. [2] Fix a variety of comments or miscellaneous data to reflect that this is KDE3 and not KDE2. [3] Account for more empty directories in the PLISTs. deskutils/kdepim3: [4] More #include -> #include . audio/arts: [5] Upgrade to 1.0.1. [6] Point at MASTER_SITE_KDE not my own mirror. audio/kdemultimedia3: [7] Account for the removal of the symlink. Simply point all such includes at . editors/koffice-kde3: [8] Get rid of #include preemptively. devel/kdesdk3: [9] Remove cervisia from build if building on -CURRENT due to C++-unsafe sys/wait.h. The header is believed to have been fixed in newer -CURRENT (>= Jun 5) but we have not tested that. devel/kdevelop: [10] Upgrade to 2.1.1 and use KDE 3 version. [11] Remove a number of suggested dependencies that no longer fit. [12] Account for where the docs for Qt went since they got moved to fit in hier(7) better. graphics/kdegraphics3: [13] Turn off kuickshow by default because it depends on imlib, which in turn depends on gtk/glib. This will be revisited when we split up the KDE ports a bit. games/kdegames3: [14] Fix compile error on -CURRENT where kpat/freecell-solver/md5.h tried to define uint32_t after sys/types.h already had. sysutils/kdeadmin3: No particular changes. misc/kdeaddons3: No particular changes. misc/kdeedu3: [15] Re-add the huge number of missing @dirrm's. misc/kdeutils3: No particular changes. misc/kde3-i18n-* and */kde3-i18n: For the most part, no particular changes. A huge number of I18N message updates went into this release, though. french/kde3-i18n: [16] Fix build Makefile error due to tarball builder's env. net/kdenetwork3: No particular changes. x11-clocks/kdetoys3: No particular changes. x11/kdebase3: [17] Account for mkfontdir "soft" build-time dependency. If mkfontdir is available, use it to build fonts.dir where kdebase installs fonts. Otherwise, don't bother. [18] Patch ElectricEyes.desktop to use the name of the program that FreeBSD uses when you install the port for it. [19] Patches for KDM merged into KDE 3.0.1. [20] Properly fix kdm/backend/xdmcp.c string format error. x11/kdelibs3: [21] Support the KDE3 version check to make sure no one tries to install KDE2 then KDE3. The 'kde-version-check' target is centralized in x11/kde3/Makefile.kde. [22] Remove patch for kdeprint/configure.in.in. [23] Add patch to fix critical icon loader bug. x11/kde3: [24] Add Makefile.kde for centralizing KDE core-specific macros that don't belong in bsd.kde.mk. x11-toolkits/qt30: [25] Mark broken on any XFree86 version < 4 due to packing list related problems if we tried to support XFree86 3. [26] Error out if the user has Qt2 installed already. x11-wm/kdeartwork3: [27] Add USE_MESA to explicitly support the 3D screensavers. [28] Re-add a large number of missing @dirrm's. Credits: [1] [4] [5] [6] [7] [9] [10] [14] [16] [21] [22] [24] [26]: will [2] [3] [8] [15] [17] [19] [25] [27] [28]: alane [11] [12] Submitted by: Lauri Watts [13] Found by: mi Removed by: will [18] [23] Submitted by: Andy Fawcett Tested by: [in addition to the above, in no particular order] knu Mattias Douhan Bradley T. Hughes Erik H. Bakke David Johnson JJ Behrens Michael W. Collette Adriaan de Groot Mark Rowlands Mark Stosberg Dave Cantrell Mark Miller Wesley Morgan Arjan van Leeuwen --- x11/kde4-baseapps/Makefile | 25 +- x11/kde4-baseapps/distinfo | 2 +- x11/kde4-baseapps/files/patch-client.c | 79 ----- x11/kde4-baseapps/files/patch-dm.c | 19 -- x11/kde4-baseapps/files/patch-dm.h | 12 - x11/kde4-baseapps/files/patch-error.c | 60 ---- .../files/patch-kdm-backend-Makefile.am | 12 - .../files/patch-kdm-backend-netaddr.c | 33 -- x11/kde4-baseapps/files/patch-kdm-backend-printf.c | 126 ------- .../files/patch-kdm-backend-protodpy.c | 22 -- x11/kde4-baseapps/files/patch-kdm-backend-xdmcp.c | 23 +- x11/kde4-baseapps/files/patch-kdm-configure.in.in | 20 -- .../files/patch-kdm-kfrontend-genkdmconf.c | 111 +----- x11/kde4-baseapps/pkg-descr | 2 + x11/kde4-baseapps/pkg-plist | 372 ++++++++++++++++++++- 15 files changed, 402 insertions(+), 516 deletions(-) delete mode 100644 x11/kde4-baseapps/files/patch-client.c delete mode 100644 x11/kde4-baseapps/files/patch-dm.c delete mode 100644 x11/kde4-baseapps/files/patch-dm.h delete mode 100644 x11/kde4-baseapps/files/patch-error.c delete mode 100644 x11/kde4-baseapps/files/patch-kdm-backend-Makefile.am delete mode 100644 x11/kde4-baseapps/files/patch-kdm-backend-netaddr.c delete mode 100644 x11/kde4-baseapps/files/patch-kdm-backend-printf.c delete mode 100644 x11/kde4-baseapps/files/patch-kdm-backend-protodpy.c delete mode 100644 x11/kde4-baseapps/files/patch-kdm-configure.in.in (limited to 'x11/kde4-baseapps') diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index a8e728ba3557..786604e592c1 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: kdebase2 +# New ports collection makefile for: kdebase3 # Date created: Fri Apr 14 2000 15:05:00 EDT # Whom: will # @@ -6,8 +6,7 @@ # PORTNAME= kdebase -PORTVERSION= 3.0 -PORTREVISION= 1 +PORTVERSION= 3.0.1 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src @@ -22,21 +21,21 @@ USE_XPM= yes USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= -CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV+= RUN_KAPPFINDER=no CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --without-ldap --disable-closure -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL) -CONFIGURE_ARGS+=--enable-final -.endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) -CONFIGURE_ARGS+=--disable-debug -.endif USE_GMAKE= yes +.include "${.CURDIR}/../../x11/kde3/Makefile.kde" + .include +.if exists(${X11BASE}/bin/mkfontdir) +PLIST_SUB+= MKFONTDIR="" +.else +PLIST_SUB+= MKFONTDIR="@comment " +.endif + .if exists(${X11BASE}/include/Xm/Xm.h) WITH_MOTIF= yes .endif @@ -59,6 +58,10 @@ post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv +post-patch: + @${PERL} -pi -e "s@Exec=ee@Exec=ElectricEyes@g" \ + ${WRKSRC}/kappfinder/apps/Graphics/ElectricEyes.desktop + .if ${MACHINE_ARCH} == "alpha" pre-configure: ${PERL} -pi -e "s@-O2@-O@g" ${WRKSRC}/admin/acinclude.m4.in diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo index e7129ca25df9..dcd456cdb4a0 100644 --- a/x11/kde4-baseapps/distinfo +++ b/x11/kde4-baseapps/distinfo @@ -1 +1 @@ -MD5 (KDE/kdebase-3.0.tar.bz2) = fc8092f16a6e26eeb01c161e60eaf3f2 +MD5 (KDE/kdebase-3.0.1.tar.bz2) = 30399832405fa2286f8fb4fd57148b5c diff --git a/x11/kde4-baseapps/files/patch-client.c b/x11/kde4-baseapps/files/patch-client.c deleted file mode 100644 index 6c54790a82de..000000000000 --- a/x11/kde4-baseapps/files/patch-client.c +++ /dev/null @@ -1,79 +0,0 @@ ---- ./kdm/backend/client.c.orig Sun Mar 24 12:31:09 2002 -+++ ./kdm/backend/client.c Thu Apr 18 20:53:44 2002 -@@ -52,6 +52,12 @@ - #ifdef K5AUTH - # include - #endif -+#ifdef CSRG_BASED -+# ifdef HAS_SETUSERCONTEXT -+# include -+# define USE_LOGIN_CAP 1 -+# endif -+#endif - #ifdef USE_PAM - # include - #elif defined(AIXV3) /* USE_PAM */ -@@ -71,13 +77,6 @@ - # include - # endif - # endif --# ifdef CSRG_BASED --# include --# ifdef HAS_SETUSERCONTEXT --# include --# define USE_LOGIN_CAP 1 --# endif --# endif - /* for nologin */ - # include - # include -@@ -867,12 +866,11 @@ - char *msg; - char **theenv; - extern char **newenv; /* from libs.a, this is set up by setpenv */ --# else --# ifdef HAS_SETUSERCONTEXT -- extern char **environ; --# endif - # endif - #endif -+#ifdef HAS_SETUSERCONTEXT -+ extern char **environ; -+#endif - char *failsafeArgv[2]; - struct verify_info *verify; - int i, pid; -@@ -1004,10 +1002,11 @@ - - #ifndef AIXV3 - --# if !defined(HAS_SETUSERCONTEXT) || defined(USE_PAM) -+# ifndef HAS_SETUSERCONTEXT - if (!SetGid (name, verify->gid)) - exit (1); --# ifdef USE_PAM -+# endif -+# ifdef USE_PAM - pam_setcred(pamh, 0); - /* pass in environment variables set by libpam and modules it called */ - pam_env = pam_getenvlist(pamh); -@@ -1015,7 +1014,8 @@ - if (pam_env) - for(; *pam_env; pam_env++) - verify->userEnviron = putEnv(*pam_env, verify->userEnviron); --# endif -+# endif -+# ifndef HAS_SETUSERCONTEXT - # if defined(BSD) && (BSD >= 199103) - if (setlogin(name) < 0) - { -@@ -1025,7 +1025,8 @@ - # endif - if (!SetUid (name, verify->uid)) - exit (1); --# else /* HAS_SETUSERCONTEXT && !USE_PAM */ -+# else /* HAS_SETUSERCONTEXT */ -+ - /* - * Destroy environment unless user has requested its preservation. - * We need to do this before setusercontext() because that may diff --git a/x11/kde4-baseapps/files/patch-dm.c b/x11/kde4-baseapps/files/patch-dm.c deleted file mode 100644 index 3004d8e5f91a..000000000000 --- a/x11/kde4-baseapps/files/patch-dm.c +++ /dev/null @@ -1,19 +0,0 @@ ---- ./kdm/backend/dm.c.orig Sun Mar 24 12:31:09 2002 -+++ ./kdm/backend/dm.c Thu Apr 18 20:53:44 2002 -@@ -236,7 +236,6 @@ - else - break; - } -- InitErrorLog (errorLogFile); - - /* - * Only allow root to run in non-debug mode to avoid problems -@@ -246,6 +245,8 @@ - fprintf (stderr, "Only root wants to run %s\n", prog); - exit (1); - } -+ -+ InitErrorLog (errorLogFile); - - /* - * Step 1 - load configuration parameters diff --git a/x11/kde4-baseapps/files/patch-dm.h b/x11/kde4-baseapps/files/patch-dm.h deleted file mode 100644 index f9f540e3486c..000000000000 --- a/x11/kde4-baseapps/files/patch-dm.h +++ /dev/null @@ -1,12 +0,0 @@ ---- ./kdm/backend/dm.h.orig Sun Mar 24 12:31:09 2002 -+++ ./kdm/backend/dm.h Thu Apr 18 20:53:44 2002 -@@ -72,6 +72,9 @@ - # include - #endif - -+#ifdef CSRG_BASED -+# include -+#endif - #ifdef pegasus - # undef dirty /* Some bozo put a macro called dirty in sys/param.h */ - #endif diff --git a/x11/kde4-baseapps/files/patch-error.c b/x11/kde4-baseapps/files/patch-error.c deleted file mode 100644 index 4d2ace7334f8..000000000000 --- a/x11/kde4-baseapps/files/patch-error.c +++ /dev/null @@ -1,60 +0,0 @@ ---- ./kdm/backend/error.c.orig Sun Mar 24 12:31:09 2002 -+++ ./kdm/backend/error.c Thu Apr 18 20:53:44 2002 -@@ -43,6 +43,8 @@ - #include "dm.h" - #include "dm_error.h" - -+#include -+#include - #include - - #define PRINT_QUOTES -@@ -91,6 +93,10 @@ - void - InitErrorLog (const char *errorLogFile) - { -+ int fd; -+ struct stat st; -+ char buf[128]; -+ - #ifdef USE_SYSLOG - # ifdef USE_PAM - ReInitErrorLog (); -@@ -101,15 +107,33 @@ - /* We do this independently of using syslog, as we cannot redirect - * the output of external programs to syslog. - */ -- if (isatty (2)) { -- char buf[100]; -+ if (errorLogFile -+ || fstat (1, &st) || -+#ifndef X_NOT_POSIX -+ !(S_ISREG(st.st_mode) || S_ISFIFO(st.st_mode)) -+#else -+ !(st.st_mode & (S_IFREG | S_IFIFO)) -+#endif -+ || fstat (2, &st) || -+#ifndef X_NOT_POSIX -+ !(S_ISREG(st.st_mode) || S_ISFIFO(st.st_mode))) -+#else -+ !(st.st_mode & (S_IFREG | S_IFIFO))) -+#endif -+ { - if (!errorLogFile) { - sprintf (buf, "/var/log/%s.log", prog); - errorLogFile = buf; - } -- if (!freopen (errorLogFile, "a", stderr)) -+ if ((fd = open (errorLogFile, O_CREAT | O_APPEND | O_WRONLY, 0666)) < 0) - LogError ("Cannot open log file %s\n", errorLogFile); -+ else { -+ if (fd != 1) { -+ dup2 (fd, 1); -+ close (fd); -+ } -+ dup2 (1, 2); -+ } - } -- dup2 (2, 1); - } - diff --git a/x11/kde4-baseapps/files/patch-kdm-backend-Makefile.am b/x11/kde4-baseapps/files/patch-kdm-backend-Makefile.am deleted file mode 100644 index cf370f25d126..000000000000 --- a/x11/kde4-baseapps/files/patch-kdm-backend-Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ ---- ./kdm/backend/Makefile.am.orig Sun Sep 23 09:29:27 2001 -+++ ./kdm/backend/Makefile.am Thu Apr 18 20:53:44 2002 -@@ -1,6 +1,7 @@ --INCLUDES = $(all_includes) $(KERBEROS_INCS) -+INCLUDES = $(X_INCLUDES) $(USER_INCLUDES) $(KERBEROS_INCS) -+CPPFLAGS = - AM_CFLAGS = $(XDM_CFLAGS) --LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KRB_RPATH) -+LDFLAGS = $(X_LDFLAGS) $(USER_LDFLAGS) $(KDE_RPATH) $(KRB_RPATH) - LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(PASSWDLIBS) \ - $(LIB_LIBS) $(KERBEROS_LIBS) $(LIBSOCKET) $(LIBRESOLV) \ - $(LIBUCB) $(LIBUTIL) diff --git a/x11/kde4-baseapps/files/patch-kdm-backend-netaddr.c b/x11/kde4-baseapps/files/patch-kdm-backend-netaddr.c deleted file mode 100644 index c0b18f485e00..000000000000 --- a/x11/kde4-baseapps/files/patch-kdm-backend-netaddr.c +++ /dev/null @@ -1,33 +0,0 @@ ---- ./kdm/backend/netaddr.c.orig Sun Mar 24 12:31:09 2002 -+++ ./kdm/backend/netaddr.c Thu Apr 18 20:53:44 2002 -@@ -216,11 +216,10 @@ - #ifdef DEBUG - /*ARGSUSED*/ - void --PrintSockAddr (struct sockaddr *a, int len) -+PrintSockAddr (char *buf, struct sockaddr *a, int len) - { - unsigned char *t, *p; - -- Debug ("family %d, ", a->sa_family); - switch (a->sa_family) { - #ifdef AF_INET - case AF_INET: -@@ -228,11 +227,14 @@ - p = (unsigned char *) &((struct sockaddr_in *) a)->sin_port; - t = (unsigned char *) &((struct sockaddr_in *) a)->sin_addr; - -- Debug ("port %d, host %d.%d.%d.%d\n", -- (p[0] << 8) + p[1], t[0], t[1], t[2], t[3]); -+ sprintf (buf, "family AF_INET, port %d, host %d.%d.%d.%d", -+ (p[0] << 8) + p[1], t[0], t[1], t[2], t[3]); - break; -- } - #endif -+ default: -+ sprintf (buf, "unknown family %d", a->sa_family); -+ break; -+ } - } - #endif - diff --git a/x11/kde4-baseapps/files/patch-kdm-backend-printf.c b/x11/kde4-baseapps/files/patch-kdm-backend-printf.c deleted file mode 100644 index 79033f3d7af3..000000000000 --- a/x11/kde4-baseapps/files/patch-kdm-backend-printf.c +++ /dev/null @@ -1,126 +0,0 @@ ---- ./kdm/backend/printf.c.orig Sun Mar 24 12:31:09 2002 -+++ ./kdm/backend/printf.c Thu Apr 18 20:53:44 2002 -@@ -65,7 +65,7 @@ - */ - - /************************************************************** -- * (C) 2001 Oswald Buddenhagen -+ * (C) 2001-2002 Oswald Buddenhagen - * Partially stolen from OpenSSH's OpenBSD compat directory. - * (C) Patrick Powell, Brandon Long, Thomas Roessler, - * Michael Elkins, Ben Lindstrom -@@ -507,23 +507,24 @@ - #ifdef USE_SYSLOG - syslog (LOG_CRIT, "Out of memory in %s()", fkt); - #else -- char dbuf[20]; -+ int el; -+ char dbuf[24], sbuf[128]; - logTime (dbuf); -- fprintf (stderr, "%s " -+ el = sprintf (sbuf, "%s " - # ifdef LOG_NAME - LOG_NAME "[%ld]: Out of memory in %s()\n", dbuf, - # else - "%s[%ld]: Out of memory in %s()\n", dbuf, prog, - # endif - (long)getpid(), fkt); -- fflush (stderr); -+ write (2, sbuf, el); - #endif - } - - typedef struct { - char *buf; - int clen, blen, type; -- char lmbuf[100]; -+ char lmbuf[128]; - } OCLBuf; - - static void -@@ -533,25 +534,11 @@ - #ifdef USE_SYSLOG - syslog (lognums[oclbp->type], "%.*s", oclbp->clen, oclbp->buf); - #else -- char dbuf[20]; -- logTime (dbuf); -- fprintf (stderr, "%s " --# ifdef LOG_NAME -- LOG_NAME "[%ld] %s: %.*s\n", dbuf, --# else -- "%s[%ld] %s: %.*s\n", dbuf, prog, --# endif -- (long)getpid(), lognams[oclbp->type], oclbp->clen, oclbp->buf); -- fflush (stderr); -+ oclbp->buf[oclbp->clen] = '\n'; -+ write (2, oclbp->buf, oclbp->clen + 1); - #endif - oclbp->clen = 0; - } -- if (oclbp->buf) { -- if (oclbp->buf != oclbp->lmbuf) -- free (oclbp->buf); -- oclbp->buf = 0; -- oclbp->blen = 0; -- } - } - - static void -@@ -564,10 +551,17 @@ - if (c == '\n') - OutChLFlush (oclbp); - else { -+#ifndef USE_SYSLOG -+ if (oclbp->clen >= oclbp->blen - 1) { -+#else - if (oclbp->clen >= oclbp->blen) { -- if (oclbp->buf == oclbp->lmbuf) -+#endif -+ if (oclbp->buf == oclbp->lmbuf) { - OutChLFlush (oclbp); -- nlen = oclbp->blen * 3 / 2 + 100; -+ oclbp->buf = 0; -+ oclbp->blen = 0; -+ } -+ nlen = oclbp->blen * 3 / 2 + 128; - nbuf = realloc (oclbp->buf, nlen); - if (nbuf) { - oclbp->buf = nbuf; -@@ -579,6 +573,19 @@ - oclbp->blen = sizeof(oclbp->lmbuf); - } - } -+#ifndef USE_SYSLOG -+ if (!oclbp->clen) { -+ char dbuf[24]; -+ logTime (dbuf); -+ oclbp->clen = sprintf (oclbp->buf, "%s " -+# ifdef LOG_NAME -+ LOG_NAME "[%ld] %s: ", dbuf, -+# else -+ "%s[%ld] %s: ", dbuf, prog, -+# endif -+ (long)getpid(), lognams[oclbp->type]); -+ } -+#endif - oclbp->buf[oclbp->clen++] = c; - } - } -@@ -586,13 +593,12 @@ - static void - Logger (int type, const char *fmt, va_list args) - { -- static OCLBuf oclb; -+ OCLBuf oclb = { 0, 0, 0, type }; - -- if (oclb.type != type) { -- OutChLFlush (&oclb); -- oclb.type = type; -- } - DoPr(OutChL, &oclb, fmt, args); -+ /* no flush, every message is supposed to be \n-terminated */ -+ if (oclb.buf && oclb.buf != oclb.lmbuf) -+ free (oclb.buf); - } - - #ifdef LOG_DEBUG_MASK diff --git a/x11/kde4-baseapps/files/patch-kdm-backend-protodpy.c b/x11/kde4-baseapps/files/patch-kdm-backend-protodpy.c deleted file mode 100644 index 0dee6a5c520d..000000000000 --- a/x11/kde4-baseapps/files/patch-kdm-backend-protodpy.c +++ /dev/null @@ -1,22 +0,0 @@ ---- ./kdm/backend/protodpy.c.orig Sun Mar 24 12:31:09 2002 -+++ ./kdm/backend/protodpy.c Thu Apr 18 20:53:44 2002 -@@ -48,12 +48,13 @@ - PrintProtoDisplay (pdpy) - struct protoDisplay *pdpy; - { -- Debug ("ProtoDisplay %p\n", pdpy); -- Debug ("\taddress: "); -- PrintSockAddr (pdpy->address, pdpy->addrlen); -- Debug ("\tdate %d (%d from now)\n", pdpy->date, time(0) - pdpy->date); -- Debug ("\tdisplay Number %d\n", pdpy->displayNumber); -- Debug ("\tsessionID %d\n", pdpy->sessionID); -+ char addrbuf[128]; -+ -+ PrintSockAddr (addrbuf, pdpy->address, pdpy->addrlen); -+ Debug ("ProtoDisplay %p\n\taddress: %s\n\tdate %d (%d from now)\n" -+ "\tdisplay Number %d\n\tsessionID %d\n", -+ pdpy, addrbuf, pdpy->date, time(0) - pdpy->date, -+ pdpy->displayNumber, pdpy->sessionID); - } - #endif - diff --git a/x11/kde4-baseapps/files/patch-kdm-backend-xdmcp.c b/x11/kde4-baseapps/files/patch-kdm-backend-xdmcp.c index ab365e01bd60..51b037275a59 100644 --- a/x11/kde4-baseapps/files/patch-kdm-backend-xdmcp.c +++ b/x11/kde4-baseapps/files/patch-kdm-backend-xdmcp.c @@ -1,24 +1,11 @@ ---- ./kdm/backend/xdmcp.c.orig Sun Mar 24 12:31:09 2002 -+++ ./kdm/backend/xdmcp.c Thu Apr 18 20:53:44 2002 -@@ -510,10 +510,8 @@ - j = 0; - for (i = 0; i < (int)clientPort.length; i++) - j = j * 256 + clientPort.data[i]; -- Debug ("Forward client address (port %d)", j); -- for (i = 0; i < (int)clientAddress.length; i++) -- Debug (" %d", clientAddress.data[i]); -- Debug ("\n"); -+ Debug ("Forward client address (port %d) %[*hhu\n", j, -+ clientAddress.length, clientAddress.data); - switch (from->sa_family) - { - #ifdef AF_INET -@@ -1014,7 +1012,7 @@ +++--- kdm/backend/xdmcp.c.orig Sun May 19 10:38:01 2002 ++++++ kdm/backend/xdmcp.c Sun May 19 10:38:16 2002 +++@@ -1012,7 +1012,7 @@ sprintf (buf, "Session %ld failed for display %.260s: %s", (long) sessionID, name, reason); -- Debug ("send_failed(\"%s\")", buf); -+ Debug ("send_failed(%\"s)\n", buf); +- Debug ("send_failed(%\"s)", buf); ++ Debug ("send_failed(%s)\n", buf); status.length = strlen (buf); status.data = (CARD8Ptr) buf; header.version = XDM_PROTOCOL_VERSION; diff --git a/x11/kde4-baseapps/files/patch-kdm-configure.in.in b/x11/kde4-baseapps/files/patch-kdm-configure.in.in deleted file mode 100644 index 2523cd5e64d3..000000000000 --- a/x11/kde4-baseapps/files/patch-kdm-configure.in.in +++ /dev/null @@ -1,20 +0,0 @@ ---- ./kdm/configure.in.in.orig Sun Mar 24 12:31:09 2002 -+++ ./kdm/configure.in.in Thu Apr 18 20:53:44 2002 -@@ -220,8 +220,6 @@ - [ AC_MSG_ERROR([--with-rpcauth requires Sun RPC header files.])]) - fi - --if test "x$use_pam" = xno; then -- - dnl should be: - dnl AC_CHECK_MEMBER(struct passwd.pw_expire, [ XDM_CFLAGS="$XDM_CFLAGS -DHAVE_PW_EXPIRE" ], , [#include ]) - dnl but somehow it doesn't work. so we make it by hand ... -@@ -245,8 +243,6 @@ - AC_CHECK_FUNC(login_getclass, [ XDM_CFLAGS="$XDM_CFLAGS -DHAVE_LOGIN_GETCLASS" ]) - AC_CHECK_FUNC(auth_timeok, [ XDM_CFLAGS="$XDM_CFLAGS -DHAVE_AUTH_TIMEOK" ]) - LIBS=$ac_save_libs -- --fi - - AC_CHECK_FUNC(vsyslog, [ XDM_CFLAGS="$XDM_CFLAGS -DUSE_SYSLOG" ]) - if test "x$use_pam" = xyes; then diff --git a/x11/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c index 5f6252b5266c..616f0f71e3ef 100644 --- a/x11/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c +++ b/x11/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c @@ -1,107 +1,22 @@ ---- ./kdm/kfrontend/genkdmconf.c.orig Thu Mar 21 21:11:30 2002 -+++ ./kdm/kfrontend/genkdmconf.c Thu Apr 18 21:22:40 2002 -@@ -37,6 +37,10 @@ - #include - #include - #include -+#include -+#ifdef BSD -+# include -+#endif - - #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) - # define ATTR_UNUSED __attribute__((unused)) -@@ -358,11 +362,11 @@ - - const char def_willing[] = - "#! /bin/sh\n" --"# The output of this script is displayed in the chooser window.\n" --"# (instead of \"Willing to manage\")\n" -+"# The output of this script is displayed in the chooser window\n" -+"# (instead of \"Willing to manage\").\n" - "\n" --"load=\"`uptime|sed -e 's/^.*load[^0-9]*//'`\"\n" --"nrusers=\"`who|cut -c 1-8|sort -u|wc -l|sed 's/^[ ]*//'`\"\n" -+"load=`uptime|sed -e 's/^.*load[^0-9]*//'`\n" -+"nrusers=`who|cut -c 1-8|sort -u|wc -l|sed 's/^[ ]*//'`\n" - "s=\"\"; [ \"$nrusers\" != 1 ] && s=s\n" - "\n" - "echo \"${nrusers} user${s}, load: ${load}\"\n"; -@@ -377,7 +381,10 @@ - " echo $! >$PIDFILE\n" - " wait $!\n" - " rm $PIDFILE\n" --") &\n"; -+") &\n" -+"\n" -+"#xconsole -geometry 480x130-0-0 -notify -verbose -fn fixed -exitOnFail -file /dev/xconsole &\n" -+"\n"; - - const char def_startup[] = - "#! /bin/sh\n" -@@ -391,14 +398,11 @@ - "# By convention, both xconsole and xterm -C check that the\n" - "# console is owned by the invoking user and is readable before attaching\n" - "# the console output. This way a random user can invoke xterm -C without\n" --"# causing serious grief.\n" --"# This is not required if you use PAM, as pam_console should handle it.\n" -+"# causing serious grief; still, it can cause havoc, so xconsole is started\n" -+"# by Xsetup usually.\n" -+"# This is not required if you use PAM with the pam_console module.\n" +--- kdm/kfrontend/genkdmconf.c.orig Wed May 8 14:21:31 2002 ++++ kdm/kfrontend/genkdmconf.c Sat May 25 13:19:06 2002 +@@ -402,7 +402,7 @@ + "# by Xsetup usually.\n" + "# This is not required if you use PAM with the pam_console module.\n" "#\n" --#ifdef HAVE_PAM - "#chown $USER /dev/console\n" --#else --"chown $USER /dev/console\n" --#endif +-"#chown $USER /dev/console\n" ++"chown $USER /dev/console\n" "\n" #ifdef _AIX "# We create a pseudodevice for finger. (host:0 becomes kdm/host_0)\n" -@@ -425,11 +429,11 @@ - " fi\n" - "fi\n"; - #else --"#exec sessreg -a -l $DISPLAY " -+"exec sessreg -a -l $DISPLAY" - # ifdef BSD --"-x " KDMCONF "/Xservers " -+" -x " KDMCONF "/Xservers -u " _PATH_UTMP - # endif --"$USER\n"; -+" $USER\n"; - #endif /* _AIX */ - - const char def_reset[] = -@@ -437,16 +441,10 @@ - "# Xreset - run as root after session exits\n" - "\n" +@@ -443,8 +443,8 @@ "# Reassign ownership of the console to root, this should disallow\n" --"# assignment of console output to any random users's xterm\n" --"# This is not required if you use PAM, as pam_console should handle it.\n" -+"# assignment of console output to any random users's xterm. See Xstartup.\n" + "# assignment of console output to any random users's xterm. See Xstartup.\n" "#\n" --#ifdef HAVE_PAM - "#chown root /dev/console\n" - "#chmod 622 /dev/console\n" --#else --"chown root /dev/console\n" --"chmod 622 /dev/console\n" --#endif +-"#chown root /dev/console\n" +-"#chmod 622 /dev/console\n" ++"chown root /dev/console\n" ++/* "#chmod 622 /dev/console\n" */ "\n" #ifdef _AIX "if [ -f /usr/lib/X11/xdm/sessreg ]; then\n" -@@ -454,11 +452,11 @@ - " exec /usr/lib/X11/xdm/sessreg -d -l xdm/$devname $USER\n" - "fi\n"; - #else --"#exec sessreg -d -l $DISPLAY " -+"exec sessreg -d -l $DISPLAY" - # ifdef BSD --"-x " KDMCONF "/Xservers " -+" -x " KDMCONF "/Xservers -u " _PATH_UTMP - # endif --"$USER\n"; -+" $USER\n"; - #endif /* _AIX */ - - const char def_session[] = diff --git a/x11/kde4-baseapps/pkg-descr b/x11/kde4-baseapps/pkg-descr index 90ae45773bea..44cd05f3ee45 100644 --- a/x11/kde4-baseapps/pkg-descr +++ b/x11/kde4-baseapps/pkg-descr @@ -1 +1,3 @@ KDE provides an integrated X11 based environment, much like CDE. +This port provides the basic utility programs, such as the Konqueror +browser, the desktop and panel. diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist index 4bd941c752f7..f24b20880fe5 100644 --- a/x11/kde4-baseapps/pkg-plist +++ b/x11/kde4-baseapps/pkg-plist @@ -1735,6 +1735,8 @@ share/doc/HTML/en/kwrite/index.docbook share/fonts/9x15.pcf.gz share/fonts/console8x16.pcf.gz share/fonts/console8x8.pcf.gz +%%MKFONTDIR%%share/fonts/fonts.dir +%%MKFONTDIR%%share/fonts/override/fonts.dir share/icons/hicolor/16x16/actions/view_choose.png share/icons/hicolor/16x16/actions/view_detailed.png share/icons/hicolor/16x16/actions/view_icon.png @@ -2519,9 +2521,369 @@ share/wallpapers/kde_passion.jpg share/wallpapers/kdm_bg.jpg share/wallpapers/only_k.jpg share/wallpapers/triplegears.jpg -@exec /bin/mkdir -p %D/share/templates/.source/emptydir -@exec /bin/mkdir -p %D/share/templates/.source/emptydir -@exec /bin/mkdir -p %D/share/templates/.source/emptydir -@exec /bin/mkdir -p %D/share/fonts/override -@exec /bin/mkdir -p %D/share/fonts/override +@comment empty dirs @exec /bin/mkdir -p %D/share/apps/kscreensaver +@exec /bin/mkdir -p %D/share/fonts/override +@exec /bin/mkdir -p %D/share/templates/.source/emptydir +@comment directories +@dirrm share/wallpapers +@dirrm share/templates/.source/emptydir +@dirrm share/templates/.source +@dirrm share/templates +@dirrm share/sounds +@dirrm share/servicetypes +@dirrm share/services/useragentstrings +@dirrm share/services/searchproviders +@dirrm share/services/kded +@dirrm share/services +@dirrm share/mimelnk/print +@dirrm share/mimelnk/application +@dirrm share/mimelnk +@dirrm share/locale/l10n/za +@dirrm share/locale/l10n/vn +@dirrm share/locale/l10n/ve +@dirrm share/locale/l10n/vc +@dirrm share/locale/l10n/uy +@dirrm share/locale/l10n/us +@dirrm share/locale/l10n/ua +@dirrm share/locale/l10n/tw +@dirrm share/locale/l10n/tt +@dirrm share/locale/l10n/tr +@dirrm share/locale/l10n/th +@dirrm share/locale/l10n/sv +@dirrm share/locale/l10n/sr +@dirrm share/locale/l10n/sk +@dirrm share/locale/l10n/si +@dirrm share/locale/l10n/se +@dirrm share/locale/l10n/sd +@dirrm share/locale/l10n/ru +@dirrm share/locale/l10n/ro +@dirrm share/locale/l10n/py +@dirrm share/locale/l10n/pt +@dirrm share/locale/l10n/pl +@dirrm share/locale/l10n/pe +@dirrm share/locale/l10n/pa +@dirrm share/locale/l10n/nz +@dirrm share/locale/l10n/no +@dirrm share/locale/l10n/nl +@dirrm share/locale/l10n/mx +@dirrm share/locale/l10n/mt +@dirrm share/locale/l10n/mk +@dirrm share/locale/l10n/lv +@dirrm share/locale/l10n/lu +@dirrm share/locale/l10n/lt +@dirrm share/locale/l10n/lc +@dirrm share/locale/l10n/kr +@dirrm share/locale/l10n/kp +@dirrm share/locale/l10n/kn +@dirrm share/locale/l10n/jp +@dirrm share/locale/l10n/jo +@dirrm share/locale/l10n/jm +@dirrm share/locale/l10n/it +@dirrm share/locale/l10n/is +@dirrm share/locale/l10n/iq +@dirrm share/locale/l10n/in +@dirrm share/locale/l10n/il +@dirrm share/locale/l10n/ie +@dirrm share/locale/l10n/id +@dirrm share/locale/l10n/hu +@dirrm share/locale/l10n/hr +@dirrm share/locale/l10n/hn +@dirrm share/locale/l10n/gt +@dirrm share/locale/l10n/gr +@dirrm share/locale/l10n/gd +@dirrm share/locale/l10n/gb +@dirrm share/locale/l10n/fr +@dirrm share/locale/l10n/fi +@dirrm share/locale/l10n/es +@dirrm share/locale/l10n/eg +@dirrm share/locale/l10n/ee +@dirrm share/locale/l10n/ec +@dirrm share/locale/l10n/do +@dirrm share/locale/l10n/dk +@dirrm share/locale/l10n/de +@dirrm share/locale/l10n/cz +@dirrm share/locale/l10n/co +@dirrm share/locale/l10n/cn +@dirrm share/locale/l10n/cl +@dirrm share/locale/l10n/ch +@dirrm share/locale/l10n/ca +@dirrm share/locale/l10n/by +@dirrm share/locale/l10n/br +@dirrm share/locale/l10n/bo +@dirrm share/locale/l10n/bg +@dirrm share/locale/l10n/be +@dirrm share/locale/l10n/bd +@dirrm share/locale/l10n/bb +@dirrm share/locale/l10n/ba +@dirrm share/locale/l10n/az +@dirrm share/locale/l10n/au +@dirrm share/locale/l10n/at +@dirrm share/locale/l10n/ar +@dirrm share/locale/l10n/ag +@dirrm share/locale/l10n/C +@dirrm share/locale/l10n +@dirrm share/locale/en_US +@dirrm share/locale +@dirrm share/icons/locolor/32x32/apps +@dirrm share/icons/locolor/32x32 +@dirrm share/icons/locolor/16x16/apps +@dirrm share/icons/locolor/16x16 +@dirrm share/icons/locolor +@dirrm share/icons/hicolor/48x48/filesystems +@dirrm share/icons/hicolor/48x48/apps +@dirrm share/icons/hicolor/48x48 +@dirrm share/icons/hicolor/32x32/filesystems +@dirrm share/icons/hicolor/32x32/devices +@dirrm share/icons/hicolor/32x32/apps +@dirrm share/icons/hicolor/32x32/actions +@dirrm share/icons/hicolor/32x32 +@dirrm share/icons/hicolor/22x22/actions +@dirrm share/icons/hicolor/22x22 +@dirrm share/icons/hicolor/16x16/filesystems +@dirrm share/icons/hicolor/16x16/devices +@dirrm share/icons/hicolor/16x16/apps +@dirrm share/icons/hicolor/16x16/actions +@dirrm share/icons/hicolor/16x16 +@dirrm share/icons/hicolor +@dirrm share/icons +@dirrm share/fonts/override +@dirrm share/fonts +@dirrm share/doc/HTML/en/kwrite +@dirrm share/doc/HTML/en/ksysguard +@dirrm share/doc/HTML/en/kpager +@dirrm share/doc/HTML/en/konsole +@dirrm share/doc/HTML/en/konqueror +@dirrm share/doc/HTML/en/kmenuedit +@dirrm share/doc/HTML/en/klipper +@dirrm share/doc/HTML/en/kioslave +@dirrm share/doc/HTML/en/kicker +@dirrm share/doc/HTML/en/khelpcenter/visualdict +@dirrm share/doc/HTML/en/khelpcenter/userguide +@dirrm share/doc/HTML/en/khelpcenter/quickstart +@dirrm share/doc/HTML/en/khelpcenter/glossary +@dirrm share/doc/HTML/en/khelpcenter/faq +@dirrm share/doc/HTML/en/khelpcenter +@dirrm share/doc/HTML/en/kfind +@dirrm share/doc/HTML/en/kdm +@dirrm share/doc/HTML/en/kdesu +@dirrm share/doc/HTML/en/kdeprint +@dirrm share/doc/HTML/en/kdebugdialog +@dirrm share/doc/HTML/en/kcontrol +@dirrm share/doc/HTML/en/kate +@dirrm share/doc/HTML/en/kaddressbook +@dirrm share/doc/HTML/en +@dirrm share/doc/HTML +@dirrm share/doc +@dirrm share/config/kdm +@dirrm share/config +@dirrm share/autostart +@dirrm share/apps/naughtyapplet/pics +@dirrm share/apps/naughtyapplet +@dirrm share/apps/kwrite +@dirrm share/apps/kwin/pics +@dirrm share/apps/kwin/icewm-themes +@dirrm share/apps/kwin +@dirrm share/apps/kthememgr/Themes +@dirrm share/apps/kthememgr +@dirrm share/apps/ksysguard/pics +@dirrm share/apps/ksysguard +@dirrm share/apps/ksplash/pics/locolor +@dirrm share/apps/ksplash/pics +@dirrm share/apps/ksplash +@dirrm share/apps/ksmserver/pics +@dirrm share/apps/ksmserver +@dirrm share/apps/kscreensaver +@dirrm share/apps/kpersonalizer/pics +@dirrm share/apps/kpersonalizer +@dirrm share/apps/konsole +@dirrm share/apps/konqueror/tiles +@dirrm share/apps/konqueror/profiles +@dirrm share/apps/konqueror/pics +@dirrm share/apps/konqueror/icons/hicolor/16x16/actions +@dirrm share/apps/konqueror/icons/hicolor/16x16 +@dirrm share/apps/konqueror/icons/hicolor +@dirrm share/apps/konqueror/icons +@dirrm share/apps/konqueror/about +@dirrm share/apps/konqueror +@dirrm share/apps/konqsidebartng/virtual_folders/services +@dirrm share/apps/konqsidebartng/virtual_folders/remote/web +@dirrm share/apps/konqsidebartng/virtual_folders/remote/ftp +@dirrm share/apps/konqsidebartng/virtual_folders/remote +@dirrm share/apps/konqsidebartng/virtual_folders +@dirrm share/apps/konqsidebartng/entries +@dirrm share/apps/konqsidebartng/dirtree +@dirrm share/apps/konqsidebartng/add +@dirrm share/apps/konqsidebartng +@dirrm share/apps/konqlistview/kpartplugins +@dirrm share/apps/konqlistview +@dirrm share/apps/konqiconview/kpartplugins +@dirrm share/apps/konqiconview +@dirrm share/apps/kmenuedit/icons/locolor/16x16/actions +@dirrm share/apps/kmenuedit/icons/locolor/16x16 +@dirrm share/apps/kmenuedit/icons/locolor +@dirrm share/apps/kmenuedit/icons/hicolor/32x32/actions +@dirrm share/apps/kmenuedit/icons/hicolor/32x32 +@dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions +@dirrm share/apps/kmenuedit/icons/hicolor/22x22 +@dirrm share/apps/kmenuedit/icons/hicolor +@dirrm share/apps/kmenuedit/icons +@dirrm share/apps/kmenuedit +@dirrm share/apps/klipper/pics +@dirrm share/apps/klipper +@dirrm share/apps/kjobviewer +@dirrm share/apps/kioslave +@dirrm share/apps/kio_info +@dirrm share/apps/kio_finger +@dirrm share/apps/kicker/wallpapers +@dirrm share/apps/kicker/tiles +@dirrm share/apps/kicker/pics +@dirrm share/apps/kicker/menuext +@dirrm share/apps/kicker/icons/locolor/16x16/actions +@dirrm share/apps/kicker/icons/locolor/16x16 +@dirrm share/apps/kicker/icons/locolor +@dirrm share/apps/kicker/icons/hicolor/16x16/actions +@dirrm share/apps/kicker/icons/hicolor/16x16 +@dirrm share/apps/kicker/icons/hicolor +@dirrm share/apps/kicker/icons +@dirrm share/apps/kicker/extensions +@dirrm share/apps/kicker/applets +@dirrm share/apps/kicker +@dirrm share/apps/khelpcenter/plugins/Tutorials +@dirrm share/apps/khelpcenter/plugins +@dirrm share/apps/khelpcenter +@dirrm share/apps/kfindpart/icons/locolor/22x22/actions +@dirrm share/apps/kfindpart/icons/locolor/22x22 +@dirrm share/apps/kfindpart/icons/locolor +@dirrm share/apps/kfindpart/icons +@dirrm share/apps/kfindpart +@dirrm share/apps/keditbookmarks +@dirrm share/apps/kdm/pics/users +@dirrm share/apps/kdm/pics +@dirrm share/apps/kdm +@dirrm share/apps/kdisplay/color-schemes +@dirrm share/apps/kdisplay/app-defaults +@dirrm share/apps/kdisplay +@dirrm share/apps/kdewizard/pics +@dirrm share/apps/kdewizard +@dirrm share/apps/kdesktop/programs +@dirrm share/apps/kdesktop/pics +@dirrm share/apps/kdesktop/patterns +@dirrm share/apps/kdesktop/DesktopLinks +@dirrm share/apps/kdesktop +@dirrm share/apps/kdeprintfax/icons/hicolor/16x16/actions +@dirrm share/apps/kdeprintfax/icons/hicolor/16x16 +@dirrm share/apps/kdeprintfax/icons/hicolor +@dirrm share/apps/kdeprintfax/icons +@dirrm share/apps/kdeprintfax +@dirrm share/apps/kdeprint_part +@dirrm share/apps/kdeprint/template +@dirrm share/apps/kdeprint +@dirrm share/apps/kdcop +@dirrm share/apps/kcontrol/pics +@dirrm share/apps/kcontrol +@dirrm share/apps/kconf_update +@dirrm share/apps/kcmusb +@dirrm share/apps/kcmlocale/pics +@dirrm share/apps/kcmlocale +@dirrm share/apps/kcmkeys +@dirrm share/apps/kcminput/pics +@dirrm share/apps/kcminput +@dirrm share/apps/kcmfontinst/pics +@dirrm share/apps/kcmfontinst/StarOffice +@dirrm share/apps/kcmfontinst +@dirrm share/apps/kcmcss +@dirrm share/apps/kbookmark +@dirrm share/apps/kate/scripts +@dirrm share/apps/kate/pics +@dirrm share/apps/kate/icons/locolor/22x22/actions +@dirrm share/apps/kate/icons/locolor/22x22 +@dirrm share/apps/kate/icons/locolor/16x16/actions +@dirrm share/apps/kate/icons/locolor/16x16 +@dirrm share/apps/kate/icons/locolor +@dirrm share/apps/kate/icons/hicolor/48x48/actions +@dirrm share/apps/kate/icons/hicolor/48x48 +@dirrm share/apps/kate/icons/hicolor/32x32/actions +@dirrm share/apps/kate/icons/hicolor/32x32 +@dirrm share/apps/kate/icons/hicolor/22x22/actions +@dirrm share/apps/kate/icons/hicolor/22x22 +@dirrm share/apps/kate/icons/hicolor/16x16/actions +@dirrm share/apps/kate/icons/hicolor/16x16 +@dirrm share/apps/kate/icons/hicolor +@dirrm share/apps/kate/icons +@dirrm share/apps/kate +@dirrm share/apps/kappfinder/apps/WordProcessing +@dirrm share/apps/kappfinder/apps/Utilities/XUtilities +@dirrm share/apps/kappfinder/apps/Utilities +@dirrm share/apps/kappfinder/apps/Toys +@dirrm share/apps/kappfinder/apps/System/Terminal +@dirrm share/apps/kappfinder/apps/System/ScreenSavers +@dirrm share/apps/kappfinder/apps/System +@dirrm share/apps/kappfinder/apps/Office +@dirrm share/apps/kappfinder/apps/Multimedia +@dirrm share/apps/kappfinder/apps/Internet/Terminal +@dirrm share/apps/kappfinder/apps/Internet +@dirrm share/apps/kappfinder/apps/Graphics +@dirrm share/apps/kappfinder/apps/Games/TacticStrategy +@dirrm share/apps/kappfinder/apps/Games/Roguelikes +@dirrm share/apps/kappfinder/apps/Games/Emulators +@dirrm share/apps/kappfinder/apps/Games/Card +@dirrm share/apps/kappfinder/apps/Games/Board +@dirrm share/apps/kappfinder/apps/Games/Arcade +@dirrm share/apps/kappfinder/apps/Games +@dirrm share/apps/kappfinder/apps/Editors +@dirrm share/apps/kappfinder/apps/Development +@dirrm share/apps/kappfinder/apps +@dirrm share/apps/kappfinder +@dirrm share/apps/kaddressbook/pics +@dirrm share/apps/kaddressbook +@dirrm share/apps/drkonqi/presets +@dirrm share/apps/drkonqi/pics +@dirrm share/apps/drkonqi/debuggers +@dirrm share/apps/drkonqi +@dirrm share/apps/clockapplet/pics +@dirrm share/apps/clockapplet +@dirrm share/apps +@dirrm share/applnk/WordProcessing +@dirrm share/applnk/Utilities +@dirrm share/applnk/Toys +@dirrm share/applnk/System/Terminal +@dirrm share/applnk/System/ScreenSavers +@dirrm share/applnk/System +@dirrm share/applnk/Settings/WebBrowsing +@dirrm share/applnk/Settings/System +@dirrm share/applnk/Settings/Sound +@dirrm share/applnk/Settings/PowerControl +@dirrm share/applnk/Settings/Personalization +@dirrm share/applnk/Settings/Peripherals +@dirrm share/applnk/Settings/Network +@dirrm share/applnk/Settings/LookNFeel/Windows +@dirrm share/applnk/Settings/LookNFeel/Themes +@dirrm share/applnk/Settings/LookNFeel/Desktop +@dirrm share/applnk/Settings/LookNFeel +@dirrm share/applnk/Settings/Information +@dirrm share/applnk/Settings/Help +@dirrm share/applnk/Settings/FileBrowsing +@dirrm share/applnk/Settings/Databases +@dirrm share/applnk/Settings +@dirrm share/applnk/Office +@dirrm share/applnk/Multimedia +@dirrm share/applnk/Internet/Terminal +@dirrm share/applnk/Internet +@dirrm share/applnk/Graphics +@dirrm share/applnk/Games/TacticStrategy +@dirrm share/applnk/Games/Roguelikes +@dirrm share/applnk/Games/Card +@dirrm share/applnk/Games/Board +@dirrm share/applnk/Games/Arcade +@dirrm share/applnk/Games +@dirrm share/applnk/Edutainment +@dirrm share/applnk/Editors +@dirrm share/applnk/Development +@dirrm share/applnk/Applications +@dirrm share/applnk/.hidden +@dirrm share/applnk +@dirrm lib/kde3 +@dirrm include/kwin +@dirrm include/ksgrd +@dirrm include/kate -- cgit v1.2.3