Update to KDE 3.4.3 / KOffice 1.4.2

10 files changed, 32 insertions, 254 deletions

diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index b37100b46249..e9dccbcbeb1a 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -34,8 +33,10 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_XPM=	yes
 USE_REINPLACE=	yes
-PKGMESSAGE=	${WRKDIR}/MESSAGE
-PKGINSTALL=	${WRKDIR}/INSTALL
+SUB_FILES=	genkdmconf.sh pkg-deinstall pkg-install pkg-message
+PKGMESSAGE=	${WRKDIR}/pkg-message
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
@@ -73,14 +74,6 @@ post-configure:
 	${REINPLACE_CMD} -e 's/444/644/g' \
 		${WRKSRC}/kdesktop/init/Templates/Makefile
 
-post-build:
-	@${CAT} ${PKGDIR}/pkg-message | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
-		| ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGMESSAGE}
-	@${CAT} ${PKGDIR}/pkg-install | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
-		| ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGINSTALL}
-	@${CAT} ${FILESDIR}/genkdmconf.sh | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
-		| ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${WRKDIR}/genkdmconf.sh
-
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/freebsd.keytab ${PREFIX}/share/apps/konsole/
 	${RM} -f ${PREFIX}/share/apps/konsole/linux.desktop
diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index da024a1bfebf..3f6e0a93df9f 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.4.2.tar.bz2) = 0ea16eb7185ef014d8bd4da4f4530272
-SIZE (KDE/kdebase-3.4.2.tar.bz2) = 22466433
+MD5 (KDE/kdebase-3.4.3.tar.bz2) = 7b25feba2774c077601d472dae5352c8
+SIZE (KDE/kdebase-3.4.3.tar.bz2) = 22425835
diff --git a/x11/kdebase4-workspace/files/genkdmconf.sh b/x11/kdebase4-workspace/files/genkdmconf.sh.in
index 479317482140..3a730a071407 100644
--- a/x11/kdebase4-workspace/files/genkdmconf.sh
+++ b/x11/kdebase4-workspace/files/genkdmconf.sh.in
@@ -14,4 +14,8 @@ export PATH
 if [ ! -r ${KDMCONFDIR}/kdmrc ]; then
 	echo "Generating KDM configuration";
 	${GENKDMCONF} --no-old --in ${KDMCONFDIR};
+else
+	echo "Updating KDM configuration";
+	${GENKDMCONF} --in ${KDMCONFDIR};
+
 fi
diff --git a/x11/kdebase4-workspace/files/patch-kcontrol_ebrowsing_plugins_shorturi_kshorturifilter.cpp b/x11/kdebase4-workspace/files/patch-kcontrol_ebrowsing_plugins_shorturi_kshorturifilter.cpp
deleted file mode 100644
index d718e60f329f..000000000000
--- a/x11/kdebase4-workspace/files/patch-kcontrol_ebrowsing_plugins_shorturi_kshorturifilter.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
---- kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp.orig	Sat Aug  6 01:48:21 2005
-+++ kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp	Sat Aug  6 01:58:48 2005
-@@ -216,6 +216,7 @@
-   QString path;
-   QString ref;
-   QString query;
-+  QString nameFilter;
- 
-   if (KURL::isRelativeURL(cmd) && QDir::isRelativePath(cmd)) {
-      path = cmd;
-@@ -228,7 +229,8 @@
-       // but not for "/tmp/a#b", if "a#b" is an existing file,
-       // or for "/tmp/a?b" (#58990)
-       if ( ( url.hasRef() || !url.query().isEmpty() ) // avoid the calling exists() when not needed
--           && QFile::exists(url.path()) )
-+           && QFile::exists(url.path())
-+           && !url.path().endsWith(QFL1("/")) ) // /tmp/?foo is a namefilter, not a query
-       {
-         path = url.path();
-         ref = url.ref();
-@@ -338,6 +340,24 @@
-   if( isLocalFullPath && !exists )
-   {
-     exists = ( stat( QFile::encodeName(path).data() , &buff ) == 0 );
-+    if ( !exists ) {
-+      // Support for name filter (/foo/*.txt), see also KonqMainWindow::detectNameFilter
-+      // If the app using this filter doesn't support it, well, it'll simply error out itself
-+      int lastSlash = path.findRev( '/' );
-+      if ( lastSlash > -1 && path.find( ' ', lastSlash ) == -1 ) // no space after last slash, otherwise it's more likely command-line arguments
-+      {
-+        QString fileName = path.mid( lastSlash + 1 );
-+        QString testPath = path.left( lastSlash + 1 );
-+        if ( ( fileName.find( '*' ) != -1 || fileName.find( '[' ) != -1 || fileName.find( '?' ) != -1 )
-+           && stat( QFile::encodeName(testPath).data(), &buff ) == 0 )        
-+        {
-+          nameFilter = fileName;
-+	  kdDebug() << "Setting nameFilter to " << nameFilter << endl;
-+          path = testPath;
-+          exists = true;
-+        }
-+      }
-+    }
-   }
- 
-   //kdDebug() << "path =" << path << " isLocalFullPath=" << isLocalFullPath << " exists=" << exists << endl;
-@@ -370,7 +390,9 @@
-     // Open "uri" as file:/xxx if it is a non-executable local resource.
-     if( isDir || S_ISREG( buff.st_mode ) )
-     {
--      //kdDebug() << "Abs path as local file" << endl;
-+      //kdDebug() << "Abs path as local file or directory" << endl;
-+      if ( !nameFilter.isEmpty() )
-+        u.setFileName( nameFilter );
-       setFilteredURI( data, u );
-       setURIType( data, ( isDir ) ? KURIFilterData::LOCAL_DIR : KURIFilterData::LOCAL_FILE );
-       return true;
diff --git a/x11/kdebase4-workspace/files/patch-khotkeys_kcontrol_ui-actions_listview_widget_ui.ui b/x11/kdebase4-workspace/files/patch-khotkeys_kcontrol_ui-actions_listview_widget_ui.ui
deleted file mode 100644
index ffcdc0d05370..000000000000
--- a/x11/kdebase4-workspace/files/patch-khotkeys_kcontrol_ui-actions_listview_widget_ui.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- khotkeys/kcontrol/ui/actions_listview_widget_ui.ui.orig	Thu Sep 15 12:55:58 2005
-+++ khotkeys/kcontrol/ui/actions_listview_widget_ui.ui	Thu Sep 15 12:56:06 2005
-@@ -80,7 +80,4 @@
- </includes>
- <layoutdefaults spacing="6" margin="11"/>
- <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
--<includehints>
--    <includehint>khotkeys::actions_listview.h</includehint>
--</includehints>
- </UI>
diff --git a/x11/kdebase4-workspace/files/patch-konqueror_konq_mainwindow.cc b/x11/kdebase4-workspace/files/patch-konqueror_konq_mainwindow.cc
deleted file mode 100644
index 4eaf87314d92..000000000000
--- a/x11/kdebase4-workspace/files/patch-konqueror_konq_mainwindow.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- konqueror/konq_mainwindow.cc.orig	Wed Jul 20 12:04:01 2005
-+++ konqueror/konq_mainwindow.cc	Sat Aug  6 00:20:37 2005
-@@ -98,6 +98,7 @@
- #include <kiconloader.h>
- #include <kpopupmenu.h>
- #include <kprocess.h>
-+#include <kio/netaccess.h>
- #include <kio/scheduler.h>
- #include <kaccelmanager.h>
- #include <kuser.h>
-@@ -428,7 +429,7 @@
-         QString fileName = path.mid( lastSlash + 1 );
-         QString testPath = path.left( lastSlash + 1 );
-         if ( ( fileName.find( '*' ) != -1 || fileName.find( '[' ) != -1 || fileName.find( '?' ) != -1 )
--             && ( !url.isLocalFile() || QFile::exists( testPath ) ) )
-+             && ( !url.isLocalFile() || QFile::exists( testPath ) ) && !KIO::NetAccess::exists( url, true ) )
-         {
-             nameFilter = fileName;
-             url.setFileName( QString::null );
diff --git a/x11/kdebase4-workspace/files/patch-post-3.4.2-kdebase-kcheckpass.diff b/x11/kdebase4-workspace/files/patch-post-3.4.2-kdebase-kcheckpass.diff
deleted file mode 100644
index 884f3e686ca8..000000000000
--- a/x11/kdebase4-workspace/files/patch-post-3.4.2-kdebase-kcheckpass.diff
+++ /dev/null
@@ -1,156 +0,0 @@
-Index: kcheckpass.c
-===================================================================
---- kcheckpass/kcheckpass.c	(revision 453871)
-+++ kcheckpass/kcheckpass.c	(working copy)
-@@ -14,7 +14,7 @@
-  *
-  * You should have received a copy of the GNU General Public
-  * License along with this program; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ * Software Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA  02110-1301, USA.
-  *
-  *
-  *	kcheckpass is a simple password checker. Just invoke and
-@@ -264,8 +264,13 @@
- 
-   va_start(ap, fmt);
-   vfprintf(stderr, fmt, ap);
-+  va_end(ap);
- }
- 
-+#ifndef O_NOFOLLOW
-+# define O_NOFOLLOW 0
-+#endif
-+
- static void ATTR_NORETURN
- usage(int exitval)
- {
-@@ -286,6 +291,14 @@
-   exit(exitval);
- }
- 
-+static int exclusive_lock(int fd)
-+{
-+  struct flock lk;
-+  lk.l_type = F_WRLCK;
-+  lk.l_whence = SEEK_SET;
-+  lk.l_start = lk.l_len = 0;
-+  return fcntl(fd, F_SETLKW, &lk);
-+}
- 
- int
- main(int argc, char **argv)
-@@ -299,10 +312,13 @@
-   char		*p;
- #endif
-   struct passwd	*pw;
--  int		c, nfd, lfd, numtries;
-+  int		c, nfd, tfd, lfd;
-   uid_t		uid;
--  long		lasttime;
-+  time_t	lasttime;
-   AuthReturn	ret;
-+  char tmpname[64], fname[64], fcont[64];
-+  time_t left = 3;
-+  lfd = tfd = 0;
- 
- #ifdef HAVE_OSF_C2_PASSWD
-   initialize_osf_security(argc, argv);
-@@ -371,6 +387,41 @@
-       return AuthError;
-     }
-   }
-+
-+  /* see if we had already a failed attempt */
-+  if ( uid != geteuid() ) {
-+    strcpy(tmpname, "/var/spool/lock/kcheckpass.tmp.XXXXXX");
-+    if ((tfd=mkstemp(tmpname)) < 0)
-+      return AuthError;
-+
-+    /* try locking out concurrent kcheckpass processes */
-+    exclusive_lock(tfd);
-+    
-+    write(tfd, fcont, sprintf(fcont, "%lu\n", time(0)+left));
-+    (void) lseek(tfd, 0, SEEK_SET);
-+
-+    sprintf(fname, "/var/spool/lock/kcheckpass.%d", uid );
-+
-+    if ((lfd = open(fname, O_RDWR | O_NOFOLLOW)) >= 0) {
-+      if (exclusive_lock(lfd) == 0) {
-+        if ((c = read(lfd, fcont, sizeof(fcont)-1)) > 0 &&
-+	    (fcont[c] = '\0', sscanf(fcont, "%ld", &lasttime) == 1))
-+	  {
-+            time_t ct = time(0);
-+
-+	    /* in case we were killed early, sleep the remaining time
-+	     * to properly enforce invocation throttling and make sure
-+	     * that users can't use kcheckpass for bruteforcing password
-+             */
-+            if(lasttime > ct && lasttime < ct + left)
-+              sleep (lasttime - ct);
-+          }
-+      }
-+      close(lfd);
-+    }
-+    rename(tmpname, fname);
-+  }
-+
-   /* Now do the fandango */
-   ret = Authenticate(
- #ifdef HAVE_PAM
-@@ -379,35 +430,21 @@
-                      method,
-                      username, 
-                      sfd < 0 ? conv_legacy : conv_server);
-+
-   if (ret == AuthOk || ret == AuthBad) {
-     /* Security: Don't undermine the shadow system. */
-     if (uid != geteuid()) {
--      char fname[32], fcont[32];
--      sprintf(fname, "/var/lock/kcheckpass.%d", uid);
--      if ((lfd = open(fname, O_RDWR | O_CREAT)) >= 0) {
--        struct flock lk;
--        lk.l_type = F_WRLCK;
--        lk.l_whence = SEEK_SET;
--        lk.l_start = lk.l_len = 0;
--	if (fcntl(lfd, F_SETLKW, &lk))
--          return AuthError;
--        if ((c = read(lfd, fcont, sizeof(fcont))) > 0 &&
--            (fcont[c] = 0, sscanf(fcont, "%ld %d\n", &lasttime, &numtries) == 2))
--        {
--          time_t left = lasttime - time(0);
--          if (numtries < 20)
--            numtries++;
--          left += 2 << (numtries > 10 ? numtries - 10 : 0);
--          if (left > 0)
--            sleep(left);
--        } else
--          numtries = 0;
--        if (ret == AuthBad) {
--          lseek(lfd, 0, SEEK_SET);
--          write(lfd, fcont, sprintf(fcont, "%ld %d\n", time(0), numtries));
--        } else
--          unlink(fname);
--      }
-+      if (ret == AuthBad) {
-+        write(tfd, fcont, sprintf(fcont, "%lu\n", time(0)+left));
-+      } else
-+        unlink(fname);
-+	
-+      unlink(tmpname);
-+
-+      if (ret == AuthBad)
-+        sleep(left);  
-+
-+      close(tfd);
-     }
-     if (ret == AuthBad) {
-       message("Authentication failure\n");
-@@ -417,6 +454,7 @@
-       }
-     }
-   }
-+
-   return ret;
- }
- 
diff --git a/x11/kdebase4-workspace/files/pkg-deinstall.in b/x11/kdebase4-workspace/files/pkg-deinstall.in
new file mode 100644
index 000000000000..e33dd4caa775
--- /dev/null
+++ b/x11/kdebase4-workspace/files/pkg-deinstall.in
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+if [ "$2" != "POST-DEINSTALL" ]; then
+        exit 0
+fi
+
+boguscreatenewentry=%%PREFIX%%/share/templates/.keep_me
+
+if [ ! -f $boguscreatenewentry ]; then
+        touch $boguscreatenewentry
+fi
+
+exit 0
+
diff --git a/x11/kdebase4-workspace/pkg-install b/x11/kdebase4-workspace/files/pkg-install.in
index ae0241bfd528..fee72a16fe3c 100644
--- a/x11/kdebase4-workspace/pkg-install
+++ b/x11/kdebase4-workspace/files/pkg-install.in
@@ -7,10 +7,15 @@ if [ "$2" != "POST-INSTALL" ]; then
         exit 0
 fi
 
+boguscreatenewentry=%%PREFIX%%/share/templates/.keep_me
 kdmrcscript=%%PREFIX%%/etc/rc.d/genkdmconf.sh
 
 if [ -f $kdmrcscript ]; then
 	sh -c "$kdmrcscript"
 fi
 
+if [ -f $boguscreatenewentry ]; then
+	rm -f $boguscreatenewentry
+fi
+
 exit 0
diff --git a/x11/kdebase4-workspace/pkg-message b/x11/kdebase4-workspace/files/pkg-message.in
index 4c4756fe4617..4c4756fe4617 100644
--- a/x11/kdebase4-workspace/pkg-message
+++ b/x11/kdebase4-workspace/files/pkg-message.in