[50045] trunk/dports/kde

takanori at macports.org takanori at macports.org
Thu Apr 23 02:53:53 PDT 2009


Revision: 50045
          http://trac.macports.org/changeset/50045
Author:   takanori at macports.org
Date:     2009-04-23 02:53:52 -0700 (Thu, 23 Apr 2009)
Log Message:
-----------
KDE 3.5.10

Modified Paths:
--------------
    trunk/dports/kde/kde/Portfile
    trunk/dports/kde/kde/files/README
    trunk/dports/kde/kde-i18n-afrikaans/Portfile
    trunk/dports/kde/kde-i18n-arabic/Portfile
    trunk/dports/kde/kde-i18n-azerbaijani/Portfile
    trunk/dports/kde/kde-i18n-basque/Portfile
    trunk/dports/kde/kde-i18n-bengali/Portfile
    trunk/dports/kde/kde-i18n-bosnian/Portfile
    trunk/dports/kde/kde-i18n-brazilian-portugese/Portfile
    trunk/dports/kde/kde-i18n-breton/Portfile
    trunk/dports/kde/kde-i18n-bulgarian/Portfile
    trunk/dports/kde/kde-i18n-catalan/Portfile
    trunk/dports/kde/kde-i18n-chinese/Portfile
    trunk/dports/kde/kde-i18n-chinese-simplified/Portfile
    trunk/dports/kde/kde-i18n-croatian/Portfile
    trunk/dports/kde/kde-i18n-czech/Portfile
    trunk/dports/kde/kde-i18n-danish/Portfile
    trunk/dports/kde/kde-i18n-dutch/Portfile
    trunk/dports/kde/kde-i18n-esperanto/Portfile
    trunk/dports/kde/kde-i18n-estonian/Portfile
    trunk/dports/kde/kde-i18n-farsi/Portfile
    trunk/dports/kde/kde-i18n-finnish/Portfile
    trunk/dports/kde/kde-i18n-french/Portfile
    trunk/dports/kde/kde-i18n-frisian/Portfile
    trunk/dports/kde/kde-i18n-galician/Portfile
    trunk/dports/kde/kde-i18n-german/Portfile
    trunk/dports/kde/kde-i18n-greek/Portfile
    trunk/dports/kde/kde-i18n-hebrew/Portfile
    trunk/dports/kde/kde-i18n-hindi/Portfile
    trunk/dports/kde/kde-i18n-hungarian/Portfile
    trunk/dports/kde/kde-i18n-icelandic/Portfile
    trunk/dports/kde/kde-i18n-irish-gaelic/Portfile
    trunk/dports/kde/kde-i18n-italian/Portfile
    trunk/dports/kde/kde-i18n-japanese/Portfile
    trunk/dports/kde/kde-i18n-kashubian/Portfile
    trunk/dports/kde/kde-i18n-kazakh/Portfile
    trunk/dports/kde/kde-i18n-khmer/Portfile
    trunk/dports/kde/kde-i18n-kinyarwanda/Portfile
    trunk/dports/kde/kde-i18n-korean/Portfile
    trunk/dports/kde/kde-i18n-latvian/Portfile
    trunk/dports/kde/kde-i18n-lithuanian/Portfile
    trunk/dports/kde/kde-i18n-low-saxon/Portfile
    trunk/dports/kde/kde-i18n-macedonian/Portfile
    trunk/dports/kde/kde-i18n-malay/Portfile
    trunk/dports/kde/kde-i18n-mongolian/Portfile
    trunk/dports/kde/kde-i18n-northern-sami/Portfile
    trunk/dports/kde/kde-i18n-norwegian-bokmaal/Portfile
    trunk/dports/kde/kde-i18n-norwegian-nynorsk/Portfile
    trunk/dports/kde/kde-i18n-polish/Portfile
    trunk/dports/kde/kde-i18n-portugese/Portfile
    trunk/dports/kde/kde-i18n-punjabi/Portfile
    trunk/dports/kde/kde-i18n-romanian/Portfile
    trunk/dports/kde/kde-i18n-russian/Portfile
    trunk/dports/kde/kde-i18n-serbian/Portfile
    trunk/dports/kde/kde-i18n-serbian-latin-script/Portfile
    trunk/dports/kde/kde-i18n-slovak/Portfile
    trunk/dports/kde/kde-i18n-slovenian/Portfile
    trunk/dports/kde/kde-i18n-spanish/Portfile
    trunk/dports/kde/kde-i18n-swati/Portfile
    trunk/dports/kde/kde-i18n-swedish/Portfile
    trunk/dports/kde/kde-i18n-tajik/Portfile
    trunk/dports/kde/kde-i18n-tamil/Portfile
    trunk/dports/kde/kde-i18n-telugu/Portfile
    trunk/dports/kde/kde-i18n-thai/Portfile
    trunk/dports/kde/kde-i18n-turkish/Portfile
    trunk/dports/kde/kde-i18n-uk-english/Portfile
    trunk/dports/kde/kde-i18n-ukranian/Portfile
    trunk/dports/kde/kde-i18n-upper-sorbian/Portfile
    trunk/dports/kde/kde-i18n-uzbek/Portfile
    trunk/dports/kde/kde-i18n-vietnamese/Portfile
    trunk/dports/kde/kde-i18n-walloon/Portfile
    trunk/dports/kde/kde-i18n-welsh/Portfile
    trunk/dports/kde/kdeaccessibility3/Portfile
    trunk/dports/kde/kdeaccessibility3/files/InstallScript.sh
    trunk/dports/kde/kdeaddons3/Portfile
    trunk/dports/kde/kdeaddons3/files/InstallScript.sh
    trunk/dports/kde/kdeaddons3/files/kdeaddons3.patch
    trunk/dports/kde/kdeartwork3/Portfile
    trunk/dports/kde/kdeartwork3/files/InstallScript.sh
    trunk/dports/kde/kdebase3/Portfile
    trunk/dports/kde/kdebase3/files/kdebase3-unified.patch
    trunk/dports/kde/kdeedu3/Portfile
    trunk/dports/kde/kdeedu3/files/CompileScript.sh
    trunk/dports/kde/kdeedu3/files/InstallScript.sh
    trunk/dports/kde/kdeedu3/files/kdeedu3.patch
    trunk/dports/kde/kdegames3/Portfile
    trunk/dports/kde/kdegraphics3/Portfile
    trunk/dports/kde/kdegraphics3/files/kdegraphics3.patch
    trunk/dports/kde/kdelibs3/Portfile
    trunk/dports/kde/kdelibs3/files/kdelibs3-unified.patch
    trunk/dports/kde/kdenetwork3/Portfile
    trunk/dports/kde/kdenetwork3/files/CompileScript.sh
    trunk/dports/kde/kdenetwork3/files/InstallScript.sh
    trunk/dports/kde/kdenetwork3/files/kdenetwork3.patch
    trunk/dports/kde/kdepim3/Portfile
    trunk/dports/kde/kdepim3/files/CompileScript.sh
    trunk/dports/kde/kdepim3/files/InstallScript.sh
    trunk/dports/kde/kdepim3/files/kdepim3.patch
    trunk/dports/kde/kdesdk3/Portfile
    trunk/dports/kde/kdesdk3/files/CompileScript.sh
    trunk/dports/kde/kdesdk3/files/kdesdk3.patch
    trunk/dports/kde/kdetoys3/Portfile
    trunk/dports/kde/kdeutils3/Portfile
    trunk/dports/kde/kdeutils3/files/kdeutils3.patch
    trunk/dports/kde/kdewebdev3/Portfile
    trunk/dports/kde/kdewebdev3/files/CompileScript.sh

Added Paths:
-----------
    trunk/dports/kde/kde-i18n-belarusian/
    trunk/dports/kde/kde-i18n-belarusian/Portfile
    trunk/dports/kde/kde-i18n-uzbek-cyrillic/
    trunk/dports/kde/kde-i18n-uzbek-cyrillic/Portfile

Removed Paths:
-------------
    trunk/dports/kde/kdegraphics3/files/xpdf-3.02pl2.patch
    trunk/dports/kde/kdelibs3/files/patch-kdeui_kactionclasses.cpp.diff
    trunk/dports/kde/kdenetwork3/files/patch-krfb_libvncserver_rfb.h.diff

Modified: trunk/dports/kde/kde/Portfile
===================================================================
--- trunk/dports/kde/kde/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -2,8 +2,8 @@
 
 PortSystem 1.0
 name		kde
-version		3.5.8
-categories	kde
+version		3.5.10
+categories	kde kde3
 maintainers	nomaintainer
 description	KDE Desktop bundle
 long_description ${description}
@@ -25,8 +25,10 @@
 build		{ }
 destroot	{
 		xinstall -d -m 755 ${destroot}${prefix}/share/doc/kde
-		xinstall -m 444 ${portpath}/${filesdir}/README ${destroot}${prefix}/share/doc/kde/
-		ui_msg "To start KDE, put \"exec ${prefix}/bin/startkde\" in your .xinitrc"
+		xinstall -m 644 ${filespath}/README ${destroot}${prefix}/share/doc/kde/
+                reinplace "s|%%PREFIX%%|${prefix}|" ${destroot}${prefix}/share/doc/kde/README
+
+		ui_msg "To start KDE, put \"exec \$SHELL -l -c ${prefix}/bin/startkde\" in your .xinitrc"
 		ui_msg "If you have problems, refer to ${prefix}/share/doc/kde/README"
 }
 

Modified: trunk/dports/kde/kde/files/README
===================================================================
--- trunk/dports/kde/kde/files/README	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde/files/README	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,27 +1,9 @@
 ==MacPorts KDE==
 
-To start the KDE desktop (this works best in full-screen X11 mode), comment 
-out quartz-wm in your .xinitrc, and add this:
-exec ${prefix}/bin/startkde
-where ${prefix} is your MP prefix.
+To start the KDE desktop (this works best in full-screen X11 mode),
+add the following line into your .xinitrc
 
+  exec $SHELL -l -c %%PREFIX%%/bin/startkde
+
 Alternatively, if you just want to run individual KDE applications, start 
 X11, and run them from the command line.
-
-==AQ (maybe one day this will be a FAQ)==
-
-Q1 When I start, any KDE application, it comes up fine, but with the fonts all squares.
-A1 Try 'sudo fc-cache'
-
-Q2 When I type sudo fc-cache, I get 'Fontconfig error: Cannot load default config file'
-A2 Do you have the file /etc/fonts/fonts.conf?  If not, you probably need to 
-   install/reinstall stuff (X11, Developer Tools...) from the CDs that came with your computer.
-
-Q3 I get errors like 'artsd: illegal option -- c'
-A3 KDE is attempting to communicate with an old version of the arts sound server that is 
-   installed on your system.  Sound is disabled in the current KDE ports.  By explicitly 
-   disabling sound in kcontrol, you may be able to stop KDE producing these errors.  
-   Alternatively, uninstall the arts port.
-
-Q4 My question isn't answered here...
-Q4 Try macports-users at lists.macosforge.org

Modified: trunk/dports/kde/kde-i18n-afrikaans/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-afrikaans/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-afrikaans/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-afrikaans
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE afrikaans language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-af-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 88c320ea5320f6af8236a0ae16483d61
+checksums       md5 08d05d7ff9f866fce127382d1e73a27d
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-arabic/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-arabic/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-arabic/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-arabic
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE arabic language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-ar-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 3f61f06685f66214ce28426a42419696
+checksums       md5 ff3f9b816be41df76dfdfa7dbefadb2f
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-azerbaijani/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-azerbaijani/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-azerbaijani/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-azerbaijani
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE azerbaijani language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-az-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 770821f4d53662a9052e26b0b7fc0d86
+checksums       md5 72b6743124db7d046f6136cf219022d3
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-basque/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-basque/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-basque/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-basque
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE basque language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-eu-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 6b47aa2863640739973a5ca390f4c9eb
+checksums       md5 222a5f1dd0d5ab6c334468fe5440dc66
 depends_lib     port:kdebase3
 
 patch {

Added: trunk/dports/kde/kde-i18n-belarusian/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-belarusian/Portfile	                        (rev 0)
+++ trunk/dports/kde/kde-i18n-belarusian/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -0,0 +1,37 @@
+# $Id$
+
+PortSystem      1.0
+
+name            kde-i18n-belarusian
+version         3.5.10
+categories      kde kde3
+maintainers     nomaintainer
+description     KDE belarusian language files.
+long_description \
+                ${description}
+platforms       darwin
+homepage        http://www.kde.org/
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
+distname        kde-i18n-be-${version}
+distfiles       ${distname}.tar.bz2:kde
+use_bzip2       yes
+checksums       md5 8b61229e1193f03fe7d54e4cfa909191
+depends_lib     port:kdebase3
+
+patch {
+    reinplace "s|doc/HTML|doc/kde|g" ${worksrcpath}/configure
+}
+
+configure.env   HOME=${workpath} KDEDIR=${prefix}
+configure.args  --without-arts
+
+build.env       ${configure.env}
+
+post-destroot {
+    xinstall -d -m 755 ${destroot}${prefix}/share/doc/kde-installed-packages
+    system "touch ${destroot}${prefix}/share/doc/kde-installed-packages/kde-i18n-belarusian"
+}
+
+universal_variant   no
+
+livecheck.check none


Property changes on: trunk/dports/kde/kde-i18n-belarusian/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Modified: trunk/dports/kde/kde-i18n-bengali/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-bengali/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-bengali/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-bengali
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE bengali language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-bn-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 ce4076af2523378de16d52c553a5570a
+checksums       md5 6d49f20c81ffae866559c09976f6b733
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-bosnian/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-bosnian/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-bosnian/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-bosnian
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE bosnian language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-bs-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 d12aa470ab906726a4e7098b66a3c31d
+checksums       md5 3605c85c1788230368d19b1a09140cd0
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-brazilian-portugese/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-brazilian-portugese/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-brazilian-portugese/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-brazilian-portugese
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE brazilian-portugese language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-pt_BR-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 615fb261ba06abc14ea7128ba142ccab
+checksums       md5 8f1344d86383337a930d4c69cfcc1c91
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-breton/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-breton/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-breton/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-breton
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE breton language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-br-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 903d567ecd398d5dcaac10521f1e2d1a
+checksums       md5 d777f77c14922eaf17e911bbb2bb7b40
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-bulgarian/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-bulgarian/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-bulgarian/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-bulgarian
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE bulgarian language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-bg-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 071791e43caac2c3ca1b5f676c3486d7
+checksums       md5 c3efc49aef6bb21f8fa604e4f300fc73
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-catalan/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-catalan/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-catalan/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-catalan
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE catalan language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-ca-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 9f1d629826873f17c0c080da113160e7
+checksums       md5 7587f2accb4231e0cb68e750e2496f55
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-chinese/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-chinese/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-chinese/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-chinese
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE chinese language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-zh_TW-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 7defcfa0506759695f92e2835b06abeb
+checksums       md5 c9b7fc28f62fc43f57c0d75535860be6
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-chinese-simplified/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-chinese-simplified/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-chinese-simplified/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-chinese-simplified
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE chinese-simplified language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-zh_CN-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 29e2e6756afa3a6ad1b9014c91137b18
+checksums       md5 65ac47c0c1d2424158e416dfa878cc26
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-croatian/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-croatian/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-croatian/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-croatian
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE croatian language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-hr-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 099d3da8a4d375a7e52d88316d4e880b
+checksums       md5 50948306543eb3ce4d27e6577955c9d8
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-czech/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-czech/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-czech/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-czech
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE czech language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-cs-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 db203a2ae671d59032b50511f5f590b4
+checksums       md5 cc83561a25a53dea5452f0261d94e2cc
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-danish/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-danish/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-danish/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-danish
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE danish language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-da-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 1fd0439f89c93563a5e0c88e9fe91b88
+checksums       md5 de37394373fef218ffd19f2efbb139b4
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-dutch/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-dutch/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-dutch/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-dutch
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE dutch language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-nl-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 97775bbdcaf8d8185eff9ee0f031ab1b
+checksums       md5 a934c97f18dbb1fcb6d2ad72e3247dd1
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-esperanto/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-esperanto/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-esperanto/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-esperanto
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE esperanto language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-eo-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 fbc2fa7fe6f43cb89328bbc8815487f9
+checksums       md5 4c4256af2b07f4ef89ceb8f8fd087a0d
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-estonian/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-estonian/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-estonian/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-estonian
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE estonian language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-et-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 3cc413ec7e20a11784779c55c059923f
+checksums       md5 58862bbec128c29db0df33a824813c15
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-farsi/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-farsi/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-farsi/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-farsi
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE farsi language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-fa-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 fbbfb775f1b64f8704e29d7fa86a0ab6
+checksums       md5 790b34649838b87444926cb32188a6d5
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-finnish/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-finnish/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-finnish/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-finnish
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE finnish language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-fi-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 126039c2f5e3f4bff0036971069a8bed
+checksums       md5 195580d7f80330bf703db2d32c6973ec
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-french/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-french/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-french/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-french
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE french language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-fr-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 2a64410a4692b7e248fde1e4bdc09f86
+checksums       md5 b92590c756aedd16ee863f307ec20c58
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-frisian/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-frisian/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-frisian/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-frisian
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE frisian language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-fy-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 8f115a9c965f7d18229e8891245c3c13
+checksums       md5 abeabb8786293786743c4f513a907bc7
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-galician/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-galician/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-galician/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-galician
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE galician language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-gl-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 243cb631a971a6a4eb6601ffd5b953b6
+checksums       md5 254953a780dc5f74c1e7107624ce9b3f
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-german/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-german/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-german/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-german
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE german language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-de-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 541d0f5189126addfdece3410027a6cd
+checksums       md5 9d24448a403242c64253fcde28d94321
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-greek/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-greek/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-greek/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-greek
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE greek language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-el-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 292682993de7ad01f25715e984ef679e
+checksums       md5 b46f636e5e89a6a22d65b8ab40c99aa0
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-hebrew/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-hebrew/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-hebrew/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-hebrew
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE hebrew language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-he-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 fc1c6cba3c11fdc184f334674228a9f3
+checksums       md5 4ba23539fa791d7a9e9b93c6992031a5
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-hindi/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-hindi/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-hindi/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-hindi
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE hindi language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-hi-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 c41c26db86e54efa21748f02ef2f5be4
+checksums       md5 0d5b52ef04c80034e4148db916a5b8d8
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-hungarian/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-hungarian/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-hungarian/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-hungarian
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE hungarian language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-hu-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 cb519a636b9c8d178578474279a4819f
+checksums       md5 998409be294212345806483033485c0f
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-icelandic/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-icelandic/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-icelandic/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-icelandic
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE icelandic language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-is-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 50c914274a83c81bc0e000e56aeb7e85
+checksums       md5 92cf1c508c3c719d6899e1f56d91cd31
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-irish-gaelic/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-irish-gaelic/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-irish-gaelic/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-irish-gaelic
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE irish-gaelic language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-ga-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 fd7235f1f0b9af0a9c84f835c8c31439
+checksums       md5 b48a11cff0f37de75cf82676e9c63503
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-italian/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-italian/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-italian/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-italian
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE italian language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-it-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 00f433d262edcea8f2aac4ce02d1ea63
+checksums       md5 aa850328a980fbcb4253ff97bd7d0305
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-japanese/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-japanese/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-japanese/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-japanese
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE japanese language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-ja-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 1a1b8c4c752c43fcb38767608134fc78
+checksums       md5 3417f460b7da4b3538439c3fd91defa5
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-kashubian/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-kashubian/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-kashubian/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-kashubian
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE kashubian language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-csb-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 2c7890547f664352f0337647308b46fd
+checksums       md5 f0c9154fd0695a22fcc6dd9a6692afc9
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-kazakh/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-kazakh/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-kazakh/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-kazakh
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE kazakh language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-kk-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 7c9ef1b73d57eb865446acd78df662b0
+checksums       md5 f66034d61514b919f5d27014843b88c9
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-khmer/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-khmer/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-khmer/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-khmer
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE khmer language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-km-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 aab309ee84138818490b5f261bbbdc00
+checksums       md5 f340a35320368600f9c6527166cd11bb
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-kinyarwanda/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-kinyarwanda/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-kinyarwanda/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-kinyarwanda
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE kinyarwanda language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-rw-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 7bb554107c402f63c3b38f9d6197a985
+checksums       md5 c3569c1115edf40e0b51b2670b441000
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-korean/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-korean/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-korean/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-korean
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE korean language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-ko-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 ffb76e99343d36c10e88c2c208610f67
+checksums       md5 910573d994b6236d64f3f13be7211112
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-latvian/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-latvian/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-latvian/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-latvian
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE latvian language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-lv-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 35a369665f244a85f3b428752e060793
+checksums       md5 2c7f33fa01658d65d824bd14d7b034ce
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-lithuanian/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-lithuanian/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-lithuanian/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-lithuanian
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE lithuanian language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-lt-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 2d59da372e7b4421fc91c4cb5597a418
+checksums       md5 c12d47a5a9f29a9e2b51d40296d4c8c3
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-low-saxon/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-low-saxon/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-low-saxon/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-low-saxon
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE low-saxon language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-nds-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 9fd018b9f51cc8cf6378b304ae7cdbbc
+checksums       md5 b30f44fd4f3220ca3ae5165486979891
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-macedonian/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-macedonian/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-macedonian/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-macedonian
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE macedonian language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-mk-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 7d3214430aa1d68f203f23f2fcca0ebe
+checksums       md5 576d665415b25ccf0744755845e80c7a
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-malay/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-malay/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-malay/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-malay
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE malay language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-ms-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 238bf49769942b979cbddcaccea5b710
+checksums       md5 0c4009229fe716e66cd1bb0b6b051477
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-mongolian/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-mongolian/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-mongolian/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-mongolian
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE mongolian language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-mn-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 8946c24129e8f8940084e419c30af8e7
+checksums       md5 e8e5b3d93bc88332995c8a36b89a82f7
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-northern-sami/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-northern-sami/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-northern-sami/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-northern-sami
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE northern-sami language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-se-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 d385011a25431cec644c70a40cc06d07
+checksums       md5 05f86c78e91e777b707bcae123e2a2b8
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-norwegian-bokmaal/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-norwegian-bokmaal/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-norwegian-bokmaal/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-norwegian-bokmaal
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE norwegian-bokmaal language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-nb-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 01d114b6fa87ad9b5f2048955e7d52e0
+checksums       md5 d990123fe61f6f15a215c5b189f7f141
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-norwegian-nynorsk/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-norwegian-nynorsk/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-norwegian-nynorsk/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-norwegian-nynorsk
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE norwegian-nynorsk language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-nn-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 67b4f67411042fbb47225d796519e259
+checksums       md5 6e6a432ffc3b8242c29fb3806a61c1d1
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-polish/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-polish/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-polish/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-polish
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE polish language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-pl-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 5467708649518662692c93d3c12dcebb
+checksums       md5 f32e46ce95dc3c7e150d57ae08de1a55
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-portugese/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-portugese/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-portugese/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-portugese
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE portugese language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-pt-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 eef833022d79bbb27e14ab3b9b2ea4c5
+checksums       md5 da33de5028e91be24115304b9ec95bb4
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-punjabi/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-punjabi/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-punjabi/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-punjabi
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE punjabi language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-pa-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 dd46c1dcfa3d5e1c0d28a91ce80a7e08
+checksums       md5 f87435d069e4adc9c211775359c336ea
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-romanian/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-romanian/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-romanian/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-romanian
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE romanian language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-ro-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 459971f0e4ed5cdb6741733ac8aa4979
+checksums       md5 864955c215254a4cb2675c7c1631a8c8
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-russian/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-russian/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-russian/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-russian
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE russian language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-ru-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 5b88cf9e5ab1e226885118b2022b29b3
+checksums       md5 0e76918a045a4792c86216bdc6dccaf4
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-serbian/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-serbian/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-serbian/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-serbian
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE serbian language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-sr-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 ceadb723611f3c32cc8f57a61dbb4ef1
+checksums       md5 5df0699edb6e7ab7243648838fca3e13
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-serbian-latin-script/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-serbian-latin-script/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-serbian-latin-script/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-serbian-latin-script
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE serbian-latin-script language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-sr at Latn-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 d72f37a5a3a2f060a0f5024cd5f63440
+checksums       md5 b2d9d83c77fd32c3f321515e840770d6
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-slovak/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-slovak/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-slovak/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-slovak
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE slovak language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-sk-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 bdc21017fdee0fc26045ed8b14cb72d8
+checksums       md5 0b012bc94d7a374e6fad26b66815eb16
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-slovenian/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-slovenian/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-slovenian/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-slovenian
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE slovenian language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-sl-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 c5393c84882a953acb2b92296d2324a2
+checksums       md5 dc1a128d27c5cf76de1a98ea80928884
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-spanish/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-spanish/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-spanish/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-spanish
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE spanish language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-es-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 d6faefeee2d7351cdff5d09d12585785
+checksums       md5 37b1d4f181dbfab4a2f235657e672eea
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-swati/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-swati/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-swati/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-swati
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE swati language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-ss-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 1e66fa69e5b3ed74e986d9b98a7502e0
+checksums       md5 d3d95a17a66f8414c16d3095aa7f7829
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-swedish/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-swedish/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-swedish/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-swedish
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE swedish language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-sv-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 8b7fe01c959630fca516151b5635b525
+checksums       md5 0769547c21b2b82e01e430826002abdd
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-tajik/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-tajik/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-tajik/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-tajik
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE tajik language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-tg-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 3a5286aabef22fbab5e3ec94c388bc8e
+checksums       md5 7999d00f85d0a9bf2991ab8600ce23c1
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-tamil/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-tamil/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-tamil/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-tamil
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE tamil language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-ta-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 59e6f48dc6ce52ad6792579dd97a468b
+checksums       md5 040cecbcc246733cbb692099138a278b
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-telugu/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-telugu/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-telugu/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-telugu
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE telugu language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-te-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 99623b9d093f65c63c74a6e433eef14c
+checksums       md5 726acc373482e8fa97e468f23e4f5619
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-thai/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-thai/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-thai/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-thai
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE thai language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-th-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 2a9f8edd352f958803b085899f26b30a
+checksums       md5 9a2b03bc371ec00e62a92a30bec2abf9
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-turkish/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-turkish/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-turkish/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-turkish
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE turkish language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-tr-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 317e4f9dd07e907f88f2c0331692a7c7
+checksums       md5 a043c8e13c699be9b60f0d56833162a8
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-uk-english/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-uk-english/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-uk-english/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-uk-english
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE uk-english language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-en_GB-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 656f2b65b1d4157deee397974969e38c
+checksums       md5 3ac6784dd0b7f24e88de85f0196fc138
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-ukranian/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-ukranian/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-ukranian/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-ukranian
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE ukranian language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-uk-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 2187a208bfdff609078e3afeaf8e02f3
+checksums       md5 c4bb322541cbba9dad22da3c588ba639
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-upper-sorbian/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-upper-sorbian/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-upper-sorbian/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,19 +1,19 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-upper-sorbian
 version         3.4.3
-categories      kde
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE upper-sorbian language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-hsb-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
 checksums       md5 0b0f7122386d2774cc7f6df4b74559db
 depends_lib     port:kdebase3

Modified: trunk/dports/kde/kde-i18n-uzbek/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-uzbek/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-uzbek/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-uzbek
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE uzbek language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-uz-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 c36c41e57e7677705732e43d69d51b63
+checksums       md5 9c4aca3db425032d85016aa23e9a3b92
 depends_lib     port:kdebase3
 
 patch {

Added: trunk/dports/kde/kde-i18n-uzbek-cyrillic/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-uzbek-cyrillic/Portfile	                        (rev 0)
+++ trunk/dports/kde/kde-i18n-uzbek-cyrillic/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -0,0 +1,37 @@
+# $Id$
+
+PortSystem      1.0
+
+name            kde-i18n-uzbek-cyrillic
+version         3.5.10
+categories      kde kde3
+maintainers     nomaintainer
+description     KDE uzbek-cyrillic language files.
+long_description \
+                ${description}
+platforms       darwin
+homepage        http://www.kde.org/
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
+distname        kde-i18n-uz at cyrillic-${version}
+distfiles       ${distname}.tar.bz2:kde
+use_bzip2       yes
+checksums       md5 32ef78a2a6a17742a150dedba636b0e8
+depends_lib     port:kdebase3
+
+patch {
+    reinplace "s|doc/HTML|doc/kde|g" ${worksrcpath}/configure
+}
+
+configure.env   HOME=${workpath} KDEDIR=${prefix}
+configure.args  --without-arts
+
+build.env       ${configure.env}
+
+post-destroot {
+    xinstall -d -m 755 ${destroot}${prefix}/share/doc/kde-installed-packages
+    system "touch ${destroot}${prefix}/share/doc/kde-installed-packages/kde-i18n-uzbek-cyrillic"
+}
+
+universal_variant   no
+
+livecheck.check none


Property changes on: trunk/dports/kde/kde-i18n-uzbek-cyrillic/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Modified: trunk/dports/kde/kde-i18n-vietnamese/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-vietnamese/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-vietnamese/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-vietnamese
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE vietnamese language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-vi-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 5e025aa483bfd52d05ad9b28028c3515
+checksums       md5 78c9313e33f5122cdd576d70be360c3c
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-walloon/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-walloon/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-walloon/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-walloon
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE walloon language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-wa-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 80ab89389e45431fedf5b57630a91108
+checksums       md5 b7bc216e665e1612e47874aea6628af3
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kde-i18n-welsh/Portfile
===================================================================
--- trunk/dports/kde/kde-i18n-welsh/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kde-i18n-welsh/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,21 +1,21 @@
 # $Id$
 
 PortSystem      1.0
+
 name            kde-i18n-welsh
-version         3.5.8
-categories      kde
+version         3.5.10
+categories      kde kde3
 maintainers     nomaintainer
 description     KDE welsh language files.
 long_description \
                 ${description}
 platforms       darwin
 homepage        http://www.kde.org/
-master_sites    kde:stable/${version}/src/kde-i18n/:kde357
-#               opendarwin::kde357
+master_sites    kde:stable/${version}/src/kde-i18n/:kde
 distname        kde-i18n-cy-${version}
-distfiles       ${distname}.tar.bz2:kde357
+distfiles       ${distname}.tar.bz2:kde
 use_bzip2       yes
-checksums       md5 148faedcc0326cf7256dec99d92bde01
+checksums       md5 67eab91e0a0a72681ea684876003a286
 depends_lib     port:kdebase3
 
 patch {

Modified: trunk/dports/kde/kdeaccessibility3/Portfile
===================================================================
--- trunk/dports/kde/kdeaccessibility3/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdeaccessibility3/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,43 +1,45 @@
 # $Id$
 
-#Synced with Fink, Version 3.5.8-1021
+#Synced with Fink, revision 1.24
 
 PortSystem 1.0
 name		kdeaccessibility3
-version		3.5.8
-set kdeadmin	kde-admindir-1024
-categories	kde
+version		3.5.10
+set kdeadmin	kde-admindir-1502
+categories	kde kde3
 maintainers	nomaintainer
 description	KDE accessibility tools. \
 		NB No KDE sound support.
 long_description ${description}
 platforms	darwin
 homepage	http://www.kde.org/
-master_sites	kde:stable/${version}/src/:kde358 \
+master_sites	kde:stable/${version}/src/:kde \
 		http://ranger.users.finkproject.org/distfiles/kde-admindir/:admin \
 		http://ranger.befunk.com/fink/kde-admindir/:admin \
 		http://astrange.ithinksw.net/~astrange/ranger-fink/kde-admindir/:admin \
 		http://www.southofheaven.net/befunk/kde-admindir/:admin
 use_bzip2	yes
 distname	kdeaccessibility-${version}
-distfiles	${distname}.tar.bz2:kde358 \
+distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
+dist_subdir     kde3
 depends_build	port:autoconf \
 		port:unsermake
 depends_lib	port:kdebase3
 #		port:freetts
 #		port:gstreamer
+#               port:libcdio
 
-checksums	${distname}.tar.bz2 md5 0ede2d48df626aa436dbe6c741d575f1 \
-		${kdeadmin}.tar.bz2 md5 d99491aa5d520fd1d70393a718019322
+checksums	${distname}.tar.bz2 md5 feb1582b9acc573cef8cd357d8a7bc1d \
+		${kdeadmin}.tar.bz2 md5 92a60282c1d81f38835ce7d495255cc3
 
 extract.only	${distname}.tar.bz2
 post-extract	{ system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
 
 patchfiles	
 patch		{
-		foreach file $patchfiles {
-		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
+		foreach f $patchfiles {
+		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${f} | patch -p1"
 		}
 		system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' ${worksrcpath}/admin/*"
 }
@@ -46,22 +48,22 @@
 		reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|HOME=/tmp|HOME=${workpath}|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|/tmp/buildlog|${workpath}/buildlog|g" ${worksrcpath}/build-helper.sh
-		foreach file {CompileScript.sh InstallScript.sh} {
-		    file copy ${filespath}/${file} ${worksrcpath}
-		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
-		    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
-		    reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
-		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${file}
-		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${file}
-		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${file}
-		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${file}
-		    file attributes ${worksrcpath}/${file} -permissions 0755
+		foreach f {CompileScript.sh InstallScript.sh} {
+		    copy ${filespath}/${f} ${worksrcpath}
+		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${f}
+		    reinplace "s|%N|${name}|g" ${worksrcpath}/${f}
+		    reinplace "s|%v|${version}|g" ${worksrcpath}/${f}
+		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${f}
+		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${f}
+		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${f}
+		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${f}
+		    file attributes ${worksrcpath}/${f} -permissions 0755
 		}
 }
 
 configure.args	--enable-kttsd-gstreamer --with-distribution='MacPorts/Mac OS X' --without-arts
 
-configure	{}
+use_configure       no
 use_parallel_build  yes
 build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
 destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }

Modified: trunk/dports/kde/kdeaccessibility3/files/InstallScript.sh
===================================================================
--- trunk/dports/kde/kdeaccessibility3/files/InstallScript.sh	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdeaccessibility3/files/InstallScript.sh	2009-04-23 09:53:52 UTC (rev 50045)
@@ -9,6 +9,8 @@
 	touch %i/share/doc/installed-packages/%N
 	touch %i/share/doc/installed-packages/%N-base
 
+	rm -rf %i/lib/libkttsd.dylib
+	rm -rf %i/lib/libKTTSD_Lib.dylib
 	rm -rf %i/share/doc/kde/en/kmouth %i/share/man/man1/kmouth*
 	install -d -m 755 %i/share/config
 	cat <<END > %i/share/config/kttsdrc

Modified: trunk/dports/kde/kdeaddons3/Portfile
===================================================================
--- trunk/dports/kde/kdeaddons3/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdeaddons3/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,27 +1,28 @@
 # $Id$
 
-#Synced with Fink, Version 3.5.8-1021
+#Synced with Fink, revision 1.24
 
 PortSystem 1.0
 name		kdeaddons3
-version		3.5.8
-set kdeadmin	kde-admindir-1024
-categories	kde
+version		3.5.10
+set kdeadmin	kde-admindir-1502
+categories	kde kde3
 maintainers	nomaintainer
 description	KDE addons. \
 		NB No KDE sound support.
 long_description ${description}
 platforms	darwin
 homepage	http://www.kde.org/
-master_sites	kde:stable/${version}/src/:kde358 \
+master_sites	kde:stable/${version}/src/:kde \
 		http://ranger.users.finkproject.org/distfiles/kde-admindir/:admin \
 		http://ranger.befunk.com/fink/kde-admindir/:admin \
 		http://astrange.ithinksw.net/~astrange/ranger-fink/kde-admindir/:admin \
 		http://www.southofheaven.net/befunk/kde-admindir/:admin
 use_bzip2	yes
 distname	kdeaddons-${version}
-distfiles	${distname}.tar.bz2:kde358 \
+distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
+dist_subdir     kde3
 depends_build	port:autoconf \
 		port:unsermake
 depends_lib	port:doxygen \
@@ -31,16 +32,16 @@
 #		port:gtk1
 #		port:libsdl
 
-checksums	${distname}.tar.bz2 md5 4a338f14210ad920bb54624cd330dd89 \
-		${kdeadmin}.tar.bz2 md5 d99491aa5d520fd1d70393a718019322
+checksums	${distname}.tar.bz2 md5 c69d082407b2c1bb46d078f8ac5d2bea \
+		${kdeadmin}.tar.bz2 md5 92a60282c1d81f38835ce7d495255cc3
 
 extract.only	${distname}.tar.bz2
 post-extract	{ system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
 
 patchfiles	kdeaddons3.patch
 patch		{
-		foreach file $patchfiles {
-		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
+		foreach f $patchfiles {
+		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${f} | patch -p1"
 		}
 		system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' ${worksrcpath}/admin/*"
 }
@@ -49,22 +50,22 @@
 		reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|HOME=/tmp|HOME=${workpath}|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|/tmp/buildlog|${workpath}/buildlog|g" ${worksrcpath}/build-helper.sh
-		foreach file {CompileScript.sh InstallScript.sh} {
-		    file copy ${filespath}/${file} ${worksrcpath}
-		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
-		    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
-		    reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
-		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${file}
-		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${file}
-		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${file}
-		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${file}
-		    file attributes ${worksrcpath}/${file} -permissions 0755
+		foreach f {CompileScript.sh InstallScript.sh} {
+		    copy ${filespath}/${f} ${worksrcpath}
+		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${f}
+		    reinplace "s|%N|${name}|g" ${worksrcpath}/${f}
+		    reinplace "s|%v|${version}|g" ${worksrcpath}/${f}
+		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${f}
+		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${f}
+		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${f}
+		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${f}
+		    file attributes ${worksrcpath}/${f} -permissions 0755
 		}
 }
 
 configure.args	--with-sdl-prefix=${prefix} --disable-sdltest --with-distribution='MacPorts/Mac OS X' --without-arts
 
-configure	{}
+use_configure       no
 use_parallel_build  yes
 build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
 destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }

Modified: trunk/dports/kde/kdeaddons3/files/InstallScript.sh
===================================================================
--- trunk/dports/kde/kdeaddons3/files/InstallScript.sh	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdeaddons3/files/InstallScript.sh	2009-04-23 09:53:52 UTC (rev 50045)
@@ -5,6 +5,13 @@
 
 	./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d
 
+#fink
+#	# in kdeartwork now
+#	rm -rf %i/share/icons/locolor/16x16/apps/ktimemon.png
+#	rm -rf %i/share/icons/locolor/32x32/apps/ktimemon.png
+#macports
+#
+
 	mkdir -p %i/share/doc/installed-packages
 	touch %i/share/doc/installed-packages/%N
 	touch %i/share/doc/installed-packages/%N-base

Modified: trunk/dports/kde/kdeaddons3/files/kdeaddons3.patch
===================================================================
--- trunk/dports/kde/kdeaddons3/files/kdeaddons3.patch	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdeaddons3/files/kdeaddons3.patch	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,5 +1,6 @@
---- kdeaddons-3.4.0/atlantikdesigner/designer/Makefile.am	2005-01-03 09:49:17.000000000 -0500
-+++ kdeaddons-3.4.0-new/atlantikdesigner/designer/Makefile.am	2005-05-17 23:28:19.000000000 -0400
+diff -Nurd kdeaddons-3.5.9/atlantikdesigner/designer/Makefile.am kdeaddons-3.5.9-new/atlantikdesigner/designer/Makefile.am
+--- kdeaddons-3.5.9/atlantikdesigner/designer/Makefile.am	2005-09-10 04:14:16.000000000 -0400
++++ kdeaddons-3.5.9-new/atlantikdesigner/designer/Makefile.am	2008-02-13 22:06:55.000000000 -0500
 @@ -1,10 +1,14 @@
 -bin_PROGRAMS = atlantikdesigner
 +
@@ -19,8 +20,9 @@
 +atlantikdesigner_la_LIBADD = -latlantikui -lkdegames $(LIB_KIO) 
  
  METASOURCES = AUTO 
---- kdeaddons-3.4.0/atlantikdesigner/designer/main.cpp	2003-06-23 00:01:15.000000000 -0400
-+++ kdeaddons-3.4.0-new/atlantikdesigner/designer/main.cpp	2005-05-17 23:28:17.000000000 -0400
+diff -Nurd kdeaddons-3.5.9/atlantikdesigner/designer/main.cpp kdeaddons-3.5.9-new/atlantikdesigner/designer/main.cpp
+--- kdeaddons-3.5.9/atlantikdesigner/designer/main.cpp	2005-09-10 04:14:16.000000000 -0400
++++ kdeaddons-3.5.9-new/atlantikdesigner/designer/main.cpp	2008-02-13 22:06:55.000000000 -0500
 @@ -5,7 +5,7 @@
  
  #include "designer.h"
@@ -30,22 +32,22 @@
  {
  	KAboutData aboutData(
  	           "atlantikdesigner",
---- kdeaddons-3.4.0/kfile-plugins/lnk/Makefile.am	2005-02-03 17:25:15.000000000 -0500
-+++ kdeaddons-3.4.0-new/kfile-plugins/lnk/Makefile.am	2005-05-17 23:28:58.000000000 -0400
+diff -Nurd kdeaddons-3.5.9/kfile-plugins/lnk/Makefile.am kdeaddons-3.5.9-new/kfile-plugins/lnk/Makefile.am
+--- kdeaddons-3.5.9/kfile-plugins/lnk/Makefile.am	2005-09-10 04:14:17.000000000 -0400
++++ kdeaddons-3.5.9-new/kfile-plugins/lnk/Makefile.am	2008-02-13 22:06:55.000000000 -0500
 @@ -2,12 +2,14 @@
  
  INCLUDES         = $(all_includes)
  
 -bin_PROGRAMS = lnkforward
--
++bin_PROGRAMS = 
++lib_LTLIBRARIES =
++kdeinit_LTLIBRARIES = lnkforward.la
+ 
 -lnkforward_SOURCES = lnkforward.cpp
 -lnkforward_LDADD = $(LIB_KDECORE) $(LIB_KIO)
 -lnkforward_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 -lnkforward_METASOURCES = lnkforward.moc
-+bin_PROGRAMS = 
-+lib_LTLIBRARIES =
-+kdeinit_LTLIBRARIES = lnkforward.la
-+
 +lnkforward_la_SOURCES = lnkforward.cpp
 +lnkforward_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO)
 +lnkforward_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
@@ -53,8 +55,9 @@
  
  lnkforward_DATA = lnkforward.desktop
  lnkforwarddir = $(kde_appsdir)/.hidden
---- kdeaddons-3.4.0/kfile-plugins/lnk/lnkforward.cpp	2004-06-21 12:28:00.000000000 -0400
-+++ kdeaddons-3.4.0-new/kfile-plugins/lnk/lnkforward.cpp	2005-05-17 23:29:14.000000000 -0400
+diff -Nurd kdeaddons-3.5.9/kfile-plugins/lnk/lnkforward.cpp kdeaddons-3.5.9-new/kfile-plugins/lnk/lnkforward.cpp
+--- kdeaddons-3.5.9/kfile-plugins/lnk/lnkforward.cpp	2005-10-10 10:53:15.000000000 -0400
++++ kdeaddons-3.5.9-new/kfile-plugins/lnk/lnkforward.cpp	2008-02-13 22:06:55.000000000 -0500
 @@ -50,7 +50,7 @@
  
  //--------------------------------------------------------------------------------
@@ -64,8 +67,9 @@
  {
    KCmdLineArgs::init(argc, argv, appName, programName, description, version, false);
  
---- kdeaddons-3.4.0/ksig/Makefile.am	2003-09-01 06:37:30.000000000 -0400
-+++ kdeaddons-3.4.0-new/ksig/Makefile.am	2005-05-17 23:30:03.000000000 -0400
+diff -Nurd kdeaddons-3.5.9/ksig/Makefile.am kdeaddons-3.5.9-new/ksig/Makefile.am
+--- kdeaddons-3.5.9/ksig/Makefile.am	2005-09-10 04:14:16.000000000 -0400
++++ kdeaddons-3.5.9-new/ksig/Makefile.am	2008-02-13 22:06:55.000000000 -0500
 @@ -1,6 +1,9 @@
 -bin_PROGRAMS = ksig
  
@@ -89,8 +93,9 @@
  
  rcdir = $(kde_datadir)/ksig
  rc_DATA = ksigui.rc
---- kdeaddons-3.4.0/ksig/main.cpp	2004-02-28 06:19:49.000000000 -0500
-+++ kdeaddons-3.4.0-new/ksig/main.cpp	2005-05-17 23:30:02.000000000 -0400
+diff -Nurd kdeaddons-3.5.9/ksig/main.cpp kdeaddons-3.5.9-new/ksig/main.cpp
+--- kdeaddons-3.5.9/ksig/main.cpp	2005-09-10 04:14:16.000000000 -0400
++++ kdeaddons-3.5.9-new/ksig/main.cpp	2008-02-13 22:06:55.000000000 -0500
 @@ -33,7 +33,7 @@
      KCmdLineLastOption
  };

Modified: trunk/dports/kde/kdeartwork3/Portfile
===================================================================
--- trunk/dports/kde/kdeartwork3/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdeartwork3/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,42 +1,43 @@
 # $Id$
 
-#Synced with Fink, Version 3.5.8-1021
+#Synced with Fink, revision 1.22
 
 PortSystem 1.0
 name		kdeartwork3
-version		3.5.8
-set kdeadmin	kde-admindir-1024
-categories	kde
+version		3.5.10
+set kdeadmin	kde-admindir-1502
+categories	kde kde3
 maintainers	nomaintainer
 description	KDE additional artwork. \
 		NB No KDE sound support.
 long_description ${description}
 platforms	darwin
 homepage	http://www.kde.org/
-master_sites	kde:stable/${version}/src/:kde358 \
+master_sites	kde:stable/${version}/src/:kde \
 		http://ranger.users.finkproject.org/distfiles/kde-admindir/:admin \
 		http://ranger.befunk.com/fink/kde-admindir/:admin \
 		http://astrange.ithinksw.net/~astrange/ranger-fink/kde-admindir/:admin \
 		http://www.southofheaven.net/befunk/kde-admindir/:admin
 use_bzip2	yes
 distname	kdeartwork-${version}
-distfiles	${distname}.tar.bz2:kde358 \
+distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
+dist_subdir     kde3
 depends_build	port:autoconf \
 		port:unsermake
 depends_lib	port:kdebase3
 #		port:xscreensaver
 
-checksums	${distname}.tar.bz2 md5 03becf82a233e6007e9372ffa5756d0b \
-		${kdeadmin}.tar.bz2 md5 d99491aa5d520fd1d70393a718019322
+checksums	${distname}.tar.bz2 md5 6e6f089dc0f1dabb0f138641600d0b59 \
+		${kdeadmin}.tar.bz2 md5 92a60282c1d81f38835ce7d495255cc3
 
 extract.only	${distname}.tar.bz2
 post-extract	{ system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
 
 patchfiles	
 patch		{
-		foreach file $patchfiles {
-		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
+		foreach f $patchfiles {
+		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${f} | patch -p1"
 		}
 		system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' ${worksrcpath}/admin/*"
 }
@@ -45,22 +46,22 @@
 		reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|HOME=/tmp|HOME=${workpath}|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|/tmp/buildlog|${workpath}/buildlog|g" ${worksrcpath}/build-helper.sh
-		foreach file {CompileScript.sh InstallScript.sh} {
-		    file copy ${filespath}/${file} ${worksrcpath}
-		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
-		    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
-		    reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
-		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${file}
-		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${file}
-		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${file}
-		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${file}
-		    file attributes ${worksrcpath}/${file} -permissions 0755
+		foreach f {CompileScript.sh InstallScript.sh} {
+		    copy ${filespath}/${f} ${worksrcpath}
+		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${f}
+		    reinplace "s|%N|${name}|g" ${worksrcpath}/${f}
+		    reinplace "s|%v|${version}|g" ${worksrcpath}/${f}
+		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${f}
+		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${f}
+		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${f}
+		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${f}
+		    file attributes ${worksrcpath}/${f} -permissions 0755
 		}
 }
 
 configure.args	--with-distribution='MacPorts/Mac OS X' --without-arts
 
-configure	{}
+use_configure       no
 use_parallel_build  yes
 build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
 destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }
@@ -68,18 +69,6 @@
 post-destroot	{
 		xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
 		xinstall -m 644 -W ${worksrcpath} README ${destroot}${prefix}/share/doc/${name}
-
-		#these icons are provided by kdesdk3
-		file delete ${destroot}${prefix}/share/icons/Locolor/16x16/apps/kbabel.png
-		file delete ${destroot}${prefix}/share/icons/Locolor/32x32/apps/kbabel.png
-
-		#these icons are provided by kdeaddons3
-		file delete ${destroot}${prefix}/share/icons/Locolor/16x16/apps/ktimemon.png
-		file delete ${destroot}${prefix}/share/icons/Locolor/32x32/apps/ktimemon.png
-
-		#rename "Locolor" to "locolor"
-		file rename ${destroot}${prefix}/share/icons/Locolor ${destroot}${prefix}/share/icons/locolor.tmp
-		file rename ${destroot}${prefix}/share/icons/locolor.tmp ${destroot}${prefix}/share/icons/locolor
 }
 
 universal_variant	no

Modified: trunk/dports/kde/kdeartwork3/files/InstallScript.sh
===================================================================
--- trunk/dports/kde/kdeartwork3/files/InstallScript.sh	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdeartwork3/files/InstallScript.sh	2009-04-23 09:53:52 UTC (rev 50045)
@@ -5,6 +5,22 @@
 
 	./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d
 
+#fink
+#	rm -rf %i/share/icons/locolor/16x16/apps/kbabel.png
+#	rm -rf %i/share/icons/locolor/32x32/apps/kbabel.png
+#macports
+	#these icons are provided by kdesdk3
+	rm -rf %i/share/icons/Locolor/16x16/apps/kbabel.png
+	rm -rf %i/share/icons/Locolor/32x32/apps/kbabel.png
+	#
+	#these icons are provided by kdeaddons3
+	rm -rf %i/share/icons/Locolor/16x16/apps/ktimemon.png
+	rm -rf %i/share/icons/Locolor/32x32/apps/ktimemon.png
+	#
+	#rename "Locolor" to "locolor"
+	mv %i/share/icons/Locolor %i/share/icons/locolor.tmp
+	mv %i/share/icons/locolor.tmp %i/share/icons/locolor
+
 	mkdir -p %i/share/doc/installed-packages
 	touch %i/share/doc/installed-packages/%N
 	touch %i/share/doc/installed-packages/%N-base

Modified: trunk/dports/kde/kdebase3/Portfile
===================================================================
--- trunk/dports/kde/kdebase3/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdebase3/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,27 +1,28 @@
 # $Id$
 
-#Synced with Fink, Version 3.5.8-1021
+#Synced with Fink, revision 1.31
 
 PortSystem 1.0
 name		kdebase3
-version		3.5.8
-set kdeadmin	kde-admindir-1024
-categories	kde
+version		3.5.10
+set kdeadmin	kde-admindir-1502
+categories	kde kde3
 maintainers	nomaintainer
 description	Base KDE programs -- e.g. kicker (taskbar). \
 		NB No KDE sound support.
 long_description ${description}
 platforms	darwin
 homepage	http://www.kde.org/
-master_sites	kde:stable/${version}/src/:kde358 \
+master_sites	kde:stable/${version}/src/:kde \
 		http://ranger.users.finkproject.org/distfiles/kde-admindir/:admin \
 		http://ranger.befunk.com/fink/kde-admindir/:admin \
 		http://astrange.ithinksw.net/~astrange/ranger-fink/kde-admindir/:admin \
 		http://www.southofheaven.net/befunk/kde-admindir/:admin
 use_bzip2	yes
 distname	kdebase-${version}
-distfiles	${distname}.tar.bz2:kde358 \
+distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
+dist_subdir     kde3
 depends_build	port:autoconf \
 		port:unsermake
 depends_lib	port:cyrus-sasl2 \
@@ -29,16 +30,16 @@
 		port:libusb
 #		port:openmotif
 
-checksums	${distname}.tar.bz2 md5 9990c669229daaaa8fca4c5e354441fd \
-		${kdeadmin}.tar.bz2 md5 d99491aa5d520fd1d70393a718019322
+checksums	${distname}.tar.bz2 md5 88237188271fbf1e6bcd40180a75d953 \
+		${kdeadmin}.tar.bz2 md5 92a60282c1d81f38835ce7d495255cc3
 
 extract.only	${distname}.tar.bz2
 post-extract	{ system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
 
 patchfiles	kdebase3-unified.patch
 patch		{
-		foreach file $patchfiles {
-		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
+		foreach f $patchfiles {
+		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${f} | patch -p1"
 		}
 		system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' ${worksrcpath}/admin/*"
 		system "perl -pi -e 's/-Xlinker -framework -Xlinker (\\S*)/-Wl,-framework,\$1/g; s/-framework (\\S*)/-Wl,-framework,\$1/g;' ${worksrcpath}/configure"
@@ -48,16 +49,16 @@
 		reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|HOME=/tmp|HOME=${workpath}|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|/tmp/buildlog|${workpath}/buildlog|g" ${worksrcpath}/build-helper.sh
-		foreach file {CompileScript.sh InstallScript.sh} {
-		    file copy ${filespath}/${file} ${worksrcpath}
-		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
-		    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
-		    reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
-		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${file}
-		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${file}
-		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${file}
-		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${file}
-		    file attributes ${worksrcpath}/${file} -permissions 0755
+		foreach f {CompileScript.sh InstallScript.sh} {
+		    copy ${filespath}/${f} ${worksrcpath}
+		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${f}
+		    reinplace "s|%N|${name}|g" ${worksrcpath}/${f}
+		    reinplace "s|%v|${version}|g" ${worksrcpath}/${f}
+		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${f}
+		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${f}
+		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${f}
+		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${f}
+		    file attributes ${worksrcpath}/${f} -permissions 0755
 		}
 		reinplace "s|doc/HTML|doc/kde|g" ${worksrcpath}/khelpcenter/searchhandlers/khc_docbookdig.pl.in
 		reinplace "s|doc/HTML|doc/kde|g" ${worksrcpath}/doc/userguide/kde-for-admins.docbook
@@ -67,7 +68,7 @@
 
 configure.args	--with-sudo-kdesu-backend --without-nfs --with-ldap=framework --with-distribution='MacPorts/Mac OS X' --without-arts
 
-configure	{}
+use_configure       no
 use_parallel_build  yes
 build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
 destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }
@@ -83,7 +84,7 @@
 
 universal_variant	no
 
-variant with_doxygen	{
+variant with_doxygen description {Include API documentation} {
 		depends_lib-append port:doxygen
 		post-patch { foreach f {CompileScript.sh InstallScript.sh} { reinplace "s|#apidox#||g" ${worksrcpath}/${f} }}
 }

Modified: trunk/dports/kde/kdebase3/files/kdebase3-unified.patch
===================================================================
--- trunk/dports/kde/kdebase3/files/kdebase3-unified.patch	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdebase3/files/kdebase3-unified.patch	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,6 +1,6 @@
-
---- kdebase-3.5.8/applnk/Makefile.am	2007-01-15 06:32:11.000000000 -0500
-+++ kdebase-3.5.8-new/applnk/Makefile.am	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/applnk/Makefile.am kdebase-3.5.9-new/applnk/Makefile.am
+--- kdebase-3.5.9/applnk/Makefile.am	2007-01-15 06:32:11.000000000 -0500
++++ kdebase-3.5.9-new/applnk/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -3,7 +3,7 @@
  xdg_menu_DATA = kde-settings.menu kde-information.menu kde-screensavers.menu
  
@@ -10,8 +10,9 @@
  
  xdg_directory_DATA = \
  kde-main.directory \
---- kdebase-3.5.8/doc/userguide/kde-for-admins.docbook	2006-07-22 04:15:40.000000000 -0400
-+++ kdebase-3.5.8-new/doc/userguide/kde-for-admins.docbook	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/doc/userguide/kde-for-admins.docbook kdebase-3.5.9-new/doc/userguide/kde-for-admins.docbook
+--- kdebase-3.5.9/doc/userguide/kde-for-admins.docbook	2006-07-22 04:15:40.000000000 -0400
++++ kdebase-3.5.9-new/doc/userguide/kde-for-admins.docbook	2008-02-13 21:05:55.000000000 -0500
 @@ -1669,7 +1669,7 @@
  </para>
  
@@ -39,8 +40,9 @@
  contains <filename>kde-essential.menu</filename> which includes some
  essential menus that are normally not shown in the &kde; menu itself:
  <itemizedlist>
---- kdebase-3.5.8/drkonqi/Makefile.am	2005-09-10 04:25:55.000000000 -0400
-+++ kdebase-3.5.8-new/drkonqi/Makefile.am	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/drkonqi/Makefile.am kdebase-3.5.9-new/drkonqi/Makefile.am
+--- kdebase-3.5.9/drkonqi/Makefile.am	2005-09-10 04:25:55.000000000 -0400
++++ kdebase-3.5.9-new/drkonqi/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -8,15 +8,17 @@
  
  EXTRA_DIST = LICENSE
@@ -63,8 +65,9 @@
  
  
  check_PROGRAMS = crashtest
---- kdebase-3.5.8/drkonqi/main.cpp	2006-07-22 04:15:52.000000000 -0400
-+++ kdebase-3.5.8-new/drkonqi/main.cpp	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/drkonqi/main.cpp kdebase-3.5.9-new/drkonqi/main.cpp
+--- kdebase-3.5.9/drkonqi/main.cpp	2006-07-22 04:15:52.000000000 -0400
++++ kdebase-3.5.9-new/drkonqi/main.cpp	2008-02-13 21:05:55.000000000 -0500
 @@ -57,7 +57,7 @@
    KCmdLineLastOption
  };
@@ -74,8 +77,9 @@
  {
    // Drop privs.
    setgid(getgid());
---- kdebase-3.5.8/kappfinder/Makefile.am	2005-09-10 04:25:41.000000000 -0400
-+++ kdebase-3.5.8-new/kappfinder/Makefile.am	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kappfinder/Makefile.am kdebase-3.5.9-new/kappfinder/Makefile.am
+--- kdebase-3.5.9/kappfinder/Makefile.am	2005-09-10 04:25:41.000000000 -0400
++++ kdebase-3.5.9-new/kappfinder/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -1,9 +1,17 @@
  SUBDIRS = apps
  
@@ -98,8 +102,9 @@
  
  noinst_PROGRAMS = kappfinder_install
  kappfinder_install_SOURCES = main_install.cpp common.cpp
---- kdebase-3.5.8/kappfinder/main.cpp	2007-10-08 05:51:26.000000000 -0400
-+++ kdebase-3.5.8-new/kappfinder/main.cpp	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kappfinder/main.cpp kdebase-3.5.9-new/kappfinder/main.cpp
+--- kdebase-3.5.9/kappfinder/main.cpp	2007-10-08 05:51:26.000000000 -0400
++++ kdebase-3.5.9-new/kappfinder/main.cpp	2008-02-13 21:05:55.000000000 -0500
 @@ -31,7 +31,7 @@
    KCmdLineLastOption
  };
@@ -109,8 +114,9 @@
  {
    KAboutData aboutData( "kappfinder", I18N_NOOP( "KAppfinder" ),
                          "1.0", description, KAboutData::License_GPL,
---- kdebase-3.5.8/kcontrol/filetypes/Makefile.am	2005-09-10 04:25:08.000000000 -0400
-+++ kdebase-3.5.8-new/kcontrol/filetypes/Makefile.am	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kcontrol/filetypes/Makefile.am kdebase-3.5.9-new/kcontrol/filetypes/Makefile.am
+--- kdebase-3.5.9/kcontrol/filetypes/Makefile.am	2005-09-10 04:25:08.000000000 -0400
++++ kdebase-3.5.9-new/kcontrol/filetypes/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -12,16 +12,18 @@
  	kservicelistwidget.h typeslistitem.h newtypedlg.h \
  	kserviceselectdlg.h
@@ -134,8 +140,9 @@
  
  messages:
  	$(XGETTEXT) *.cpp -o $(podir)/filetypes.pot
---- kdebase-3.5.8/kcontrol/filetypes/keditfiletype.cpp	2007-05-14 03:55:38.000000000 -0400
-+++ kdebase-3.5.8-new/kcontrol/filetypes/keditfiletype.cpp	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kcontrol/filetypes/keditfiletype.cpp kdebase-3.5.9-new/kcontrol/filetypes/keditfiletype.cpp
+--- kdebase-3.5.9/kcontrol/filetypes/keditfiletype.cpp	2007-05-14 03:55:38.000000000 -0400
++++ kdebase-3.5.9-new/kcontrol/filetypes/keditfiletype.cpp	2008-02-13 21:05:55.000000000 -0500
 @@ -108,7 +108,7 @@
    KCmdLineLastOption
  };
@@ -145,8 +152,9 @@
  {
    KLocale::setMainCatalogue("filetypes");
    KAboutData aboutData( "keditfiletype", I18N_NOOP("KEditFileType"), "1.0",
---- kdebase-3.5.8/kcontrol/fonts/Makefile.am	2007-05-14 03:55:34.000000000 -0400
-+++ kdebase-3.5.8-new/kcontrol/fonts/Makefile.am	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kcontrol/fonts/Makefile.am kdebase-3.5.9-new/kcontrol/fonts/Makefile.am
+--- kdebase-3.5.9/kcontrol/fonts/Makefile.am	2007-05-14 03:55:34.000000000 -0400
++++ kdebase-3.5.9-new/kcontrol/fonts/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -4,13 +4,13 @@
  libkxftconfig_la_LIBADD = $(LIBFONTCONFIG_LIBS)
  libkxftconfig_la_LDFLAGS = $(LIBFONTCONFIG_RPATH)
@@ -163,8 +171,9 @@
  METASOURCES = AUTO
  
  noinst_HEADERS = fonts.h kxftconfig.h
---- kdebase-3.5.8/kcontrol/fonts/configure.in.in	2007-05-14 03:55:34.000000000 -0400
-+++ kdebase-3.5.8-new/kcontrol/fonts/configure.in.in	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kcontrol/fonts/configure.in.in kdebase-3.5.9-new/kcontrol/fonts/configure.in.in
+--- kdebase-3.5.9/kcontrol/fonts/configure.in.in	2007-05-14 03:55:34.000000000 -0400
++++ kdebase-3.5.9-new/kcontrol/fonts/configure.in.in	2008-02-13 21:05:55.000000000 -0500
 @@ -1,8 +1,6 @@
 -KDE_FIND_PATH(fontconfig-config, FONTCONFIG_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [
          KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [
@@ -174,8 +183,9 @@
  
  if test -n "$PKGCONFIG"; then
    vers=`$PKGCONFIG fontconfig --modversion 2>/dev/null | sed -e 's/libfontconfig //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
---- kdebase-3.5.8/kcontrol/kfontinst/configure.in.in	2006-01-19 12:00:50.000000000 -0500
-+++ kdebase-3.5.8-new/kcontrol/kfontinst/configure.in.in	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kcontrol/kfontinst/configure.in.in kdebase-3.5.9-new/kcontrol/kfontinst/configure.in.in
+--- kdebase-3.5.9/kcontrol/kfontinst/configure.in.in	2006-01-19 12:00:50.000000000 -0500
++++ kdebase-3.5.9-new/kcontrol/kfontinst/configure.in.in	2008-02-13 21:05:55.000000000 -0500
 @@ -36,11 +36,9 @@
  
      KFI_FOUND_FONTCONFIG=0
@@ -188,8 +198,9 @@
  
      if test -n "$PKGCONFIG"; then
          vers=`$PKGCONFIG fontconfig --modversion 2>/dev/null | sed -e 's/libfontconfig //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
---- kdebase-3.5.8/kcontrol/kfontinst/kcmfontinst/Makefile.am	2005-09-10 04:25:09.000000000 -0400
-+++ kdebase-3.5.8-new/kcontrol/kfontinst/kcmfontinst/Makefile.am	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kcontrol/kfontinst/kcmfontinst/Makefile.am kdebase-3.5.9-new/kcontrol/kfontinst/kcmfontinst/Makefile.am
+--- kdebase-3.5.9/kcontrol/kfontinst/kcmfontinst/Makefile.am	2005-09-10 04:25:09.000000000 -0400
++++ kdebase-3.5.9-new/kcontrol/kfontinst/kcmfontinst/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -4,10 +4,10 @@
  endif
  
@@ -203,8 +214,9 @@
   
  xdg_apps_DATA = kcmfontinst.desktop
   
---- kdebase-3.5.8/kcontrol/kfontinst/kfile-plugin/Makefile.am	2005-09-10 04:25:09.000000000 -0400
-+++ kdebase-3.5.8-new/kcontrol/kfontinst/kfile-plugin/Makefile.am	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kcontrol/kfontinst/kfile-plugin/Makefile.am kdebase-3.5.9-new/kcontrol/kfontinst/kfile-plugin/Makefile.am
+--- kdebase-3.5.9/kcontrol/kfontinst/kfile-plugin/Makefile.am	2005-09-10 04:25:09.000000000 -0400
++++ kdebase-3.5.9-new/kcontrol/kfontinst/kfile-plugin/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -1,13 +1,13 @@
  kde_module_LTLIBRARIES = kfile_font.la
  
@@ -222,8 +234,9 @@
  
  METASOURCES = AUTO
  noinst_HEADERS = KFileFont.h
---- kdebase-3.5.8/kcontrol/kfontinst/kfontinst/Main.cpp	2007-05-14 03:55:38.000000000 -0400
-+++ kdebase-3.5.8-new/kcontrol/kfontinst/kfontinst/Main.cpp	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kcontrol/kfontinst/kfontinst/Main.cpp kdebase-3.5.9-new/kcontrol/kfontinst/kfontinst/Main.cpp
+--- kdebase-3.5.9/kcontrol/kfontinst/kfontinst/Main.cpp	2007-05-14 03:55:38.000000000 -0400
++++ kdebase-3.5.9-new/kcontrol/kfontinst/kfontinst/Main.cpp	2008-02-13 21:05:55.000000000 -0500
 @@ -190,7 +190,7 @@
          KFI::CXConfig::refreshPaths(true);
  }
@@ -233,8 +246,9 @@
  {
  #ifdef HAVE_GETOPT_H
      static struct option options[]=
---- kdebase-3.5.8/kcontrol/kfontinst/kfontinst/Makefile.am	2007-05-14 03:55:38.000000000 -0400
-+++ kdebase-3.5.8-new/kcontrol/kfontinst/kfontinst/Makefile.am	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kcontrol/kfontinst/kfontinst/Makefile.am kdebase-3.5.9-new/kcontrol/kfontinst/kfontinst/Makefile.am
+--- kdebase-3.5.9/kcontrol/kfontinst/kfontinst/Makefile.am	2007-05-14 03:55:38.000000000 -0400
++++ kdebase-3.5.9-new/kcontrol/kfontinst/kfontinst/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -1,5 +1,8 @@
 -bin_PROGRAMS = kfontinst
 -kfontinst_SOURCES = \
@@ -256,8 +270,9 @@
 +kfontinst_LDADD = $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) ../../fonts/libkxftconfig.la $(LIBZ) $(LIB_KIO) ../lib/libkfontinst.la
 +kfontinst_LDFLAGS = $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(all_libraries) $(KDE_RPATH)
 +AM_CPPFLAGS= -DOS_$(UNAME) -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) $(all_includes)
---- kdebase-3.5.8/kcontrol/kfontinst/kio/Makefile.am	2005-09-10 04:25:09.000000000 -0400
-+++ kdebase-3.5.8-new/kcontrol/kfontinst/kio/Makefile.am	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kcontrol/kfontinst/kio/Makefile.am kdebase-3.5.9-new/kcontrol/kfontinst/kio/Makefile.am
+--- kdebase-3.5.9/kcontrol/kfontinst/kio/Makefile.am	2005-09-10 04:25:09.000000000 -0400
++++ kdebase-3.5.9-new/kcontrol/kfontinst/kio/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -2,9 +2,9 @@
  kio_fonts_la_SOURCES = \
  KioFonts.cpp
@@ -271,8 +286,9 @@
  
  # The kxftconfig stuf really belongs to kdebase/kcontrol/fonts - here only so that can distribute this as an archive.
  noinst_HEADERS = \
---- kdebase-3.5.8/kcontrol/kfontinst/lib/FcEngine.h	2005-09-10 04:25:09.000000000 -0400
-+++ kdebase-3.5.8-new/kcontrol/kfontinst/lib/FcEngine.h	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kcontrol/kfontinst/lib/FcEngine.h kdebase-3.5.9-new/kcontrol/kfontinst/lib/FcEngine.h
+--- kdebase-3.5.9/kcontrol/kfontinst/lib/FcEngine.h	2005-09-10 04:25:09.000000000 -0400
++++ kdebase-3.5.9-new/kcontrol/kfontinst/lib/FcEngine.h	2008-02-13 21:05:55.000000000 -0500
 @@ -5,6 +5,8 @@
  #include "config.h"
  #endif
@@ -282,8 +298,9 @@
  #include <qstring.h>
  #include <qvaluevector.h>
  #include <qfont.h>
---- kdebase-3.5.8/kcontrol/kfontinst/lib/Makefile.am	2005-09-10 04:25:09.000000000 -0400
-+++ kdebase-3.5.8-new/kcontrol/kfontinst/lib/Makefile.am	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kcontrol/kfontinst/lib/Makefile.am kdebase-3.5.9-new/kcontrol/kfontinst/lib/Makefile.am
+--- kdebase-3.5.9/kcontrol/kfontinst/lib/Makefile.am	2005-09-10 04:25:09.000000000 -0400
++++ kdebase-3.5.9-new/kcontrol/kfontinst/lib/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -9,6 +9,6 @@
  FcEngine.h \
  KfiConstants.h
@@ -294,8 +311,9 @@
 +libkfontinst_la_LIBADD = $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KDECORE) $(LIB_KIO) $(LIBXFT_LIB)
 +libkfontinst_la_LDFLAGS = $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(all_libraries) $(KDE_RPATH) -no-undefined
 +AM_CPPFLAGS= $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE $(all_includes)
---- kdebase-3.5.8/kcontrol/kfontinst/thumbnail/Makefile.am	2005-09-10 04:25:09.000000000 -0400
-+++ kdebase-3.5.8-new/kcontrol/kfontinst/thumbnail/Makefile.am	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kcontrol/kfontinst/thumbnail/Makefile.am kdebase-3.5.9-new/kcontrol/kfontinst/thumbnail/Makefile.am
+--- kdebase-3.5.9/kcontrol/kfontinst/thumbnail/Makefile.am	2005-09-10 04:25:09.000000000 -0400
++++ kdebase-3.5.9-new/kcontrol/kfontinst/thumbnail/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -2,7 +2,7 @@
  
  fontthumbnail_la_SOURCES = FontThumbnail.cpp
@@ -311,8 +329,9 @@
  
 -AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS)
 +AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(all_includes)
---- kdebase-3.5.8/kcontrol/kfontinst/viewpart/FontViewerApp.cpp	2005-10-10 11:03:47.000000000 -0400
-+++ kdebase-3.5.8-new/kcontrol/kfontinst/viewpart/FontViewerApp.cpp	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kcontrol/kfontinst/viewpart/FontViewerApp.cpp kdebase-3.5.9-new/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
+--- kdebase-3.5.9/kcontrol/kfontinst/viewpart/FontViewerApp.cpp	2005-10-10 11:03:47.000000000 -0400
++++ kdebase-3.5.9-new/kcontrol/kfontinst/viewpart/FontViewerApp.cpp	2008-02-13 21:05:55.000000000 -0500
 @@ -116,7 +116,7 @@
                              KAboutData::License_GPL,
                              I18N_NOOP("(c) Craig Drummond, 2004"));
@@ -322,8 +341,9 @@
  {
      KCmdLineArgs::init(argc, argv, &aboutData);
      KCmdLineArgs::addCmdLineOptions(options);
---- kdebase-3.5.8/kcontrol/kfontinst/viewpart/Makefile.am	2005-09-10 04:25:09.000000000 -0400
-+++ kdebase-3.5.8-new/kcontrol/kfontinst/viewpart/Makefile.am	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kcontrol/kfontinst/viewpart/Makefile.am kdebase-3.5.9-new/kcontrol/kfontinst/viewpart/Makefile.am
+--- kdebase-3.5.9/kcontrol/kfontinst/viewpart/Makefile.am	2005-09-10 04:25:09.000000000 -0400
++++ kdebase-3.5.9-new/kcontrol/kfontinst/viewpart/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -13,18 +13,21 @@
  
  kde_services_DATA = kfontviewpart.desktop
@@ -351,8 +371,9 @@
 +kfontview_la_SOURCES = FontViewerApp.cpp
  
  
---- kdebase-3.5.8/kdcop/Makefile.am	2005-09-10 04:25:53.000000000 -0400
-+++ kdebase-3.5.8-new/kdcop/Makefile.am	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kdcop/Makefile.am kdebase-3.5.9-new/kdcop/Makefile.am
+--- kdebase-3.5.9/kdcop/Makefile.am	2005-09-10 04:25:53.000000000 -0400
++++ kdebase-3.5.9-new/kdcop/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -7,10 +7,13 @@
  
  INCLUDES = $(all_includes)
@@ -371,8 +392,9 @@
  
  noinst_HEADERS = kdcopwindow.h
  METASOURCES =	AUTO
---- kdebase-3.5.8/kdcop/kdcop.cpp	2005-09-10 04:25:53.000000000 -0400
-+++ kdebase-3.5.8-new/kdcop/kdcop.cpp	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kdcop/kdcop.cpp kdebase-3.5.9-new/kdcop/kdcop.cpp
+--- kdebase-3.5.9/kdcop/kdcop.cpp	2005-09-10 04:25:53.000000000 -0400
++++ kdebase-3.5.9-new/kdcop/kdcop.cpp	2008-02-13 21:05:55.000000000 -0500
 @@ -15,7 +15,7 @@
      KCmdLineLastOption
  };
@@ -382,8 +404,9 @@
  {
    KAboutData aboutData( "kdcop", I18N_NOOP("KDCOP"),
  			"0.1", I18N_NOOP( "A graphical DCOP browser/client" ),
---- kdebase-3.5.8/kdebugdialog/Makefile.am	2005-09-10 04:24:57.000000000 -0400
-+++ kdebase-3.5.8-new/kdebugdialog/Makefile.am	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kdebugdialog/Makefile.am kdebase-3.5.9-new/kdebugdialog/Makefile.am
+--- kdebase-3.5.9/kdebugdialog/Makefile.am	2005-09-10 04:24:57.000000000 -0400
++++ kdebase-3.5.9-new/kdebugdialog/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -4,12 +4,14 @@
  
  ####### Files
@@ -404,8 +427,9 @@
  
  messages:
  	$(XGETTEXT) *.cpp -o $(podir)/kdebugdialog.pot	
---- kdebase-3.5.8/kdebugdialog/main.cpp	2005-10-10 11:03:40.000000000 -0400
-+++ kdebase-3.5.8-new/kdebugdialog/main.cpp	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kdebugdialog/main.cpp kdebase-3.5.9-new/kdebugdialog/main.cpp
+--- kdebase-3.5.9/kdebugdialog/main.cpp	2005-10-10 11:03:40.000000000 -0400
++++ kdebase-3.5.9-new/kdebugdialog/main.cpp	2008-02-13 21:05:55.000000000 -0500
 @@ -75,7 +75,7 @@
    KCmdLineLastOption
  };
@@ -415,8 +439,9 @@
  {
    KAboutData data( "kdebugdialog", I18N_NOOP( "KDebugDialog"),
      "1.0", I18N_NOOP("A dialog box for setting preferences for debug output"),
---- kdebase-3.5.8/kdepasswd/Makefile.am	2005-09-10 04:24:59.000000000 -0400
-+++ kdebase-3.5.8-new/kdepasswd/Makefile.am	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kdepasswd/Makefile.am kdebase-3.5.9-new/kdepasswd/Makefile.am
+--- kdebase-3.5.9/kdepasswd/Makefile.am	2005-09-10 04:24:59.000000000 -0400
++++ kdebase-3.5.9-new/kdepasswd/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -1,10 +1,13 @@
  
  SUBDIRS = kcm
@@ -435,8 +460,9 @@
  
  METASOURCES =  AUTO
  AM_CPPFLAGS= -I$(top_srcdir)/libkonq $(all_includes)
---- kdebase-3.5.8/kdepasswd/kdepasswd.cpp	2005-09-10 04:24:59.000000000 -0400
-+++ kdebase-3.5.8-new/kdepasswd/kdepasswd.cpp	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kdepasswd/kdepasswd.cpp kdebase-3.5.9-new/kdepasswd/kdepasswd.cpp
+--- kdebase-3.5.9/kdepasswd/kdepasswd.cpp	2005-09-10 04:24:59.000000000 -0400
++++ kdebase-3.5.9-new/kdepasswd/kdepasswd.cpp	2008-02-13 21:05:55.000000000 -0500
 @@ -26,7 +26,7 @@
  };
  
@@ -446,8 +472,9 @@
  {
      KAboutData aboutData("kdepasswd", I18N_NOOP("KDE passwd"),
              VERSION, I18N_NOOP("Changes a UNIX password."),
---- kdebase-3.5.8/kdeprint/kdeprintfax/Makefile.am	2005-09-10 04:25:38.000000000 -0400
-+++ kdebase-3.5.8-new/kdeprint/kdeprintfax/Makefile.am	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kdeprint/kdeprintfax/Makefile.am kdebase-3.5.9-new/kdeprint/kdeprintfax/Makefile.am
+--- kdebase-3.5.9/kdeprint/kdeprintfax/Makefile.am	2005-09-10 04:25:38.000000000 -0400
++++ kdebase-3.5.9-new/kdeprint/kdeprintfax/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -1,11 +1,14 @@
  INCLUDES= $(all_includes)
  
@@ -468,8 +495,9 @@
  
  xdg_apps_DATA = kdeprintfax.desktop
  
---- kdebase-3.5.8/kdeprint/kdeprintfax/main.cpp	2005-10-10 11:04:02.000000000 -0400
-+++ kdebase-3.5.8-new/kdeprint/kdeprintfax/main.cpp	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kdeprint/kdeprintfax/main.cpp kdebase-3.5.9-new/kdeprint/kdeprintfax/main.cpp
+--- kdebase-3.5.9/kdeprint/kdeprintfax/main.cpp	2005-10-10 11:04:02.000000000 -0400
++++ kdebase-3.5.9-new/kdeprint/kdeprintfax/main.cpp	2008-02-13 21:05:55.000000000 -0500
 @@ -44,7 +44,7 @@
    // INSERT YOUR COMMANDLINE OPTIONS HERE
  };
@@ -479,8 +507,9 @@
  {
  
    KAboutData aboutData( "kdeprintfax", I18N_NOOP("KdeprintFax"),
---- kdebase-3.5.8/kdeprint/kprinter/printwrapper.cpp	2007-01-15 06:32:07.000000000 -0500
-+++ kdebase-3.5.8-new/kdeprint/kprinter/printwrapper.cpp	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kdeprint/kprinter/printwrapper.cpp kdebase-3.5.9-new/kdeprint/kprinter/printwrapper.cpp
+--- kdebase-3.5.9/kdeprint/kprinter/printwrapper.cpp	2007-01-15 06:32:07.000000000 -0500
++++ kdebase-3.5.9-new/kdeprint/kprinter/printwrapper.cpp	2008-02-13 21:05:55.000000000 -0500
 @@ -137,10 +137,6 @@
  {
  	KCmdLineArgs	*args = KCmdLineArgs::parsedArgs();
@@ -503,8 +532,9 @@
  #  if defined(HAVE_SIGSET)
  		sigset(SIGHUP, signal_handler);
  		sigset(SIGINT, signal_handler);
---- kdebase-3.5.8/kdesktop/Makefile.am	2006-05-22 14:12:51.000000000 -0400
-+++ kdebase-3.5.8-new/kdesktop/Makefile.am	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kdesktop/Makefile.am kdebase-3.5.9-new/kdesktop/Makefile.am
+--- kdebase-3.5.9/kdesktop/Makefile.am	2006-05-22 14:12:51.000000000 -0400
++++ kdebase-3.5.9-new/kdesktop/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -8,9 +8,9 @@
  
  ####### Files
@@ -530,8 +560,9 @@
  
  METASOURCES = AUTO
  
---- kdebase-3.5.8/kdesktop/kcheckrunning.cpp	2005-10-10 11:04:11.000000000 -0400
-+++ kdebase-3.5.8-new/kdesktop/kcheckrunning.cpp	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kdesktop/kcheckrunning.cpp kdebase-3.5.9-new/kdesktop/kcheckrunning.cpp
+--- kdebase-3.5.9/kdesktop/kcheckrunning.cpp	2005-10-10 11:04:11.000000000 -0400
++++ kdebase-3.5.9-new/kdesktop/kcheckrunning.cpp	2008-02-13 21:05:55.000000000 -0500
 @@ -18,8 +18,9 @@
  */
  
@@ -543,8 +574,9 @@
      {
      Display* dpy = XOpenDisplay( NULL );
      if( dpy == NULL )
---- kdebase-3.5.8/kdesktop/kwebdesktop/Makefile.am	2005-09-10 04:25:45.000000000 -0400
-+++ kdebase-3.5.8-new/kdesktop/kwebdesktop/Makefile.am	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kdesktop/kwebdesktop/Makefile.am kdebase-3.5.9-new/kdesktop/kwebdesktop/Makefile.am
+--- kdebase-3.5.9/kdesktop/kwebdesktop/Makefile.am	2005-09-10 04:25:45.000000000 -0400
++++ kdebase-3.5.9-new/kdesktop/kwebdesktop/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -2,12 +2,15 @@
  INCLUDES= $(all_includes)
  LDADD = $(LIB_KHTML)
@@ -564,8 +596,9 @@
  
  kdesktop_kwebdesktop_data_DATA = kwebdesktop.desktop
  kdesktop_kwebdesktop_datadir = $(kde_datadir)/kdesktop/programs
---- kdebase-3.5.8/kdesktop/kwebdesktop/kwebdesktop.cpp	2007-01-15 06:32:10.000000000 -0500
-+++ kdebase-3.5.8-new/kdesktop/kwebdesktop/kwebdesktop.cpp	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kdesktop/kwebdesktop/kwebdesktop.cpp kdebase-3.5.9-new/kdesktop/kwebdesktop/kwebdesktop.cpp
+--- kdebase-3.5.9/kdesktop/kwebdesktop/kwebdesktop.cpp	2007-01-15 06:32:10.000000000 -0500
++++ kdebase-3.5.9-new/kdesktop/kwebdesktop/kwebdesktop.cpp	2008-02-13 21:05:55.000000000 -0500
 @@ -84,7 +84,7 @@
  }
  
@@ -575,8 +608,9 @@
  {
      KAboutData data( "kwebdesktop", I18N_NOOP("KDE Web Desktop"),
                       VERSION,
---- kdebase-3.5.8/kdesktop/lock/Makefile.am	2005-09-10 04:25:41.000000000 -0400
-+++ kdebase-3.5.8-new/kdesktop/lock/Makefile.am	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kdesktop/lock/Makefile.am kdebase-3.5.9-new/kdesktop/lock/Makefile.am
+--- kdebase-3.5.9/kdesktop/lock/Makefile.am	2005-09-10 04:25:41.000000000 -0400
++++ kdebase-3.5.9-new/kdesktop/lock/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -1,14 +1,16 @@
  ## Makefile.am of kdebase/kdesktop/lock
  
@@ -598,8 +632,9 @@
  
  noinst_HEADERS = lockprocess.h lockdlg.h autologout.h main.h
  
---- kdebase-3.5.8/kdesktop/lock/main.cc	2006-03-17 05:17:37.000000000 -0500
-+++ kdebase-3.5.8-new/kdesktop/lock/main.cc	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kdesktop/lock/main.cc kdebase-3.5.9-new/kdesktop/lock/main.cc
+--- kdebase-3.5.9/kdesktop/lock/main.cc	2006-03-17 05:17:37.000000000 -0500
++++ kdebase-3.5.9-new/kdesktop/lock/main.cc	2008-02-13 21:05:55.000000000 -0500
 @@ -59,7 +59,7 @@
  
  // -----------------------------------------------------------------------------
@@ -609,8 +644,9 @@
  {
      KLocale::setMainCatalogue("kdesktop");
  
---- kdebase-3.5.8/kdesu/kdesu/Makefile.am	2005-09-10 04:26:14.000000000 -0400
-+++ kdebase-3.5.8-new/kdesu/kdesu/Makefile.am	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kdesu/kdesu/Makefile.am kdebase-3.5.9-new/kdesu/kdesu/Makefile.am
+--- kdebase-3.5.9/kdesu/kdesu/Makefile.am	2005-09-10 04:26:14.000000000 -0400
++++ kdebase-3.5.9-new/kdesu/kdesu/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -3,11 +3,14 @@
  INCLUDES= $(all_includes)
  
@@ -631,8 +667,9 @@
  noinst_HEADERS = sudlg.h
  
  ## Messages
---- kdebase-3.5.8/kdesu/kdesu/kdesu.cpp	2006-05-22 14:13:07.000000000 -0400
-+++ kdebase-3.5.8-new/kdesu/kdesu/kdesu.cpp	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kdesu/kdesu/kdesu.cpp kdebase-3.5.9-new/kdesu/kdesu/kdesu.cpp
+--- kdebase-3.5.9/kdesu/kdesu/kdesu.cpp	2008-02-13 04:40:49.000000000 -0500
++++ kdebase-3.5.9-new/kdesu/kdesu/kdesu.cpp	2008-02-13 21:05:55.000000000 -0500
 @@ -86,7 +86,7 @@
  
  static int startApp();
@@ -642,8 +679,9 @@
  {
      // FIXME: this can be considered a poor man's solution, as it's not
      // directly obvious to a gui user. :)
---- kdebase-3.5.8/kdesu/kdesud/Makefile.am	2005-09-10 04:26:13.000000000 -0400
-+++ kdebase-3.5.8-new/kdesu/kdesud/Makefile.am	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kdesu/kdesud/Makefile.am kdebase-3.5.9-new/kdesu/kdesud/Makefile.am
+--- kdebase-3.5.9/kdesu/kdesud/Makefile.am	2005-09-10 04:26:13.000000000 -0400
++++ kdebase-3.5.9-new/kdesu/kdesud/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -4,10 +4,13 @@
  
  KDE_CXXFLAGS = $(KDE_USE_FPIE)
@@ -662,8 +700,9 @@
  noinst_HEADERS = repo.h handler.h lexer.h secure.h
  
  ## kdesud needs to be suid or sgid something
---- kdebase-3.5.8/kdesu/kdesud/kdesud.cpp	2007-05-14 03:55:53.000000000 -0400
-+++ kdebase-3.5.8-new/kdesu/kdesud/kdesud.cpp	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kdesu/kdesud/kdesud.cpp kdebase-3.5.9-new/kdesu/kdesud/kdesud.cpp
+--- kdebase-3.5.9/kdesu/kdesud/kdesud.cpp	2007-05-14 03:55:53.000000000 -0400
++++ kdebase-3.5.9-new/kdesu/kdesud/kdesud.cpp	2008-02-13 21:05:55.000000000 -0500
 @@ -246,7 +246,7 @@
   * Main program
   */
@@ -673,8 +712,9 @@
  {
      KAboutData aboutData("kdesud", I18N_NOOP("KDE su daemon"),
              Version, I18N_NOOP("Daemon used by kdesu"),
---- kdebase-3.5.8/kdialog/Makefile.am	2005-09-10 04:25:36.000000000 -0400
-+++ kdebase-3.5.8-new/kdialog/Makefile.am	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kdialog/Makefile.am kdebase-3.5.9-new/kdialog/Makefile.am
+--- kdebase-3.5.9/kdialog/Makefile.am	2005-09-10 04:25:36.000000000 -0400
++++ kdebase-3.5.9-new/kdialog/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -1,11 +1,13 @@
  KDE_CXXFLAGS = -DQT_NO_CAST_ASCII -DQT_NO_ASCII_CAST
  INCLUDES = $(all_includes)
@@ -693,8 +733,9 @@
  
  METASOURCES = AUTO
  
---- kdebase-3.5.8/kdialog/kdialog.cpp	2006-05-22 14:12:42.000000000 -0400
-+++ kdebase-3.5.8-new/kdialog/kdialog.cpp	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kdialog/kdialog.cpp kdebase-3.5.9-new/kdialog/kdialog.cpp
+--- kdebase-3.5.9/kdialog/kdialog.cpp	2006-05-22 14:12:42.000000000 -0400
++++ kdebase-3.5.9-new/kdialog/kdialog.cpp	2008-02-13 21:05:55.000000000 -0500
 @@ -660,7 +660,7 @@
  }
  
@@ -704,21 +745,23 @@
  {
    KAboutData aboutData( "kdialog", I18N_NOOP("KDialog"),
                          "1.0", I18N_NOOP( "KDialog can be used to show nice dialog boxes from shell scripts" ),
---- kdebase-3.5.8/kdm/kfrontend/kdm_greet.c	2005-10-10 11:04:31.000000000 -0400
-+++ kdebase-3.5.8-new/kdm/kfrontend/kdm_greet.c	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kdm/kfrontend/kdm_greet.c kdebase-3.5.9-new/kdm/kfrontend/kdm_greet.c
+--- kdebase-3.5.9/kdm/kfrontend/kdm_greet.c	2005-10-10 11:04:31.000000000 -0400
++++ kdebase-3.5.9-new/kdm/kfrontend/kdm_greet.c	2008-02-13 21:05:55.000000000 -0500
 @@ -44,8 +44,9 @@
  # include <sched.h>
  #endif
  
-+#include <X11/Xlib.h>
+-#if defined(HAVE_XTEST) || defined(HAVE_XKB)
+ # include <X11/Xlib.h>
 +
- #if defined(HAVE_XTEST) || defined(HAVE_XKB)
--# include <X11/Xlib.h>
++#if defined(HAVE_XTEST) || defined(HAVE_XKB)
  # include <X11/keysym.h>
  #endif
  
---- kdebase-3.5.8/kfind/Makefile.am	2005-09-10 04:25:00.000000000 -0400
-+++ kdebase-3.5.8-new/kfind/Makefile.am	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kfind/Makefile.am kdebase-3.5.9-new/kfind/Makefile.am
+--- kdebase-3.5.9/kfind/Makefile.am	2005-09-10 04:25:00.000000000 -0400
++++ kdebase-3.5.9-new/kfind/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -28,9 +28,12 @@
  
  #And this is for kfind
@@ -736,8 +779,9 @@
  # the library search path.
 -kfind_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 +kfind_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
---- kdebase-3.5.8/kfind/main.cpp	2005-09-10 04:25:00.000000000 -0400
-+++ kdebase-3.5.8-new/kfind/main.cpp	2007-10-17 10:17:28.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kfind/main.cpp kdebase-3.5.9-new/kfind/main.cpp
+--- kdebase-3.5.9/kfind/main.cpp	2005-09-10 04:25:00.000000000 -0400
++++ kdebase-3.5.9-new/kfind/main.cpp	2008-02-13 21:05:55.000000000 -0500
 @@ -19,7 +19,7 @@
    KCmdLineLastOption
  };
@@ -747,8 +791,9 @@
  {
    KLocale::setMainCatalogue("kfindpart");
    KAboutData aboutData( "kfind", I18N_NOOP("KFind"),
---- kdebase-3.5.8/khelpcenter/Makefile.am	2005-09-10 04:25:18.000000000 -0400
-+++ kdebase-3.5.8-new/khelpcenter/Makefile.am	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/khelpcenter/Makefile.am kdebase-3.5.9-new/khelpcenter/Makefile.am
+--- kdebase-3.5.9/khelpcenter/Makefile.am	2005-09-10 04:25:18.000000000 -0400
++++ kdebase-3.5.9-new/khelpcenter/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -3,14 +3,14 @@
  INCLUDES = $(all_includes)
  METASOURCES = AUTO
@@ -769,8 +814,9 @@
  
  khelpcenter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
  khelpcenter_la_LIBADD = $(LIB_KHTML)
---- kdebase-3.5.8/khelpcenter/htmlsearch/Makefile.am	2005-09-10 04:25:18.000000000 -0400
-+++ kdebase-3.5.8-new/khelpcenter/htmlsearch/Makefile.am	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/khelpcenter/htmlsearch/Makefile.am kdebase-3.5.9-new/khelpcenter/htmlsearch/Makefile.am
+--- kdebase-3.5.9/khelpcenter/htmlsearch/Makefile.am	2005-09-10 04:25:18.000000000 -0400
++++ kdebase-3.5.9-new/khelpcenter/htmlsearch/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -21,14 +21,15 @@
  
  xdg_apps_DATA = htmlsearch.desktop
@@ -791,8 +837,9 @@
  
  xpm_DATA = unchecked.xpm checked.xpm
  xpmdir = $(kde_datadir)/khelpcenter/pics
---- kdebase-3.5.8/khelpcenter/htmlsearch/index.cpp	2005-09-10 04:25:18.000000000 -0400
-+++ kdebase-3.5.8-new/khelpcenter/htmlsearch/index.cpp	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/khelpcenter/htmlsearch/index.cpp kdebase-3.5.9-new/khelpcenter/htmlsearch/index.cpp
+--- kdebase-3.5.9/khelpcenter/htmlsearch/index.cpp	2005-09-10 04:25:18.000000000 -0400
++++ kdebase-3.5.9-new/khelpcenter/htmlsearch/index.cpp	2008-02-13 21:05:55.000000000 -0500
 @@ -13,7 +13,7 @@
  };
  
@@ -802,8 +849,9 @@
  {
    KAboutData aboutData( "khtmlindex", I18N_NOOP("KHtmlIndex"),
  	"",
---- kdebase-3.5.8/khelpcenter/khc_indexbuilder.cpp	2007-10-08 05:51:18.000000000 -0400
-+++ kdebase-3.5.8-new/khelpcenter/khc_indexbuilder.cpp	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/khelpcenter/khc_indexbuilder.cpp kdebase-3.5.9-new/khelpcenter/khc_indexbuilder.cpp
+--- kdebase-3.5.9/khelpcenter/khc_indexbuilder.cpp	2007-10-08 05:51:18.000000000 -0400
++++ kdebase-3.5.9-new/khelpcenter/khc_indexbuilder.cpp	2008-02-13 21:05:55.000000000 -0500
 @@ -168,7 +168,7 @@
    KCmdLineLastOption
  };
@@ -813,8 +861,9 @@
  {
    KAboutData aboutData( "khc_indexbuilder",
                          I18N_NOOP("KHelpCenter Index Builder"),
---- kdebase-3.5.8/kicker/extensions/kasbar/Makefile.am	2005-09-10 04:25:29.000000000 -0400
-+++ kdebase-3.5.8-new/kicker/extensions/kasbar/Makefile.am	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kicker/extensions/kasbar/Makefile.am kdebase-3.5.9-new/kicker/extensions/kasbar/Makefile.am
+--- kdebase-3.5.9/kicker/extensions/kasbar/Makefile.am	2005-09-10 04:25:29.000000000 -0400
++++ kdebase-3.5.9-new/kicker/extensions/kasbar/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -35,10 +35,12 @@
  
  EXTRA_DIST = $(lnk_DATA)
@@ -832,8 +881,9 @@
  		$(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
  
  
---- kdebase-3.5.8/kicker/extensions/kasbar/kasbarapp.cpp	2005-10-10 11:03:59.000000000 -0400
-+++ kdebase-3.5.8-new/kicker/extensions/kasbar/kasbarapp.cpp	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kicker/extensions/kasbar/kasbarapp.cpp kdebase-3.5.9-new/kicker/extensions/kasbar/kasbarapp.cpp
+--- kdebase-3.5.9/kicker/extensions/kasbar/kasbarapp.cpp	2005-10-10 11:03:59.000000000 -0400
++++ kdebase-3.5.9-new/kicker/extensions/kasbar/kasbarapp.cpp	2008-02-13 21:05:55.000000000 -0500
 @@ -73,7 +73,7 @@
     KCmdLineLastOption
  };
@@ -843,8 +893,9 @@
  {
    KCmdLineArgs::init( argc, argv, "kasbar", "KasBar", I18N_NOOP( "An alternative task manager" ), VERSION_STRING );
    KCmdLineArgs::addCmdLineOptions( options );
---- kdebase-3.5.8/kioslave/info/kde-info2html.conf	2005-09-10 04:25:37.000000000 -0400
-+++ kdebase-3.5.8-new/kioslave/info/kde-info2html.conf	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kioslave/info/kde-info2html.conf kdebase-3.5.9-new/kioslave/info/kde-info2html.conf
+--- kdebase-3.5.9/kioslave/info/kde-info2html.conf	2005-09-10 04:25:37.000000000 -0400
++++ kdebase-3.5.9-new/kioslave/info/kde-info2html.conf	2008-02-13 21:05:55.000000000 -0500
 @@ -25,6 +25,7 @@
  
  #-- location of info files.
@@ -853,8 +904,9 @@
  	    "/usr/share/info",
  	    "/usr/info",
  	    "/usr/lib/info",
---- kdebase-3.5.8/kioslave/ldap/configure.in.in	2005-10-10 11:04:01.000000000 -0400
-+++ kdebase-3.5.8-new/kioslave/ldap/configure.in.in	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kioslave/ldap/configure.in.in kdebase-3.5.9-new/kioslave/ldap/configure.in.in
+--- kdebase-3.5.9/kioslave/ldap/configure.in.in	2005-10-10 11:04:01.000000000 -0400
++++ kdebase-3.5.9-new/kioslave/ldap/configure.in.in	2008-02-13 21:05:55.000000000 -0500
 @@ -38,10 +38,11 @@
  case "$with_ldap" in
  no) AC_MSG_RESULT(no) ;;
@@ -868,8 +920,9 @@
    ;;
  FOUND)
    AC_MSG_RESULT(incs=$ldap_incdir libs=$ldap_libdir)
---- kdebase-3.5.8/kioslave/man/kio_man.cpp	2007-10-08 05:51:22.000000000 -0400
-+++ kdebase-3.5.8-new/kioslave/man/kio_man.cpp	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kioslave/man/kio_man.cpp kdebase-3.5.9-new/kioslave/man/kio_man.cpp
+--- kdebase-3.5.9/kioslave/man/kio_man.cpp	2007-10-08 05:51:22.000000000 -0400
++++ kdebase-3.5.9-new/kioslave/man/kio_man.cpp	2008-02-13 21:05:55.000000000 -0500
 @@ -50,7 +50,7 @@
  
  MANProtocol *MANProtocol::_self = 0;
@@ -887,16 +940,18 @@
          "/usr/X11/man",
          "/usr/X11R6/man",
          "/usr/man",
---- kdebase-3.5.8/kioslave/media/configure.in.in	2007-05-14 03:55:41.000000000 -0400
-+++ kdebase-3.5.8-new/kioslave/media/configure.in.in	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kioslave/media/configure.in.in kdebase-3.5.9-new/kioslave/media/configure.in.in
+--- kdebase-3.5.9/kioslave/media/configure.in.in	2007-05-14 03:55:41.000000000 -0400
++++ kdebase-3.5.9-new/kioslave/media/configure.in.in	2008-02-13 21:05:55.000000000 -0500
 @@ -182,3 +182,5 @@
  
  AC_CHECK_FUNCS(statvfs)
  
 +AC_CHECK_FUNCS(statvfs)
 +
---- kdebase-3.5.8/kioslave/media/mounthelper/Makefile.am	2006-07-22 04:15:42.000000000 -0400
-+++ kdebase-3.5.8-new/kioslave/media/mounthelper/Makefile.am	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kioslave/media/mounthelper/Makefile.am kdebase-3.5.9-new/kioslave/media/mounthelper/Makefile.am
+--- kdebase-3.5.9/kioslave/media/mounthelper/Makefile.am	2006-07-22 04:15:42.000000000 -0400
++++ kdebase-3.5.9-new/kioslave/media/mounthelper/Makefile.am	2008-02-13 21:05:55.000000000 -0500
 @@ -1,12 +1,14 @@
 -bin_PROGRAMS = kio_media_mounthelper
 +bin_PROGRAMS =
@@ -916,8 +971,9 @@
  
  METASOURCES = AUTO
  
---- kdebase-3.5.8/kioslave/media/mounthelper/kio_media_mounthelper.cpp	2007-05-14 03:55:40.000000000 -0400
-+++ kdebase-3.5.8-new/kioslave/media/mounthelper/kio_media_mounthelper.cpp	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kioslave/media/mounthelper/kio_media_mounthelper.cpp kdebase-3.5.9-new/kioslave/media/mounthelper/kio_media_mounthelper.cpp
+--- kdebase-3.5.9/kioslave/media/mounthelper/kio_media_mounthelper.cpp	2007-05-14 03:55:40.000000000 -0400
++++ kdebase-3.5.9-new/kioslave/media/mounthelper/kio_media_mounthelper.cpp	2008-02-13 21:05:56.000000000 -0500
 @@ -188,7 +188,7 @@
  };
  
@@ -927,8 +983,9 @@
  {
  	KCmdLineArgs::init(argc, argv, "kio_media_mounthelper",
  	                   "kio_media_mounthelper", "kio_media_mounthelper",
---- kdebase-3.5.8/kioslave/nfs/mount_xdr.c	2005-09-10 04:25:37.000000000 -0400
-+++ kdebase-3.5.8-new/kioslave/nfs/mount_xdr.c	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kioslave/nfs/mount_xdr.c kdebase-3.5.9-new/kioslave/nfs/mount_xdr.c
+--- kdebase-3.5.9/kioslave/nfs/mount_xdr.c	2005-09-10 04:25:37.000000000 -0400
++++ kdebase-3.5.9-new/kioslave/nfs/mount_xdr.c	2008-02-13 21:05:56.000000000 -0500
 @@ -43,6 +43,13 @@
  
  /* from @(#)mount.x	1.3 91/03/11 TIRPC 1.0 */
@@ -943,8 +1000,9 @@
  bool_t
  xdr_fhandle(XDR *xdrs, fhandle objp)
  {
---- kdebase-3.5.8/kioslave/trash/Makefile.am	2005-09-10 04:25:37.000000000 -0400
-+++ kdebase-3.5.8-new/kioslave/trash/Makefile.am	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kioslave/trash/Makefile.am kdebase-3.5.9-new/kioslave/trash/Makefile.am
+--- kdebase-3.5.9/kioslave/trash/Makefile.am	2005-09-10 04:25:37.000000000 -0400
++++ kdebase-3.5.9-new/kioslave/trash/Makefile.am	2008-02-13 21:05:56.000000000 -0500
 @@ -9,10 +9,13 @@
  kio_trash_la_LIBADD  = libtrashcommon.la $(LIB_KIO)
  kio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
@@ -963,8 +1021,9 @@
  
  kde_services_DATA = trash.protocol
  
---- kdebase-3.5.8/kioslave/trash/ktrash.cpp	2005-10-10 11:04:01.000000000 -0400
-+++ kdebase-3.5.8-new/kioslave/trash/ktrash.cpp	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kioslave/trash/ktrash.cpp kdebase-3.5.9-new/kioslave/trash/ktrash.cpp
+--- kdebase-3.5.9/kioslave/trash/ktrash.cpp	2005-10-10 11:04:01.000000000 -0400
++++ kdebase-3.5.9-new/kioslave/trash/ktrash.cpp	2008-02-13 21:05:56.000000000 -0500
 @@ -35,7 +35,7 @@
      KCmdLineLastOption
  };
@@ -974,8 +1033,9 @@
  {
      KApplication::disableAutoDcopRegistration();
      KCmdLineArgs::init( argc, argv, "ktrash",
---- kdebase-3.5.8/knetattach/Makefile.am	2005-09-10 04:25:49.000000000 -0400
-+++ kdebase-3.5.8-new/knetattach/Makefile.am	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/knetattach/Makefile.am kdebase-3.5.9-new/knetattach/Makefile.am
+--- kdebase-3.5.9/knetattach/Makefile.am	2005-09-10 04:25:49.000000000 -0400
++++ kdebase-3.5.9-new/knetattach/Makefile.am	2008-02-13 21:05:56.000000000 -0500
 @@ -1,9 +1,12 @@
  INCLUDES= $(all_includes)
  
@@ -993,8 +1053,9 @@
  METASOURCES = AUTO
  xdg_apps_DATA = knetattach.desktop
  KDE_ICON = AUTO
---- kdebase-3.5.8/knetattach/main.cpp	2005-10-10 11:04:20.000000000 -0400
-+++ kdebase-3.5.8-new/knetattach/main.cpp	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/knetattach/main.cpp kdebase-3.5.9-new/knetattach/main.cpp
+--- kdebase-3.5.9/knetattach/main.cpp	2005-10-10 11:04:20.000000000 -0400
++++ kdebase-3.5.9-new/knetattach/main.cpp	2008-02-13 21:05:56.000000000 -0500
 @@ -25,7 +25,7 @@
  
  #include "knetattach.h"
@@ -1004,8 +1065,9 @@
  	KAboutData about("knetattach", I18N_NOOP("KDE Network Wizard"), "1.0",
  		I18N_NOOP("KDE Network Wizard"),
  		KAboutData::License_GPL,
---- kdebase-3.5.8/konqueror/keditbookmarks/Makefile.am	2005-09-10 04:25:49.000000000 -0400
-+++ kdebase-3.5.8-new/konqueror/keditbookmarks/Makefile.am	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/konqueror/keditbookmarks/Makefile.am kdebase-3.5.9-new/konqueror/keditbookmarks/Makefile.am
+--- kdebase-3.5.9/konqueror/keditbookmarks/Makefile.am	2005-09-10 04:25:49.000000000 -0400
++++ kdebase-3.5.9-new/konqueror/keditbookmarks/Makefile.am	2008-02-13 21:05:56.000000000 -0500
 @@ -2,13 +2,13 @@
  
  METASOURCES = AUTO
@@ -1025,8 +1087,9 @@
  
  dcop_DCOPIDLNG = true
  keditbookmarks_la_SOURCES = main.cpp listview.cpp toplevel.cpp actionsimpl.cpp commands.cpp importers.cpp dcop.skel dcop.cpp bookmarkiterator.cpp  \
---- kdebase-3.5.8/konqueror/keditbookmarks/kbookmarkmerger.cpp	2005-09-10 04:25:49.000000000 -0400
-+++ kdebase-3.5.8-new/konqueror/keditbookmarks/kbookmarkmerger.cpp	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/konqueror/keditbookmarks/kbookmarkmerger.cpp kdebase-3.5.9-new/konqueror/keditbookmarks/kbookmarkmerger.cpp
+--- kdebase-3.5.9/konqueror/keditbookmarks/kbookmarkmerger.cpp	2005-09-10 04:25:49.000000000 -0400
++++ kdebase-3.5.9-new/konqueror/keditbookmarks/kbookmarkmerger.cpp	2008-02-13 21:05:56.000000000 -0500
 @@ -55,7 +55,7 @@
  	return XGetSelectionOwner( dpy, atom ) != None;
  }
@@ -1036,8 +1099,9 @@
  {
  	const bool kdeRunning = kdeIsRunning();
  
---- kdebase-3.5.8/kpager/Makefile.am	2005-09-10 04:25:36.000000000 -0400
-+++ kdebase-3.5.8-new/kpager/Makefile.am	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kpager/Makefile.am kdebase-3.5.9-new/kpager/Makefile.am
+--- kdebase-3.5.9/kpager/Makefile.am	2005-09-10 04:25:36.000000000 -0400
++++ kdebase-3.5.9-new/kpager/Makefile.am	2008-02-13 21:05:56.000000000 -0500
 @@ -1,14 +1,16 @@
  INCLUDES= $(all_includes)
  
@@ -1060,8 +1124,9 @@
  
  KDE_ICON = kpager
  
---- kdebase-3.5.8/kpager/main.cpp	2005-10-10 11:04:00.000000000 -0400
-+++ kdebase-3.5.8-new/kpager/main.cpp	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kpager/main.cpp kdebase-3.5.9-new/kpager/main.cpp
+--- kdebase-3.5.9/kpager/main.cpp	2005-10-10 11:04:00.000000000 -0400
++++ kdebase-3.5.9-new/kpager/main.cpp	2008-02-13 21:05:56.000000000 -0500
 @@ -62,7 +62,7 @@
  
  };
@@ -1071,8 +1136,9 @@
  {
      KAboutData *aboutdata = new KAboutData("kpager", "KPager", "1.5",
  					   I18N_NOOP("Desktop Overview"), KAboutData::License_GPL,
---- kdebase-3.5.8/kpersonalizer/Makefile.am	2005-09-10 04:25:00.000000000 -0400
-+++ kdebase-3.5.8-new/kpersonalizer/Makefile.am	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kpersonalizer/Makefile.am kdebase-3.5.9-new/kpersonalizer/Makefile.am
+--- kdebase-3.5.9/kpersonalizer/Makefile.am	2005-09-10 04:25:00.000000000 -0400
++++ kdebase-3.5.9-new/kpersonalizer/Makefile.am	2008-02-13 21:05:56.000000000 -0500
 @@ -1,11 +1,14 @@
 -bin_PROGRAMS = kpersonalizer
 -kpersonalizer_SOURCES = stylepreview.ui krefinepage.cpp \
@@ -1100,8 +1166,9 @@
  
  # Uncomment the following two lines if you add a ui.rc file for your application to make use of
  # KDE\xB4s XML GUI builing
---- kdebase-3.5.8/kpersonalizer/main.cpp	2005-09-10 04:25:00.000000000 -0400
-+++ kdebase-3.5.8-new/kpersonalizer/main.cpp	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kpersonalizer/main.cpp kdebase-3.5.9-new/kpersonalizer/main.cpp
+--- kdebase-3.5.9/kpersonalizer/main.cpp	2005-09-10 04:25:00.000000000 -0400
++++ kdebase-3.5.9-new/kpersonalizer/main.cpp	2008-02-13 21:05:56.000000000 -0500
 @@ -33,7 +33,7 @@
          KCmdLineLastOption
  };
@@ -1111,8 +1178,9 @@
  {
  	KAboutData aboutData( "kpersonalizer", I18N_NOOP("KPersonalizer"),
  		VERSION, description, KAboutData::License_GPL,
---- kdebase-3.5.8/kreadconfig/Makefile.am	2005-09-10 04:25:36.000000000 -0400
-+++ kdebase-3.5.8-new/kreadconfig/Makefile.am	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kreadconfig/Makefile.am kdebase-3.5.9-new/kreadconfig/Makefile.am
+--- kdebase-3.5.9/kreadconfig/Makefile.am	2005-09-10 04:25:36.000000000 -0400
++++ kdebase-3.5.9-new/kreadconfig/Makefile.am	2008-02-13 21:05:56.000000000 -0500
 @@ -1,12 +1,17 @@
  AM_CPPFLAGS = -DQT_NO_CAST_ASCII 
  
@@ -1136,8 +1204,9 @@
  
  messages:
  	$(XGETTEXT) $(kreadconfig_SOURCES) -o $(podir)/kreadconfig.pot
---- kdebase-3.5.8/kreadconfig/kreadconfig.cpp	2005-09-10 04:25:36.000000000 -0400
-+++ kdebase-3.5.8-new/kreadconfig/kreadconfig.cpp	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kreadconfig/kreadconfig.cpp kdebase-3.5.9-new/kreadconfig/kreadconfig.cpp
+--- kdebase-3.5.9/kreadconfig/kreadconfig.cpp	2005-09-10 04:25:36.000000000 -0400
++++ kdebase-3.5.9-new/kreadconfig/kreadconfig.cpp	2008-02-13 21:05:56.000000000 -0500
 @@ -41,7 +41,7 @@
  	{ "type <type>", I18N_NOOP("Type of variable"), 0 },
          KCmdLineLastOption
@@ -1147,8 +1216,9 @@
  {
  	KAboutData aboutData("kreadconfig", I18N_NOOP("KReadConfig"),
  		"1.0.1",
---- kdebase-3.5.8/kreadconfig/kwriteconfig.cpp	2005-09-10 04:25:36.000000000 -0400
-+++ kdebase-3.5.8-new/kreadconfig/kwriteconfig.cpp	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kreadconfig/kwriteconfig.cpp kdebase-3.5.9-new/kreadconfig/kwriteconfig.cpp
+--- kdebase-3.5.9/kreadconfig/kwriteconfig.cpp	2005-09-10 04:25:36.000000000 -0400
++++ kdebase-3.5.9-new/kreadconfig/kwriteconfig.cpp	2008-02-13 21:05:56.000000000 -0500
 @@ -23,7 +23,7 @@
  	{ "+value", I18N_NOOP( "The value to write. Mandatory, on a shell use '' for empty" ), 0 },
          KCmdLineLastOption
@@ -1158,8 +1228,9 @@
  {
  	KAboutData aboutData("kwriteconfig", I18N_NOOP("KWriteConfig"),
  		"1.0.0",
---- kdebase-3.5.8/ksplashml/Makefile.am	2005-09-10 04:25:51.000000000 -0400
-+++ kdebase-3.5.8-new/ksplashml/Makefile.am	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/ksplashml/Makefile.am kdebase-3.5.9-new/ksplashml/Makefile.am
+--- kdebase-3.5.9/ksplashml/Makefile.am	2005-09-10 04:25:51.000000000 -0400
++++ kdebase-3.5.9-new/ksplashml/Makefile.am	2008-02-13 21:05:56.000000000 -0500
 @@ -4,10 +4,13 @@
  
  METASOURCES=AUTO
@@ -1178,8 +1249,9 @@
  
  noinst_HEADERS = ksplashiface.h wndmain.h
  
---- kdebase-3.5.8/ksplashml/main.cpp	2005-09-10 04:25:51.000000000 -0400
-+++ kdebase-3.5.8-new/ksplashml/main.cpp	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/ksplashml/main.cpp kdebase-3.5.9-new/ksplashml/main.cpp
+--- kdebase-3.5.9/ksplashml/main.cpp	2005-09-10 04:25:51.000000000 -0400
++++ kdebase-3.5.9-new/ksplashml/main.cpp	2008-02-13 21:05:56.000000000 -0500
 @@ -37,7 +37,7 @@
    KCmdLineLastOption
  };
@@ -1189,8 +1261,9 @@
  {
    KAboutData about(
      "ksplash",
---- kdebase-3.5.8/ksplashml/themeengine/simple/Makefile.am	2005-09-10 04:25:50.000000000 -0400
-+++ kdebase-3.5.8-new/ksplashml/themeengine/simple/Makefile.am	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/ksplashml/themeengine/simple/Makefile.am kdebase-3.5.9-new/ksplashml/themeengine/simple/Makefile.am
+--- kdebase-3.5.9/ksplashml/themeengine/simple/Makefile.am	2005-09-10 04:25:50.000000000 -0400
++++ kdebase-3.5.9-new/ksplashml/themeengine/simple/Makefile.am	2008-02-13 21:05:56.000000000 -0500
 @@ -1,7 +1,10 @@
  
  INCLUDES = $(all_includes)
@@ -1206,8 +1279,9 @@
 +ksplashsimple_la_SOURCES = main.cpp
 +ksplashsimple_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 +ksplashsimple_la_LIBADD = $(LIB_XINERAMA) $(LIB_X11)
---- kdebase-3.5.8/ksplashml/themeengine/simple/main.cpp	2006-10-01 13:32:04.000000000 -0400
-+++ kdebase-3.5.8-new/ksplashml/themeengine/simple/main.cpp	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/ksplashml/themeengine/simple/main.cpp kdebase-3.5.9-new/ksplashml/themeengine/simple/main.cpp
+--- kdebase-3.5.9/ksplashml/themeengine/simple/main.cpp	2006-10-01 13:32:04.000000000 -0400
++++ kdebase-3.5.9-new/ksplashml/themeengine/simple/main.cpp	2008-02-13 21:05:56.000000000 -0500
 @@ -31,10 +31,11 @@
  # endif
  #endif
@@ -1221,8 +1295,9 @@
      {
      if( fork() != 0 )
          return 0;
---- kdebase-3.5.8/kstart/Makefile.am	2005-09-10 04:25:55.000000000 -0400
-+++ kdebase-3.5.8-new/kstart/Makefile.am	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kstart/Makefile.am kdebase-3.5.9-new/kstart/Makefile.am
+--- kdebase-3.5.9/kstart/Makefile.am	2005-09-10 04:25:55.000000000 -0400
++++ kdebase-3.5.9-new/kstart/Makefile.am	2008-02-13 21:05:56.000000000 -0500
 @@ -6,10 +6,13 @@
  
  #######	Files
@@ -1241,8 +1316,9 @@
  METASOURCES =	kstart.moc 
  
  noinst_HEADERS = kstart.h version.h
---- kdebase-3.5.8/kstart/kstart.cpp	2005-09-10 04:25:55.000000000 -0400
-+++ kdebase-3.5.8-new/kstart/kstart.cpp	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kstart/kstart.cpp kdebase-3.5.9-new/kstart/kstart.cpp
+--- kdebase-3.5.9/kstart/kstart.cpp	2005-09-10 04:25:55.000000000 -0400
++++ kdebase-3.5.9-new/kstart/kstart.cpp	2008-02-13 21:05:56.000000000 -0500
 @@ -283,7 +283,7 @@
    KCmdLineLastOption
  };
@@ -1252,8 +1328,9 @@
  {
    // David, 05/03/2000
    KAboutData aboutData( "kstart", I18N_NOOP("KStart"), KSTART_VERSION,
---- kdebase-3.5.8/ksysguard/gui/Makefile.am	2005-09-10 04:26:15.000000000 -0400
-+++ kdebase-3.5.8-new/ksysguard/gui/Makefile.am	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/ksysguard/gui/Makefile.am kdebase-3.5.9-new/ksysguard/gui/Makefile.am
+--- kdebase-3.5.9/ksysguard/gui/Makefile.am	2005-09-10 04:26:15.000000000 -0400
++++ kdebase-3.5.9-new/ksysguard/gui/Makefile.am	2008-02-13 21:05:56.000000000 -0500
 @@ -18,21 +18,23 @@
   
  ####### This part is very ksysguard specific
@@ -1282,8 +1359,9 @@
  
  kpm_SOURCES = kpm.c
  
---- kdebase-3.5.8/ksysguard/gui/ksysguard.cc	2006-03-17 05:17:48.000000000 -0500
-+++ kdebase-3.5.8-new/ksysguard/gui/ksysguard.cc	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/ksysguard/gui/ksysguard.cc kdebase-3.5.9-new/ksysguard/gui/ksysguard.cc
+--- kdebase-3.5.9/ksysguard/gui/ksysguard.cc	2006-03-17 05:17:48.000000000 -0500
++++ kdebase-3.5.9-new/ksysguard/gui/ksysguard.cc	2008-02-13 21:05:56.000000000 -0500
 @@ -520,7 +520,7 @@
  /*
   * Once upon a time...
@@ -1293,8 +1371,9 @@
  {
    // initpipe is used to keep the parent process around till the child
    // has registered with dcop.
---- kdebase-3.5.8/ksystraycmd/Makefile.am	2005-09-10 04:26:16.000000000 -0400
-+++ kdebase-3.5.8-new/ksystraycmd/Makefile.am	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/ksystraycmd/Makefile.am kdebase-3.5.9-new/ksystraycmd/Makefile.am
+--- kdebase-3.5.9/ksystraycmd/Makefile.am	2005-09-10 04:26:16.000000000 -0400
++++ kdebase-3.5.9-new/ksystraycmd/Makefile.am	2008-02-13 21:05:56.000000000 -0500
 @@ -1,16 +1,19 @@
  ####### Fiddle here
  
@@ -1319,8 +1398,9 @@
  
  messages:
  	$(XGETTEXT) $(ksystraycmd_SOURCES) -o $(podir)/ksystraycmd.pot
---- kdebase-3.5.8/ksystraycmd/main.cpp	2006-10-01 13:32:16.000000000 -0400
-+++ kdebase-3.5.8-new/ksystraycmd/main.cpp	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/ksystraycmd/main.cpp kdebase-3.5.9-new/ksystraycmd/main.cpp
+--- kdebase-3.5.9/ksystraycmd/main.cpp	2006-10-01 13:32:16.000000000 -0400
++++ kdebase-3.5.9-new/ksystraycmd/main.cpp	2008-02-13 21:05:56.000000000 -0500
 @@ -46,7 +46,7 @@
    KCmdLineLastOption
  };
@@ -1330,8 +1410,9 @@
  {
    KAboutData aboutData( "ksystraycmd", I18N_NOOP( "KSysTrayCmd" ),
  			"KSysTrayCmd 0.1",
---- kdebase-3.5.8/ktip/Makefile.am	2005-09-10 04:25:55.000000000 -0400
-+++ kdebase-3.5.8-new/ktip/Makefile.am	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/ktip/Makefile.am kdebase-3.5.9-new/ktip/Makefile.am
+--- kdebase-3.5.9/ktip/Makefile.am	2005-09-10 04:25:55.000000000 -0400
++++ kdebase-3.5.9-new/ktip/Makefile.am	2008-02-13 21:05:56.000000000 -0500
 @@ -2,10 +2,13 @@
  
  SUBDIRS = pics
@@ -1350,8 +1431,9 @@
  
  METASOURCES = AUTO
  KDE_ICON = AUTO
---- kdebase-3.5.8/ktip/ktipwindow.cpp	2005-10-10 11:04:21.000000000 -0400
-+++ kdebase-3.5.8-new/ktip/ktipwindow.cpp	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/ktip/ktipwindow.cpp kdebase-3.5.9-new/ktip/ktipwindow.cpp
+--- kdebase-3.5.9/ktip/ktipwindow.cpp	2005-10-10 11:04:21.000000000 -0400
++++ kdebase-3.5.9-new/ktip/ktipwindow.cpp	2008-02-13 21:05:56.000000000 -0500
 @@ -31,7 +31,7 @@
  
  static const char description[] = I18N_NOOP("Useful tips");
@@ -1361,8 +1443,9 @@
  {
  	KAboutData aboutData("ktip", I18N_NOOP("KTip"),
  				"0.3", description, KAboutData::License_GPL,
---- kdebase-3.5.8/kwin/clients/kwmtheme/cli_installer/Makefile.am	2005-09-10 04:25:55.000000000 -0400
-+++ kdebase-3.5.8-new/kwin/clients/kwmtheme/cli_installer/Makefile.am	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kwin/clients/kwmtheme/cli_installer/Makefile.am kdebase-3.5.9-new/kwin/clients/kwmtheme/cli_installer/Makefile.am
+--- kdebase-3.5.9/kwin/clients/kwmtheme/cli_installer/Makefile.am	2005-09-10 04:25:55.000000000 -0400
++++ kdebase-3.5.9-new/kwin/clients/kwmtheme/cli_installer/Makefile.am	2008-02-13 21:05:56.000000000 -0500
 @@ -4,15 +4,17 @@
  
  ####### This part is very kwmtheme specific
@@ -1385,8 +1468,9 @@
 -kwmtheme_LDADD   = $(LIB_KDECORE)
 +kwmtheme_la_LIBADD   = $(LIB_KDECORE)
  
---- kdebase-3.5.8/kwin/clients/kwmtheme/cli_installer/main.cpp	2005-09-10 04:25:55.000000000 -0400
-+++ kdebase-3.5.8-new/kwin/clients/kwmtheme/cli_installer/main.cpp	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kwin/clients/kwmtheme/cli_installer/main.cpp kdebase-3.5.9-new/kwin/clients/kwmtheme/cli_installer/main.cpp
+--- kdebase-3.5.9/kwin/clients/kwmtheme/cli_installer/main.cpp	2005-09-10 04:25:55.000000000 -0400
++++ kdebase-3.5.9-new/kwin/clients/kwmtheme/cli_installer/main.cpp	2008-02-13 21:05:56.000000000 -0500
 @@ -37,7 +37,7 @@
      copyOutput.close();
  }
@@ -1396,8 +1480,9 @@
  {
      KCmdLineArgs::init(argc, argv, "kwmtheme", description, "0.1");
      KCmdLineArgs::addCmdLineOptions( options );
---- kdebase-3.5.8/kwin/killer/Makefile.am	2005-09-10 04:25:55.000000000 -0400
-+++ kdebase-3.5.8-new/kwin/killer/Makefile.am	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kwin/killer/Makefile.am kdebase-3.5.9-new/kwin/killer/Makefile.am
+--- kdebase-3.5.9/kwin/killer/Makefile.am	2005-09-10 04:25:55.000000000 -0400
++++ kdebase-3.5.9-new/kwin/killer/Makefile.am	2008-02-13 21:05:56.000000000 -0500
 @@ -1,9 +1,11 @@
  INCLUDES = $(all_includes)
  
@@ -1414,8 +1499,9 @@
 +kwin_killer_helper_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
  
  METASOURCES = AUTO
---- kdebase-3.5.8/kwin/killer/killer.cpp	2005-09-10 04:25:55.000000000 -0400
-+++ kdebase-3.5.8-new/kwin/killer/killer.cpp	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/kwin/killer/killer.cpp kdebase-3.5.9-new/kwin/killer/killer.cpp
+--- kdebase-3.5.9/kwin/killer/killer.cpp	2005-09-10 04:25:55.000000000 -0400
++++ kdebase-3.5.9-new/kwin/killer/killer.cpp	2008-02-13 21:05:56.000000000 -0500
 @@ -43,7 +43,7 @@
          KCmdLineLastOption
      };
@@ -1425,8 +1511,9 @@
      {
      KLocale::setMainCatalogue( "kwin" ); // the messages are in kwin's .po file
      KCmdLineArgs::init( argc, argv, "kwin_killer_helper", I18N_NOOP( "KWin" ),
---- kdebase-3.5.8/libkonq/Makefile.am	2005-10-10 11:04:21.000000000 -0400
-+++ kdebase-3.5.8-new/libkonq/Makefile.am	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/libkonq/Makefile.am kdebase-3.5.9-new/libkonq/Makefile.am
+--- kdebase-3.5.9/libkonq/Makefile.am	2005-10-10 11:04:21.000000000 -0400
++++ kdebase-3.5.9-new/libkonq/Makefile.am	2008-02-13 21:05:56.000000000 -0500
 @@ -21,7 +21,7 @@
  
  lib_LTLIBRARIES = libkonq.la
@@ -1436,8 +1523,9 @@
  
  libkonq_la_SOURCES = konq_popupmenu.cc knewmenu.cc \
     konq_xmlguiclient.cc\
---- kdebase-3.5.8/nsplugins/Makefile.am	2007-10-08 05:51:24.000000000 -0400
-+++ kdebase-3.5.8-new/nsplugins/Makefile.am	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/nsplugins/Makefile.am kdebase-3.5.9-new/nsplugins/Makefile.am
+--- kdebase-3.5.9/nsplugins/Makefile.am	2007-10-08 05:51:24.000000000 -0400
++++ kdebase-3.5.9-new/nsplugins/Makefile.am	2008-02-13 21:05:56.000000000 -0500
 @@ -13,10 +13,13 @@
  libnsplugin_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_PLUGIN) -no-undefined
  libnsplugin_la_LIBADD  = -lkparts
@@ -1456,8 +1544,9 @@
  
  kcm_nsplugins_la_SOURCES = kcm_nsplugins.cpp 
  kcm_nsplugins_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
---- kdebase-3.5.8/nsplugins/pluginscan.cpp	2007-10-08 05:51:24.000000000 -0400
-+++ kdebase-3.5.8-new/nsplugins/pluginscan.cpp	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/nsplugins/pluginscan.cpp kdebase-3.5.9-new/nsplugins/pluginscan.cpp
+--- kdebase-3.5.9/nsplugins/pluginscan.cpp	2007-10-08 05:51:24.000000000 -0400
++++ kdebase-3.5.9-new/nsplugins/pluginscan.cpp	2008-02-13 21:05:56.000000000 -0500
 @@ -516,7 +516,7 @@
  };
  
@@ -1467,8 +1556,9 @@
  {
      KAboutData aboutData( "nspluginscan", I18N_NOOP("nspluginscan"),
                            "0.3", "nspluginscan", KAboutData::License_GPL,
---- kdebase-3.5.8/nsplugins/sdk/prcpucfg.h	2007-10-08 05:51:23.000000000 -0400
-+++ kdebase-3.5.8-new/nsplugins/sdk/prcpucfg.h	2007-10-17 10:21:11.000000000 -0400
+diff -uNbwr kdebase-3.5.9/nsplugins/sdk/prcpucfg.h kdebase-3.5.9-new/nsplugins/sdk/prcpucfg.h
+--- kdebase-3.5.9/nsplugins/sdk/prcpucfg.h	2008-02-13 04:40:38.000000000 -0500
++++ kdebase-3.5.9-new/nsplugins/sdk/prcpucfg.h	2008-02-13 21:05:56.000000000 -0500
 @@ -48,7 +48,7 @@
  
  #define PR_AF_INET6 10  /* same as AF_INET6 */
@@ -1478,10 +1568,11 @@
  
  #undef  IS_LITTLE_ENDIAN
  #define IS_BIG_ENDIAN    1
---- kdebase-3.5.8/nsplugins/viewer/Makefile.am	2005-09-10 04:25:39.000000000 -0400
-+++ kdebase-3.5.8-new/nsplugins/viewer/Makefile.am	2007-10-17 10:17:29.000000000 -0400
-@@ -1,12 +1,14 @@
- INCLUDES = -I$(top_srcdir)/nsplugins -I$(top_builddir)/nsplugins $(all_includes)
+diff -uNbwr kdebase-3.5.9/nsplugins/viewer/Makefile.am kdebase-3.5.9-new/nsplugins/viewer/Makefile.am
+--- kdebase-3.5.9/nsplugins/viewer/Makefile.am	2008-02-13 04:40:38.000000000 -0500
++++ kdebase-3.5.9-new/nsplugins/viewer/Makefile.am	2008-02-13 21:07:01.000000000 -0500
+@@ -1,11 +1,13 @@
+ INCLUDES = -I$(top_srcdir)/nsplugins -I$(top_builddir)/nsplugins $(all_includes) `pkg-config --cflags glib-2.0`
  METASOURCES = AUTO
  
 -bin_PROGRAMS = nspluginviewer 
@@ -1491,16 +1582,16 @@
  
 -nspluginviewer_SOURCES = NSPluginCallbackIface.stub NSPluginClassIface.skel \
 +nspluginviewer_la_SOURCES = NSPluginCallbackIface.stub NSPluginClassIface.skel \
- 	nsplugin.cpp viewer.cpp kxt.cpp qxteventloop.cpp
--nspluginviewer_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
+ 	nsplugin.cpp viewer.cpp kxt.cpp qxteventloop.cpp glibevents.cpp
+-nspluginviewer_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic `pkg-config --libs glib-2.0`
 -nspluginviewer_LDADD = $(LIB_KIO) $(LIB_KPARTS) -lXt
-+nspluginviewer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -export-dynamic -module
++nspluginviewer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -export-dynamic `pkg-config --libs glib-2.0`
 +nspluginviewer_la_LIBADD = $(LIB_KIO) $(LIB_KPARTS) -lXt
  
  NSPluginCallbackIface_DIR = $(srcdir)/..
- 
---- kdebase-3.5.8/nsplugins/viewer/viewer.cpp	2006-01-19 12:01:49.000000000 -0500
-+++ kdebase-3.5.8-new/nsplugins/viewer/viewer.cpp	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/nsplugins/viewer/viewer.cpp kdebase-3.5.9-new/nsplugins/viewer/viewer.cpp
+--- kdebase-3.5.9/nsplugins/viewer/viewer.cpp	2008-02-13 04:40:38.000000000 -0500
++++ kdebase-3.5.9-new/nsplugins/viewer/viewer.cpp	2008-02-13 21:05:56.000000000 -0500
 @@ -22,6 +22,9 @@
  
  */
@@ -1511,7 +1602,7 @@
  
  #include <config.h>
  
-@@ -213,7 +216,7 @@
+@@ -214,7 +217,7 @@
  #endif
  
  
@@ -1520,10 +1611,11 @@
  {
      // nspluginviewer is a helper app, it shouldn't do session management at all
     setenv( "SESSION_MANAGER", "", 1 );
---- kdebase-3.5.8/startkde	2007-10-08 07:09:44.000000000 -0400
-+++ kdebase-3.5.8-new/startkde	2007-10-17 10:17:29.000000000 -0400
+diff -uNbwr kdebase-3.5.9/startkde kdebase-3.5.9-new/startkde
+--- kdebase-3.5.9/startkde	2008-02-13 04:49:19.000000000 -0500
++++ kdebase-3.5.9-new/startkde	2008-02-13 21:05:56.000000000 -0500
 @@ -3,6 +3,11 @@
- #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.8 )
+ #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.9 )
  #
  
 +source "@FINKPREFIX@/bin/init.sh"

Modified: trunk/dports/kde/kdeedu3/Portfile
===================================================================
--- trunk/dports/kde/kdeedu3/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdeedu3/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,41 +1,42 @@
 # $Id$
 
-#Synced with Fink, Version 3.5.8-1021
+#Synced with Fink, revision 1.26
 
 PortSystem 1.0
 name		kdeedu3
-version		3.5.8
-set kdeadmin	kde-admindir-1024
-categories	kde
+version		3.5.10
+set kdeadmin	kde-admindir-1502
+categories	kde kde3
 maintainers	nomaintainer
 description	KDE educational games and software. \
 		NB No KDE sound support.
 long_description ${description}
 platforms	darwin
 homepage	http://www.kde.org/
-master_sites	kde:stable/${version}/src/:kde358 \
+master_sites	kde:stable/${version}/src/:kde \
 		http://ranger.users.finkproject.org/distfiles/kde-admindir/:admin \
 		http://ranger.befunk.com/fink/kde-admindir/:admin \
 		http://astrange.ithinksw.net/~astrange/ranger-fink/kde-admindir/:admin \
 		http://www.southofheaven.net/befunk/kde-admindir/:admin
 use_bzip2	yes
 distname	kdeedu-${version}
-distfiles	${distname}.tar.bz2:kde358 \
+distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
+dist_subdir     kde3
 depends_build	port:autoconf \
 		port:unsermake
 depends_lib	port:kdebase3
 
-checksums	${distname}.tar.bz2 md5 aaae4c6fe82c806eb20942178cadad9e \
-		${kdeadmin}.tar.bz2 md5 d99491aa5d520fd1d70393a718019322
+checksums	${distname}.tar.bz2 md5 1b1466bf4cb0a59b1abd8613a2588142 \
+		${kdeadmin}.tar.bz2 md5 92a60282c1d81f38835ce7d495255cc3
 
 extract.only	${distname}.tar.bz2
 post-extract	{ system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
 
 patchfiles	kdeedu3.patch
 patch		{
-		foreach file $patchfiles {
-		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
+		foreach f $patchfiles {
+		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${f} | patch -p1"
 		}
 		system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' ${worksrcpath}/admin/*"
 }
@@ -44,22 +45,23 @@
 		reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|HOME=/tmp|HOME=${workpath}|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|/tmp/buildlog|${workpath}/buildlog|g" ${worksrcpath}/build-helper.sh
-		foreach file {CompileScript.sh InstallScript.sh} {
-		    file copy ${filespath}/${file} ${worksrcpath}
-		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
-		    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
-		    reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
-		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${file}
-		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${file}
-		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${file}
-		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${file}
-		    file attributes ${worksrcpath}/${file} -permissions 0755
+		foreach f {CompileScript.sh InstallScript.sh} {
+		    copy ${filespath}/${f} ${worksrcpath}
+		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${f}
+		    reinplace "s|%N|${name}|g" ${worksrcpath}/${f}
+		    reinplace "s|%v|${version}|g" ${worksrcpath}/${f}
+		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${f}
+		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${f}
+		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${f}
+		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${f}
+		    reinplace "s|%b|${worksrcpath}|g" ${worksrcpath}/${f}
+		    file attributes ${worksrcpath}/${f} -permissions 0755
 		}
 }
 
 configure.args	--disable-kig-python-scripting --with-distribution='MacPorts/Mac OS X' --without-arts
 
-configure	{}
+use_configure       no
 use_parallel_build  yes
 build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
 destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }

Modified: trunk/dports/kde/kdeedu3/files/CompileScript.sh
===================================================================
--- trunk/dports/kde/kdeedu3/files/CompileScript.sh	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdeedu3/files/CompileScript.sh	2009-04-23 09:53:52 UTC (rev 50045)
@@ -3,7 +3,7 @@
 	export PREFIX="%p" USE_UNSERMAKE=1
 	. ./environment-helper.sh
 #fink
-#	export LDFLAGS="-L%p/lib/python2.4/config"
+#	export LDFLAGS="-L%p/lib/python2.4/config $LDFLAGS"
 #macports
 #
 

Modified: trunk/dports/kde/kdeedu3/files/InstallScript.sh
===================================================================
--- trunk/dports/kde/kdeedu3/files/InstallScript.sh	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdeedu3/files/InstallScript.sh	2009-04-23 09:53:52 UTC (rev 50045)
@@ -19,4 +19,5 @@
 	ln -s libkdeeduui.3.dylib libkdeeduui.1.dylib
 	popd
 
-	perl -pi -e 's,-L%b,-L%p,g' %i/lib/*.la %i/lib/kde3/*.la
+	pushd %b; FixifiedB=`/bin/pwd`; popd
+	perl -pi -e "s,-L$FixifiedB,-L%p,g" %i/lib/*.la %i/lib/kde3/*.la

Modified: trunk/dports/kde/kdeedu3/files/kdeedu3.patch
===================================================================
--- trunk/dports/kde/kdeedu3/files/kdeedu3.patch	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdeedu3/files/kdeedu3.patch	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,6 +1,6 @@
-diff -uNr kdeedu-3.5.8/kalzium/src/Makefile.am kdeedu-3.5.8-new/kalzium/src/Makefile.am
---- kdeedu-3.5.8/kalzium/src/Makefile.am	2005-09-10 10:24:07.000000000 -0400
-+++ kdeedu-3.5.8-new/kalzium/src/Makefile.am	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kalzium/src/Makefile.am kdeedu-3.5.9-new/kalzium/src/Makefile.am
+--- kdeedu-3.5.9/kalzium/src/Makefile.am	2005-09-10 10:24:07.000000000 -0400
++++ kdeedu-3.5.9-new/kalzium/src/Makefile.am	2008-02-13 21:57:24.000000000 -0500
 @@ -1,8 +1,11 @@
  # set the include path for X, qt and KDE
  INCLUDES= -I$(srcdir)/../../libkdeedu/kdeeduplot -I$(srcdir)/../../libkdeedu/kdeeduui $(all_includes)
@@ -33,9 +33,9 @@
  
  #this RegExp-monster grep for <name origin=foo">bar</name> and puts the i18n() around foo and bar
  messages-old: rc.cpp
-diff -uNr kdeedu-3.5.8/kalzium/src/main.cpp kdeedu-3.5.8-new/kalzium/src/main.cpp
---- kdeedu-3.5.8/kalzium/src/main.cpp	2006-10-01 13:24:17.000000000 -0400
-+++ kdeedu-3.5.8-new/kalzium/src/main.cpp	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kalzium/src/main.cpp kdeedu-3.5.9-new/kalzium/src/main.cpp
+--- kdeedu-3.5.9/kalzium/src/main.cpp	2006-10-01 13:24:17.000000000 -0400
++++ kdeedu-3.5.9-new/kalzium/src/main.cpp	2008-02-13 21:57:24.000000000 -0500
 @@ -43,7 +43,7 @@
  };
  #endif
@@ -45,9 +45,9 @@
  {
  #ifdef HAVE_FACILE
      caml_startup(argv);
-diff -uNr kdeedu-3.5.8/kbruch/src/Makefile.am kdeedu-3.5.8-new/kbruch/src/Makefile.am
---- kdeedu-3.5.8/kbruch/src/Makefile.am	2005-09-10 04:18:00.000000000 -0400
-+++ kdeedu-3.5.8-new/kbruch/src/Makefile.am	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kbruch/src/Makefile.am kdeedu-3.5.9-new/kbruch/src/Makefile.am
+--- kdeedu-3.5.9/kbruch/src/Makefile.am	2005-09-10 04:18:00.000000000 -0400
++++ kdeedu-3.5.9-new/kbruch/src/Makefile.am	2008-02-13 21:57:24.000000000 -0500
 @@ -1,10 +1,14 @@
 -bin_PROGRAMS = kbruch
  
@@ -68,9 +68,9 @@
  
  EXTRA_DIST = kbruch.cpp kbruch.h kbruch.desktop hi32-app-kbruch.png hi16-app-kbruch.png lo32-app-kbruch.png lo16-app-kbruch.png mainqtwidget.cpp mainqtwidget.h primenumber.cpp primenumber.h statisticsview.cpp statisticsview.h exercisebase.cpp exercisebase.h taskview.cpp taskview.h ratio.cpp ratio.h task.cpp task.h taskwidget.cpp taskwidget.h fractionbasewidget.cpp fractionbasewidget.h resultwidget.cpp resultwidget.h exercisecompare.cpp exercisecompare.h ratiowidget.cpp ratiowidget.h rationalwidget.cpp rationalwidget.h exerciseconvert.cpp exerciseconvert.h exercisefactorize.cpp exercisefactorize.h factorizedwidget.cpp factorizedwidget.h kbruch.rc taskvieweroptionsbase.ui
  
-diff -uNr kdeedu-3.5.8/kbruch/src/kbruch.cpp kdeedu-3.5.8-new/kbruch/src/kbruch.cpp
---- kdeedu-3.5.8/kbruch/src/kbruch.cpp	2007-05-14 03:38:52.000000000 -0400
-+++ kdeedu-3.5.8-new/kbruch/src/kbruch.cpp	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kbruch/src/kbruch.cpp kdeedu-3.5.9-new/kbruch/src/kbruch.cpp
+--- kdeedu-3.5.9/kbruch/src/kbruch.cpp	2007-05-14 03:38:52.000000000 -0400
++++ kdeedu-3.5.9-new/kbruch/src/kbruch.cpp	2008-02-13 21:57:25.000000000 -0500
 @@ -29,7 +29,7 @@
  #include <kaboutdata.h>
  
@@ -80,9 +80,9 @@
  {
  	// init random generator
  	srand(time(NULL));
-diff -uNr kdeedu-3.5.8/keduca/keduca/Makefile.am kdeedu-3.5.8-new/keduca/keduca/Makefile.am
---- kdeedu-3.5.8/keduca/keduca/Makefile.am	2005-09-10 04:17:25.000000000 -0400
-+++ kdeedu-3.5.8-new/keduca/keduca/Makefile.am	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/keduca/keduca/Makefile.am kdeedu-3.5.9-new/keduca/keduca/Makefile.am
+--- kdeedu-3.5.9/keduca/keduca/Makefile.am	2005-09-10 04:17:25.000000000 -0400
++++ kdeedu-3.5.9-new/keduca/keduca/Makefile.am	2008-02-13 21:57:25.000000000 -0500
 @@ -1,11 +1,13 @@
  # set the include path for X, qt and KDE
 -INCLUDES= -I../libkeduca $(all_includes)
@@ -102,9 +102,9 @@
  
  # Convenience library
  #noinst_LTLIBRARIES = libkeduca_common.la
-diff -uNr kdeedu-3.5.8/keduca/keduca/main.cpp kdeedu-3.5.8-new/keduca/keduca/main.cpp
---- kdeedu-3.5.8/keduca/keduca/main.cpp	2005-09-10 04:17:25.000000000 -0400
-+++ kdeedu-3.5.8-new/keduca/keduca/main.cpp	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/keduca/keduca/main.cpp kdeedu-3.5.9-new/keduca/keduca/main.cpp
+--- kdeedu-3.5.9/keduca/keduca/main.cpp	2005-09-10 04:17:25.000000000 -0400
++++ kdeedu-3.5.9-new/keduca/keduca/main.cpp	2008-02-13 21:57:25.000000000 -0500
 @@ -31,7 +31,7 @@
      KCmdLineLastOption
  };
@@ -114,9 +114,9 @@
  {
      KAboutData aboutData( "keduca", I18N_NOOP("KEduca"),
                            version, description, KAboutData::License_GPL,
-diff -uNr kdeedu-3.5.8/keduca/keducabuilder/Makefile.am kdeedu-3.5.8-new/keduca/keducabuilder/Makefile.am
---- kdeedu-3.5.8/keduca/keducabuilder/Makefile.am	2005-09-10 04:17:25.000000000 -0400
-+++ kdeedu-3.5.8-new/keduca/keducabuilder/Makefile.am	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/keduca/keducabuilder/Makefile.am kdeedu-3.5.9-new/keduca/keducabuilder/Makefile.am
+--- kdeedu-3.5.9/keduca/keducabuilder/Makefile.am	2005-09-10 04:17:25.000000000 -0400
++++ kdeedu-3.5.9-new/keduca/keducabuilder/Makefile.am	2008-02-13 21:57:25.000000000 -0500
 @@ -1,6 +1,10 @@
 -bin_PROGRAMS = keducabuilder
 -keducabuilder_SOURCES = kcontroladdeditbase.ui keducaeditorstartdialogbase.ui keducaeditorstartdialog.cpp ktagcombobox.cpp klangcombo.cpp kcontrolheader.cpp keducabuilder.cpp kcontroladdedit.cpp  main.cpp
@@ -146,9 +146,9 @@
  
  # Uncomment the following two lines if you add a ui.rc file for your application to make use of
  # KDE\xB4s XML GUI builing
-diff -uNr kdeedu-3.5.8/keduca/keducabuilder/main.cpp kdeedu-3.5.8-new/keduca/keducabuilder/main.cpp
---- kdeedu-3.5.8/keduca/keducabuilder/main.cpp	2005-09-10 04:17:25.000000000 -0400
-+++ kdeedu-3.5.8-new/keduca/keducabuilder/main.cpp	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/keduca/keducabuilder/main.cpp kdeedu-3.5.9-new/keduca/keducabuilder/main.cpp
+--- kdeedu-3.5.9/keduca/keducabuilder/main.cpp	2005-09-10 04:17:25.000000000 -0400
++++ kdeedu-3.5.9-new/keduca/keducabuilder/main.cpp	2008-02-13 21:57:25.000000000 -0500
 @@ -32,7 +32,7 @@
      KCmdLineLastOption
  };
@@ -158,9 +158,9 @@
  {
      KAboutData aboutData( "keduca", I18N_NOOP("KEducaBuilder"),
                            version, description, KAboutData::License_GPL,
-diff -uNr kdeedu-3.5.8/khangman/khangman/Makefile.am kdeedu-3.5.8-new/khangman/khangman/Makefile.am
---- kdeedu-3.5.8/khangman/khangman/Makefile.am	2005-09-10 04:16:50.000000000 -0400
-+++ kdeedu-3.5.8-new/khangman/khangman/Makefile.am	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/khangman/khangman/Makefile.am kdeedu-3.5.9-new/khangman/khangman/Makefile.am
+--- kdeedu-3.5.9/khangman/khangman/Makefile.am	2005-09-10 04:16:50.000000000 -0400
++++ kdeedu-3.5.9-new/khangman/khangman/Makefile.am	2008-02-13 21:57:25.000000000 -0500
 @@ -1,7 +1,11 @@
  ####### kdevelop will overwrite this part!!! (begin)##########
 -bin_PROGRAMS = khangman
@@ -185,9 +185,9 @@
  
  rc_DATA = khangmanui.rc
  rcdir = $(kde_datadir)/khangman
-diff -uNr kdeedu-3.5.8/khangman/khangman/main.cpp kdeedu-3.5.8-new/khangman/khangman/main.cpp
---- kdeedu-3.5.8/khangman/khangman/main.cpp	2007-01-15 06:20:03.000000000 -0500
-+++ kdeedu-3.5.8-new/khangman/khangman/main.cpp	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/khangman/khangman/main.cpp kdeedu-3.5.9-new/khangman/khangman/main.cpp
+--- kdeedu-3.5.9/khangman/khangman/main.cpp	2007-01-15 06:20:03.000000000 -0500
++++ kdeedu-3.5.9-new/khangman/khangman/main.cpp	2008-02-13 21:57:25.000000000 -0500
 @@ -39,7 +39,7 @@
      KCmdLineLastOption
  };
@@ -197,9 +197,9 @@
  {
      KAboutData aboutData( "khangman", I18N_NOOP("KHangMan"),
                                KHM_VERSION, description, KAboutData::License_GPL,
-diff -uNr kdeedu-3.5.8/kig/kig/Makefile.am kdeedu-3.5.8-new/kig/kig/Makefile.am
---- kdeedu-3.5.8/kig/kig/Makefile.am	2005-09-10 04:17:20.000000000 -0400
-+++ kdeedu-3.5.8-new/kig/kig/Makefile.am	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kig/kig/Makefile.am kdeedu-3.5.9-new/kig/kig/Makefile.am
+--- kdeedu-3.5.9/kig/kig/Makefile.am	2005-09-10 04:17:20.000000000 -0400
++++ kdeedu-3.5.9-new/kig/kig/Makefile.am	2008-02-13 21:57:25.000000000 -0500
 @@ -19,12 +19,14 @@
  #########################################################################
  # this is the program that gets installed.  it's name is used for all
@@ -219,9 +219,9 @@
  
  # this is where the desktop file will go 
  xdg_apps_DATA = kig.desktop
-diff -uNr kdeedu-3.5.8/kig/kig/main.cpp kdeedu-3.5.8-new/kig/kig/main.cpp
---- kdeedu-3.5.8/kig/kig/main.cpp	2005-10-10 10:55:35.000000000 -0400
-+++ kdeedu-3.5.8-new/kig/kig/main.cpp	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kig/kig/main.cpp kdeedu-3.5.9-new/kig/kig/main.cpp
+--- kdeedu-3.5.9/kig/kig/main.cpp	2005-10-10 10:55:35.000000000 -0400
++++ kdeedu-3.5.9-new/kig/kig/main.cpp	2008-02-13 21:57:25.000000000 -0500
 @@ -101,7 +101,7 @@
    return (*converterfunction)( file, outfile );
  }
@@ -231,9 +231,9 @@
  {
    KAboutData *about = kigAboutData( "kig", I18N_NOOP("Kig") );
  
-diff -uNr kdeedu-3.5.8/kiten/Makefile.am kdeedu-3.5.8-new/kiten/Makefile.am
---- kdeedu-3.5.8/kiten/Makefile.am	2005-09-10 04:17:15.000000000 -0400
-+++ kdeedu-3.5.8-new/kiten/Makefile.am	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kiten/Makefile.am kdeedu-3.5.9-new/kiten/Makefile.am
+--- kdeedu-3.5.9/kiten/Makefile.am	2005-09-10 04:17:15.000000000 -0400
++++ kdeedu-3.5.9-new/kiten/Makefile.am	2008-02-13 21:57:25.000000000 -0500
 @@ -2,15 +2,16 @@
  
  SUBDIRS = pics
@@ -255,9 +255,9 @@
  
  libkiten_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 1:0:0
  libkiten_la_LIBADD = $(LIB_KDEUI) $(LIB_KDEPRINT)
-diff -uNr kdeedu-3.5.8/kiten/main.cpp kdeedu-3.5.8-new/kiten/main.cpp
---- kdeedu-3.5.8/kiten/main.cpp	2005-10-10 10:55:32.000000000 -0400
-+++ kdeedu-3.5.8-new/kiten/main.cpp	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kiten/main.cpp kdeedu-3.5.9-new/kiten/main.cpp
+--- kdeedu-3.5.9/kiten/main.cpp	2005-10-10 10:55:32.000000000 -0400
++++ kdeedu-3.5.9-new/kiten/main.cpp	2008-02-13 21:57:25.000000000 -0500
 @@ -37,7 +37,7 @@
  	// INSERT YOUR COMMANDLINE OPTIONS HERE
  };
@@ -267,9 +267,9 @@
  {
  	qInstallMsgHandler(noMessageOutput);
  	KAboutData aboutData( "kiten", I18N_NOOP("Kiten"),
-diff -uNr kdeedu-3.5.8/kiten/xjdxgen.c kdeedu-3.5.8-new/kiten/xjdxgen.c
---- kdeedu-3.5.8/kiten/xjdxgen.c	2006-05-22 14:03:43.000000000 -0400
-+++ kdeedu-3.5.8-new/kiten/xjdxgen.c	2007-10-25 07:53:21.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kiten/xjdxgen.c kdeedu-3.5.9-new/kiten/xjdxgen.c
+--- kdeedu-3.5.9/kiten/xjdxgen.c	2006-05-22 14:03:43.000000000 -0400
++++ kdeedu-3.5.9-new/kiten/xjdxgen.c	2008-02-13 21:57:25.000000000 -0500
 @@ -23,6 +23,7 @@
    -- jason */
  
@@ -278,9 +278,9 @@
  #include <inttypes.h>
  #include <sys/stat.h>
  #include <unistd.h>
-diff -uNr kdeedu-3.5.8/klatin/klatin/Makefile.am kdeedu-3.5.8-new/klatin/klatin/Makefile.am
---- kdeedu-3.5.8/klatin/klatin/Makefile.am	2005-09-10 04:17:24.000000000 -0400
-+++ kdeedu-3.5.8-new/klatin/klatin/Makefile.am	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/klatin/klatin/Makefile.am kdeedu-3.5.9-new/klatin/klatin/Makefile.am
+--- kdeedu-3.5.9/klatin/klatin/Makefile.am	2005-09-10 04:17:24.000000000 -0400
++++ kdeedu-3.5.9-new/klatin/klatin/Makefile.am	2008-02-13 21:57:25.000000000 -0500
 @@ -6,19 +6,21 @@
  
  # this is the program that gets installed.  it's name is used for all
@@ -307,9 +307,9 @@
  	klatinchoose.ui settings.kcfgc klatingrammarwidget.ui klatinvocabwidget.ui klatinverbswidget.ui \
  	klatinresultsdialog.ui klatinsettings_vocabpage.ui
  
-diff -uNr kdeedu-3.5.8/klatin/klatin/main.cpp kdeedu-3.5.8-new/klatin/klatin/main.cpp
---- kdeedu-3.5.8/klatin/klatin/main.cpp	2005-09-10 04:17:24.000000000 -0400
-+++ kdeedu-3.5.8-new/klatin/klatin/main.cpp	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/klatin/klatin/main.cpp kdeedu-3.5.9-new/klatin/klatin/main.cpp
+--- kdeedu-3.5.9/klatin/klatin/main.cpp	2005-09-10 04:17:24.000000000 -0400
++++ kdeedu-3.5.9-new/klatin/klatin/main.cpp	2008-02-13 21:57:25.000000000 -0500
 @@ -29,7 +29,7 @@
  	KCmdLineLastOption
  };
@@ -319,9 +319,9 @@
  {
  
  	KAboutData aboutData( "klatin", I18N_NOOP("KLatin"),
-diff -uNr kdeedu-3.5.8/klettres/klettres/Makefile.am kdeedu-3.5.8-new/klettres/klettres/Makefile.am
---- kdeedu-3.5.8/klettres/klettres/Makefile.am	2005-09-10 04:16:56.000000000 -0400
-+++ kdeedu-3.5.8-new/klettres/klettres/Makefile.am	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/klettres/klettres/Makefile.am kdeedu-3.5.9-new/klettres/klettres/Makefile.am
+--- kdeedu-3.5.9/klettres/klettres/Makefile.am	2005-09-10 04:16:56.000000000 -0400
++++ kdeedu-3.5.9-new/klettres/klettres/Makefile.am	2008-02-13 21:57:25.000000000 -0500
 @@ -1,10 +1,13 @@
  ####### kdevelop will overwrite this part!!! (begin)##########
 -bin_PROGRAMS = klettres
@@ -348,9 +348,9 @@
  
  messages: rc.cpp
  	$(XGETTEXT) *.cpp -o $(podir)/klettres.pot;
-diff -uNr kdeedu-3.5.8/klettres/klettres/main.cpp kdeedu-3.5.8-new/klettres/klettres/main.cpp
---- kdeedu-3.5.8/klettres/klettres/main.cpp	2007-01-15 06:20:04.000000000 -0500
-+++ kdeedu-3.5.8-new/klettres/klettres/main.cpp	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/klettres/klettres/main.cpp kdeedu-3.5.9-new/klettres/klettres/main.cpp
+--- kdeedu-3.5.9/klettres/klettres/main.cpp	2007-01-15 06:20:04.000000000 -0500
++++ kdeedu-3.5.9-new/klettres/klettres/main.cpp	2008-02-13 21:57:25.000000000 -0500
 @@ -43,7 +43,7 @@
          KCmdLineLastOption
      };
@@ -360,9 +360,9 @@
  {
      KAboutData about("klettres", I18N_NOOP("KLettres"), KLETTRES_VERSION, description,
                       KAboutData::License_GPL, "(C) 2001-2006 Anne-Marie Mahfouf",0, "http://edu.kde.org/klettres", "submit at bugs.kde.org");
-diff -uNr kdeedu-3.5.8/kmplot/kmplot/Makefile.am kdeedu-3.5.8-new/kmplot/kmplot/Makefile.am
---- kdeedu-3.5.8/kmplot/kmplot/Makefile.am	2005-09-10 04:17:09.000000000 -0400
-+++ kdeedu-3.5.8-new/kmplot/kmplot/Makefile.am	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kmplot/kmplot/Makefile.am kdeedu-3.5.9-new/kmplot/kmplot/Makefile.am
+--- kdeedu-3.5.9/kmplot/kmplot/Makefile.am	2005-09-10 04:17:09.000000000 -0400
++++ kdeedu-3.5.9-new/kmplot/kmplot/Makefile.am	2008-02-13 21:57:25.000000000 -0500
 @@ -21,12 +21,14 @@
  #########################################################################
  # this is the program that gets installed.  it's name is used for all
@@ -382,9 +382,9 @@
  
  # this is where the desktop file will go
  appmimedir = $(kde_mimedir)/application
-diff -uNr kdeedu-3.5.8/kmplot/kmplot/main.cpp kdeedu-3.5.8-new/kmplot/kmplot/main.cpp
---- kdeedu-3.5.8/kmplot/kmplot/main.cpp	2005-10-10 10:55:30.000000000 -0400
-+++ kdeedu-3.5.8-new/kmplot/kmplot/main.cpp	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kmplot/kmplot/main.cpp kdeedu-3.5.9-new/kmplot/kmplot/main.cpp
+--- kdeedu-3.5.9/kmplot/kmplot/main.cpp	2005-10-10 10:55:30.000000000 -0400
++++ kdeedu-3.5.9-new/kmplot/kmplot/main.cpp	2008-02-13 21:57:25.000000000 -0500
 @@ -50,7 +50,7 @@
      };
  
@@ -394,9 +394,9 @@
  {
  	KAboutData aboutData(
  	    "kmplot",
-diff -uNr kdeedu-3.5.8/kpercentage/kpercentage/Makefile.am kdeedu-3.5.8-new/kpercentage/kpercentage/Makefile.am
---- kdeedu-3.5.8/kpercentage/kpercentage/Makefile.am	2005-09-10 04:16:51.000000000 -0400
-+++ kdeedu-3.5.8-new/kpercentage/kpercentage/Makefile.am	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kpercentage/kpercentage/Makefile.am kdeedu-3.5.9-new/kpercentage/kpercentage/Makefile.am
+--- kdeedu-3.5.9/kpercentage/kpercentage/Makefile.am	2005-09-10 04:16:51.000000000 -0400
++++ kdeedu-3.5.9-new/kpercentage/kpercentage/Makefile.am	2008-02-13 21:57:25.000000000 -0500
 @@ -1,6 +1,10 @@
 -bin_PROGRAMS = kpercentage
 -kpercentage_SOURCES =  kanimation.cpp kanswer.cpp kpercentmain.cpp  kpercentage.cpp ksplashscreen.cpp main.cpp
@@ -420,9 +420,9 @@
  
  
  stringstocpp:
-diff -uNr kdeedu-3.5.8/kpercentage/kpercentage/main.cpp kdeedu-3.5.8-new/kpercentage/kpercentage/main.cpp
---- kdeedu-3.5.8/kpercentage/kpercentage/main.cpp	2005-09-10 04:16:51.000000000 -0400
-+++ kdeedu-3.5.8-new/kpercentage/kpercentage/main.cpp	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kpercentage/kpercentage/main.cpp kdeedu-3.5.9-new/kpercentage/kpercentage/main.cpp
+--- kdeedu-3.5.9/kpercentage/kpercentage/main.cpp	2008-02-13 04:36:34.000000000 -0500
++++ kdeedu-3.5.9-new/kpercentage/kpercentage/main.cpp	2008-02-13 21:57:25.000000000 -0500
 @@ -34,7 +34,7 @@
          KCmdLineLastOption
      };
@@ -432,9 +432,9 @@
  {
      KAboutData aboutData
      (
-diff -uNr kdeedu-3.5.8/kstars/kstars/Makefile.am kdeedu-3.5.8-new/kstars/kstars/Makefile.am
---- kdeedu-3.5.8/kstars/kstars/Makefile.am	2005-09-10 04:17:55.000000000 -0400
-+++ kdeedu-3.5.8-new/kstars/kstars/Makefile.am	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kstars/kstars/Makefile.am kdeedu-3.5.9-new/kstars/kstars/Makefile.am
+--- kdeedu-3.5.9/kstars/kstars/Makefile.am	2005-09-10 04:17:55.000000000 -0400
++++ kdeedu-3.5.9-new/kstars/kstars/Makefile.am	2008-02-13 21:57:25.000000000 -0500
 @@ -1,6 +1,8 @@
 -bin_PROGRAMS = kstars
 +bin_PROGRAMS = 
@@ -471,9 +471,9 @@
  
  # Uncomment the following two lines if you add a ui.rc file for your application to make use of
  # KDE
-diff -uNr kdeedu-3.5.8/kstars/kstars/indi/apmount.cpp kdeedu-3.5.8-new/kstars/kstars/indi/apmount.cpp
---- kdeedu-3.5.8/kstars/kstars/indi/apmount.cpp	2005-10-10 10:55:39.000000000 -0400
-+++ kdeedu-3.5.8-new/kstars/kstars/indi/apmount.cpp	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kstars/kstars/indi/apmount.cpp kdeedu-3.5.9-new/kstars/kstars/indi/apmount.cpp
+--- kdeedu-3.5.9/kstars/kstars/indi/apmount.cpp	2005-10-10 10:55:39.000000000 -0400
++++ kdeedu-3.5.9-new/kstars/kstars/indi/apmount.cpp	2008-02-13 21:57:25.000000000 -0500
 @@ -39,8 +39,9 @@
  */
  
@@ -486,9 +486,9 @@
  #endif
  
  static inline double timezoneOffset()
-diff -uNr kdeedu-3.5.8/kstars/kstars/indi/fli_ccd.c kdeedu-3.5.8-new/kstars/kstars/indi/fli_ccd.c
---- kdeedu-3.5.8/kstars/kstars/indi/fli_ccd.c	2005-10-10 10:55:39.000000000 -0400
-+++ kdeedu-3.5.8-new/kstars/kstars/indi/fli_ccd.c	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kstars/kstars/indi/fli_ccd.c kdeedu-3.5.9-new/kstars/kstars/indi/fli_ccd.c
+--- kdeedu-3.5.9/kstars/kstars/indi/fli_ccd.c	2005-10-10 10:55:39.000000000 -0400
++++ kdeedu-3.5.9-new/kstars/kstars/indi/fli_ccd.c	2008-02-13 21:57:25.000000000 -0500
 @@ -19,6 +19,7 @@
  
  #endif
@@ -497,9 +497,9 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-diff -uNr kdeedu-3.5.8/kstars/kstars/indi/lx200generic.cpp kdeedu-3.5.8-new/kstars/kstars/indi/lx200generic.cpp
---- kdeedu-3.5.8/kstars/kstars/indi/lx200generic.cpp	2005-10-10 10:55:39.000000000 -0400
-+++ kdeedu-3.5.8-new/kstars/kstars/indi/lx200generic.cpp	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kstars/kstars/indi/lx200generic.cpp kdeedu-3.5.9-new/kstars/kstars/indi/lx200generic.cpp
+--- kdeedu-3.5.9/kstars/kstars/indi/lx200generic.cpp	2005-10-10 10:55:39.000000000 -0400
++++ kdeedu-3.5.9-new/kstars/kstars/indi/lx200generic.cpp	2008-02-13 21:57:25.000000000 -0500
 @@ -41,7 +41,7 @@
  
  
@@ -509,9 +509,9 @@
  #endif
  
  static inline double timezoneOffset()
-diff -uNr kdeedu-3.5.8/kstars/kstars/indi/webcam/Makefile.am kdeedu-3.5.8-new/kstars/kstars/indi/webcam/Makefile.am
---- kdeedu-3.5.8/kstars/kstars/indi/webcam/Makefile.am	2005-09-10 04:17:35.000000000 -0400
-+++ kdeedu-3.5.8-new/kstars/kstars/indi/webcam/Makefile.am	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kstars/kstars/indi/webcam/Makefile.am kdeedu-3.5.9-new/kstars/kstars/indi/webcam/Makefile.am
+--- kdeedu-3.5.9/kstars/kstars/indi/webcam/Makefile.am	2005-09-10 04:17:35.000000000 -0400
++++ kdeedu-3.5.9-new/kstars/kstars/indi/webcam/Makefile.am	2008-02-13 21:57:25.000000000 -0500
 @@ -1,7 +1,7 @@
  if HAVE_V4L2
     libwebcam_linux = libwebcam_v4l2_linux.la
@@ -521,9 +521,9 @@
  endif
  
  noinst_LTLIBRARIES = libwebcam.la $(libwebcam_linux)
-diff -uNr kdeedu-3.5.8/kstars/kstars/main.cpp kdeedu-3.5.8-new/kstars/kstars/main.cpp
---- kdeedu-3.5.8/kstars/kstars/main.cpp	2007-10-08 05:48:19.000000000 -0400
-+++ kdeedu-3.5.8-new/kstars/kstars/main.cpp	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kstars/kstars/main.cpp kdeedu-3.5.9-new/kstars/kstars/main.cpp
+--- kdeedu-3.5.9/kstars/kstars/main.cpp	2008-02-13 04:36:37.000000000 -0500
++++ kdeedu-3.5.9-new/kstars/kstars/main.cpp	2008-02-13 21:57:25.000000000 -0500
 @@ -49,7 +49,7 @@
  	KCmdLineLastOption
  };
@@ -533,9 +533,9 @@
  {
  	KAboutData aboutData( "kstars", I18N_NOOP("KStars"),
  		KSTARS_VERSION, description, KAboutData::License_GPL,
-diff -uNr kdeedu-3.5.8/ktouch/src/Makefile.am kdeedu-3.5.8-new/ktouch/src/Makefile.am
---- kdeedu-3.5.8/ktouch/src/Makefile.am	2006-05-22 14:03:38.000000000 -0400
-+++ kdeedu-3.5.8-new/ktouch/src/Makefile.am	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/ktouch/src/Makefile.am kdeedu-3.5.9-new/ktouch/src/Makefile.am
+--- kdeedu-3.5.9/ktouch/src/Makefile.am	2006-05-22 14:03:38.000000000 -0400
++++ kdeedu-3.5.9-new/ktouch/src/Makefile.am	2008-02-13 21:57:25.000000000 -0500
 @@ -26,7 +26,7 @@
  		ktouchstatistics.h 	ktouchstatus.h 	ktouchtrainer.h 	ktouchutils.h ktouchcoloreditor.h
  
@@ -574,9 +574,9 @@
  
  rcdir = $(kde_datadir)/ktouch
  rc_DATA = ktouchui.rc
-diff -uNr kdeedu-3.5.8/ktouch/src/main.cpp kdeedu-3.5.8-new/ktouch/src/main.cpp
---- kdeedu-3.5.8/ktouch/src/main.cpp	2006-05-22 14:03:38.000000000 -0400
-+++ kdeedu-3.5.8-new/ktouch/src/main.cpp	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/ktouch/src/main.cpp kdeedu-3.5.9-new/ktouch/src/main.cpp
+--- kdeedu-3.5.9/ktouch/src/main.cpp	2006-05-22 14:03:38.000000000 -0400
++++ kdeedu-3.5.9-new/ktouch/src/main.cpp	2008-02-13 21:57:25.000000000 -0500
 @@ -26,7 +26,7 @@
      KCmdLineLastOption
  };
@@ -586,9 +586,9 @@
  {
      KAboutData about("ktouch",
                       I18N_NOOP("KTouch"),
-diff -uNr kdeedu-3.5.8/kturtle/src/Makefile.am kdeedu-3.5.8-new/kturtle/src/Makefile.am
---- kdeedu-3.5.8/kturtle/src/Makefile.am	2005-09-10 04:16:51.000000000 -0400
-+++ kdeedu-3.5.8-new/kturtle/src/Makefile.am	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kturtle/src/Makefile.am kdeedu-3.5.9-new/kturtle/src/Makefile.am
+--- kdeedu-3.5.9/kturtle/src/Makefile.am	2005-09-10 04:16:51.000000000 -0400
++++ kdeedu-3.5.9-new/kturtle/src/Makefile.am	2008-02-13 21:57:25.000000000 -0500
 @@ -6,20 +6,22 @@
  # added from kjots
  AM_LDFLAGS   = $(all_libraries) $(KDE_RPATH)
@@ -617,9 +617,9 @@
  
  # these are the headers for your project
  noinst_HEADERS = kturtle.h canvas.h dialogs.cpp value.h lexer.h parser.h executer.h treenode.h token.h translate.h
-diff -uNr kdeedu-3.5.8/kturtle/src/main.cpp kdeedu-3.5.8-new/kturtle/src/main.cpp
---- kdeedu-3.5.8/kturtle/src/main.cpp	2005-10-10 10:55:19.000000000 -0400
-+++ kdeedu-3.5.8-new/kturtle/src/main.cpp	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kturtle/src/main.cpp kdeedu-3.5.9-new/kturtle/src/main.cpp
+--- kdeedu-3.5.9/kturtle/src/main.cpp	2005-10-10 10:55:19.000000000 -0400
++++ kdeedu-3.5.9-new/kturtle/src/main.cpp	2008-02-13 21:57:25.000000000 -0500
 @@ -43,7 +43,7 @@
  };
  
@@ -629,9 +629,9 @@
  {
  	KAboutData about("kturtle", I18N_NOOP("KTurtle"), version, description, KAboutData::License_GPL, copyright, 0, website);
  	about.addAuthor("Cies Breijs",
-diff -uNr kdeedu-3.5.8/kverbos/kverbos/Makefile.am kdeedu-3.5.8-new/kverbos/kverbos/Makefile.am
---- kdeedu-3.5.8/kverbos/kverbos/Makefile.am	2005-09-10 04:17:22.000000000 -0400
-+++ kdeedu-3.5.8-new/kverbos/kverbos/Makefile.am	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kverbos/kverbos/Makefile.am kdeedu-3.5.9-new/kverbos/kverbos/Makefile.am
+--- kdeedu-3.5.9/kverbos/kverbos/Makefile.am	2005-09-10 04:17:22.000000000 -0400
++++ kdeedu-3.5.9-new/kverbos/kverbos/Makefile.am	2008-02-13 21:57:25.000000000 -0500
 @@ -1,8 +1,11 @@
  SUBDIRS = icons data
  
@@ -656,9 +656,9 @@
  
  rcdir = $(kde_datadir)/kverbos
  rc_DATA = kverbosui.rc
-diff -uNr kdeedu-3.5.8/kverbos/kverbos/main.cpp kdeedu-3.5.8-new/kverbos/kverbos/main.cpp
---- kdeedu-3.5.8/kverbos/kverbos/main.cpp	2005-09-10 04:17:22.000000000 -0400
-+++ kdeedu-3.5.8-new/kverbos/kverbos/main.cpp	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kverbos/kverbos/main.cpp kdeedu-3.5.9-new/kverbos/kverbos/main.cpp
+--- kdeedu-3.5.9/kverbos/kverbos/main.cpp	2005-09-10 04:17:22.000000000 -0400
++++ kdeedu-3.5.9-new/kverbos/kverbos/main.cpp	2008-02-13 21:57:25.000000000 -0500
 @@ -32,7 +32,7 @@
  
  
@@ -668,9 +668,9 @@
  {
  
  	KAboutData aboutData( "kverbos", I18N_NOOP("KVerbos"),
-diff -uNr kdeedu-3.5.8/kwordquiz/src/Makefile.am kdeedu-3.5.8-new/kwordquiz/src/Makefile.am
---- kdeedu-3.5.8/kwordquiz/src/Makefile.am	2007-05-14 03:38:51.000000000 -0400
-+++ kdeedu-3.5.8-new/kwordquiz/src/Makefile.am	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kwordquiz/src/Makefile.am kdeedu-3.5.9-new/kwordquiz/src/Makefile.am
+--- kdeedu-3.5.9/kwordquiz/src/Makefile.am	2007-05-14 03:38:51.000000000 -0400
++++ kdeedu-3.5.9-new/kwordquiz/src/Makefile.am	2008-02-13 21:57:25.000000000 -0500
 @@ -1,9 +1,11 @@
  ####### kdevelop will overwrite this part!!! (begin)##########
 -bin_PROGRAMS = kwordquiz
@@ -703,9 +703,9 @@
  
  rcdir = $(kde_datadir)/kwordquiz
  rc_DATA = kwordquizui.rc eventsrc
-diff -uNr kdeedu-3.5.8/kwordquiz/src/main.cpp kdeedu-3.5.8-new/kwordquiz/src/main.cpp
---- kdeedu-3.5.8/kwordquiz/src/main.cpp	2005-10-10 10:55:21.000000000 -0400
-+++ kdeedu-3.5.8-new/kwordquiz/src/main.cpp	2007-10-24 22:24:41.000000000 -0400
+diff -Nurd kdeedu-3.5.9/kwordquiz/src/main.cpp kdeedu-3.5.9-new/kwordquiz/src/main.cpp
+--- kdeedu-3.5.9/kwordquiz/src/main.cpp	2005-10-10 10:55:21.000000000 -0400
++++ kdeedu-3.5.9-new/kwordquiz/src/main.cpp	2008-02-13 21:57:25.000000000 -0500
 @@ -33,7 +33,7 @@
    { 0, 0, 0 }
  };

Modified: trunk/dports/kde/kdegames3/Portfile
===================================================================
--- trunk/dports/kde/kdegames3/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdegames3/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,43 +1,44 @@
 # $Id$
 
-#Synced with Fink, Version 3.5.8-1021
+#Synced with Fink, revision 1.27
 
 PortSystem 1.0
 name		kdegames3
-version		3.5.8
-set kdeadmin	kde-admindir-1024
-categories	kde
+version		3.5.10
+set kdeadmin	kde-admindir-1502
+categories	kde kde3
 maintainers	nomaintainer
 description	KDE games. \
 		NB No KDE sound support.
 long_description ${description}
 platforms	darwin
 homepage	http://www.kde.org/
-master_sites	kde:stable/${version}/src/:kde358 \
+master_sites	kde:stable/${version}/src/:kde \
 		http://ranger.users.finkproject.org/distfiles/kde-admindir/:admin \
 		http://ranger.befunk.com/fink/kde-admindir/:admin \
 		http://astrange.ithinksw.net/~astrange/ranger-fink/kde-admindir/:admin \
 		http://www.southofheaven.net/befunk/kde-admindir/:admin
 use_bzip2	yes
 distname	kdegames-${version}
-distfiles	${distname}.tar.bz2:kde358 \
+distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
+dist_subdir     kde3
 depends_build	port:autoconf \
 		port:unsermake
 depends_lib	port:kdebase3
 #		port:libcapsinetwork
 #		port:libmath++
 
-checksums	${distname}.tar.bz2 md5 786ee4e47820d92aef7db73424b9604c \
-		${kdeadmin}.tar.bz2 md5 d99491aa5d520fd1d70393a718019322
+checksums	${distname}.tar.bz2 md5 5533b3886cbb74180933fe3f3d209031 \
+		${kdeadmin}.tar.bz2 md5 92a60282c1d81f38835ce7d495255cc3
 
 extract.only	${distname}.tar.bz2
 post-extract	{ system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
 
 patchfiles	
 patch		{
-		foreach file $patchfiles {
-		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
+		foreach f $patchfiles {
+		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${f} | patch -p1"
 		}
 		system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' ${worksrcpath}/admin/*"
 }
@@ -46,22 +47,22 @@
 		reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|HOME=/tmp|HOME=${workpath}|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|/tmp/buildlog|${workpath}/buildlog|g" ${worksrcpath}/build-helper.sh
-		foreach file {CompileScript.sh InstallScript.sh} {
-		    file copy ${filespath}/${file} ${worksrcpath}
-		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
-		    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
-		    reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
-		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${file}
-		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${file}
-		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${file}
-		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${file}
-		    file attributes ${worksrcpath}/${file} -permissions 0755
+		foreach f {CompileScript.sh InstallScript.sh} {
+		    copy ${filespath}/${f} ${worksrcpath}
+		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${f}
+		    reinplace "s|%N|${name}|g" ${worksrcpath}/${f}
+		    reinplace "s|%v|${version}|g" ${worksrcpath}/${f}
+		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${f}
+		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${f}
+		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${f}
+		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${f}
+		    file attributes ${worksrcpath}/${f} -permissions 0755
 		}
 }
 
 configure.args	--with-distribution='MacPorts/Mac OS X' --without-arts
 
-configure	{}
+use_configure       no
 use_parallel_build  yes
 build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
 destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }

Modified: trunk/dports/kde/kdegraphics3/Portfile
===================================================================
--- trunk/dports/kde/kdegraphics3/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdegraphics3/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,28 +1,28 @@
 # $Id$
 
-#Synced with Fink, Version 3.5.8-1021
+#Synced with Fink, revision 1.32
 
 PortSystem 1.0
 name		kdegraphics3
-version		3.5.8
-revision	1
-set kdeadmin	kde-admindir-1024
-categories	kde
+version		3.5.10
+set kdeadmin	kde-admindir-1502
+categories	kde kde3
 maintainers	nomaintainer
 description	KDE graphics. \
 		NB No KDE sound support.
 long_description ${description}
 platforms	darwin
 homepage	http://www.kde.org/
-master_sites	kde:stable/${version}/src/:kde358 \
+master_sites	kde:stable/${version}/src/:kde \
 		http://ranger.users.finkproject.org/distfiles/kde-admindir/:admin \
 		http://ranger.befunk.com/fink/kde-admindir/:admin \
 		http://astrange.ithinksw.net/~astrange/ranger-fink/kde-admindir/:admin \
 		http://www.southofheaven.net/befunk/kde-admindir/:admin
 use_bzip2	yes
 distname	kdegraphics-${version}
-distfiles	${distname}.tar.bz2:kde358 \
+distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
+dist_subdir     kde3
 depends_build	port:autoconf \
 		port:unsermake
 depends_lib	port:fribidi \
@@ -36,17 +36,16 @@
 #		port:libwww
 #		port:poppler-qt3
 
-checksums	${distname}.tar.bz2 md5 a3a31fc0e5b791ef330dd0627095d90f \
-		${kdeadmin}.tar.bz2 md5 d99491aa5d520fd1d70393a718019322
+checksums	${distname}.tar.bz2 md5 a09094b5357d8cd5c49d45b5d291dcfe \
+		${kdeadmin}.tar.bz2 md5 92a60282c1d81f38835ce7d495255cc3
 
 extract.only	${distname}.tar.bz2
 post-extract	{ system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
 
 patchfiles	kdegraphics3.patch dp01.patch
-set patchfiles2	xpdf-3.02pl2.patch
 patch		{
-		foreach file $patchfiles {
-		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
+		foreach f $patchfiles {
+		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${f} | patch -p1"
 		}
 		system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' ${worksrcpath}/admin/*"
 }
@@ -55,25 +54,22 @@
 		reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|HOME=/tmp|HOME=${workpath}|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|/tmp/buildlog|${workpath}/buildlog|g" ${worksrcpath}/build-helper.sh
-		foreach file {CompileScript.sh InstallScript.sh} {
-		    file copy ${filespath}/${file} ${worksrcpath}
-		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
-		    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
-		    reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
-		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${file}
-		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${file}
-		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${file}
-		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${file}
-		    file attributes ${worksrcpath}/${file} -permissions 0755
+		foreach f {CompileScript.sh InstallScript.sh} {
+		    copy ${filespath}/${f} ${worksrcpath}
+		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${f}
+		    reinplace "s|%N|${name}|g" ${worksrcpath}/${f}
+		    reinplace "s|%v|${version}|g" ${worksrcpath}/${f}
+		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${f}
+		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${f}
+		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${f}
+		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${f}
+		    file attributes ${worksrcpath}/${f} -permissions 0755
 		}
-		foreach file ${patchfiles2} {
-		    system "cd ${worksrcpath}/kpdf/xpdf && patch -p1 < ${filespath}/${file}"
-		}
 }
 
 configure.args	--without-kamera --with-imlib-config=${prefix}/bin --with-distribution='MacPorts/Mac OS X' --without-arts
 
-configure	{}
+use_configure       no
 use_parallel_build  yes
 build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
 destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }

Modified: trunk/dports/kde/kdegraphics3/files/kdegraphics3.patch
===================================================================
--- trunk/dports/kde/kdegraphics3/files/kdegraphics3.patch	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdegraphics3/files/kdegraphics3.patch	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,6 +1,6 @@
-
---- kdegraphics-3.5.4/kcoloredit/Makefile.am	2006-07-22 04:10:29.000000000 -0400
-+++ kdegraphics-3.5.4-new/kcoloredit/Makefile.am	2006-07-31 01:04:48.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kcoloredit/Makefile.am kdegraphics-3.5.9-new/kcoloredit/Makefile.am
+--- kdegraphics-3.5.9/kcoloredit/Makefile.am	2006-07-22 04:10:29.000000000 -0400
++++ kdegraphics-3.5.9-new/kcoloredit/Makefile.am	2008-02-13 21:58:38.000000000 -0500
 @@ -1,21 +1,24 @@
  INCLUDES = $(all_includes)
  
@@ -34,8 +34,9 @@
  
  noinst_HEADERS = color.h colorselector.h editablestreamhistory.h \
  	gradientselection.h imageselection.h kcoloredit.h kcoloreditdoc.h \
---- kdegraphics-3.5.4/kcoloredit/kcolorchooser.cpp	2005-09-10 04:18:59.000000000 -0400
-+++ kdegraphics-3.5.4-new/kcoloredit/kcolorchooser.cpp	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kcoloredit/kcolorchooser.cpp kdegraphics-3.5.9-new/kcoloredit/kcolorchooser.cpp
+--- kdegraphics-3.5.9/kcoloredit/kcolorchooser.cpp	2005-09-10 04:18:59.000000000 -0400
++++ kdegraphics-3.5.9-new/kcoloredit/kcolorchooser.cpp	2008-02-13 21:58:38.000000000 -0500
 @@ -41,7 +41,7 @@
     KCmdLineLastOption
  };
@@ -45,8 +46,9 @@
  {
    KLocale::setMainCatalogue("kdelibs"); 
    KAboutData aboutData( "kcolorchooser", I18N_NOOP("KColorChooser"),
---- kdegraphics-3.5.4/kcoloredit/main.cpp	2005-09-10 04:18:59.000000000 -0400
-+++ kdegraphics-3.5.4-new/kcoloredit/main.cpp	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kcoloredit/main.cpp kdegraphics-3.5.9-new/kcoloredit/main.cpp
+--- kdegraphics-3.5.9/kcoloredit/main.cpp	2005-09-10 04:18:59.000000000 -0400
++++ kdegraphics-3.5.9-new/kcoloredit/main.cpp	2008-02-13 21:58:38.000000000 -0500
 @@ -34,7 +34,7 @@
    // INSERT YOUR COMMANDLINE OPTIONS HERE
  };
@@ -56,8 +58,9 @@
  {
  
  	KAboutData aboutData( "kcoloredit", I18N_NOOP("KColorEdit"),
---- kdegraphics-3.5.4/kdvi/Makefile.am	2005-09-10 04:18:58.000000000 -0400
-+++ kdegraphics-3.5.4-new/kdvi/Makefile.am	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kdvi/Makefile.am kdegraphics-3.5.9-new/kdvi/Makefile.am
+--- kdegraphics-3.5.9/kdvi/Makefile.am	2005-09-10 04:18:58.000000000 -0400
++++ kdegraphics-3.5.9-new/kdvi/Makefile.am	2008-02-13 21:58:38.000000000 -0500
 @@ -1,11 +1,13 @@
  # set the include path for X, qt and KDE
  INCLUDES= -I$(top_srcdir)/kviewshell \
@@ -87,8 +90,9 @@
  
  ## this option you can leave out. Just, if you use "make dist", you need it
  noinst_HEADERS = dvi.h dviRenderer.h xdvi.h
---- kdegraphics-3.5.4/kdvi/main.cpp	2005-11-08 17:25:52.000000000 -0500
-+++ kdegraphics-3.5.4-new/kdvi/main.cpp	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kdvi/main.cpp kdegraphics-3.5.9-new/kdvi/main.cpp
+--- kdegraphics-3.5.9/kdvi/main.cpp	2005-11-08 17:25:52.000000000 -0500
++++ kdegraphics-3.5.9-new/kdvi/main.cpp	2008-02-13 21:58:38.000000000 -0500
 @@ -29,7 +29,7 @@
  static const char description[] = I18N_NOOP("A previewer for Device Independent files (DVI files) produced by the TeX typesetting system.");
  
@@ -98,8 +102,9 @@
  {
    KAboutData about ("kdvi", I18N_NOOP("KDVI"), "1.4",
                      description, KAboutData::License_GPL,
---- kdegraphics-3.5.4/kfax/Makefile.am	2005-10-10 10:56:54.000000000 -0400
-+++ kdegraphics-3.5.4-new/kfax/Makefile.am	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kfax/Makefile.am kdegraphics-3.5.9-new/kfax/Makefile.am
+--- kdegraphics-3.5.9/kfax/Makefile.am	2005-10-10 10:56:54.000000000 -0400
++++ kdegraphics-3.5.9-new/kfax/Makefile.am	2008-02-13 21:58:38.000000000 -0500
 @@ -1,16 +1,18 @@
 -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 -LDADD      = $(LIB_KFILE) $(LIB_KDEPRINT) -lm
@@ -123,8 +128,9 @@
  
  xdg_apps_DATA = kfax.desktop
  
---- kdegraphics-3.5.4/kfax/kfax.cpp	2006-07-22 04:10:31.000000000 -0400
-+++ kdegraphics-3.5.4-new/kfax/kfax.cpp	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kfax/kfax.cpp kdegraphics-3.5.9-new/kfax/kfax.cpp
+--- kdegraphics-3.5.9/kfax/kfax.cpp	2007-01-15 06:22:09.000000000 -0500
++++ kdegraphics-3.5.9-new/kfax/kfax.cpp	2008-02-13 21:58:38.000000000 -0500
 @@ -1646,7 +1646,7 @@
     KCmdLineLastOption
  };
@@ -134,8 +140,9 @@
  {
    KAboutData aboutData( "kfax", I18N_NOOP("KFax"),
        KFAXVERSION, description, KAboutData::License_GPL,
---- kdegraphics-3.5.4/kfaxview/libkfaximage/Makefile.am	2005-09-10 04:18:44.000000000 -0400
-+++ kdegraphics-3.5.4-new/kfaxview/libkfaximage/Makefile.am	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kfaxview/libkfaximage/Makefile.am kdegraphics-3.5.9-new/kfaxview/libkfaximage/Makefile.am
+--- kdegraphics-3.5.9/kfaxview/libkfaximage/Makefile.am	2005-09-10 04:18:44.000000000 -0400
++++ kdegraphics-3.5.9-new/kfaxview/libkfaximage/Makefile.am	2008-02-13 21:58:38.000000000 -0500
 @@ -1,7 +1,7 @@
  INCLUDES = -I$(top_srcdir) $(all_includes)
  
@@ -145,8 +152,9 @@
  libkfaximage_la_LIBADD  = $(LIB_KDECORE)
  libkfaximage_la_SOURCES = kfaximage.cpp faxexpand.cpp faxinit.cpp
  
---- kdegraphics-3.5.4/kfile-plugins/png/Makefile.am	2005-09-10 04:19:24.000000000 -0400
-+++ kdegraphics-3.5.4-new/kfile-plugins/png/Makefile.am	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kfile-plugins/png/Makefile.am kdegraphics-3.5.9-new/kfile-plugins/png/Makefile.am
+--- kdegraphics-3.5.9/kfile-plugins/png/Makefile.am	2005-09-10 04:19:24.000000000 -0400
++++ kdegraphics-3.5.9-new/kfile-plugins/png/Makefile.am	2008-02-13 21:58:38.000000000 -0500
 @@ -10,7 +10,7 @@
  
  kfile_png_la_SOURCES = kfile_png.cpp
@@ -156,8 +164,9 @@
  
  # let automoc handle all of the meta source files (moc)
  METASOURCES = AUTO
---- kdegraphics-3.5.4/kghostview/Makefile.am	2006-05-22 14:05:40.000000000 -0400
-+++ kdegraphics-3.5.4-new/kghostview/Makefile.am	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kghostview/Makefile.am kdegraphics-3.5.9-new/kghostview/Makefile.am
+--- kdegraphics-3.5.9/kghostview/Makefile.am	2006-05-22 14:05:40.000000000 -0400
++++ kdegraphics-3.5.9-new/kghostview/Makefile.am	2008-02-13 21:58:38.000000000 -0500
 @@ -4,7 +4,8 @@
  
  ####### Files
@@ -181,8 +190,9 @@
  
  libdscparse_la_LDFLAGS = $(all_libraries) -no-undefined
  libdscparse_la_LIBADD = $(LIB_QT)
---- kdegraphics-3.5.4/kghostview/main.cpp	2005-10-10 10:56:55.000000000 -0400
-+++ kdegraphics-3.5.4-new/kghostview/main.cpp	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kghostview/main.cpp kdegraphics-3.5.9-new/kghostview/main.cpp
+--- kdegraphics-3.5.9/kghostview/main.cpp	2007-10-08 05:48:41.000000000 -0400
++++ kdegraphics-3.5.9-new/kghostview/main.cpp	2008-02-13 21:58:38.000000000 -0500
 @@ -43,7 +43,7 @@
      KCmdLineLastOption
  };
@@ -192,8 +202,9 @@
  {
      KCmdLineArgs::init( argc, argv, KGVPart::createAboutData() );
      KCmdLineArgs::addCmdLineOptions( options );
---- kdegraphics-3.5.4/kiconedit/Makefile.am	2006-03-17 05:11:23.000000000 -0500
-+++ kdegraphics-3.5.4-new/kiconedit/Makefile.am	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kiconedit/Makefile.am kdegraphics-3.5.9-new/kiconedit/Makefile.am
+--- kdegraphics-3.5.9/kiconedit/Makefile.am	2006-03-17 05:11:23.000000000 -0500
++++ kdegraphics-3.5.9-new/kiconedit/Makefile.am	2008-02-13 21:58:38.000000000 -0500
 @@ -1,18 +1,20 @@
  INCLUDES = $(all_includes)
  SUBDIRS = pics
@@ -220,8 +231,9 @@
  
  DISTCLEANFILES = *~ .deps/* .libs/*
  
---- kdegraphics-3.5.4/kiconedit/main.cpp	2005-10-10 10:56:55.000000000 -0400
-+++ kdegraphics-3.5.4-new/kiconedit/main.cpp	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kiconedit/main.cpp kdegraphics-3.5.9-new/kiconedit/main.cpp
+--- kdegraphics-3.5.9/kiconedit/main.cpp	2005-10-10 10:56:55.000000000 -0400
++++ kdegraphics-3.5.9-new/kiconedit/main.cpp	2008-02-13 21:58:38.000000000 -0500
 @@ -40,7 +40,7 @@
    KCmdLineLastOption
  };
@@ -231,8 +243,9 @@
  {
    KAboutData aboutData( "kiconedit", I18N_NOOP("KIconEdit"),
      VERSION, description, KAboutData::License_GPL,
---- kdegraphics-3.5.4/kooka/Makefile.am	2005-09-10 04:19:00.000000000 -0400
-+++ kdegraphics-3.5.4-new/kooka/Makefile.am	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kooka/Makefile.am kdegraphics-3.5.9-new/kooka/Makefile.am
+--- kdegraphics-3.5.9/kooka/Makefile.am	2005-09-10 04:19:00.000000000 -0400
++++ kdegraphics-3.5.9-new/kooka/Makefile.am	2008-02-13 21:58:38.000000000 -0500
 @@ -2,10 +2,13 @@
  
  SUBDIRS = pics
@@ -260,8 +273,9 @@
  
  INCLUDES         = -I$(top_srcdir)/libkscan $(all_includes) $(LIBSANE_INCLUDES) $(KADMOS_INC)
  
---- kdegraphics-3.5.4/kooka/main.cpp	2005-09-10 04:19:00.000000000 -0400
-+++ kdegraphics-3.5.4-new/kooka/main.cpp	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kooka/main.cpp kdegraphics-3.5.9-new/kooka/main.cpp
+--- kdegraphics-3.5.9/kooka/main.cpp	2007-10-08 05:48:39.000000000 -0400
++++ kdegraphics-3.5.9-new/kooka/main.cpp	2008-02-13 21:58:38.000000000 -0500
 @@ -71,7 +71,7 @@
  
  
@@ -271,8 +285,9 @@
  {
     KAboutData about("kooka", I18N_NOOP("Kooka"), KOOKA_VERSION, I18N_NOOP(description),
  		    KAboutData::License_GPL_V2, "(C) 2000 Klaas Freitag", 0,
---- kdegraphics-3.5.4/kpdf/Makefile.am	2005-09-10 04:18:43.000000000 -0400
-+++ kdegraphics-3.5.4-new/kpdf/Makefile.am	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kpdf/Makefile.am kdegraphics-3.5.9-new/kpdf/Makefile.am
+--- kdegraphics-3.5.9/kpdf/Makefile.am	2005-09-10 04:18:43.000000000 -0400
++++ kdegraphics-3.5.9-new/kpdf/Makefile.am	2008-02-13 21:58:38.000000000 -0500
 @@ -1,6 +1,6 @@
  SUBDIRS = xpdf conf core ui shell
  
@@ -281,8 +296,9 @@
  
  METASOURCES = AUTO
  
---- kdegraphics-3.5.4/kpdf/shell/Makefile.am	2005-09-10 04:18:43.000000000 -0400
-+++ kdegraphics-3.5.4-new/kpdf/shell/Makefile.am	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kpdf/shell/Makefile.am kdegraphics-3.5.9-new/kpdf/shell/Makefile.am
+--- kdegraphics-3.5.9/kpdf/shell/Makefile.am	2005-09-10 04:18:43.000000000 -0400
++++ kdegraphics-3.5.9-new/kpdf/shell/Makefile.am	2008-02-13 21:58:38.000000000 -0500
 @@ -1,12 +1,15 @@
 -INCLUDES = -I$(srcdir)/xpdf -I$(srcdir)/xpdf/goo -I$(top_builddir)/kpdf $(all_includes) $(FREETYPE_CFLAGS)
 +INCLUDES = -I$(srcdir)/xpdf -I$(srcdir)/xpdf/goo -I$(top_builddir)/kpdf $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) $(all_includes)
@@ -304,8 +320,9 @@
  
  EXTRA_DIST = kpdf.desktop
  xdg_apps_DATA = kpdf.desktop
---- kdegraphics-3.5.4/kpdf/shell/main.cpp	2006-07-23 10:15:17.000000000 -0400
-+++ kdegraphics-3.5.4-new/kpdf/shell/main.cpp	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kpdf/shell/main.cpp kdegraphics-3.5.9-new/kpdf/shell/main.cpp
+--- kdegraphics-3.5.9/kpdf/shell/main.cpp	2008-02-13 04:37:05.000000000 -0500
++++ kdegraphics-3.5.9-new/kpdf/shell/main.cpp	2008-02-13 21:58:38.000000000 -0500
 @@ -29,7 +29,7 @@
      KCmdLineLastOption
  };
@@ -315,9 +332,10 @@
  {
      KAboutData about(
          "kpdf",
---- kdegraphics-3.5.4/kpdf/xpdf/xpdf/GlobalParams.cc	2005-11-08 17:25:47.000000000 -0500
-+++ kdegraphics-3.5.4-new/kpdf/xpdf/xpdf/GlobalParams.cc	2006-07-31 01:03:32.000000000 -0400
-@@ -1315,7 +1315,7 @@
+diff -Nurd kdegraphics-3.5.9/kpdf/xpdf/xpdf/GlobalParams.cc kdegraphics-3.5.9-new/kpdf/xpdf/xpdf/GlobalParams.cc
+--- kdegraphics-3.5.9/kpdf/xpdf/xpdf/GlobalParams.cc	2007-05-14 03:39:30.000000000 -0400
++++ kdegraphics-3.5.9-new/kpdf/xpdf/xpdf/GlobalParams.cc	2008-02-13 21:58:38.000000000 -0500
+@@ -2066,7 +2066,7 @@
    if (type.contains("Italic")) slant=FC_SLANT_ITALIC;
    if (type.contains("Bold")) weight=FC_WEIGHT_BOLD;
    if (type.contains("Light")) weight=FC_WEIGHT_LIGHT;
@@ -326,7 +344,7 @@
  }
  
  DisplayFontParam *GlobalParams::getDisplayFont(GString *fontName) {
-@@ -1329,13 +1329,14 @@
+@@ -2080,13 +2080,14 @@
    dfp = (DisplayFontParam *)displayFonts->lookup(fontName);
    // KPDF: try to find font using Xft
    if (!dfp) {
@@ -343,8 +361,9 @@
  	if (!p) goto fin;
  	m = XftFontMatch(qt_xdisplay(),qt_xscreen(),p,&res);
  	if (!m) goto fin;
---- kdegraphics-3.5.4/kpdf/xpdf/xpdf/Makefile.am	2006-05-22 14:05:33.000000000 -0400
-+++ kdegraphics-3.5.4-new/kpdf/xpdf/xpdf/Makefile.am	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kpdf/xpdf/xpdf/Makefile.am kdegraphics-3.5.9-new/kpdf/xpdf/xpdf/Makefile.am
+--- kdegraphics-3.5.9/kpdf/xpdf/xpdf/Makefile.am	2007-05-14 03:39:30.000000000 -0400
++++ kdegraphics-3.5.9-new/kpdf/xpdf/xpdf/Makefile.am	2008-02-13 21:58:38.000000000 -0500
 @@ -1,7 +1,7 @@
  INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../fofi -I$(srcdir)/../splash -I$(srcdir)/../goo $(LIBFREETYPE_CFLAGS) $(XFT_CFLAGS) $(all_includes)
  
@@ -352,10 +371,11 @@
 -libxpdf_la_LIBADD = $(LIB_X11) $(LIBFREETYPE_LIBS) $(LIBPAPER_LIBS) $(XFT_LIBS) $(LIBJPEG) ../goo/libgoo.la ../fofi/libfofi.la ../splash/libsplash.la 
 +libxpdf_la_LIBADD = $(LIBFREETYPE_LIBS) $(XFT_LIBS) $(LIB_X11) $(LIBPAPER_LIBS) $(LIBJPEG) ../goo/libgoo.la ../fofi/libfofi.la ../splash/libsplash.la 
  libxpdf_la_SOURCES = Annot.cc Array.cc BuiltinFont.cc BuiltinFontTables.cc \
-      Catalog.cc CharCodeToUnicode.cc CMap.cc Decrypt.cc Dict.cc DCTStream.cc \
+      Catalog.cc CharCodeToUnicode.cc CMap.cc Decrypt.cc Dict.cc \
       FontEncodingTables.cc Function.cc Gfx.cc \
---- kdegraphics-3.5.4/kpovmodeler/Makefile.am	2005-09-10 04:18:54.000000000 -0400
-+++ kdegraphics-3.5.4-new/kpovmodeler/Makefile.am	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kpovmodeler/Makefile.am kdegraphics-3.5.9-new/kpovmodeler/Makefile.am
+--- kdegraphics-3.5.9/kpovmodeler/Makefile.am	2005-09-10 04:18:54.000000000 -0400
++++ kdegraphics-3.5.9-new/kpovmodeler/Makefile.am	2008-02-13 21:58:38.000000000 -0500
 @@ -224,11 +224,12 @@
  ####
  # the executable
@@ -373,8 +393,9 @@
  
  dummy.cpp:
  	echo > dummy.cpp
---- kdegraphics-3.5.4/kpovmodeler/main.cpp	2005-09-10 04:18:54.000000000 -0400
-+++ kdegraphics-3.5.4-new/kpovmodeler/main.cpp	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kpovmodeler/main.cpp kdegraphics-3.5.9-new/kpovmodeler/main.cpp
+--- kdegraphics-3.5.9/kpovmodeler/main.cpp	2007-10-08 05:48:38.000000000 -0400
++++ kdegraphics-3.5.9-new/kpovmodeler/main.cpp	2008-02-13 21:58:38.000000000 -0500
 @@ -35,7 +35,7 @@
    KCmdLineLastOption
  };
@@ -384,8 +405,9 @@
  {
     PMShell* shell = 0;
  
---- kdegraphics-3.5.4/kruler/Makefile.am	2005-09-10 04:19:23.000000000 -0400
-+++ kdegraphics-3.5.4-new/kruler/Makefile.am	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kruler/Makefile.am kdegraphics-3.5.9-new/kruler/Makefile.am
+--- kdegraphics-3.5.9/kruler/Makefile.am	2005-09-10 04:19:23.000000000 -0400
++++ kdegraphics-3.5.9-new/kruler/Makefile.am	2008-02-13 21:58:38.000000000 -0500
 @@ -2,11 +2,14 @@
  
  INCLUDES= $(all_includes)
@@ -406,8 +428,9 @@
  
  xdg_apps_DATA = kruler.desktop
  
---- kdegraphics-3.5.4/kruler/main.cpp	2005-09-10 04:19:23.000000000 -0400
-+++ kdegraphics-3.5.4-new/kruler/main.cpp	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kruler/main.cpp kdegraphics-3.5.9-new/kruler/main.cpp
+--- kdegraphics-3.5.9/kruler/main.cpp	2005-09-10 04:19:23.000000000 -0400
++++ kdegraphics-3.5.9-new/kruler/main.cpp	2008-02-13 21:58:38.000000000 -0500
 @@ -22,7 +22,7 @@
    // INSERT YOUR COMMANDLINE OPTIONS HERE
  };
@@ -417,8 +440,9 @@
  {
  
  
---- kdegraphics-3.5.4/ksnapshot/Makefile.am	2005-09-10 04:19:19.000000000 -0400
-+++ kdegraphics-3.5.4-new/ksnapshot/Makefile.am	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/ksnapshot/Makefile.am kdegraphics-3.5.9-new/ksnapshot/Makefile.am
+--- kdegraphics-3.5.9/ksnapshot/Makefile.am	2005-09-10 04:19:19.000000000 -0400
++++ kdegraphics-3.5.9-new/ksnapshot/Makefile.am	2008-02-13 21:58:38.000000000 -0500
 @@ -1,14 +1,16 @@
 -bin_PROGRAMS= ksnapshot
 +bin_PROGRAMS= 
@@ -441,8 +465,9 @@
  
  xdg_apps_DATA = ksnapshot.desktop
  
---- kdegraphics-3.5.4/ksnapshot/main.cpp	2005-10-10 10:56:53.000000000 -0400
-+++ kdegraphics-3.5.4-new/ksnapshot/main.cpp	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/ksnapshot/main.cpp kdegraphics-3.5.9-new/ksnapshot/main.cpp
+--- kdegraphics-3.5.9/ksnapshot/main.cpp	2007-10-08 05:48:40.000000000 -0400
++++ kdegraphics-3.5.9-new/ksnapshot/main.cpp	2008-02-13 21:58:38.000000000 -0500
 @@ -40,7 +40,7 @@
      { 0, 0, 0 }
  };
@@ -452,8 +477,9 @@
  {
    KAboutData aboutData( "ksnapshot", I18N_NOOP("KSnapshot"),
      KSNAPVERSION, description, KAboutData::License_GPL,
---- kdegraphics-3.5.4/ksvg/Makefile.am	2005-09-10 04:19:19.000000000 -0400
-+++ kdegraphics-3.5.4-new/ksvg/Makefile.am	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/ksvg/Makefile.am kdegraphics-3.5.9-new/ksvg/Makefile.am
+--- kdegraphics-3.5.9/ksvg/Makefile.am	2005-09-10 04:19:19.000000000 -0400
++++ kdegraphics-3.5.9-new/ksvg/Makefile.am	2008-02-13 21:58:38.000000000 -0500
 @@ -4,9 +4,9 @@
  libksvg_la_SOURCES = dummy.cc
  libksvg_la_METASOURCES = AUTO
@@ -466,8 +492,9 @@
  
  INCLUDES = -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl $(all_includes)
  
---- kdegraphics-3.5.4/ksvg/impl/libs/libtext2path/src/Makefile.am	2005-09-10 04:19:14.000000000 -0400
-+++ kdegraphics-3.5.4-new/ksvg/impl/libs/libtext2path/src/Makefile.am	2006-07-31 01:03:32.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/ksvg/impl/libs/libtext2path/src/Makefile.am kdegraphics-3.5.9-new/ksvg/impl/libs/libtext2path/src/Makefile.am
+--- kdegraphics-3.5.9/ksvg/impl/libs/libtext2path/src/Makefile.am	2005-09-10 04:19:14.000000000 -0400
++++ kdegraphics-3.5.9-new/ksvg/impl/libs/libtext2path/src/Makefile.am	2008-02-13 21:58:38.000000000 -0500
 @@ -1,10 +1,10 @@
  lib_LTLIBRARIES = libtext2path.la
  
@@ -481,24 +508,27 @@
  libtext2path_la_SOURCES = Affine.cpp Rectangle.cpp Font.cpp Glyph.cpp GlyphTracer.cpp Converter.cpp QtUnicode.cpp
 -libtext2path_la_LDFLAGS = $(FRIBIDI_LIBS) $(FONTCONFIG_LIBS)
 +libtext2path_la_LDFLAGS = $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(FRIBIDI_LIBS)
---- kdegraphics-3.5.4/ksvg/plugin/backends/agg/Makefile.am	2005-09-10 04:19:12.000000000 -0400
-+++ kdegraphics-3.5.4-new/ksvg/plugin/backends/agg/Makefile.am	2006-07-31 01:03:33.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/ksvg/plugin/backends/agg/Makefile.am kdegraphics-3.5.9-new/ksvg/plugin/backends/agg/Makefile.am
+--- kdegraphics-3.5.9/ksvg/plugin/backends/agg/Makefile.am	2005-09-10 04:19:12.000000000 -0400
++++ kdegraphics-3.5.9-new/ksvg/plugin/backends/agg/Makefile.am	2008-02-13 21:58:38.000000000 -0500
 @@ -12,4 +12,4 @@
  kde_services_DATA = ksvgaggcanvas.desktop
  
  KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 -INCLUDES = $(KDE_INCLUDES) $(AGG_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl -I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/core -I$(top_srcdir)/ksvg/impl/libs/art_support -I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(all_includes)
 +INCLUDES = $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) $(KDE_INCLUDES) $(AGG_CFLAGS) -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl -I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/core -I$(top_srcdir)/ksvg/impl/libs/art_support -I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(all_includes)
---- kdegraphics-3.5.4/ksvg/plugin/backends/libart/Makefile.am	2005-09-10 04:19:11.000000000 -0400
-+++ kdegraphics-3.5.4-new/ksvg/plugin/backends/libart/Makefile.am	2006-07-31 01:03:33.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/ksvg/plugin/backends/libart/Makefile.am kdegraphics-3.5.9-new/ksvg/plugin/backends/libart/Makefile.am
+--- kdegraphics-3.5.9/ksvg/plugin/backends/libart/Makefile.am	2005-09-10 04:19:11.000000000 -0400
++++ kdegraphics-3.5.9-new/ksvg/plugin/backends/libart/Makefile.am	2008-02-13 21:58:38.000000000 -0500
 @@ -8,4 +8,4 @@
  kde_services_DATA = ksvglibartcanvas.desktop
  
  KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 -INCLUDES = $(LIBART_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl -I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/core -I$(top_srcdir)/ksvg/impl/libs/art_support -I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(KDE_INCLUDES) $(all_includes)
 +INCLUDES = $(FREETYPE_CFLAGS) $(LIBART_CFLAGS) $(FONTCONFIG_CFLAGS) -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl -I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/core -I$(top_srcdir)/ksvg/impl/libs/art_support -I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(KDE_INCLUDES) $(all_includes)
---- kdegraphics-3.5.4/ksvg/test/external/Makefile.am	2005-09-10 04:19:09.000000000 -0400
-+++ kdegraphics-3.5.4-new/ksvg/test/external/Makefile.am	2006-07-31 01:03:33.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/ksvg/test/external/Makefile.am kdegraphics-3.5.9-new/ksvg/test/external/Makefile.am
+--- kdegraphics-3.5.9/ksvg/test/external/Makefile.am	2005-09-10 04:19:09.000000000 -0400
++++ kdegraphics-3.5.9-new/ksvg/test/external/Makefile.am	2008-02-13 21:58:38.000000000 -0500
 @@ -1,13 +1,16 @@
  INCLUDES = $(FREETYPE_CFLAGS) -I$(top_srcdir)/ksvg -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl -I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/core -I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(all_includes)
 +LDFLAGS = $(FREETYPE_LDFLAGS)
@@ -523,8 +553,9 @@
 +printnodetest_la_SOURCES = printnodetest.cpp
 +printnodetest_la_LIBADD =  $(LIB_KDECORE) ../../libksvg.la
 +printnodetest_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -module
---- kdegraphics-3.5.4/ksvg/test/external/printnodetest.cpp	2005-10-10 10:56:46.000000000 -0400
-+++ kdegraphics-3.5.4-new/ksvg/test/external/printnodetest.cpp	2006-07-31 01:03:33.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/ksvg/test/external/printnodetest.cpp kdegraphics-3.5.9-new/ksvg/test/external/printnodetest.cpp
+--- kdegraphics-3.5.9/ksvg/test/external/printnodetest.cpp	2005-10-10 10:56:46.000000000 -0400
++++ kdegraphics-3.5.9-new/ksvg/test/external/printnodetest.cpp	2008-02-13 21:58:38.000000000 -0500
 @@ -44,7 +44,7 @@
  	exit(0);
  }
@@ -534,8 +565,9 @@
  {
  	KAboutData *about = new KAboutData("KSVG printNode test app", I18N_NOOP("KSVG test"), "0.1", I18N_NOOP("KSVG printNode test app"));
  	KCmdLineArgs::init(argc, argv, about);
---- kdegraphics-3.5.4/ksvg/test/external/svgdisplay.cc	2005-09-10 04:19:09.000000000 -0400
-+++ kdegraphics-3.5.4-new/ksvg/test/external/svgdisplay.cc	2006-07-31 01:03:33.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/ksvg/test/external/svgdisplay.cc kdegraphics-3.5.9-new/ksvg/test/external/svgdisplay.cc
+--- kdegraphics-3.5.9/ksvg/test/external/svgdisplay.cc	2005-09-10 04:19:09.000000000 -0400
++++ kdegraphics-3.5.9-new/ksvg/test/external/svgdisplay.cc	2008-02-13 21:58:38.000000000 -0500
 @@ -10,7 +10,7 @@
  	KCmdLineLastOption
  };
@@ -545,8 +577,9 @@
  {
  
  	KAboutData *about = new KAboutData( "KSVG test app", I18N_NOOP("KSVG test"), "0.1", I18N_NOOP("KSVG standalone test app") );
---- kdegraphics-3.5.4/kviewshell/Makefile.am	2005-09-10 04:19:21.000000000 -0400
-+++ kdegraphics-3.5.4-new/kviewshell/Makefile.am	2006-07-31 01:03:33.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kviewshell/Makefile.am kdegraphics-3.5.9-new/kviewshell/Makefile.am
+--- kdegraphics-3.5.9/kviewshell/Makefile.am	2005-09-10 04:19:21.000000000 -0400
++++ kdegraphics-3.5.9-new/kviewshell/Makefile.am	2008-02-13 21:58:38.000000000 -0500
 @@ -5,8 +5,9 @@
  
  ####### Files
@@ -571,8 +604,9 @@
  
  kviewshellinclude_HEADERS = anchor.h bookmark.h pageView.h documentPageCache.h documentRenderer.h documentWidget.h \
  	history.h hyperlink.h kmultipage.h length.h pageNumber.h pageSize.h renderedDocumentPage.h renderedDocumentPagePixmap.h \
---- kdegraphics-3.5.4/kviewshell/main.cpp	2005-11-08 17:25:45.000000000 -0500
-+++ kdegraphics-3.5.4-new/kviewshell/main.cpp	2006-07-31 01:03:33.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kviewshell/main.cpp kdegraphics-3.5.9-new/kviewshell/main.cpp
+--- kdegraphics-3.5.9/kviewshell/main.cpp	2005-11-08 17:25:45.000000000 -0500
++++ kdegraphics-3.5.9-new/kviewshell/main.cpp	2008-02-13 21:58:38.000000000 -0500
 @@ -32,7 +32,7 @@
  static const char description[] = I18N_NOOP("Generic framework for viewer applications");
  
@@ -582,8 +616,9 @@
  {
    KAboutData about ("kviewshell", I18N_NOOP("KViewShell"), "0.6",
  		    description, KAboutData::License_GPL,
---- kdegraphics-3.5.4/kviewshell/plugins/djvu/libdjvu/Makefile.am	2005-11-08 17:25:45.000000000 -0500
-+++ kdegraphics-3.5.4-new/kviewshell/plugins/djvu/libdjvu/Makefile.am	2006-07-31 01:03:33.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/kviewshell/plugins/djvu/libdjvu/Makefile.am kdegraphics-3.5.9-new/kviewshell/plugins/djvu/libdjvu/Makefile.am
+--- kdegraphics-3.5.9/kviewshell/plugins/djvu/libdjvu/Makefile.am	2005-11-08 17:25:45.000000000 -0500
++++ kdegraphics-3.5.9-new/kviewshell/plugins/djvu/libdjvu/Makefile.am	2008-02-13 21:58:38.000000000 -0500
 @@ -1,7 +1,7 @@
  INCLUDES = -I$(top_srcdir) $(all_includes)
  
@@ -594,8 +629,9 @@
  libdjvu_la_LIBADD = $(LIBJPEG)
  libdjvu_la_SOURCES = Arrays.cpp DjVuDocEditor.cpp DjVuMessageLite.cpp GOS.cpp IW44Image.cpp \
  	BSByteStream.cpp DjVuDocument.cpp DjVuNavDir.cpp GPixmap.cpp JB2EncodeCodec.cpp \
---- kdegraphics-3.5.4/libkscan/img_canvas.cpp	2006-05-22 14:05:37.000000000 -0400
-+++ kdegraphics-3.5.4-new/libkscan/img_canvas.cpp	2006-07-31 01:03:33.000000000 -0400
+diff -Nurd kdegraphics-3.5.9/libkscan/img_canvas.cpp kdegraphics-3.5.9-new/libkscan/img_canvas.cpp
+--- kdegraphics-3.5.9/libkscan/img_canvas.cpp	2006-05-22 14:05:37.000000000 -0400
++++ kdegraphics-3.5.9-new/libkscan/img_canvas.cpp	2008-02-13 21:58:38.000000000 -0500
 @@ -701,7 +701,7 @@
                             double(image->width());
              kdDebug(29000) << "FIT WIDTH scrollbar to substract: " << sbWidth << endl;

Deleted: trunk/dports/kde/kdegraphics3/files/xpdf-3.02pl2.patch
===================================================================
--- trunk/dports/kde/kdegraphics3/files/xpdf-3.02pl2.patch	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdegraphics3/files/xpdf-3.02pl2.patch	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,823 +0,0 @@
-diff -c -r xpdf-3.02pl1.orig/xpdf/Stream.cc xpdf-3.02/xpdf/Stream.cc
-*** xpdf-3.02pl1.orig/xpdf/Stream.cc	Thu Oct 25 15:47:38 2007
---- xpdf-3.02/xpdf/Stream.cc	Thu Oct 25 15:48:19 2007
-***************
-*** 1243,1265 ****
-    columns = columnsA;
-    if (columns < 1) {
-      columns = 1;
-!   }
-!   if (columns + 4 <= 0) {
-!     columns = INT_MAX - 4;
-    }
-    rows = rowsA;
-    endOfBlock = endOfBlockA;
-    black = blackA;
-!   refLine = (short *)gmallocn(columns + 3, sizeof(short));
-!   codingLine = (short *)gmallocn(columns + 2, sizeof(short));
-  
-    eof = gFalse;
-    row = 0;
-    nextLine2D = encoding < 0;
-    inputBits = 0;
-!   codingLine[0] = 0;
-!   codingLine[1] = refLine[2] = columns;
-!   a0 = 1;
-  
-    buf = EOF;
-  }
---- 1243,1268 ----
-    columns = columnsA;
-    if (columns < 1) {
-      columns = 1;
-!   } else if (columns > INT_MAX - 2) {
-!     columns = INT_MAX - 2;
-    }
-    rows = rowsA;
-    endOfBlock = endOfBlockA;
-    black = blackA;
-!   // 0 <= codingLine[0] < codingLine[1] < ... < codingLine[n] = columns
-!   // ---> max codingLine size = columns + 1
-!   // refLine has one extra guard entry at the end
-!   // ---> max refLine size = columns + 2
-!   codingLine = (int *)gmallocn(columns + 1, sizeof(int));
-!   refLine = (int *)gmallocn(columns + 2, sizeof(int));
-  
-    eof = gFalse;
-    row = 0;
-    nextLine2D = encoding < 0;
-    inputBits = 0;
-!   codingLine[0] = columns;
-!   a0i = 0;
-!   outputBits = 0;
-  
-    buf = EOF;
-  }
-***************
-*** 1278,1286 ****
-    row = 0;
-    nextLine2D = encoding < 0;
-    inputBits = 0;
-!   codingLine[0] = 0;
-!   codingLine[1] = columns;
-!   a0 = 1;
-    buf = EOF;
-  
-    // skip any initial zero bits and end-of-line marker, and get the 2D
---- 1281,1289 ----
-    row = 0;
-    nextLine2D = encoding < 0;
-    inputBits = 0;
-!   codingLine[0] = columns;
-!   a0i = 0;
-!   outputBits = 0;
-    buf = EOF;
-  
-    // skip any initial zero bits and end-of-line marker, and get the 2D
-***************
-*** 1297,1507 ****
-    }
-  }
-  
-  int CCITTFaxStream::lookChar() {
-    short code1, code2, code3;
-!   int a0New;
-!   GBool err, gotEOL;
-!   int ret;
-!   int bits, i;
-  
-!   // if at eof just return EOF
-!   if (eof && codingLine[a0] >= columns) {
-!     return EOF;
-    }
-  
-    // read the next row
-!   err = gFalse;
-!   if (codingLine[a0] >= columns) {
-  
-      // 2-D encoding
-      if (nextLine2D) {
--       // state:
--       //   a0New = current position in coding line (0 <= a0New <= columns)
--       //   codingLine[a0] = last change in coding line
--       //                    (black-to-white if a0 is even,
--       //                     white-to-black if a0 is odd)
--       //   refLine[b1] = next change in reference line of opposite color
--       //                 to a0
--       // invariants:
--       //   0 <= codingLine[a0] <= a0New
--       //           <= refLine[b1] <= refLine[b1+1] <= columns
--       //   0 <= a0 <= columns+1
--       //   refLine[0] = 0
--       //   refLine[n] = refLine[n+1] = columns
--       //     -- for some 1 <= n <= columns+1
--       // end condition:
--       //   0 = codingLine[0] <= codingLine[1] < codingLine[2] < ...
--       //     < codingLine[n-1] < codingLine[n] = columns
--       //     -- where 1 <= n <= columns+1
-        for (i = 0; codingLine[i] < columns; ++i) {
-  	refLine[i] = codingLine[i];
-        }
-!       refLine[i] = refLine[i + 1] = columns;
-!       b1 = 1;
-!       a0New = codingLine[a0 = 0] = 0;
-!       do {
-  	code1 = getTwoDimCode();
-  	switch (code1) {
-  	case twoDimPass:
-! 	  if (refLine[b1] < columns) {
-! 	    a0New = refLine[b1 + 1];
-! 	    b1 += 2;
-  	  }
-  	  break;
-  	case twoDimHoriz:
-! 	  if ((a0 & 1) == 0) {
-! 	    code1 = code2 = 0;
-  	    do {
-! 	      code1 += code3 = getWhiteCode();
-  	    } while (code3 >= 64);
-  	    do {
-! 	      code2 += code3 = getBlackCode();
-  	    } while (code3 >= 64);
-  	  } else {
-- 	    code1 = code2 = 0;
-  	    do {
-! 	      code1 += code3 = getBlackCode();
-  	    } while (code3 >= 64);
-  	    do {
-! 	      code2 += code3 = getWhiteCode();
-  	    } while (code3 >= 64);
-  	  }
-! 	  if (code1 > 0 || code2 > 0) {
-! 	    if (a0New + code1 <= columns) {
-! 	      codingLine[a0 + 1] = a0New + code1;
-! 	    } else {
-! 	      codingLine[a0 + 1] = columns;
-! 	    }
-! 	    ++a0;
-! 	    if (codingLine[a0] + code2 <= columns) {
-! 	      codingLine[a0 + 1] = codingLine[a0] + code2;
-! 	    } else {
-! 	      codingLine[a0 + 1] = columns;
-! 	    }
-! 	    ++a0;
-! 	    a0New = codingLine[a0];
-! 	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
-! 	      b1 += 2;
-  	    }
-  	  }
-  	  break;
-! 	case twoDimVert0:
-! 	  if (refLine[b1] < columns) {
-! 	    a0New = codingLine[++a0] = refLine[b1];
-! 	    ++b1;
-! 	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
-! 	      b1 += 2;
-  	    }
-- 	  } else {
-- 	    a0New = codingLine[++a0] = columns;
-  	  }
-  	  break;
-  	case twoDimVertR1:
-! 	  if (refLine[b1] + 1 < columns) {
-! 	    a0New = codingLine[++a0] = refLine[b1] + 1;
-! 	    ++b1;
-! 	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
-! 	      b1 += 2;
-  	    }
-- 	  } else {
-- 	    a0New = codingLine[++a0] = columns;
-  	  }
-  	  break;
-! 	case twoDimVertL1:
-! 	  if (refLine[b1] - 1 > a0New || (a0 == 0 && refLine[b1] == 1)) {
-! 	    a0New = codingLine[++a0] = refLine[b1] - 1;
-! 	    --b1;
-! 	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
-! 	      b1 += 2;
-  	    }
-  	  }
-  	  break;
-! 	case twoDimVertR2:
-! 	  if (refLine[b1] + 2 < columns) {
-! 	    a0New = codingLine[++a0] = refLine[b1] + 2;
-! 	    ++b1;
-! 	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
-! 	      b1 += 2;
-  	    }
-- 	  } else {
-- 	    a0New = codingLine[++a0] = columns;
-  	  }
-  	  break;
-  	case twoDimVertL2:
-! 	  if (refLine[b1] - 2 > a0New || (a0 == 0 && refLine[b1] == 2)) {
-! 	    a0New = codingLine[++a0] = refLine[b1] - 2;
-! 	    --b1;
-! 	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
-! 	      b1 += 2;
-  	    }
-! 	  }
-! 	  break;
-! 	case twoDimVertR3:
-! 	  if (refLine[b1] + 3 < columns) {
-! 	    a0New = codingLine[++a0] = refLine[b1] + 3;
-! 	    ++b1;
-! 	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
-! 	      b1 += 2;
-  	    }
-- 	  } else {
-- 	    a0New = codingLine[++a0] = columns;
-  	  }
-  	  break;
-! 	case twoDimVertL3:
-! 	  if (refLine[b1] - 3 > a0New || (a0 == 0 && refLine[b1] == 3)) {
-! 	    a0New = codingLine[++a0] = refLine[b1] - 3;
-! 	    --b1;
-! 	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
-! 	      b1 += 2;
-  	    }
-  	  }
-  	  break;
-  	case EOF:
-  	  eof = gTrue;
-! 	  codingLine[a0 = 0] = columns;
-! 	  return EOF;
-  	default:
-  	  error(getPos(), "Bad 2D code %04x in CCITTFax stream", code1);
-  	  err = gTrue;
-  	  break;
-  	}
-!       } while (codingLine[a0] < columns);
-  
-      // 1-D encoding
-      } else {
-!       codingLine[a0 = 0] = 0;
-!       while (1) {
-  	code1 = 0;
-! 	do {
-! 	  code1 += code3 = getWhiteCode();
-! 	} while (code3 >= 64);
-! 	codingLine[a0+1] = codingLine[a0] + code1;
-! 	++a0;
-! 	if (codingLine[a0] >= columns) {
-! 	  break;
-! 	}
-! 	code2 = 0;
-! 	do {
-! 	  code2 += code3 = getBlackCode();
-! 	} while (code3 >= 64);
-! 	codingLine[a0+1] = codingLine[a0] + code2;
-! 	++a0;
-! 	if (codingLine[a0] >= columns) {
-! 	  break;
-  	}
-        }
-      }
-  
--     if (codingLine[a0] != columns) {
--       error(getPos(), "CCITTFax row is wrong length (%d)", codingLine[a0]);
--       // force the row to be the correct length
--       while (codingLine[a0] > columns) {
-- 	--a0;
--       }
--       codingLine[++a0] = columns;
--       err = gTrue;
--     }
-- 
-      // byte-align the row
-      if (byteAlign) {
-        inputBits &= ~7;
---- 1300,1529 ----
-    }
-  }
-  
-+ inline void CCITTFaxStream::addPixels(int a1, int blackPixels) {
-+   if (a1 > codingLine[a0i]) {
-+     if (a1 > columns) {
-+       error(getPos(), "CCITTFax row is wrong length (%d)", a1);
-+       err = gTrue;
-+       a1 = columns;
-+     }
-+     if ((a0i & 1) ^ blackPixels) {
-+       ++a0i;
-+     }
-+     codingLine[a0i] = a1;
-+   }
-+ }
-+ 
-+ inline void CCITTFaxStream::addPixelsNeg(int a1, int blackPixels) {
-+   if (a1 > codingLine[a0i]) {
-+     if (a1 > columns) {
-+       error(getPos(), "CCITTFax row is wrong length (%d)", a1);
-+       err = gTrue;
-+       a1 = columns;
-+     }
-+     if ((a0i & 1) ^ blackPixels) {
-+       ++a0i;
-+     }
-+     codingLine[a0i] = a1;
-+   } else if (a1 < codingLine[a0i]) {
-+     if (a1 < 0) {
-+       error(getPos(), "Invalid CCITTFax code");
-+       err = gTrue;
-+       a1 = 0;
-+     }
-+     while (a0i > 0 && a1 <= codingLine[a0i - 1]) {
-+       --a0i;
-+     }
-+     codingLine[a0i] = a1;
-+   }
-+ }
-+ 
-  int CCITTFaxStream::lookChar() {
-    short code1, code2, code3;
-!   int b1i, blackPixels, i, bits;
-!   GBool gotEOL;
-  
-!   if (buf != EOF) {
-!     return buf;
-    }
-  
-    // read the next row
-!   if (outputBits == 0) {
-! 
-!     // if at eof just return EOF
-!     if (eof) {
-!       return EOF;
-!     }
-! 
-!     err = gFalse;
-  
-      // 2-D encoding
-      if (nextLine2D) {
-        for (i = 0; codingLine[i] < columns; ++i) {
-  	refLine[i] = codingLine[i];
-        }
-!       refLine[i++] = columns;
-!       refLine[i] = columns;
-!       codingLine[0] = 0;
-!       a0i = 0;
-!       b1i = 0;
-!       blackPixels = 0;
-!       // invariant:
-!       // refLine[b1i-1] <= codingLine[a0i] < refLine[b1i] < refLine[b1i+1]
-!       //                                                             <= columns
-!       // exception at left edge:
-!       //   codingLine[a0i = 0] = refLine[b1i = 0] = 0 is possible
-!       // exception at right edge:
-!       //   refLine[b1i] = refLine[b1i+1] = columns is possible
-!       while (codingLine[a0i] < columns) {
-  	code1 = getTwoDimCode();
-  	switch (code1) {
-  	case twoDimPass:
-! 	  addPixels(refLine[b1i + 1], blackPixels);
-! 	  if (refLine[b1i + 1] < columns) {
-! 	    b1i += 2;
-  	  }
-  	  break;
-  	case twoDimHoriz:
-! 	  code1 = code2 = 0;
-! 	  if (blackPixels) {
-  	    do {
-! 	      code1 += code3 = getBlackCode();
-  	    } while (code3 >= 64);
-  	    do {
-! 	      code2 += code3 = getWhiteCode();
-  	    } while (code3 >= 64);
-  	  } else {
-  	    do {
-! 	      code1 += code3 = getWhiteCode();
-  	    } while (code3 >= 64);
-  	    do {
-! 	      code2 += code3 = getBlackCode();
-  	    } while (code3 >= 64);
-  	  }
-! 	  addPixels(codingLine[a0i] + code1, blackPixels);
-! 	  if (codingLine[a0i] < columns) {
-! 	    addPixels(codingLine[a0i] + code2, blackPixels ^ 1);
-! 	  }
-! 	  while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-! 	    b1i += 2;
-! 	  }
-! 	  break;
-! 	case twoDimVertR3:
-! 	  addPixels(refLine[b1i] + 3, blackPixels);
-! 	  blackPixels ^= 1;
-! 	  if (codingLine[a0i] < columns) {
-! 	    ++b1i;
-! 	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-! 	      b1i += 2;
-  	    }
-  	  }
-  	  break;
-! 	case twoDimVertR2:
-! 	  addPixels(refLine[b1i] + 2, blackPixels);
-! 	  blackPixels ^= 1;
-! 	  if (codingLine[a0i] < columns) {
-! 	    ++b1i;
-! 	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-! 	      b1i += 2;
-  	    }
-  	  }
-  	  break;
-  	case twoDimVertR1:
-! 	  addPixels(refLine[b1i] + 1, blackPixels);
-! 	  blackPixels ^= 1;
-! 	  if (codingLine[a0i] < columns) {
-! 	    ++b1i;
-! 	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-! 	      b1i += 2;
-  	    }
-  	  }
-  	  break;
-! 	case twoDimVert0:
-! 	  addPixels(refLine[b1i], blackPixels);
-! 	  blackPixels ^= 1;
-! 	  if (codingLine[a0i] < columns) {
-! 	    ++b1i;
-! 	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-! 	      b1i += 2;
-  	    }
-  	  }
-  	  break;
-! 	case twoDimVertL3:
-! 	  addPixelsNeg(refLine[b1i] - 3, blackPixels);
-! 	  blackPixels ^= 1;
-! 	  if (codingLine[a0i] < columns) {
-! 	    if (b1i > 0) {
-! 	      --b1i;
-! 	    } else {
-! 	      ++b1i;
-! 	    }
-! 	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-! 	      b1i += 2;
-  	    }
-  	  }
-  	  break;
-  	case twoDimVertL2:
-! 	  addPixelsNeg(refLine[b1i] - 2, blackPixels);
-! 	  blackPixels ^= 1;
-! 	  if (codingLine[a0i] < columns) {
-! 	    if (b1i > 0) {
-! 	      --b1i;
-! 	    } else {
-! 	      ++b1i;
-  	    }
-! 	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-! 	      b1i += 2;
-  	    }
-  	  }
-  	  break;
-! 	case twoDimVertL1:
-! 	  addPixelsNeg(refLine[b1i] - 1, blackPixels);
-! 	  blackPixels ^= 1;
-! 	  if (codingLine[a0i] < columns) {
-! 	    if (b1i > 0) {
-! 	      --b1i;
-! 	    } else {
-! 	      ++b1i;
-! 	    }
-! 	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-! 	      b1i += 2;
-  	    }
-  	  }
-  	  break;
-  	case EOF:
-+ 	  addPixels(columns, 0);
-  	  eof = gTrue;
-! 	  break;
-  	default:
-  	  error(getPos(), "Bad 2D code %04x in CCITTFax stream", code1);
-+ 	  addPixels(columns, 0);
-  	  err = gTrue;
-  	  break;
-  	}
-!       }
-  
-      // 1-D encoding
-      } else {
-!       codingLine[0] = 0;
-!       a0i = 0;
-!       blackPixels = 0;
-!       while (codingLine[a0i] < columns) {
-  	code1 = 0;
-! 	if (blackPixels) {
-! 	  do {
-! 	    code1 += code3 = getBlackCode();
-! 	  } while (code3 >= 64);
-! 	} else {
-! 	  do {
-! 	    code1 += code3 = getWhiteCode();
-! 	  } while (code3 >= 64);
-  	}
-+ 	addPixels(codingLine[a0i] + code1, blackPixels);
-+ 	blackPixels ^= 1;
-        }
-      }
-  
-      // byte-align the row
-      if (byteAlign) {
-        inputBits &= ~7;
-***************
-*** 1560,1573 ****
-      // this if we know the stream contains end-of-line markers because
-      // the "just plow on" technique tends to work better otherwise
-      } else if (err && endOfLine) {
-!       do {
-  	if (code1 == EOF) {
-  	  eof = gTrue;
-  	  return EOF;
-  	}
-  	eatBits(1);
-! 	code1 = lookBits(13);
-!       } while ((code1 >> 1) != 0x001);
-        eatBits(12); 
-        if (encoding > 0) {
-  	eatBits(1);
---- 1582,1598 ----
-      // this if we know the stream contains end-of-line markers because
-      // the "just plow on" technique tends to work better otherwise
-      } else if (err && endOfLine) {
-!       while (1) {
-! 	code1 = lookBits(13);
-  	if (code1 == EOF) {
-  	  eof = gTrue;
-  	  return EOF;
-  	}
-+ 	if ((code1 >> 1) == 0x001) {
-+ 	  break;
-+ 	}
-  	eatBits(1);
-!       }
-        eatBits(12); 
-        if (encoding > 0) {
-  	eatBits(1);
-***************
-*** 1575,1585 ****
-        }
-      }
-  
-!     a0 = 0;
-!     outputBits = codingLine[1] - codingLine[0];
-!     if (outputBits == 0) {
-!       a0 = 1;
-!       outputBits = codingLine[2] - codingLine[1];
-      }
-  
-      ++row;
---- 1600,1610 ----
-        }
-      }
-  
-!     // set up for output
-!     if (codingLine[0] > 0) {
-!       outputBits = codingLine[a0i = 0];
-!     } else {
-!       outputBits = codingLine[a0i = 1];
-      }
-  
-      ++row;
-***************
-*** 1587,1625 ****
-  
-    // get a byte
-    if (outputBits >= 8) {
-!     ret = ((a0 & 1) == 0) ? 0xff : 0x00;
-!     if ((outputBits -= 8) == 0) {
-!       ++a0;
-!       if (codingLine[a0] < columns) {
-! 	outputBits = codingLine[a0 + 1] - codingLine[a0];
-!       }
-      }
-    } else {
-      bits = 8;
-!     ret = 0;
-      do {
-        if (outputBits > bits) {
-! 	i = bits;
-! 	bits = 0;
-! 	if ((a0 & 1) == 0) {
-! 	  ret |= 0xff >> (8 - i);
-  	}
-! 	outputBits -= i;
-        } else {
-! 	i = outputBits;
-! 	bits -= outputBits;
-! 	if ((a0 & 1) == 0) {
-! 	  ret |= (0xff >> (8 - i)) << bits;
-  	}
-  	outputBits = 0;
-! 	++a0;
-! 	if (codingLine[a0] < columns) {
-! 	  outputBits = codingLine[a0 + 1] - codingLine[a0];
-  	}
-        }
-!     } while (bits > 0 && codingLine[a0] < columns);
-    }
--   buf = black ? (ret ^ 0xff) : ret;
-    return buf;
-  }
-  
---- 1612,1654 ----
-  
-    // get a byte
-    if (outputBits >= 8) {
-!     buf = (a0i & 1) ? 0x00 : 0xff;
-!     outputBits -= 8;
-!     if (outputBits == 0 && codingLine[a0i] < columns) {
-!       ++a0i;
-!       outputBits = codingLine[a0i] - codingLine[a0i - 1];
-      }
-    } else {
-      bits = 8;
-!     buf = 0;
-      do {
-        if (outputBits > bits) {
-! 	buf <<= bits;
-! 	if (!(a0i & 1)) {
-! 	  buf |= 0xff >> (8 - bits);
-  	}
-! 	outputBits -= bits;
-! 	bits = 0;
-        } else {
-! 	buf <<= outputBits;
-! 	if (!(a0i & 1)) {
-! 	  buf |= 0xff >> (8 - outputBits);
-  	}
-+ 	bits -= outputBits;
-  	outputBits = 0;
-! 	if (codingLine[a0i] < columns) {
-! 	  ++a0i;
-! 	  outputBits = codingLine[a0i] - codingLine[a0i - 1];
-! 	} else if (bits > 0) {
-! 	  buf <<= bits;
-! 	  bits = 0;
-  	}
-        }
-!     } while (bits);
-!   }
-!   if (black) {
-!     buf ^= 0xff;
-    }
-    return buf;
-  }
-  
-***************
-*** 1661,1666 ****
---- 1690,1698 ----
-    code = 0; // make gcc happy
-    if (endOfBlock) {
-      code = lookBits(12);
-+     if (code == EOF) {
-+       return 1;
-+     }
-      if ((code >> 5) == 0) {
-        p = &whiteTab1[code];
-      } else {
-***************
-*** 1673,1678 ****
---- 1705,1713 ----
-    } else {
-      for (n = 1; n <= 9; ++n) {
-        code = lookBits(n);
-+       if (code == EOF) {
-+ 	return 1;
-+       }
-        if (n < 9) {
-  	code <<= 9 - n;
-        }
-***************
-*** 1684,1689 ****
---- 1719,1727 ----
-      }
-      for (n = 11; n <= 12; ++n) {
-        code = lookBits(n);
-+       if (code == EOF) {
-+ 	return 1;
-+       }
-        if (n < 12) {
-  	code <<= 12 - n;
-        }
-***************
-*** 1709,1717 ****
-    code = 0; // make gcc happy
-    if (endOfBlock) {
-      code = lookBits(13);
-      if ((code >> 7) == 0) {
-        p = &blackTab1[code];
-!     } else if ((code >> 9) == 0) {
-        p = &blackTab2[(code >> 1) - 64];
-      } else {
-        p = &blackTab3[code >> 7];
---- 1747,1758 ----
-    code = 0; // make gcc happy
-    if (endOfBlock) {
-      code = lookBits(13);
-+     if (code == EOF) {
-+       return 1;
-+     }
-      if ((code >> 7) == 0) {
-        p = &blackTab1[code];
-!     } else if ((code >> 9) == 0 && (code >> 7) != 0) {
-        p = &blackTab2[(code >> 1) - 64];
-      } else {
-        p = &blackTab3[code >> 7];
-***************
-*** 1723,1728 ****
---- 1764,1772 ----
-    } else {
-      for (n = 2; n <= 6; ++n) {
-        code = lookBits(n);
-+       if (code == EOF) {
-+ 	return 1;
-+       }
-        if (n < 6) {
-  	code <<= 6 - n;
-        }
-***************
-*** 1734,1739 ****
---- 1778,1786 ----
-      }
-      for (n = 7; n <= 12; ++n) {
-        code = lookBits(n);
-+       if (code == EOF) {
-+ 	return 1;
-+       }
-        if (n < 12) {
-  	code <<= 12 - n;
-        }
-***************
-*** 1747,1752 ****
---- 1794,1802 ----
-      }
-      for (n = 10; n <= 13; ++n) {
-        code = lookBits(n);
-+       if (code == EOF) {
-+ 	return 1;
-+       }
-        if (n < 13) {
-  	code <<= 13 - n;
-        }
-***************
-*** 1961,1966 ****
---- 2011,2022 ----
-      // allocate a buffer for the whole image
-      bufWidth = ((width + mcuWidth - 1) / mcuWidth) * mcuWidth;
-      bufHeight = ((height + mcuHeight - 1) / mcuHeight) * mcuHeight;
-+     if (bufWidth <= 0 || bufHeight <= 0 ||
-+ 	bufWidth > INT_MAX / bufWidth / (int)sizeof(int)) {
-+       error(getPos(), "Invalid image size in DCT stream");
-+       y = height;
-+       return;
-+     }
-      for (i = 0; i < numComps; ++i) {
-        frameBuf[i] = (int *)gmallocn(bufWidth * bufHeight, sizeof(int));
-        memset(frameBuf[i], 0, bufWidth * bufHeight * sizeof(int));
-***************
-*** 3036,3041 ****
---- 3092,3102 ----
-    }
-    scanInfo.firstCoeff = str->getChar();
-    scanInfo.lastCoeff = str->getChar();
-+   if (scanInfo.firstCoeff < 0 || scanInfo.lastCoeff > 63 ||
-+       scanInfo.firstCoeff > scanInfo.lastCoeff) {
-+     error(getPos(), "Bad DCT coefficient numbers in scan info block");
-+     return gFalse;
-+   }
-    c = str->getChar();
-    scanInfo.ah = (c >> 4) & 0x0f;
-    scanInfo.al = c & 0x0f;
-diff -c -r xpdf-3.02pl1.orig/xpdf/Stream.h xpdf-3.02/xpdf/Stream.h
-*** xpdf-3.02pl1.orig/xpdf/Stream.h	Tue Feb 27 14:05:52 2007
---- xpdf-3.02/xpdf/Stream.h	Thu Oct 25 15:48:15 2007
-***************
-*** 528,540 ****
-    int row;			// current row
-    int inputBuf;			// input buffer
-    int inputBits;		// number of bits in input buffer
-!   short *refLine;		// reference line changing elements
-!   int b1;			// index into refLine
-!   short *codingLine;		// coding line changing elements
-!   int a0;			// index into codingLine
-    int outputBits;		// remaining ouput bits
-    int buf;			// character buffer
-  
-    short getTwoDimCode();
-    short getWhiteCode();
-    short getBlackCode();
---- 528,542 ----
-    int row;			// current row
-    int inputBuf;			// input buffer
-    int inputBits;		// number of bits in input buffer
-!   int *codingLine;		// coding line changing elements
-!   int *refLine;			// reference line changing elements
-!   int a0i;			// index into codingLine
-!   GBool err;			// error on current line
-    int outputBits;		// remaining ouput bits
-    int buf;			// character buffer
-  
-+   void addPixels(int a1, int black);
-+   void addPixelsNeg(int a1, int black);
-    short getTwoDimCode();
-    short getWhiteCode();
-    short getBlackCode();

Modified: trunk/dports/kde/kdelibs3/Portfile
===================================================================
--- trunk/dports/kde/kdelibs3/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdelibs3/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,28 +1,28 @@
 # $Id$
 
-#Synced with Fink, Version 3.5.8-1023
+#Synced with Fink, revision 1.32
 
 PortSystem 1.0
 name		kdelibs3
-version		3.5.8
-revision	4
-set kdeadmin	kde-admindir-1024
-categories	kde
+version		3.5.10
+set kdeadmin	kde-admindir-1502
+categories	kde kde3
 maintainers	nomaintainer
 description	Essential libraries for KDE applications. \
 		NB No KDE sound support.
 long_description ${description}
 platforms	darwin
 homepage	http://www.kde.org/
-master_sites	kde:stable/${version}/src/:kde358 \
+master_sites	kde:stable/${version}/src/:kde \
 		http://ranger.users.finkproject.org/distfiles/kde-admindir/:admin \
 		http://ranger.befunk.com/fink/kde-admindir/:admin \
 		http://astrange.ithinksw.net/~astrange/ranger-fink/kde-admindir/:admin \
 		http://www.southofheaven.net/befunk/kde-admindir/:admin
 use_bzip2	yes
 distname	kdelibs-${version}
-distfiles	${distname}.tar.bz2:kde358 \
+distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
+dist_subdir     kde3
 depends_build	port:autoconf \
 		port:pkgconfig \
 		port:unsermake
@@ -43,7 +43,6 @@
 		port:libpng \
 		port:libxml2 \
 		port:libxslt \
-		port:lua \
 		port:pcre \
 		port:tiff \
 		port:openexr \
@@ -54,19 +53,19 @@
 #		port:dbus
 #		port:dbus-qt3
 #		port:hal
-#depends_run	port:shared-mime-info
+depends_run	port:dejavu-fonts
+#               port:shared-mime-info
 
-checksums	${distname}.tar.bz2 md5 acaa37e79e840d10dca326277a20863c \
-		${kdeadmin}.tar.bz2 md5 d99491aa5d520fd1d70393a718019322
+checksums	${distname}.tar.bz2 md5 43cd55ed15f63b5738d620ef9f9fd568 \
+		${kdeadmin}.tar.bz2 md5 92a60282c1d81f38835ce7d495255cc3
 
 extract.only	${distname}.tar.bz2
 post-extract	{ system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
 
-patchfiles	kdelibs3-unified.patch \
-                patch-kdeui_kactionclasses.cpp.diff
+patchfiles	kdelibs3-unified.patch
 patch		{
-		foreach file $patchfiles {
-		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
+		foreach f $patchfiles {
+		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${f} | patch -p1"
 		}
 		system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' ${worksrcpath}/admin/*"
 }
@@ -75,32 +74,27 @@
 		reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|HOME=/tmp|HOME=${workpath}|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|/tmp/buildlog|${workpath}/buildlog|g" ${worksrcpath}/build-helper.sh
-		foreach file {CompileScript.sh InstallScript.sh} {
-		    file copy ${filespath}/${file} ${worksrcpath}
-		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
-		    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
-		    reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
-		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${file}
-		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${file}
-		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${file}
-		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${file}
-		    file attributes ${worksrcpath}/${file} -permissions 0755
+		foreach f {CompileScript.sh InstallScript.sh} {
+		    copy ${filespath}/${f} ${worksrcpath}
+		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${f}
+		    reinplace "s|%N|${name}|g" ${worksrcpath}/${f}
+		    reinplace "s|%v|${version}|g" ${worksrcpath}/${f}
+		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${f}
+		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${f}
+		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${f}
+		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${f}
+		    file attributes ${worksrcpath}/${f} -permissions 0755
 		}
 		foreach f {kdeglobals konsolerc} {
 			# Monaco CY is not a standard font in Tiger.
-			reinplace "s|Monaco CY|Bitstream Vera Sans Mono|g" ${worksrcpath}/darwin/${f}
-			reinplace "s|Baghdad|Bitstream Vera Sans|g" ${worksrcpath}/darwin/${f}
+			reinplace "s|Monaco CY|DejaVu Sans Mono|g" ${worksrcpath}/darwin/${f}
+			reinplace "s|Baghdad|DejaVu Sans|g" ${worksrcpath}/darwin/${f}
 		}
-		system "echo \"\[FMSettings\]\nStandardFont=Bitstream Vera Sans,10,-1,5,50,0,0,0,0,0\" > ${worksrcpath}/darwin/kdesktoprc"
+		system "echo \"\[FMSettings\]\nStandardFont=DejaVu Sans,10,-1,5,50,0,0,0,0,0\" > ${worksrcpath}/darwin/kdesktoprc"
 }
 
-configure.args --enable-cups --with-ldap=framework --with-gssapi=framework --with-distribution='MacPorts/Mac OS X' --without-arts
+configure.args --without-lua --enable-cups --with-ldap=framework --with-gssapi=framework --with-distribution='MacPorts/Mac OS X' --without-arts
 
-pre-configure	{
-		if {[file exists ${prefix}/bin/cups-config]} {
-			return -code error "port:cups-headers may prevent building this port. Please uninstall (or deactivate) cups-headers and restart the build."
-		}
-}
 use_configure       no
 use_parallel_build  yes
 build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }

Modified: trunk/dports/kde/kdelibs3/files/kdelibs3-unified.patch
===================================================================
--- trunk/dports/kde/kdelibs3/files/kdelibs3-unified.patch	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdelibs3/files/kdelibs3-unified.patch	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,6 +1,6 @@
-
---- kdelibs-3.5.8/darwin/kcmartsrc	1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-3.5.8-new/darwin/kcmartsrc	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/darwin/kcmartsrc kdelibs-3.5.9-new/darwin/kcmartsrc
+--- kdelibs-3.5.9/darwin/kcmartsrc	1969-12-31 19:00:00.000000000 -0500
++++ kdelibs-3.5.9-new/darwin/kcmartsrc	2008-02-13 21:00:34.000000000 -0500
 @@ -0,0 +1,9 @@
 +[Arts]
 +Arguments=\s-F 10 -S 4096 -a esd -d -b 16 -s 60 -m artsmessage -c drkonqi -l 3 -f
@@ -11,8 +11,9 @@
 +StartRealtime=false
 +StartServer=false
 +SuspendTime=60
---- kdelibs-3.5.8/darwin/kdeglobals	1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-3.5.8-new/darwin/kdeglobals	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/darwin/kdeglobals kdelibs-3.5.9-new/darwin/kdeglobals
+--- kdelibs-3.5.9/darwin/kdeglobals	1969-12-31 19:00:00.000000000 -0500
++++ kdelibs-3.5.9-new/darwin/kdeglobals	2008-02-13 21:00:34.000000000 -0500
 @@ -0,0 +1,129 @@
 +[$Version]
 +update_info=kaccel.upd:kde3.3/r1,kded.upd:kde3.0,klippershortcuts.upd:04112002,kwin.upd:kde3.2Xinerama,socks.upd:kde3.0/r1
@@ -143,16 +144,18 @@
 +
 +[WM]
 +activeFont=Baghdad,12,-1,5,50,0,0,0,0,0
---- kdelibs-3.5.8/darwin/knotifyrc	1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-3.5.8-new/darwin/knotifyrc	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/darwin/knotifyrc kdelibs-3.5.9-new/darwin/knotifyrc
+--- kdelibs-3.5.9/darwin/knotifyrc	1969-12-31 19:00:00.000000000 -0500
++++ kdelibs-3.5.9-new/darwin/knotifyrc	2008-02-13 21:00:34.000000000 -0500
 @@ -0,0 +1,5 @@
 +[Misc]
 +External player=@FINKPREFIX@/bin/mplayer
 +LastConfiguredApp=knotify
 +Use external player=false
 +Volume=100
---- kdelibs-3.5.8/darwin/konsolerc	1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-3.5.8-new/darwin/konsolerc	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/darwin/konsolerc kdelibs-3.5.9-new/darwin/konsolerc
+--- kdelibs-3.5.9/darwin/konsolerc	1969-12-31 19:00:00.000000000 -0500
++++ kdelibs-3.5.9-new/darwin/konsolerc	2008-02-13 21:00:34.000000000 -0500
 @@ -0,0 +1,19 @@
 +[Desktop Entry]
 +ActiveSession=0
@@ -173,8 +176,9 @@
 +schema=Linux.schema
 +scrollbar=2
 +tabbar=2
---- kdelibs-3.5.8/dcop/dcopc.c	2006-05-22 14:14:21.000000000 -0400
-+++ kdelibs-3.5.8-new/dcop/dcopc.c	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/dcop/dcopc.c kdelibs-3.5.9-new/dcop/dcopc.c
+--- kdelibs-3.5.9/dcop/dcopc.c	2006-05-22 14:14:21.000000000 -0400
++++ kdelibs-3.5.9-new/dcop/dcopc.c	2008-02-13 21:00:34.000000000 -0500
 @@ -674,6 +674,9 @@
    while((i = strchr(displayName, ':')) != NULL)
       *i = '_';
@@ -185,8 +189,9 @@
    dcopServer = getenv("DCOPSERVER");
  
    if (NULL == dcopServer) {
---- kdelibs-3.5.8/dcop/dcopclient.cpp	2007-10-08 05:52:08.000000000 -0400
-+++ kdelibs-3.5.8-new/dcop/dcopclient.cpp	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/dcop/dcopclient.cpp kdelibs-3.5.9-new/dcop/dcopclient.cpp
+--- kdelibs-3.5.9/dcop/dcopclient.cpp	2007-10-08 05:52:08.000000000 -0400
++++ kdelibs-3.5.9-new/dcop/dcopclient.cpp	2008-02-13 21:00:34.000000000 -0500
 @@ -270,6 +270,8 @@
      {
          while( (i = disp.find(KPATH_SEPARATOR)) >= 0)
@@ -196,8 +201,9 @@
      }
  
      fName += "/.DCOPserver_";
---- kdelibs-3.5.8/dcop/dcopserver_shutdown.c	2005-10-10 11:06:13.000000000 -0400
-+++ kdelibs-3.5.8-new/dcop/dcopserver_shutdown.c	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/dcop/dcopserver_shutdown.c kdelibs-3.5.9-new/dcop/dcopserver_shutdown.c
+--- kdelibs-3.5.9/dcop/dcopserver_shutdown.c	2005-10-10 11:06:13.000000000 -0400
++++ kdelibs-3.5.9-new/dcop/dcopserver_shutdown.c	2008-02-13 21:00:34.000000000 -0500
 @@ -118,6 +118,8 @@
    strncat(dcop_file_old,display, n);
    while((i = strchr(display, ':')))
@@ -207,8 +213,9 @@
    strncat(dcop_file, display, n);
    free(display);
  
---- kdelibs-3.5.8/kdecore/Makefile.am	2006-10-01 13:33:38.000000000 -0400
-+++ kdelibs-3.5.8-new/kdecore/Makefile.am	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/kdecore/Makefile.am kdelibs-3.5.9-new/kdecore/Makefile.am
+--- kdelibs-3.5.9/kdecore/Makefile.am	2006-10-01 13:33:38.000000000 -0400
++++ kdelibs-3.5.9-new/kdecore/Makefile.am	2008-02-13 21:00:34.000000000 -0500
 @@ -24,7 +24,7 @@
  
  if include_SVGICONS
@@ -227,8 +234,9 @@
  libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
  libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
  	$(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/standard_weak.nmcheck
---- kdelibs-3.5.8/kdecore/kglobalsettings.cpp	2005-10-10 11:06:03.000000000 -0400
-+++ kdelibs-3.5.8-new/kdecore/kglobalsettings.cpp	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/kdecore/kglobalsettings.cpp kdelibs-3.5.9-new/kdecore/kglobalsettings.cpp
+--- kdelibs-3.5.9/kdecore/kglobalsettings.cpp	2005-10-10 11:06:03.000000000 -0400
++++ kdelibs-3.5.9-new/kdecore/kglobalsettings.cpp	2008-02-13 21:00:34.000000000 -0500
 @@ -491,7 +491,7 @@
        s_desktopPath->append('/');
  
@@ -238,8 +246,9 @@
      *s_trashPath = g.readPathEntry( "Trash" , *s_trashPath);
      *s_trashPath = QDir::cleanDirPath( *s_trashPath );
      if ( !s_trashPath->endsWith("/") )
---- kdelibs-3.5.8/kdecore/ksocks.cpp	2005-10-10 11:06:03.000000000 -0400
-+++ kdelibs-3.5.8-new/kdecore/ksocks.cpp	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/kdecore/ksocks.cpp kdelibs-3.5.9-new/kdecore/ksocks.cpp
+--- kdelibs-3.5.9/kdecore/ksocks.cpp	2005-10-10 11:06:03.000000000 -0400
++++ kdelibs-3.5.9-new/kdecore/ksocks.cpp	2008-02-13 21:00:34.000000000 -0500
 @@ -480,7 +480,7 @@
                                                     ksocklen_t addrlen) {
     if (_useSocks && F_connect)
@@ -310,8 +319,9 @@
  }
  
  
---- kdelibs-3.5.8/kdecore/kstandarddirs.cpp	2007-01-15 06:34:17.000000000 -0500
-+++ kdelibs-3.5.8-new/kdecore/kstandarddirs.cpp	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/kdecore/kstandarddirs.cpp kdelibs-3.5.9-new/kdecore/kstandarddirs.cpp
+--- kdelibs-3.5.9/kdecore/kstandarddirs.cpp	2008-02-13 04:41:08.000000000 -0500
++++ kdelibs-3.5.9-new/kdecore/kstandarddirs.cpp	2008-02-13 21:00:34.000000000 -0500
 @@ -1021,7 +1021,7 @@
      if (!strcmp(type, "data"))
  	return "share/apps/";
@@ -321,8 +331,9 @@
      if (!strcmp(type, "icon"))
  	return "share/icons/";
      if (!strcmp(type, "config"))
---- kdelibs-3.5.8/kdecore/kuniqueapplication.cpp	2005-11-08 17:39:22.000000000 -0500
-+++ kdelibs-3.5.8-new/kdecore/kuniqueapplication.cpp	2007-11-06 23:28:33.000000000 -0500
+diff -Nurd kdelibs-3.5.9/kdecore/kuniqueapplication.cpp kdelibs-3.5.9-new/kdecore/kuniqueapplication.cpp
+--- kdelibs-3.5.9/kdecore/kuniqueapplication.cpp	2005-11-08 17:39:22.000000000 -0500
++++ kdelibs-3.5.9-new/kdecore/kuniqueapplication.cpp	2008-02-13 21:00:34.000000000 -0500
 @@ -59,6 +59,10 @@
  #  endif
  #endif
@@ -479,8 +490,9 @@
    return inst;
  }
  
---- kdelibs-3.5.8/kdecore/network/ksocketdevice.cpp	2007-01-15 06:34:17.000000000 -0500
-+++ kdelibs-3.5.8-new/kdecore/network/ksocketdevice.cpp	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/kdecore/network/ksocketdevice.cpp kdelibs-3.5.9-new/kdecore/network/ksocketdevice.cpp
+--- kdelibs-3.5.9/kdecore/network/ksocketdevice.cpp	2007-01-15 06:34:17.000000000 -0500
++++ kdelibs-3.5.9-new/kdecore/network/ksocketdevice.cpp	2008-02-13 21:00:34.000000000 -0500
 @@ -316,7 +316,7 @@
      }
  
@@ -517,8 +529,9 @@
    KSocketAddress peerAddress;
    peerAddress.setLength(len = 32);	// arbitrary value
    if (kde_getpeername(m_sockfd, peerAddress.address(), &len) == -1)
---- kdelibs-3.5.8/kdecore/network/syssocket.h	2005-09-10 04:27:10.000000000 -0400
-+++ kdelibs-3.5.8-new/kdecore/network/syssocket.h	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/kdecore/network/syssocket.h kdelibs-3.5.9-new/kdecore/network/syssocket.h
+--- kdelibs-3.5.9/kdecore/network/syssocket.h	2005-09-10 04:27:10.000000000 -0400
++++ kdelibs-3.5.9-new/kdecore/network/syssocket.h	2008-02-13 21:00:34.000000000 -0500
 @@ -53,7 +53,7 @@
    }
  
@@ -558,8 +571,9 @@
    {
      return ::getsockname(fd, sa, len);
    }
---- kdelibs-3.5.8/kded/Makefile.am	2005-10-10 11:06:29.000000000 -0400
-+++ kdelibs-3.5.8-new/kded/Makefile.am	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/kded/Makefile.am kdelibs-3.5.9-new/kded/Makefile.am
+--- kdelibs-3.5.9/kded/Makefile.am	2005-10-10 11:06:29.000000000 -0400
++++ kdelibs-3.5.9-new/kded/Makefile.am	2008-02-13 21:00:34.000000000 -0500
 @@ -58,7 +58,10 @@
  servicetype_DATA = kdedmodule.desktop
  servicetypedir = $(kde_servicetypesdir)
@@ -572,8 +586,9 @@
  
  update_DATA = kded.upd
  updatedir = $(kde_datadir)/kconf_update
---- kdelibs-3.5.8/kded/kbuildsycoca.cpp	2007-05-14 03:52:43.000000000 -0400
-+++ kdelibs-3.5.8-new/kded/kbuildsycoca.cpp	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/kded/kbuildsycoca.cpp kdelibs-3.5.9-new/kded/kbuildsycoca.cpp
+--- kdelibs-3.5.9/kded/kbuildsycoca.cpp	2007-05-14 03:52:43.000000000 -0400
++++ kdelibs-3.5.9-new/kded/kbuildsycoca.cpp	2008-02-13 21:00:34.000000000 -0500
 @@ -379,7 +379,11 @@
       connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
               this, SLOT(slotCreateEntry(const QString &, KService **)));
@@ -587,8 +602,9 @@
  
       KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false);
       entry->setLayoutInfo(kdeMenu->layoutList);
---- kdelibs-3.5.8/kdeprint/configure.in.in	2005-09-10 04:27:43.000000000 -0400
-+++ kdelibs-3.5.8-new/kdeprint/configure.in.in	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/kdeprint/configure.in.in kdelibs-3.5.9-new/kdeprint/configure.in.in
+--- kdelibs-3.5.9/kdeprint/configure.in.in	2005-09-10 04:27:43.000000000 -0400
++++ kdelibs-3.5.9-new/kdeprint/configure.in.in	2008-02-13 21:00:34.000000000 -0500
 @@ -80,7 +80,7 @@
  
        dnl check if CUPS is at least 1.1.20
@@ -598,8 +614,9 @@
        if test "$ac_have_new_cups" = "yes"; then
   	AC_DEFINE(HAVE_CUPS_NO_PWD_CACHE, 1, CUPS doesn't have password caching)
        fi
---- kdelibs-3.5.8/kdeprint/cups/Makefile.am	2006-10-02 06:46:55.000000000 -0400
-+++ kdelibs-3.5.8-new/kdeprint/cups/Makefile.am	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/kdeprint/cups/Makefile.am kdelibs-3.5.9-new/kdeprint/cups/Makefile.am
+--- kdelibs-3.5.9/kdeprint/cups/Makefile.am	2006-10-02 06:46:55.000000000 -0400
++++ kdelibs-3.5.9-new/kdeprint/cups/Makefile.am	2008-02-13 21:00:34.000000000 -0500
 @@ -14,8 +14,8 @@
  				  imagepreview.cpp imageposition.cpp kpimagepage.cpp \
  				  kptextpage.cpp kphpgl2page.cpp cupsaddsmb2.cpp kmwother.cpp ippreportdlg.cpp \
@@ -611,8 +628,9 @@
  kdeprint_cups_la_METASOURCES = AUTO
  
  noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmcupsuimanager.h \
---- kdelibs-3.5.8/kdeprint/cups/cupsdconf2/Makefile.am	2005-09-10 04:27:41.000000000 -0400
-+++ kdelibs-3.5.8-new/kdeprint/cups/cupsdconf2/Makefile.am	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/kdeprint/cups/cupsdconf2/Makefile.am kdelibs-3.5.9-new/kdeprint/cups/cupsdconf2/Makefile.am
+--- kdelibs-3.5.9/kdeprint/cups/cupsdconf2/Makefile.am	2005-09-10 04:27:41.000000000 -0400
++++ kdelibs-3.5.9-new/kdeprint/cups/cupsdconf2/Makefile.am	2008-02-13 21:00:34.000000000 -0500
 @@ -14,8 +14,8 @@
  			  locationdialog.cpp addressdialog.cpp cups-util.c \
  			  qdirmultilineedit.cpp sizewidget.cpp main.cpp
@@ -624,8 +642,9 @@
  
  noinst_HEADERS = cupsdconf.h cupsdpage.h cupsddialog.h cupsdcomment.h cupsdsplash.h \
  		 cupsdserverpage.h cupsdlogpage.h cupsdjobspage.h cupsdfilterpage.h \
---- kdelibs-3.5.8/kdeui/Makefile.am	2007-10-08 05:52:12.000000000 -0400
-+++ kdelibs-3.5.8-new/kdeui/Makefile.am	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/kdeui/Makefile.am kdelibs-3.5.9-new/kdeui/Makefile.am
+--- kdelibs-3.5.9/kdeui/Makefile.am	2007-10-08 05:52:12.000000000 -0400
++++ kdelibs-3.5.9-new/kdeui/Makefile.am	2008-02-13 21:00:34.000000000 -0500
 @@ -27,10 +27,10 @@
  AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
  
@@ -639,8 +658,9 @@
  libkspell_la_LIBADD = libkdeui.la
  libkspell_la_SOURCES = dummy.cpp
  
---- kdelibs-3.5.8/kimgio/Makefile.am	2005-09-10 04:26:42.000000000 -0400
-+++ kdelibs-3.5.8-new/kimgio/Makefile.am	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/kimgio/Makefile.am kdelibs-3.5.9-new/kimgio/Makefile.am
+--- kdelibs-3.5.9/kimgio/Makefile.am	2005-09-10 04:26:42.000000000 -0400
++++ kdelibs-3.5.9-new/kimgio/Makefile.am	2008-02-13 21:00:34.000000000 -0500
 @@ -21,7 +21,7 @@
               kimg_pcx.la kimg_tga.la kimg_rgb.la kimg_xcf.la kimg_dds.la $(KIMGIO_EXR_MODULES) \
  			 kimg_psd.la kimg_hdr.la
@@ -650,8 +670,9 @@
  
  kimg_tiff_la_SOURCES = tiffr.cpp
  kimg_tiff_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
---- kdelibs-3.5.8/kinit/Makefile.am	2007-10-08 05:52:03.000000000 -0400
-+++ kdelibs-3.5.8-new/kinit/Makefile.am	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/kinit/Makefile.am kdelibs-3.5.9-new/kinit/Makefile.am
+--- kdelibs-3.5.9/kinit/Makefile.am	2007-10-08 05:52:03.000000000 -0400
++++ kdelibs-3.5.9-new/kinit/Makefile.am	2008-02-13 21:00:34.000000000 -0500
 @@ -15,7 +15,7 @@
  #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  #    Boston, MA 02110-1301, USA.
@@ -661,8 +682,9 @@
  
  SUBDIRS = . tests
  
---- kdelibs-3.5.8/kinit/kinit.cpp	2007-10-08 05:52:03.000000000 -0400
-+++ kdelibs-3.5.8-new/kinit/kinit.cpp	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/kinit/kinit.cpp kdelibs-3.5.9-new/kinit/kinit.cpp
+--- kdelibs-3.5.9/kinit/kinit.cpp	2007-10-08 05:52:03.000000000 -0400
++++ kdelibs-3.5.9-new/kinit/kinit.cpp	2008-02-13 21:00:34.000000000 -0500
 @@ -593,6 +593,11 @@
       if ( getenv("KDE_IS_PRELINKED") && !execpath.isEmpty() && !launcher)
           libpath.truncate(0);
@@ -675,8 +697,9 @@
       if ( !libpath.isEmpty() )
       {
         d.handle = lt_dlopen( QFile::encodeName(libpath) );
---- kdelibs-3.5.8/kinit/start_kdeinit_wrapper.c	2007-10-08 05:52:03.000000000 -0400
-+++ kdelibs-3.5.8-new/kinit/start_kdeinit_wrapper.c	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/kinit/start_kdeinit_wrapper.c kdelibs-3.5.9-new/kinit/start_kdeinit_wrapper.c
+--- kdelibs-3.5.9/kinit/start_kdeinit_wrapper.c	2008-02-13 04:41:06.000000000 -0500
++++ kdelibs-3.5.9-new/kinit/start_kdeinit_wrapper.c	2008-02-13 21:01:39.000000000 -0500
 @@ -50,9 +50,9 @@
           close( 0 ); /* stdin */
           dup2( pipes[ 0 ], 0 );
@@ -695,16 +718,17 @@
     if(argc == 0)
        return 1;
 -   argv[0] = "start_kdeinit";
--   execv("start_kdeinit",argv);
+-   execvp("start_kdeinit",argv);
 -   perror("start_kdeinit");
 +   argv[0] = "@FINKPREFIX@/bin/start_kdeinit";
-+   execv("@FINKPREFIX@/bin/start_kdeinit",argv);
++   execvp("@FINKPREFIX@/bin/start_kdeinit",argv);
 +   perror("@FINKPREFIX@/bin/start_kdeinit");
     return 1;
  }
  #endif
---- kdelibs-3.5.8/kio/kssl/kopenssl.cc	2006-07-22 04:16:39.000000000 -0400
-+++ kdelibs-3.5.8-new/kio/kssl/kopenssl.cc	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/kio/kssl/kopenssl.cc kdelibs-3.5.9-new/kio/kssl/kopenssl.cc
+--- kdelibs-3.5.9/kio/kssl/kopenssl.cc	2006-07-22 04:16:39.000000000 -0400
++++ kdelibs-3.5.9-new/kio/kssl/kopenssl.cc	2008-02-13 21:00:34.000000000 -0500
 @@ -323,6 +323,7 @@
               #elif defined(_AIX)
               << "libssl.a(libssl.so.0)"
@@ -721,8 +745,9 @@
  	     << "libcrypto.dylib"
  	     << "libcrypto.0.9.dylib"
  	     #else
---- kdelibs-3.5.8/kio/misc/kpac/Makefile.am	2005-09-10 04:26:47.000000000 -0400
-+++ kdelibs-3.5.8-new/kio/misc/kpac/Makefile.am	2007-11-06 23:28:11.000000000 -0500
+diff -Nurd kdelibs-3.5.9/kio/misc/kpac/Makefile.am kdelibs-3.5.9-new/kio/misc/kpac/Makefile.am
+--- kdelibs-3.5.9/kio/misc/kpac/Makefile.am	2005-09-10 04:26:47.000000000 -0400
++++ kdelibs-3.5.9-new/kio/misc/kpac/Makefile.am	2008-02-13 21:00:34.000000000 -0500
 @@ -10,7 +10,7 @@
  kded_proxyscout_la_SOURCES = proxyscout.skel proxyscout.cpp script.cpp \
                               downloader.cpp discovery.cpp
@@ -732,27 +757,3 @@
  
  kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c
  kpac_dhcp_helper_CFLAGS = $(KDE_USE_FPIE)
---- kdelibs-3.5.8/kioslave/http/http.cc	2007-10-08 05:52:02.000000000 -0400
-+++ kdelibs-3.5.8-new/kioslave/http/http.cc	2007-11-06 23:28:11.000000000 -0500
-@@ -3409,10 +3409,6 @@
- 
-   } while (!m_bEOF && (len || noHeader) && (headerSize < maxHeaderSize) && (gets(buffer, sizeof(buffer)-1)));
- 
--  // Send the current response before processing starts or it
--  // might never get sent...
--  forwardHttpResponseHeader();
--
-   // Now process the HTTP/1.1 upgrade
-   QStringList::Iterator opt = upgradeOffers.begin();
-   for( ; opt != upgradeOffers.end(); ++opt) {
-@@ -3818,6 +3814,10 @@
-     mimeType( m_strMimeType );
-   }
- 
-+  // Do not move send response header before any redirection as it seems
-+  // to screw up some sites. See BR# 150904.
-+  forwardHttpResponseHeader();
-+
-   if (m_request.method == HTTP_HEAD)
-      return true;
- 

Deleted: trunk/dports/kde/kdelibs3/files/patch-kdeui_kactionclasses.cpp.diff
===================================================================
--- trunk/dports/kde/kdelibs3/files/patch-kdeui_kactionclasses.cpp.diff	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdelibs3/files/patch-kdeui_kactionclasses.cpp.diff	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,13 +0,0 @@
---- kdelibs-3.5.8/kdeui/kactionclasses.cpp.orig	2007-10-08 18:52:12.000000000 +0900
-+++ kdelibs-3.5.8/kdeui/kactionclasses.cpp	2008-09-23 01:43:55.000000000 +0900
-@@ -667,8 +667,8 @@
-     KToolBar* bar = static_cast<KToolBar*>( widget );
-     int id_ = KAction::getToolButtonID();
-     bar->insertCombo( comboItems(), id_, isEditable(),
--                      SIGNAL( activated( int ) ), this,
--                      SLOT( slotActivated( int ) ), isEnabled(),
-+                      SIGNAL( activated( const QString & ) ), this,
-+                      SLOT( slotActivated( const QString & ) ), isEnabled(),
-                       toolTip(), -1, index );
- 
-     QComboBox *cb = bar->getCombo( id_ );

Modified: trunk/dports/kde/kdenetwork3/Portfile
===================================================================
--- trunk/dports/kde/kdenetwork3/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdenetwork3/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,27 +1,28 @@
 # $Id$
 
-#Synced with Fink, Version 3.5.8-1021
+#Synced with Fink, revision 1.27
 
 PortSystem 1.0
 name		kdenetwork3
-version		3.5.8
-set kdeadmin	kde-admindir-1024
-categories	kde
+version		3.5.10
+set kdeadmin	kde-admindir-1502
+categories	kde kde3
 maintainers	nomaintainer
 description	KDE network tools. \
 		NB No KDE sound support.
 long_description ${description}
 platforms	darwin
 homepage	http://www.kde.org/
-master_sites	kde:stable/${version}/src/:kde358 \
+master_sites	kde:stable/${version}/src/:kde \
 		http://ranger.users.finkproject.org/distfiles/kde-admindir/:admin \
 		http://ranger.befunk.com/fink/kde-admindir/:admin \
 		http://astrange.ithinksw.net/~astrange/ranger-fink/kde-admindir/:admin \
 		http://www.southofheaven.net/befunk/kde-admindir/:admin
 use_bzip2	yes
 distname	kdenetwork-${version}
-distfiles	${distname}.tar.bz2:kde358 \
+distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
+dist_subdir     kde3
 depends_build	port:autoconf \
 		port:unsermake
 depends_lib	port:kdebase3 \
@@ -30,19 +31,20 @@
 #		port:gtk1
 #		port:qca
 #		port:xmms
+#               port:bind6
 
 # what about libgadu?
 
-checksums	${distname}.tar.bz2 md5 0e79374d1109d937b0c9bdd3a75e7476 \
-		${kdeadmin}.tar.bz2 md5 d99491aa5d520fd1d70393a718019322
+checksums	${distname}.tar.bz2 md5 634b2e914661faebae79d95dcc6c5bfa \
+		${kdeadmin}.tar.bz2 md5 92a60282c1d81f38835ce7d495255cc3
 
 extract.only	${distname}.tar.bz2
 post-extract	{ system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
 
-patchfiles	kdenetwork3.patch patch-krfb_libvncserver_rfb.h.diff
+patchfiles	kdenetwork3.patch
 patch		{
-		foreach file $patchfiles {
-		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
+		foreach f $patchfiles {
+		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${f} | patch -p1"
 		}
 		system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' ${worksrcpath}/admin/*"
 }
@@ -51,23 +53,23 @@
 		reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|HOME=/tmp|HOME=${workpath}|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|/tmp/buildlog|${workpath}/buildlog|g" ${worksrcpath}/build-helper.sh
-		foreach file {CompileScript.sh InstallScript.sh} {
-		    file copy ${filespath}/${file} ${worksrcpath}
-		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
-		    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
-		    reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
-		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${file}
-		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${file}
-		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${file}
-		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${file}
-		    file attributes ${worksrcpath}/${file} -permissions 0755
+		foreach f {CompileScript.sh InstallScript.sh} {
+		    copy ${filespath}/${f} ${worksrcpath}
+		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${f}
+		    reinplace "s|%N|${name}|g" ${worksrcpath}/${f}
+		    reinplace "s|%v|${version}|g" ${worksrcpath}/${f}
+		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${f}
+		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${f}
+		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${f}
+		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${f}
+		    file attributes ${worksrcpath}/${f} -permissions 0755
 		}
 }
 
 configure.args	--disable-jingle --with-distribution='MacPorts/Mac OS X' --without-arts
 # --with-libgadu-libs=${prefix}/lib --with-libgadu-includes=${prefix}/include 
 
-configure	{}
+use_configure       no
 use_parallel_build  yes
 build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
 destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }

Modified: trunk/dports/kde/kdenetwork3/files/CompileScript.sh
===================================================================
--- trunk/dports/kde/kdenetwork3/files/CompileScript.sh	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdenetwork3/files/CompileScript.sh	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,6 +1,6 @@
 #!/bin/sh -ev
 
-	export PREFIX="%p" USE_UNSERMAKE=1 CC=gcc
+	export PREFIX="%p" USE_UNSERMAKE=1 CC=gcc DO_NOT_COMPILE="ktalkd"
 	. ./environment-helper.sh
 
 	./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs

Modified: trunk/dports/kde/kdenetwork3/files/InstallScript.sh
===================================================================
--- trunk/dports/kde/kdenetwork3/files/InstallScript.sh	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdenetwork3/files/InstallScript.sh	2009-04-23 09:53:52 UTC (rev 50045)
@@ -13,5 +13,7 @@
 	rm -rf %i/share/doc/kde/en/kcontrol/kxmlrpcd
 	rm -rf %i/share/doc/kde/en/kppp
 	rm -rf %i/share/doc/kde/en/kwifimanager
+	rm -rf %i/share/doc/kde/en/kcontrol/kcmtalkd
+	rm -rf %i/share/doc/kde/en/ktalkd
 
 	find %i/share/apps/kopete -type d -name CVS -exec rm -rf {} \; || :

Modified: trunk/dports/kde/kdenetwork3/files/kdenetwork3.patch
===================================================================
--- trunk/dports/kde/kdenetwork3/files/kdenetwork3.patch	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdenetwork3/files/kdenetwork3.patch	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,6 +1,6 @@
-
---- kdenetwork-3.5.8/kopete/libkopete/avdevice/videocontrol.h	2007-10-08 05:49:07.000000000 -0400
-+++ kdenetwork-3.5.8-new/kopete/libkopete/avdevice/videocontrol.h	2007-10-15 09:59:42.000000000 -0400
+diff -Nurd kdenetwork-3.5.10/kopete/libkopete/avdevice/videocontrol.h kdenetwork-3.5.10-new/kopete/libkopete/avdevice/videocontrol.h
+--- kdenetwork-3.5.10/kopete/libkopete/avdevice/videocontrol.h	2007-10-08 05:49:07.000000000 -0400
++++ kdenetwork-3.5.10-new/kopete/libkopete/avdevice/videocontrol.h	2009-04-15 11:38:18.000000000 -0400
 @@ -20,15 +20,15 @@
  #ifndef KOPETE_AVVIDEOCONTROL_H
  #define KOPETE_AVVIDEOCONTROL_H
@@ -10,13 +10,12 @@
 -#ifndef __u64 //required by videodev.h
 -#define __u64 unsigned long long
 -#endif // __u64
--
++#include <stdint.h>
++#include <sys/types.h>
+ 
 -#ifndef __s64 //required by videodev.h
 -#define __s64 long long
 -#endif // __s64
-+#include <stdint.h>
-+#include <sys/types.h>
-+
 +typedef u_int32_t __u32;
 +typedef int32_t __s32;
 +/*
@@ -26,8 +25,37 @@
  
  #include <qstring.h>
  #include <kdebug.h>
---- kdenetwork-3.5.8/ktalkd/ktalkd/talkd.cpp	2006-03-17 05:12:34.000000000 -0500
-+++ kdenetwork-3.5.8-new/ktalkd/ktalkd/talkd.cpp	2007-10-15 07:56:22.000000000 -0400
+diff -Nurd kdenetwork-3.5.10/krfb/libvncserver/rfb.h kdenetwork-3.5.10-new/krfb/libvncserver/rfb.h
+--- kdenetwork-3.5.10/krfb/libvncserver/rfb.h	2008-08-19 14:13:37.000000000 -0400
++++ kdenetwork-3.5.10-new/krfb/libvncserver/rfb.h	2009-04-15 11:38:19.000000000 -0400
+@@ -43,11 +43,24 @@
+ 
+ #ifdef LONG64
+ typedef unsigned long CARD64;
++#if defined (_LP64) || \
++    defined(__alpha) || defined(__alpha__) || \
++    defined(__ia64__) || defined(ia64) || \
++    defined(__sparc64__) || \
++    defined(__s390x__) || \
++    (defined(__hppa__) && defined(__LP64__)) || \
++    defined(__amd64__) || defined(amd64) || \
++    defined(__powerpc64__) || \
++    (defined(sgi) && (_MIPS_SZLONG == 64))
+ typedef unsigned int CARD32;
+ #else
+ typedef unsigned long CARD32;
+ #endif
+ 
++#else
++typedef unsigned long CARD32;
++#endif
++
+ typedef CARD32 Pixel;
+ /* typedef CARD32 KeySym; */
+ #ifndef __osf__
+diff -Nurd kdenetwork-3.5.10/ktalkd/ktalkd/talkd.cpp kdenetwork-3.5.10-new/ktalkd/ktalkd/talkd.cpp
+--- kdenetwork-3.5.10/ktalkd/ktalkd/talkd.cpp	2006-03-17 05:12:34.000000000 -0500
++++ kdenetwork-3.5.10-new/ktalkd/ktalkd/talkd.cpp	2009-04-15 11:38:19.000000000 -0400
 @@ -183,7 +183,7 @@
  	struct hostent *hp;
  	struct sockaddr_in sn;
@@ -46,8 +74,9 @@
  	int do_debug=0, do_badpackets=0, ch;
  
  	new KInstance("ktalkd"); // for KConfig and friends
---- kdenetwork-3.5.8/lanbrowsing/lisa/netmanager.cpp	2005-09-10 04:20:14.000000000 -0400
-+++ kdenetwork-3.5.8-new/lanbrowsing/lisa/netmanager.cpp	2007-10-15 07:56:22.000000000 -0400
+diff -Nurd kdenetwork-3.5.10/lanbrowsing/lisa/netmanager.cpp kdenetwork-3.5.10-new/lanbrowsing/lisa/netmanager.cpp
+--- kdenetwork-3.5.10/lanbrowsing/lisa/netmanager.cpp	2005-09-10 04:20:14.000000000 -0400
++++ kdenetwork-3.5.10-new/lanbrowsing/lisa/netmanager.cpp	2009-04-15 11:38:19.000000000 -0400
 @@ -413,7 +413,7 @@
           {
              mdcerr<<"NetManager::run: on m_listenFD"<<std::endl;
@@ -75,8 +104,9 @@
     mdcerr<<" NetManager::findServerServer: broadcasting to: "
     <<std::ios::hex<<m_broadcastAddress<<std::ios::dec<<std::endl;
     
---- kdenetwork-3.5.8/lanbrowsing/lisa/netscanner.cpp	2006-07-22 04:11:31.000000000 -0400
-+++ kdenetwork-3.5.8-new/lanbrowsing/lisa/netscanner.cpp	2007-10-15 07:56:22.000000000 -0400
+diff -Nurd kdenetwork-3.5.10/lanbrowsing/lisa/netscanner.cpp kdenetwork-3.5.10-new/lanbrowsing/lisa/netscanner.cpp
+--- kdenetwork-3.5.10/lanbrowsing/lisa/netscanner.cpp	2006-07-22 04:11:31.000000000 -0400
++++ kdenetwork-3.5.10-new/lanbrowsing/lisa/netscanner.cpp	2009-04-15 11:38:19.000000000 -0400
 @@ -550,7 +550,7 @@
           select(0,0,0,0,&tv1);
           //now read the answers, hopefully

Deleted: trunk/dports/kde/kdenetwork3/files/patch-krfb_libvncserver_rfb.h.diff
===================================================================
--- trunk/dports/kde/kdenetwork3/files/patch-krfb_libvncserver_rfb.h.diff	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdenetwork3/files/patch-krfb_libvncserver_rfb.h.diff	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,13 +0,0 @@
---- kdenetwork-3.5.8/krfb/libvncserver/rfb.h	2005-09-10 17:20:13.000000000 +0900
-+++ kdenetwork-3.5.8-new/krfb/libvncserver/rfb.h	2008-05-04 17:59:50.000000000 +0900
-@@ -38,9 +38,7 @@
- #include "keysym.h"
- 
- /* TODO: this stuff has to go into autoconf */
--typedef unsigned char CARD8;
--typedef unsigned short CARD16;
--typedef unsigned int CARD32;
-+#include <X11/Xmd.h>
- typedef CARD32 Pixel;
- /* typedef CARD32 KeySym; */
- #ifndef __osf__

Modified: trunk/dports/kde/kdepim3/Portfile
===================================================================
--- trunk/dports/kde/kdepim3/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdepim3/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,27 +1,28 @@
 # $Id$
 
-#Synced with Fink, revision 1.10
+#Synced with Fink, revision 1.37
 
 PortSystem 1.0
 name		kdepim3
-version		3.5.8
-set kdeadmin	kde-admindir-1024
-categories	kde
+version		3.5.10
+set kdeadmin	kde-admindir-1502
+categories	kde kde3
 maintainers	nomaintainer
 description	KDE personal information management tools. \
 		NB No KDE sound support.
 long_description ${description}
 platforms	darwin
 homepage	http://www.kde.org/
-master_sites	kde:stable/${version}/src/:kde358 \
+master_sites	kde:stable/${version}/src/:kde \
 		http://ranger.users.finkproject.org/distfiles/kde-admindir/:admin \
 		http://ranger.befunk.com/fink/kde-admindir/:admin \
 		http://astrange.ithinksw.net/~astrange/ranger-fink/kde-admindir/:admin \
 		http://www.southofheaven.net/befunk/kde-admindir/:admin
 use_bzip2	yes
 distname	kdepim-${version}
-distfiles	${distname}.tar.bz2:kde358 \
+distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
+dist_subdir     kde3
 depends_build	port:autoconf \
 		port:unsermake
 depends_lib	port:gpgme \
@@ -34,16 +35,16 @@
 #		port:pilot-link
 #		port:gpgsm or port:gnupg2
 
-checksums	${distname}.tar.bz2 md5 a1ffff553f1d6739c7791891028b176b \
-		${kdeadmin}.tar.bz2 md5 d99491aa5d520fd1d70393a718019322
+checksums	${distname}.tar.bz2 md5 fc93e458a8eec8131ede56cff30c28b2 \
+		${kdeadmin}.tar.bz2 md5 92a60282c1d81f38835ce7d495255cc3
 
 extract.only	${distname}.tar.bz2
 post-extract	{ system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
 
 patchfiles	kdepim3.patch
 patch		{
-		foreach file $patchfiles {
-		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
+		foreach f $patchfiles {
+		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${f} | patch -p1"
 		}
 		system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' ${worksrcpath}/admin/*"
 		system "perl -pi -e 's,#include <malloc.h>,,g' ${worksrcpath}/libkcal/versit/vcc*"
@@ -54,23 +55,22 @@
 		reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|HOME=/tmp|HOME=${workpath}|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|/tmp/buildlog|${workpath}/buildlog|g" ${worksrcpath}/build-helper.sh
-		foreach file {CompileScript.sh InstallScript.sh} {
-		    file copy ${filespath}/${file} ${worksrcpath}
-		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
-		    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
-		    reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
-		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${file}
-		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${file}
-		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${file}
-		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${file}
-		    file attributes ${worksrcpath}/${file} -permissions 0755
+		foreach f {CompileScript.sh InstallScript.sh} {
+		    copy ${filespath}/${f} ${worksrcpath}
+		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${f}
+		    reinplace "s|%N|${name}|g" ${worksrcpath}/${f}
+		    reinplace "s|%v|${version}|g" ${worksrcpath}/${f}
+		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${f}
+		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${f}
+		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${f}
+		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${f}
+		    file attributes ${worksrcpath}/${f} -permissions 0755
 		}
 }
 
 configure.args	--disable-indexlib --with-distribution='MacPorts/Mac OS X' --without-gnokii --without-arts
-#--with-pilot-link=${prefix}/lib/pilot-link10
 
-configure	{}
+use_configure       no
 use_parallel_build  yes
 build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
 destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }

Modified: trunk/dports/kde/kdepim3/files/CompileScript.sh
===================================================================
--- trunk/dports/kde/kdepim3/files/CompileScript.sh	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdepim3/files/CompileScript.sh	2009-04-23 09:53:52 UTC (rev 50045)
@@ -5,12 +5,6 @@
 	export ac_cv_path_GPGME_CONFIG="%p/bin/gpgme-config --thread=pthread"
 
 	export CC=gcc CXX=g++
-#fink
-#	export PKG_CONFIG_PATH="%p/lib/pilot-link10/lib/pkgconfig:$PKG_CONFIG_PATH"
-#	export CPPFLAGS="-I%p/lib/pilot-link10/include $CPPFLAGS"
-#	export LDFLAGS="-L%p/lib/pilot-link10/lib $LDFLAGS"
-#macports
-#
 
 	ranlib %p/lib/libgpg*.a >/dev/null 2>&1
 	./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs

Modified: trunk/dports/kde/kdepim3/files/InstallScript.sh
===================================================================
--- trunk/dports/kde/kdepim3/files/InstallScript.sh	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdepim3/files/InstallScript.sh	2009-04-23 09:53:52 UTC (rev 50045)
@@ -5,6 +5,7 @@
 
 	./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d
 
+	rm -rf %i/lib/kde3/libkaddrbk_distributionlist.*
 	mkdir -p %i/share/doc/installed-packages
 	touch %i/share/doc/installed-packages/%N
 	touch %i/share/doc/installed-packages/%N-base

Modified: trunk/dports/kde/kdepim3/files/kdepim3.patch
===================================================================
--- trunk/dports/kde/kdepim3/files/kdepim3.patch	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdepim3/files/kdepim3.patch	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,6 +1,6 @@
-
---- kdepim-3.5.8/akregator/src/Makefile.am	2006-10-01 13:30:25.000000000 -0400
-+++ kdepim-3.5.8-new/akregator/src/Makefile.am	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/akregator/src/Makefile.am kdepim-3.5.10-new/akregator/src/Makefile.am
+--- kdepim-3.5.10/akregator/src/Makefile.am	2006-10-01 13:30:25.000000000 -0400
++++ kdepim-3.5.10-new/akregator/src/Makefile.am	2009-04-17 16:23:32.000000000 -0400
 @@ -16,12 +16,13 @@
  #########################################################################
  # this is the program that gets installed.  it's name is used for all
@@ -28,8 +28,9 @@
  libakregatorprivate_la_LIBADD =	$(top_builddir)/libkdepim/libkdepim.la \
  	$(top_builddir)/akregator/src/librss/librsslocal.la $(LIB_KHTML)
  
---- kdepim-3.5.8/akregator/src/main.cpp	2007-01-15 06:28:31.000000000 -0500
-+++ kdepim-3.5.8-new/akregator/src/main.cpp	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/akregator/src/main.cpp kdepim-3.5.10-new/akregator/src/main.cpp
+--- kdepim-3.5.10/akregator/src/main.cpp	2007-01-15 06:28:31.000000000 -0500
++++ kdepim-3.5.10-new/akregator/src/main.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -85,7 +85,7 @@
  
  } // namespace Akregator
@@ -39,8 +40,9 @@
  {
      Akregator::AboutData about;
      KCmdLineArgs::init(argc, argv, &about);
---- kdepim-3.5.8/certmanager/Makefile.am	2005-09-10 04:23:51.000000000 -0400
-+++ kdepim-3.5.8-new/certmanager/Makefile.am	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/certmanager/Makefile.am kdepim-3.5.10-new/certmanager/Makefile.am
+--- kdepim-3.5.10/certmanager/Makefile.am	2005-09-10 04:23:51.000000000 -0400
++++ kdepim-3.5.10-new/certmanager/Makefile.am	2009-04-17 16:23:32.000000000 -0400
 @@ -4,9 +4,11 @@
  
  INCLUDES = -I$(srcdir)/lib -I$(top_srcdir)/libkdenetwork $(GPGME_CFLAGS) $(all_includes)
@@ -66,8 +68,9 @@
  
  rcdir = $(kde_datadir)/kleopatra
  rc_DATA = kleopatraui.rc
---- kdepim-3.5.8/certmanager/conf/Makefile.am	2005-10-10 11:02:19.000000000 -0400
-+++ kdepim-3.5.8-new/certmanager/conf/Makefile.am	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/certmanager/conf/Makefile.am kdepim-3.5.10-new/certmanager/conf/Makefile.am
+--- kdepim-3.5.10/certmanager/conf/Makefile.am	2005-10-10 11:02:19.000000000 -0400
++++ kdepim-3.5.10-new/certmanager/conf/Makefile.am	2009-04-17 16:23:32.000000000 -0400
 @@ -15,7 +15,7 @@
  	appearanceconfigwidget.cpp \
  	dnorderconfigpage.cpp
@@ -77,8 +80,9 @@
  kcm_kleopatra_la_LIBADD = ../lib/libkleopatra.la $(LIB_KDEUI)
  
  kde_services_DATA = \
---- kdepim-3.5.8/certmanager/kwatchgnupg/Makefile.am	2005-09-10 04:23:49.000000000 -0400
-+++ kdepim-3.5.8-new/certmanager/kwatchgnupg/Makefile.am	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/certmanager/kwatchgnupg/Makefile.am kdepim-3.5.10-new/certmanager/kwatchgnupg/Makefile.am
+--- kdepim-3.5.10/certmanager/kwatchgnupg/Makefile.am	2005-09-10 04:23:49.000000000 -0400
++++ kdepim-3.5.10-new/certmanager/kwatchgnupg/Makefile.am	2009-04-17 16:23:32.000000000 -0400
 @@ -2,9 +2,11 @@
  
  INCLUDES = -I$(top_srcdir)/certmanager/lib -I$(top_srcdir)/libkdenetwork $(GPGME_CFLAGS) $(all_includes)
@@ -104,8 +108,9 @@
  
  rcdir = $(kde_datadir)/kwatchgnupg
  rc_DATA = kwatchgnupgui.rc
---- kdepim-3.5.8/certmanager/kwatchgnupg/main.cpp	2005-09-10 04:23:49.000000000 -0400
-+++ kdepim-3.5.8-new/certmanager/kwatchgnupg/main.cpp	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/certmanager/kwatchgnupg/main.cpp kdepim-3.5.10-new/certmanager/kwatchgnupg/main.cpp
+--- kdepim-3.5.10/certmanager/kwatchgnupg/main.cpp	2005-09-10 04:23:49.000000000 -0400
++++ kdepim-3.5.10-new/certmanager/kwatchgnupg/main.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -74,7 +74,7 @@
    return KUniqueApplication::newInstance();
  }
@@ -115,8 +120,9 @@
  {
    AboutData aboutData;
  
---- kdepim-3.5.8/certmanager/main.cpp	2005-09-10 04:23:51.000000000 -0400
-+++ kdepim-3.5.8-new/certmanager/main.cpp	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/certmanager/main.cpp kdepim-3.5.10-new/certmanager/main.cpp
+--- kdepim-3.5.10/certmanager/main.cpp	2005-09-10 04:23:51.000000000 -0400
++++ kdepim-3.5.10-new/certmanager/main.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -46,7 +46,7 @@
  #include <kglobal.h>
  #include <kiconloader.h>
@@ -126,8 +132,9 @@
  {
    AboutData aboutData;
  
---- kdepim-3.5.8/kabc/frontend/Makefile.am	2005-09-10 04:24:24.000000000 -0400
-+++ kdepim-3.5.8-new/kabc/frontend/Makefile.am	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/kabc/frontend/Makefile.am kdepim-3.5.10-new/kabc/frontend/Makefile.am
+--- kdepim-3.5.10/kabc/frontend/Makefile.am	2005-09-10 04:24:24.000000000 -0400
++++ kdepim-3.5.10-new/kabc/frontend/Makefile.am	2009-04-17 16:23:32.000000000 -0400
 @@ -2,9 +2,11 @@
  
  METASOURCES = AUTO
@@ -144,8 +151,9 @@
 +kabcfrontend_la_LIBADD = -lkabc $(LIB_KDECORE)
 +kabcfrontend_la_SOURCES = main.cpp mainWindow.ui
  
---- kdepim-3.5.8/kabc/frontend/main.cpp	2005-09-10 04:24:24.000000000 -0400
-+++ kdepim-3.5.8-new/kabc/frontend/main.cpp	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/kabc/frontend/main.cpp kdepim-3.5.10-new/kabc/frontend/main.cpp
+--- kdepim-3.5.10/kabc/frontend/main.cpp	2005-09-10 04:24:24.000000000 -0400
++++ kdepim-3.5.10-new/kabc/frontend/main.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -6,7 +6,7 @@
  
  #include "mainWindow.h"
@@ -155,8 +163,9 @@
  {
    KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
    KCmdLineArgs::init(argc,argv,&aboutData);
---- kdepim-3.5.8/kabc/kabc2mutt/Makefile.am	2005-09-10 04:24:24.000000000 -0400
-+++ kdepim-3.5.8-new/kabc/kabc2mutt/Makefile.am	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/kabc/kabc2mutt/Makefile.am kdepim-3.5.10-new/kabc/kabc2mutt/Makefile.am
+--- kdepim-3.5.10/kabc/kabc2mutt/Makefile.am	2005-09-10 04:24:24.000000000 -0400
++++ kdepim-3.5.10-new/kabc/kabc2mutt/Makefile.am	2009-04-17 16:23:32.000000000 -0400
 @@ -2,11 +2,13 @@
  
  METASOURCES = AUTO
@@ -175,8 +184,9 @@
  
  messages: rc.cpp
  	$(XGETTEXT) *.cpp -o $(podir)/kabc2mutt.pot
---- kdepim-3.5.8/kabc/kabc2mutt/main.cpp	2005-09-10 04:24:24.000000000 -0400
-+++ kdepim-3.5.8-new/kabc/kabc2mutt/main.cpp	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/kabc/kabc2mutt/main.cpp kdepim-3.5.10-new/kabc/kabc2mutt/main.cpp
+--- kdepim-3.5.10/kabc/kabc2mutt/main.cpp	2005-09-10 04:24:24.000000000 -0400
++++ kdepim-3.5.10-new/kabc/kabc2mutt/main.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -41,7 +41,7 @@
  };
  
@@ -186,8 +196,9 @@
  {
    KApplication::disableAutoDcopRegistration();
    KCmdLineArgs::init( argc, argv, appName, programName, description, version );
---- kdepim-3.5.8/kaddressbook/Makefile.am	2007-05-14 03:54:44.000000000 -0400
-+++ kdepim-3.5.8-new/kaddressbook/Makefile.am	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/kaddressbook/Makefile.am kdepim-3.5.10-new/kaddressbook/Makefile.am
+--- kdepim-3.5.10/kaddressbook/Makefile.am	2008-02-13 04:39:43.000000000 -0500
++++ kdepim-3.5.10-new/kaddressbook/Makefile.am	2009-04-17 16:23:32.000000000 -0400
 @@ -14,11 +14,12 @@
            -I$(top_buildir)/kaddressbook/editors \
            $(all_includes)
@@ -214,8 +225,32 @@
  
  rcdir = $(kde_datadir)/kaddressbook
  rc_DATA = kaddressbookui.rc kaddressbook_part.rc
---- kdepim-3.5.8/kaddressbook/main.cpp	2005-11-08 17:33:33.000000000 -0500
-+++ kdepim-3.5.8-new/kaddressbook/main.cpp	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/kaddressbook/features/Makefile.am kdepim-3.5.10-new/kaddressbook/features/Makefile.am
+--- kdepim-3.5.10/kaddressbook/features/Makefile.am	2008-08-19 14:15:52.000000000 -0400
++++ kdepim-3.5.10-new/kaddressbook/features/Makefile.am	2009-04-17 16:29:07.000000000 -0400
+@@ -16,16 +16,16 @@
+ 
+ if compile_newdistrlists
+ libkaddrbk_distributionlistng_la_SOURCES = distributionlistngwidget.cpp
+-libkaddrbk_distributionlistng_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
++libkaddrbk_distributionlistng_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ libkaddrbk_distributionlistng_la_LIBADD = $(XXLIBS)
+ else
+ libkaddrbk_distributionlist_la_SOURCES = distributionlistwidget.cpp
+-libkaddrbk_distributionlist_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
++libkaddrbk_distributionlist_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ libkaddrbk_distributionlist_la_LIBADD = $(XXLIBS)
+ endif
+ 
+ libkaddrbk_resourceselection_la_SOURCES = resourceselection.cpp
+-libkaddrbk_resourceselection_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
++libkaddrbk_resourceselection_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS)
+ 
+ noinst_HEADERS = distributionlistwidget.h distributionlistngwidget.h resourceselection.h
+diff -Nurd kdepim-3.5.10/kaddressbook/main.cpp kdepim-3.5.10-new/kaddressbook/main.cpp
+--- kdepim-3.5.10/kaddressbook/main.cpp	2005-11-08 17:33:33.000000000 -0500
++++ kdepim-3.5.10-new/kaddressbook/main.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -109,7 +109,7 @@
    return 0;
  }
@@ -225,8 +260,9 @@
  {
    KLocale::setMainCatalogue( "kaddressbook" );
  
---- kdepim-3.5.8/kandy/src/Makefile.am	2005-09-10 04:24:42.000000000 -0400
-+++ kdepim-3.5.8-new/kandy/src/Makefile.am	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/kandy/src/Makefile.am kdepim-3.5.10-new/kandy/src/Makefile.am
+--- kdepim-3.5.10/kandy/src/Makefile.am	2005-09-10 04:24:42.000000000 -0400
++++ kdepim-3.5.10-new/kandy/src/Makefile.am	2009-04-17 16:23:32.000000000 -0400
 @@ -1,10 +1,12 @@
 -bin_PROGRAMS = kandy kandy_client
 +bin_PROGRAMS = 
@@ -257,8 +293,9 @@
  
  METASOURCES = AUTO
  
---- kdepim-3.5.8/kandy/src/kandy_client.cpp	2005-09-10 04:24:42.000000000 -0400
-+++ kdepim-3.5.8-new/kandy/src/kandy_client.cpp	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/kandy/src/kandy_client.cpp kdepim-3.5.10-new/kandy/src/kandy_client.cpp
+--- kdepim-3.5.10/kandy/src/kandy_client.cpp	2005-09-10 04:24:42.000000000 -0400
++++ kdepim-3.5.10-new/kandy/src/kandy_client.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <qdatastream.h>
  #include <qstring.h>
@@ -268,8 +305,9 @@
  {
      KApplication app(argc, argv, "kandy_client", false);
  
---- kdepim-3.5.8/kandy/src/main.cpp	2005-09-10 04:24:42.000000000 -0400
-+++ kdepim-3.5.8-new/kandy/src/main.cpp	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/kandy/src/main.cpp kdepim-3.5.10-new/kandy/src/main.cpp
+--- kdepim-3.5.10/kandy/src/main.cpp	2005-09-10 04:24:42.000000000 -0400
++++ kdepim-3.5.10-new/kandy/src/main.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -85,7 +85,7 @@
  #endif
  }
@@ -279,8 +317,9 @@
  {
    KAboutData about("kandy", I18N_NOOP("Kandy"), version, description,
                     KAboutData::License_GPL, "(C) 2001 Cornelius Schumacher",0,
---- kdepim-3.5.8/kitchensync/src/Makefile.am	2007-10-08 05:50:47.000000000 -0400
-+++ kdepim-3.5.8-new/kitchensync/src/Makefile.am	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/kitchensync/src/Makefile.am kdepim-3.5.10-new/kitchensync/src/Makefile.am
+--- kdepim-3.5.10/kitchensync/src/Makefile.am	2007-10-08 05:50:47.000000000 -0400
++++ kdepim-3.5.10-new/kitchensync/src/Makefile.am	2009-04-17 16:23:32.000000000 -0400
 @@ -7,11 +7,13 @@
              $(all_includes)
  
@@ -308,8 +347,9 @@
  libkitchensyncpart_la_LIBADD = $(LIB_KPARTS) libkitchensync.la
  
  # Resources
---- kdepim-3.5.8/kitchensync/src/main.cpp	2007-05-14 03:54:46.000000000 -0400
-+++ kdepim-3.5.8-new/kitchensync/src/main.cpp	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/kitchensync/src/main.cpp kdepim-3.5.10-new/kitchensync/src/main.cpp
+--- kdepim-3.5.10/kitchensync/src/main.cpp	2007-05-14 03:54:46.000000000 -0400
++++ kdepim-3.5.10-new/kitchensync/src/main.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -32,7 +32,7 @@
    KCmdLineLastOption
  };
@@ -319,9 +359,10 @@
  {
    KAboutData *about = MainWidget::aboutData();
  
---- kdepim-3.5.8/kmail/Makefile.am	2007-10-08 05:50:38.000000000 -0400
-+++ kdepim-3.5.8-new/kmail/Makefile.am	2007-10-15 10:32:27.000000000 -0400
-@@ -24,32 +24,34 @@
+diff -Nurd kdepim-3.5.10/kmail/Makefile.am kdepim-3.5.10-new/kmail/Makefile.am
+--- kdepim-3.5.10/kmail/Makefile.am	2008-08-19 14:15:47.000000000 -0400
++++ kdepim-3.5.10-new/kmail/Makefile.am	2009-04-17 16:23:32.000000000 -0400
+@@ -25,32 +25,34 @@
  endif
  
  lib_LTLIBRARIES = libkmailprivate.la
@@ -366,7 +407,7 @@
  
  libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \
                  configuredialog_p.cpp klistviewindexedsearchline.cpp \
-@@ -139,7 +141,7 @@
+@@ -154,7 +156,7 @@
  
  libkmailprivate_la_COMPILE_FIRST = globalsettings_base.h customtemplates_base.h templatesconfiguration_base.h
  
@@ -375,8 +416,9 @@
  
  kmail_COMPILE_FIRST = globalsettings_base.h customtemplates_base.h templatesconfiguration_base.h
  
---- kdepim-3.5.8/kmail/main.cpp	2005-09-10 04:24:02.000000000 -0400
-+++ kdepim-3.5.8-new/kmail/main.cpp	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/kmail/main.cpp kdepim-3.5.10-new/kmail/main.cpp
+--- kdepim-3.5.10/kmail/main.cpp	2005-09-10 04:24:02.000000000 -0400
++++ kdepim-3.5.10-new/kmail/main.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -64,7 +64,7 @@
    return 0;
  }
@@ -386,8 +428,9 @@
  {
    // WABA: KMail is a KUniqueApplication. Unfortunately this makes debugging
    // a bit harder: You should pass --nofork as commandline argument when using
---- kdepim-3.5.8/kmailcvt/Makefile.am	2005-09-10 04:24:16.000000000 -0400
-+++ kdepim-3.5.8-new/kmailcvt/Makefile.am	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/kmailcvt/Makefile.am kdepim-3.5.10-new/kmailcvt/Makefile.am
+--- kdepim-3.5.10/kmailcvt/Makefile.am	2005-09-10 04:24:16.000000000 -0400
++++ kdepim-3.5.10-new/kmailcvt/Makefile.am	2009-04-17 16:23:32.000000000 -0400
 @@ -1,6 +1,9 @@
  
 -bin_PROGRAMS = kmailcvt
@@ -422,8 +465,9 @@
  
  KDE_ICON=AUTO
  
---- kdepim-3.5.8/kmailcvt/main.cpp	2005-09-10 04:24:16.000000000 -0400
-+++ kdepim-3.5.8-new/kmailcvt/main.cpp	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/kmailcvt/main.cpp kdepim-3.5.10-new/kmailcvt/main.cpp
+--- kdepim-3.5.10/kmailcvt/main.cpp	2005-09-10 04:24:16.000000000 -0400
++++ kdepim-3.5.10-new/kmailcvt/main.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -26,7 +26,7 @@
    KCmdLineLastOption
  };
@@ -433,8 +477,9 @@
  {
    KLocale::setMainCatalogue("kmailcvt");
  
---- kdepim-3.5.8/kmobile/Makefile.am	2005-09-10 04:23:39.000000000 -0400
-+++ kdepim-3.5.8-new/kmobile/Makefile.am	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/kmobile/Makefile.am kdepim-3.5.10-new/kmobile/Makefile.am
+--- kdepim-3.5.10/kmobile/Makefile.am	2005-09-10 04:23:39.000000000 -0400
++++ kdepim-3.5.10-new/kmobile/Makefile.am	2009-04-17 16:23:32.000000000 -0400
 @@ -2,15 +2,16 @@
  
  SUBDIRS = . devices		# kioslave
@@ -456,8 +501,9 @@
  			pref.cpp kmobileiface.skel kmobile_selectiondialog.ui \
  			systemtray.cpp
  
---- kdepim-3.5.8/kmobile/main.cpp	2005-09-10 04:23:39.000000000 -0400
-+++ kdepim-3.5.8-new/kmobile/main.cpp	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/kmobile/main.cpp kdepim-3.5.10-new/kmobile/main.cpp
+--- kdepim-3.5.10/kmobile/main.cpp	2005-09-10 04:23:39.000000000 -0400
++++ kdepim-3.5.10-new/kmobile/main.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -35,7 +35,7 @@
      KCmdLineLastOption
  };
@@ -467,8 +513,9 @@
  {
      KAboutData about("kmobile", I18N_NOOP("KMobile"), version, description,
                       KAboutData::License_GPL, "(C) 2003-2005 Helge Deller", 0, 0, "deller at kde.org");
---- kdepim-3.5.8/knode/Makefile.am	2007-05-14 03:54:39.000000000 -0400
-+++ kdepim-3.5.8-new/knode/Makefile.am	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/knode/Makefile.am kdepim-3.5.10-new/knode/Makefile.am
+--- kdepim-3.5.10/knode/Makefile.am	2008-02-13 04:39:38.000000000 -0500
++++ kdepim-3.5.10-new/knode/Makefile.am	2009-04-17 16:23:32.000000000 -0400
 @@ -10,22 +10,23 @@
  lib_LTLIBRARIES = libknodecommon.la
  
@@ -494,7 +541,7 @@
  kcm_knode_la_LIBADD = libknodecommon.la $(LIB_KDECORE)
  knconfigpages.lo: smtpaccountwidget_base.h
  
--libknodecommon_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
+-libknodecommon_la_LDFLAGS = -version-info 3:0:0 -no-undefined $(all_libraries)
 +libknodecommon_la_LDFLAGS = -no-undefined $(all_libraries)
  libknodecommon_la_LIBADD = $(top_builddir)/libkmime/libkmime.la $(top_builddir)/libkpgp/libkpgp.la $(top_builddir)/libkdepim/libkdepim.la $(LIB_KSPELL) $(LIB_KABC) $(LIB_KFILE) $(LIB_KUTILS) $(LIBRESOLV) $(LIB_KHTML)
  libknodecommon_la_SOURCES =   knconfigmanager.cpp \
@@ -517,8 +564,9 @@
  
  xdg_apps_DATA = KNode.desktop
  
---- kdepim-3.5.8/knode/main.cpp	2006-01-19 11:55:48.000000000 -0500
-+++ kdepim-3.5.8-new/knode/main.cpp	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/knode/main.cpp kdepim-3.5.10-new/knode/main.cpp
+--- kdepim-3.5.10/knode/main.cpp	2006-01-19 11:55:48.000000000 -0500
++++ kdepim-3.5.10-new/knode/main.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -25,7 +25,7 @@
  #include "knode_options.h"
  using KNode::AboutData;
@@ -528,8 +576,9 @@
  {
    AboutData aboutData;
  
---- kdepim-3.5.8/knotes/Makefile.am	2007-10-08 05:50:51.000000000 -0400
-+++ kdepim-3.5.8-new/knotes/Makefile.am	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/knotes/Makefile.am kdepim-3.5.10-new/knotes/Makefile.am
+--- kdepim-3.5.10/knotes/Makefile.am	2008-02-13 04:39:52.000000000 -0500
++++ kdepim-3.5.10-new/knotes/Makefile.am	2009-04-17 16:23:32.000000000 -0400
 @@ -2,7 +2,9 @@
  
  SUBDIRS         = . pics icons
@@ -541,15 +590,15 @@
  
  include_HEADERS = KNotesIface.h KNotesAppIface.h
  noinst_HEADERS  = knotesapp.h knote.h knoteedit.h knotebutton.h \
-@@ -23,16 +25,16 @@
+@@ -24,16 +26,16 @@
  libknote_la_SOURCES = knote.cpp knotebutton.cpp knoteconfigdlg.cpp knotehostdlg.cpp \
  							 knotealarmdlg.cpp knotesalarm.cpp
  
 -knotes_SOURCES  = main.cpp knotesapp.cpp KNotesAppIface.skel
 -knotes_LDADD    = libknote.la libknoteseditor.la libknotesnetwork.la libknotesresources.la \
 +knotes_la_SOURCES  = main.cpp knotesapp.cpp KNotesAppIface.skel
-+knotes_la_LIBADD   = libknote.la libknoteseditor.la libknotesnetwork.la libknotesresources.la \
-                   libknoteslegacy.la libknotesconfig.la  $(top_builddir)/libkcal/libkcal.la \
++knotes_la_LIBADD    = libknote.la libknoteseditor.la libknotesnetwork.la libknotesresources.la \
+                   libknoteslegacy.la libknotesconfig.la libknotesprinting.la $(top_builddir)/libkcal/libkcal.la \
                    $(top_builddir)/libkdepim/libkdepim.la $(LIB_KIO) -lkresources -lkdeprint -lkutils
 -knotes_LDFLAGS  = $(all_libraries) $(KDE_RPATH)
 -knotes_COMPILE_FIRST = knoteconfig.h
@@ -560,11 +609,12 @@
  knotes_local_la_SOURCES = resourcelocal_plugin.cpp
 -knotes_local_la_LDFLAGS = $(KDE_LDFLAGS) $(all_libraries) -module $(KDE_PLUGIN)
 +knotes_local_la_LDFLAGS = $(KDE_LDFLAGS) $(all_libraries) $(KDE_PLUGIN)
- knotes_local_la_LIBADD  = libknotesresources.la libknotesconfig.la \
+ knotes_local_la_LIBADD  = libknotesresources.la libknotesconfig.la libknotesprinting.la \
                            $(top_builddir)/libkcal/libkcal.la -lkdeprint
  
---- kdepim-3.5.8/knotes/main.cpp	2006-03-17 05:16:01.000000000 -0500
-+++ kdepim-3.5.8-new/knotes/main.cpp	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/knotes/main.cpp kdepim-3.5.10-new/knotes/main.cpp
+--- kdepim-3.5.10/knotes/main.cpp	2006-03-17 05:16:01.000000000 -0500
++++ kdepim-3.5.10-new/knotes/main.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -86,7 +86,7 @@
      return KUniqueApplication::newInstance();
  }
@@ -574,8 +624,9 @@
  {
      QString version = QString::number( KNOTES_VERSION );
  
---- kdepim-3.5.8/kode/Makefile.am	2005-09-10 04:23:43.000000000 -0400
-+++ kdepim-3.5.8-new/kode/Makefile.am	2007-10-15 10:32:27.000000000 -0400
+diff -Nurd kdepim-3.5.10/kode/Makefile.am kdepim-3.5.10-new/kode/Makefile.am
+--- kdepim-3.5.10/kode/Makefile.am	2005-09-10 04:23:43.000000000 -0400
++++ kdepim-3.5.10-new/kode/Makefile.am	2009-04-17 16:23:32.000000000 -0400
 @@ -12,10 +12,11 @@
                       -version-info 1:0:0 -no-undefined
  libkode_la_LIBADD = -lkdecore
@@ -592,8 +643,9 @@
 +kode_la_SOURCES = kodemain.cpp
  
  METASOURCES = AUTO
---- kdepim-3.5.8/kode/kodemain.cpp	2005-09-10 04:23:43.000000000 -0400
-+++ kdepim-3.5.8-new/kode/kodemain.cpp	2007-10-15 10:32:28.000000000 -0400
+diff -Nurd kdepim-3.5.10/kode/kodemain.cpp kdepim-3.5.10-new/kode/kodemain.cpp
+--- kdepim-3.5.10/kode/kodemain.cpp	2005-09-10 04:23:43.000000000 -0400
++++ kdepim-3.5.10-new/kode/kodemain.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -607,7 +607,7 @@
    return 0;
  }
@@ -603,8 +655,21 @@
  {
    KAboutData aboutData( "kode", I18N_NOOP("KDE Code Generator"), "0.1" );
    aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher at kde.org" );
---- kdepim-3.5.8/konsolekalendar/Makefile.am	2005-11-08 17:33:45.000000000 -0500
-+++ kdepim-3.5.8-new/konsolekalendar/Makefile.am	2007-10-15 10:32:28.000000000 -0400
+diff -Nurd kdepim-3.5.10/kode/kxml_compiler/Makefile.am kdepim-3.5.10-new/kode/kxml_compiler/Makefile.am
+--- kdepim-3.5.10/kode/kxml_compiler/Makefile.am	2005-09-10 04:23:43.000000000 -0400
++++ kdepim-3.5.10-new/kode/kxml_compiler/Makefile.am	2009-04-17 16:23:32.000000000 -0400
+@@ -3,7 +3,7 @@
+ bin_PROGRAMS = kxml_compiler
+ 
+ kxml_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-kxml_compiler_LDADD   = ../libkode.la -lkdecore
++kxml_compiler_LDADD  = ../libkode.la -lkdecore
+ kxml_compiler_SOURCES = parser.cpp creator.cpp kxml_compiler.cpp
+ 
+ METASOURCES = AUTO
+diff -Nurd kdepim-3.5.10/konsolekalendar/Makefile.am kdepim-3.5.10-new/konsolekalendar/Makefile.am
+--- kdepim-3.5.10/konsolekalendar/Makefile.am	2005-11-08 17:33:45.000000000 -0500
++++ kdepim-3.5.10-new/konsolekalendar/Makefile.am	2009-04-17 16:23:32.000000000 -0400
 @@ -6,14 +6,16 @@
  
  METASOURCES = AUTO
@@ -626,8 +691,9 @@
  
  appsdir = $(kde_appsdir)/Utilities
  xdg_apps_DATA = konsolekalendar.desktop
---- kdepim-3.5.8/konsolekalendar/main.cpp	2006-07-22 04:14:27.000000000 -0400
-+++ kdepim-3.5.8-new/konsolekalendar/main.cpp	2007-10-15 10:32:28.000000000 -0400
+diff -Nurd kdepim-3.5.10/konsolekalendar/main.cpp kdepim-3.5.10-new/konsolekalendar/main.cpp
+--- kdepim-3.5.10/konsolekalendar/main.cpp	2008-02-13 04:39:54.000000000 -0500
++++ kdepim-3.5.10-new/konsolekalendar/main.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -165,7 +165,7 @@
    KCmdLineLastOption
  };
@@ -637,9 +703,10 @@
  {
    KAboutData aboutData(
      progName,                        // internal program name
---- kdepim-3.5.8/kontact/src/Makefile.am	2005-09-10 04:24:42.000000000 -0400
-+++ kdepim-3.5.8-new/kontact/src/Makefile.am	2007-10-15 10:32:28.000000000 -0400
-@@ -5,23 +5,29 @@
+diff -Nurd kdepim-3.5.10/kontact/src/Makefile.am kdepim-3.5.10-new/kontact/src/Makefile.am
+--- kdepim-3.5.10/kontact/src/Makefile.am	2008-02-13 04:39:52.000000000 -0500
++++ kdepim-3.5.10-new/kontact/src/Makefile.am	2009-04-17 16:23:32.000000000 -0400
+@@ -5,24 +5,30 @@
  lib_LTLIBRARIES = libkontact.la
  libkontact_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
  libkontact_la_LIBADD = $(LIB_KDECORE)
@@ -665,7 +732,8 @@
    $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_KHTML)
 -kontact_SOURCES = main.cpp mainwindow.cpp sidepanebase.cpp \
 +kontact_la_SOURCES = main.cpp mainwindow.cpp sidepanebase.cpp \
-   iconsidepane.cpp aboutdialog.cpp
+   iconsidepane.cpp aboutdialog.cpp profilemanager.cpp profiledialog.cpp \
+   kontactiface.skel
 -kontact_COMPILE_FIRST = prefs.h
 +kontact_la_COMPILE_FIRST = prefs.h
  
@@ -677,8 +745,9 @@
  kcm_kontact_la_LIBADD = libkontact.la $(top_builddir)/libkdepim/libkdepim.la
  kcm_kontact_la_COMPILE_FIRST = prefs.h
  
---- kdepim-3.5.8/kontact/src/main.cpp	2007-05-14 03:54:53.000000000 -0400
-+++ kdepim-3.5.8-new/kontact/src/main.cpp	2007-10-15 10:32:28.000000000 -0400
+diff -Nurd kdepim-3.5.10/kontact/src/main.cpp kdepim-3.5.10-new/kontact/src/main.cpp
+--- kdepim-3.5.10/kontact/src/main.cpp	2008-08-19 14:16:02.000000000 -0400
++++ kdepim-3.5.10-new/kontact/src/main.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -120,7 +120,7 @@
    return KUniqueApplication::newInstance();
  }
@@ -687,9 +756,10 @@
 +extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
  {
    KAboutData about( "kontact", I18N_NOOP( "Kontact" ), version, description,
-                     KAboutData::License_GPL, I18N_NOOP("(C) 2001-2004 The Kontact developers"), 0, "http://kontact.org" );
---- kdepim-3.5.8/korganizer/Makefile.am	2007-05-14 03:54:31.000000000 -0400
-+++ kdepim-3.5.8-new/korganizer/Makefile.am	2007-10-15 10:32:28.000000000 -0400
+                     KAboutData::License_GPL, I18N_NOOP("(C) 2001-2008 The Kontact developers"), 0, "http://kontact.org" );
+diff -Nurd kdepim-3.5.10/korganizer/Makefile.am kdepim-3.5.10-new/korganizer/Makefile.am
+--- kdepim-3.5.10/korganizer/Makefile.am	2008-08-19 14:16:05.000000000 -0400
++++ kdepim-3.5.10-new/korganizer/Makefile.am	2009-04-17 16:23:32.000000000 -0400
 @@ -12,23 +12,24 @@
    -I$(top_builddir) \
    $(all_includes)
@@ -722,7 +792,7 @@
  libkorganizerpart_la_LIBADD  = libkorganizer.la
  libkorganizerpart_la_SOURCES = korganizer_part.cpp
  libkorganizerpart_la_COMPILE_FIRST = publishdialog_base.h koprefs_base.h
-@@ -67,7 +68,7 @@
+@@ -68,7 +69,7 @@
  libkorganizer_la_COMPILE_FIRST = \
  	kogroupwareprefspage.ui \
  	$(top_srcdir)/libkdepim/categoryselectdialog.h
@@ -731,8 +801,9 @@
  	koagendaview.cpp koagenda.cpp koagendaitem.cpp \
  	datenavigator.cpp kdatenavigator.cpp datenavigatorcontainer.cpp \
  	datechecker.cpp \
---- kdepim-3.5.8/korganizer/korgac/Makefile.am	2005-09-10 04:24:44.000000000 -0400
-+++ kdepim-3.5.8-new/korganizer/korgac/Makefile.am	2007-10-15 10:32:28.000000000 -0400
+diff -Nurd kdepim-3.5.10/korganizer/korgac/Makefile.am kdepim-3.5.10-new/korganizer/korgac/Makefile.am
+--- kdepim-3.5.10/korganizer/korgac/Makefile.am	2005-09-10 04:24:44.000000000 -0400
++++ kdepim-3.5.10-new/korganizer/korgac/Makefile.am	2009-04-17 16:23:32.000000000 -0400
 @@ -1,11 +1,13 @@
  INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/korganizer $(all_includes)
  
@@ -762,8 +833,9 @@
  
  noinst_HEADERS = alarmclientiface.h alarmdialog.h \
                   alarmdockwindow.h koalarmclient.h
---- kdepim-3.5.8/korganizer/korgac/korgacmain.cpp	2006-01-19 11:56:25.000000000 -0500
-+++ kdepim-3.5.8-new/korganizer/korgac/korgacmain.cpp	2007-10-15 10:32:28.000000000 -0400
+diff -Nurd kdepim-3.5.10/korganizer/korgac/korgacmain.cpp kdepim-3.5.10-new/korganizer/korgac/korgacmain.cpp
+--- kdepim-3.5.10/korganizer/korgac/korgacmain.cpp	2006-01-19 11:56:25.000000000 -0500
++++ kdepim-3.5.10-new/korganizer/korgac/korgacmain.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -59,7 +59,7 @@
    { 0, 0, 0 }
  };
@@ -773,8 +845,9 @@
  {
    KLocale::setMainCatalogue( "korganizer" );
    KAboutData aboutData( "korgac", I18N_NOOP("KOrganizer Reminder Daemon"),
---- kdepim-3.5.8/korganizer/korgplugins.cpp	2005-09-10 04:24:47.000000000 -0400
-+++ kdepim-3.5.8-new/korganizer/korgplugins.cpp	2007-10-15 10:32:28.000000000 -0400
+diff -Nurd kdepim-3.5.10/korganizer/korgplugins.cpp kdepim-3.5.10-new/korganizer/korgplugins.cpp
+--- kdepim-3.5.10/korganizer/korgplugins.cpp	2005-09-10 04:24:47.000000000 -0400
++++ kdepim-3.5.10-new/korganizer/korgplugins.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -32,7 +32,7 @@
  
  #include "kocore.h"
@@ -784,8 +857,9 @@
  {
    KAboutData aboutData("korgplugins",I18N_NOOP("KOrgPlugins"),"0.1");
    KCmdLineArgs::init(argc,argv,&aboutData);
---- kdepim-3.5.8/korganizer/main.cpp	2005-09-10 04:24:47.000000000 -0400
-+++ kdepim-3.5.8-new/korganizer/main.cpp	2007-10-15 10:32:28.000000000 -0400
+diff -Nurd kdepim-3.5.10/korganizer/main.cpp kdepim-3.5.10-new/korganizer/main.cpp
+--- kdepim-3.5.10/korganizer/main.cpp	2005-09-10 04:24:47.000000000 -0400
++++ kdepim-3.5.10-new/korganizer/main.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -35,7 +35,7 @@
  #include "korganizer.h"
  #include "korganizer_options.h"
@@ -795,8 +869,9 @@
  {
    KOrg::AboutData aboutData;
  
---- kdepim-3.5.8/korganizer/timezone.cpp	2005-09-10 04:24:47.000000000 -0400
-+++ kdepim-3.5.8-new/korganizer/timezone.cpp	2007-10-15 10:32:28.000000000 -0400
+diff -Nurd kdepim-3.5.10/korganizer/timezone.cpp kdepim-3.5.10-new/korganizer/timezone.cpp
+--- kdepim-3.5.10/korganizer/timezone.cpp	2005-09-10 04:24:47.000000000 -0400
++++ kdepim-3.5.10-new/korganizer/timezone.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -34,7 +34,7 @@
  
  #include "koprefs.h"
@@ -806,8 +881,9 @@
  {
    KAboutData aboutData("timezone",I18N_NOOP("KOrganizer Timezone Test"),"0.1");
    KCmdLineArgs::init(argc,argv,&aboutData);
---- kdepim-3.5.8/korn/Makefile.am	2007-10-08 05:50:45.000000000 -0400
-+++ kdepim-3.5.8-new/korn/Makefile.am	2007-10-15 10:35:09.000000000 -0400
+diff -Nurd kdepim-3.5.10/korn/Makefile.am kdepim-3.5.10-new/korn/Makefile.am
+--- kdepim-3.5.10/korn/Makefile.am	2007-10-08 05:50:45.000000000 -0400
++++ kdepim-3.5.10-new/korn/Makefile.am	2009-04-17 16:23:32.000000000 -0400
 @@ -7,11 +7,14 @@
  
  METASOURCES = AUTO
@@ -827,8 +903,9 @@
    accountmanager.cpp \
    account_input.cpp \
    boxcontainer.cpp \
---- kdepim-3.5.8/korn/main.cpp	2006-07-22 04:14:20.000000000 -0400
-+++ kdepim-3.5.8-new/korn/main.cpp	2007-10-15 10:32:28.000000000 -0400
+diff -Nurd kdepim-3.5.10/korn/main.cpp kdepim-3.5.10-new/korn/main.cpp
+--- kdepim-3.5.10/korn/main.cpp	2006-07-22 04:14:20.000000000 -0400
++++ kdepim-3.5.10-new/korn/main.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -14,7 +14,7 @@
  static const char version[] = "0.4";
  
@@ -838,8 +915,9 @@
  {
  	KAboutData aboutData(argv[0], I18N_NOOP("Korn"),
  		version, description, KAboutData::License_GPL,
---- kdepim-3.5.8/kpilot/conduits/Makefile.am	2007-05-14 03:54:52.000000000 -0400
-+++ kdepim-3.5.8-new/kpilot/conduits/Makefile.am	2007-10-15 10:32:28.000000000 -0400
+diff -Nurd kdepim-3.5.10/kpilot/conduits/Makefile.am kdepim-3.5.10-new/kpilot/conduits/Makefile.am
+--- kdepim-3.5.10/kpilot/conduits/Makefile.am	2007-05-14 03:54:52.000000000 -0400
++++ kdepim-3.5.10-new/kpilot/conduits/Makefile.am	2009-04-17 16:23:32.000000000 -0400
 @@ -7,6 +7,8 @@
  MAL_SUBDIR = malconduit
  else
@@ -857,8 +935,9 @@
  	  memofileconduit \
  	  notepadconduit \
  	  popmail \
---- kdepim-3.5.8/kpilot/conduits/docconduit/Makefile.am	2005-11-08 17:33:38.000000000 -0500
-+++ kdepim-3.5.8-new/kpilot/conduits/docconduit/Makefile.am	2007-10-15 10:32:28.000000000 -0400
+diff -Nurd kdepim-3.5.10/kpilot/conduits/docconduit/Makefile.am kdepim-3.5.10-new/kpilot/conduits/docconduit/Makefile.am
+--- kdepim-3.5.10/kpilot/conduits/docconduit/Makefile.am	2005-11-08 17:33:38.000000000 -0500
++++ kdepim-3.5.10-new/kpilot/conduits/docconduit/Makefile.am	2009-04-17 16:23:32.000000000 -0400
 @@ -14,20 +14,22 @@
  
  noinst_LTLIBRARIES = libpalmdoc_shared.la
@@ -887,8 +966,9 @@
  
  xdg_apps_DATA = kpalmdoc.desktop
  servicetypedir = $(kde_servicetypesdir)
---- kdepim-3.5.8/kpilot/conduits/docconduit/kpalmdoc.cpp	2005-09-10 04:24:37.000000000 -0400
-+++ kdepim-3.5.8-new/kpilot/conduits/docconduit/kpalmdoc.cpp	2007-10-15 10:32:28.000000000 -0400
+diff -Nurd kdepim-3.5.10/kpilot/conduits/docconduit/kpalmdoc.cpp kdepim-3.5.10-new/kpilot/conduits/docconduit/kpalmdoc.cpp
+--- kdepim-3.5.10/kpilot/conduits/docconduit/kpalmdoc.cpp	2005-09-10 04:24:37.000000000 -0400
++++ kdepim-3.5.10-new/kpilot/conduits/docconduit/kpalmdoc.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -36,7 +36,7 @@
  
  
@@ -898,8 +978,9 @@
  {
  
  	KAboutData about("converter", I18N_NOOP("KPalmDOC"), "-0.0.1",
---- kdepim-3.5.8/kpilot/conduits/malconduit/mal-conduit.cc	2007-05-14 03:54:51.000000000 -0400
-+++ kdepim-3.5.8-new/kpilot/conduits/malconduit/mal-conduit.cc	2007-10-15 10:32:28.000000000 -0400
+diff -Nurd kdepim-3.5.10/kpilot/conduits/malconduit/mal-conduit.cc kdepim-3.5.10-new/kpilot/conduits/malconduit/mal-conduit.cc
+--- kdepim-3.5.10/kpilot/conduits/malconduit/mal-conduit.cc	2007-05-14 03:54:51.000000000 -0400
++++ kdepim-3.5.10-new/kpilot/conduits/malconduit/mal-conduit.cc	2009-04-17 16:23:32.000000000 -0400
 @@ -34,6 +34,7 @@
  
  #include "options.h"
@@ -908,8 +989,9 @@
  #include <qregexp.h>
  #include <kconfig.h>
  #include <kdebug.h>
---- kdepim-3.5.8/kpilot/kpilot/Makefile.am	2007-05-14 03:54:52.000000000 -0400
-+++ kdepim-3.5.8-new/kpilot/kpilot/Makefile.am	2007-10-15 10:32:28.000000000 -0400
+diff -Nurd kdepim-3.5.10/kpilot/kpilot/Makefile.am kdepim-3.5.10-new/kpilot/kpilot/Makefile.am
+--- kdepim-3.5.10/kpilot/kpilot/Makefile.am	2007-05-14 03:54:52.000000000 -0400
++++ kdepim-3.5.10-new/kpilot/kpilot/Makefile.am	2009-04-17 16:23:32.000000000 -0400
 @@ -9,9 +9,10 @@
  SUBDIRS = Icons
  
@@ -973,8 +1055,9 @@
  	../lib/libkpilot.la libconfiguration.la
  kpilotTest_LDADD	= $(LIB_KFILE) $(PISOCK_LIB) \
  	../lib/libkpilot.la libconfiguration.la
---- kdepim-3.5.8/kpilot/kpilot/kpilot.cc	2007-05-14 03:54:52.000000000 -0400
-+++ kdepim-3.5.8-new/kpilot/kpilot/kpilot.cc	2007-10-15 10:32:28.000000000 -0400
+diff -Nurd kdepim-3.5.10/kpilot/kpilot/kpilot.cc kdepim-3.5.10-new/kpilot/kpilot/kpilot.cc
+--- kdepim-3.5.10/kpilot/kpilot/kpilot.cc	2007-05-14 03:54:52.000000000 -0400
++++ kdepim-3.5.10-new/kpilot/kpilot/kpilot.cc	2009-04-17 16:23:32.000000000 -0400
 @@ -1008,7 +1008,7 @@
  
  
@@ -984,8 +1067,9 @@
  {
  	FUNCTIONSETUP;
  
---- kdepim-3.5.8/kpilot/kpilot/pilotDaemon.cc	2007-05-14 03:54:52.000000000 -0400
-+++ kdepim-3.5.8-new/kpilot/kpilot/pilotDaemon.cc	2007-10-15 10:32:28.000000000 -0400
+diff -Nurd kdepim-3.5.10/kpilot/kpilot/pilotDaemon.cc kdepim-3.5.10-new/kpilot/kpilot/pilotDaemon.cc
+--- kdepim-3.5.10/kpilot/kpilot/pilotDaemon.cc	2007-05-14 03:54:52.000000000 -0400
++++ kdepim-3.5.10-new/kpilot/kpilot/pilotDaemon.cc	2009-04-17 16:23:32.000000000 -0400
 @@ -1301,7 +1301,7 @@
  } ;
  
@@ -995,8 +1079,9 @@
  {
  	FUNCTIONSETUP;
  
---- kdepim-3.5.8/kresources/featureplan/benchmarkfeaturelist.cpp	2005-09-10 04:23:46.000000000 -0400
-+++ kdepim-3.5.8-new/kresources/featureplan/benchmarkfeaturelist.cpp	2007-10-15 10:32:28.000000000 -0400
+diff -Nurd kdepim-3.5.10/kresources/featureplan/benchmarkfeaturelist.cpp kdepim-3.5.10-new/kresources/featureplan/benchmarkfeaturelist.cpp
+--- kdepim-3.5.10/kresources/featureplan/benchmarkfeaturelist.cpp	2008-02-13 04:39:29.000000000 -0500
++++ kdepim-3.5.10-new/kresources/featureplan/benchmarkfeaturelist.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -67,7 +67,7 @@
    }
  }
@@ -1006,8 +1091,9 @@
  {
    KAboutData aboutData( "benchmarkfeaturelist",
                          "Benchmark for feature list XML parser",
---- kdepim-3.5.8/kresources/featureplan/dumpfeaturelist.cpp	2006-05-22 14:10:46.000000000 -0400
-+++ kdepim-3.5.8-new/kresources/featureplan/dumpfeaturelist.cpp	2007-10-15 10:32:28.000000000 -0400
+diff -Nurd kdepim-3.5.10/kresources/featureplan/dumpfeaturelist.cpp kdepim-3.5.10-new/kresources/featureplan/dumpfeaturelist.cpp
+--- kdepim-3.5.10/kresources/featureplan/dumpfeaturelist.cpp	2006-05-22 14:10:46.000000000 -0400
++++ kdepim-3.5.10-new/kresources/featureplan/dumpfeaturelist.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -67,7 +67,7 @@
    }
  }
@@ -1017,8 +1103,9 @@
  {
    KAboutData aboutData( "dumpfeaturelist", "Dump XML feature list to stdout",
                          "0.1" );
---- kdepim-3.5.8/kresources/groupwise/soap/soapdebug.cpp	2005-09-10 04:23:46.000000000 -0400
-+++ kdepim-3.5.8-new/kresources/groupwise/soap/soapdebug.cpp	2007-10-15 10:32:28.000000000 -0400
+diff -Nurd kdepim-3.5.10/kresources/groupwise/soap/soapdebug.cpp kdepim-3.5.10-new/kresources/groupwise/soap/soapdebug.cpp
+--- kdepim-3.5.10/kresources/groupwise/soap/soapdebug.cpp	2005-09-10 04:23:46.000000000 -0400
++++ kdepim-3.5.10-new/kresources/groupwise/soap/soapdebug.cpp	2009-04-17 16:23:32.000000000 -0400
 @@ -44,7 +44,7 @@
    KCmdLineLastOption
  };
@@ -1028,21 +1115,21 @@
  {
    KAboutData aboutData( "soapdebug", I18N_NOOP("Groupwise Soap Debug"), "0.1" );
    aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher at kde.org" );
---- kdepim-3.5.8/ktnef/gui/Makefile.am	2005-09-10 04:24:43.000000000 -0400
-+++ kdepim-3.5.8-new/ktnef/gui/Makefile.am	2007-10-15 10:32:28.000000000 -0400
+diff -Nurd kdepim-3.5.10/ktnef/gui/Makefile.am kdepim-3.5.10-new/ktnef/gui/Makefile.am
+--- kdepim-3.5.10/ktnef/gui/Makefile.am	2005-09-10 04:24:43.000000000 -0400
++++ kdepim-3.5.10-new/ktnef/gui/Makefile.am	2009-04-17 16:23:32.000000000 -0400
 @@ -2,14 +2,16 @@
  
  SUBDIRS = pics
  
 -bin_PROGRAMS = ktnef
--
++bin_PROGRAMS = 
++lib_LTLIBRARIES = 
++kdeinit_LTLIBRARIES = ktnef.la
+ 
 -ktnef_LDFLAGS = $(KDE_RPATH) $(all_libraries)
 -ktnef_LDADD   = $(LIB_KFILE) $(top_builddir)/ktnef/lib/libktnef.la
 -ktnef_SOURCES = ktnefmain.cpp ktnefview.cpp attachpropertydialogbase.ui \
-+bin_PROGRAMS = 
-+lib_LTLIBRARIES = 
-+kdeinit_LTLIBRARIES = ktnef.la
-+
 +ktnef_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 +ktnef_la_LIBADD  = $(LIB_KFILE) $(top_builddir)/ktnef/lib/libktnef.la
 +ktnef_la_SOURCES = ktnefmain.cpp ktnefview.cpp attachpropertydialogbase.ui \
@@ -1053,8 +1140,9 @@
  
  noinst_HEADERS = ktnefmain.h ktnefview.h attachpropertydialog.h \
                   qwmf.h wmfstruct.h metafuncs.h
---- kdepim-3.5.8/ktnef/gui/main.cpp	2005-09-10 04:24:43.000000000 -0400
-+++ kdepim-3.5.8-new/ktnef/gui/main.cpp	2007-10-15 10:32:28.000000000 -0400
+diff -Nurd kdepim-3.5.10/ktnef/gui/main.cpp kdepim-3.5.10-new/ktnef/gui/main.cpp
+--- kdepim-3.5.10/ktnef/gui/main.cpp	2005-09-10 04:24:43.000000000 -0400
++++ kdepim-3.5.10-new/ktnef/gui/main.cpp	2009-04-17 16:23:33.000000000 -0400
 @@ -33,7 +33,7 @@
    // INSERT YOUR COMMANDLINE OPTIONS HERE
  };
@@ -1064,8 +1152,9 @@
  {
  
    KAboutData aboutData( "ktnef", I18N_NOOP("KTnef"),
---- kdepim-3.5.8/libkcal/convertqtopia.cpp	2005-09-10 04:24:36.000000000 -0400
-+++ kdepim-3.5.8-new/libkcal/convertqtopia.cpp	2007-10-15 10:32:28.000000000 -0400
+diff -Nurd kdepim-3.5.10/libkcal/convertqtopia.cpp kdepim-3.5.10-new/libkcal/convertqtopia.cpp
+--- kdepim-3.5.10/libkcal/convertqtopia.cpp	2005-09-10 04:24:36.000000000 -0400
++++ kdepim-3.5.10-new/libkcal/convertqtopia.cpp	2009-04-17 16:23:33.000000000 -0400
 @@ -48,7 +48,7 @@
    KCmdLineLastOption
  };
@@ -1075,8 +1164,9 @@
  {
    KAboutData aboutData("convertqtopia",I18N_NOOP("Qtopia calendar file converter"),"0.1");
    aboutData.addAuthor("Cornelius Schumacher", 0, "schumacher at kde.org");
---- kdepim-3.5.8/libkdepim/cfgc/autoexample.cpp	2005-09-10 04:24:24.000000000 -0400
-+++ kdepim-3.5.8-new/libkdepim/cfgc/autoexample.cpp	2007-10-15 10:32:31.000000000 -0400
+diff -Nurd kdepim-3.5.10/libkdepim/cfgc/autoexample.cpp kdepim-3.5.10-new/libkdepim/cfgc/autoexample.cpp
+--- kdepim-3.5.10/libkdepim/cfgc/autoexample.cpp	2005-09-10 04:24:24.000000000 -0400
++++ kdepim-3.5.10-new/libkdepim/cfgc/autoexample.cpp	2009-04-17 16:23:33.000000000 -0400
 @@ -36,7 +36,7 @@
  
  #include <qlabel.h>
@@ -1086,8 +1176,9 @@
  {
    KAboutData aboutData( "example", I18N_NOOP("autoconfig example"), "0.1" );
    aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher at kde.org" );
---- kdepim-3.5.8/libkdepim/cfgc/example.cpp	2005-09-10 04:24:24.000000000 -0400
-+++ kdepim-3.5.8-new/libkdepim/cfgc/example.cpp	2007-10-15 10:32:31.000000000 -0400
+diff -Nurd kdepim-3.5.10/libkdepim/cfgc/example.cpp kdepim-3.5.10-new/libkdepim/cfgc/example.cpp
+--- kdepim-3.5.10/libkdepim/cfgc/example.cpp	2005-09-10 04:24:24.000000000 -0400
++++ kdepim-3.5.10-new/libkdepim/cfgc/example.cpp	2009-04-17 16:23:33.000000000 -0400
 @@ -32,7 +32,7 @@
  
  #include <libkdepim/kprefsdialog.h>
@@ -1097,8 +1188,9 @@
  {
    KAboutData aboutData( "example", I18N_NOOP("cfgc example"), "0.1" );
    aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher at kde.org" );
---- kdepim-3.5.8/libkholidays/Makefile.am	2006-07-22 04:14:21.000000000 -0400
-+++ kdepim-3.5.8-new/libkholidays/Makefile.am	2007-10-15 10:32:31.000000000 -0400
+diff -Nurd kdepim-3.5.10/libkholidays/Makefile.am kdepim-3.5.10-new/libkholidays/Makefile.am
+--- kdepim-3.5.10/libkholidays/Makefile.am	2006-07-22 04:14:21.000000000 -0400
++++ kdepim-3.5.10-new/libkholidays/Makefile.am	2009-04-17 16:23:33.000000000 -0400
 @@ -7,7 +7,7 @@
  lib_LTLIBRARIES = libkholidays.la
  
@@ -1108,8 +1200,9 @@
  libkholidays_la_SOURCES = kholidays.cpp scanholiday.c parseholiday.h parseholiday.c lunarphase.cpp
  
  #the lex/flex and yacc/bison files are in CVS and NOT generated
---- kdepim-3.5.8/libkholidays/parseholiday.c	2007-10-08 05:50:46.000000000 -0400
-+++ kdepim-3.5.8-new/libkholidays/parseholiday.c	2007-10-15 10:32:31.000000000 -0400
+diff -Nurd kdepim-3.5.10/libkholidays/parseholiday.c kdepim-3.5.10-new/libkholidays/parseholiday.c
+--- kdepim-3.5.10/libkholidays/parseholiday.c	2007-10-08 05:50:46.000000000 -0400
++++ kdepim-3.5.10-new/libkholidays/parseholiday.c	2009-04-17 16:23:33.000000000 -0400
 @@ -204,8 +204,8 @@
  			 int year, int off, int length);
  /*** Variables and structures ***/
@@ -1121,8 +1214,9 @@
  int	         yacc_small;		/* small string or on its own line? */
  int	         yacc_stringcolor;	/* color of holiday name text, 1..8 */
  char	        *yacc_string;		/* holiday name text */
---- kdepim-3.5.8/libkholidays/scanholiday.c	2007-05-14 03:54:44.000000000 -0400
-+++ kdepim-3.5.8-new/libkholidays/scanholiday.c	2007-10-15 10:32:31.000000000 -0400
+diff -Nurd kdepim-3.5.10/libkholidays/scanholiday.c kdepim-3.5.10-new/libkholidays/scanholiday.c
+--- kdepim-3.5.10/libkholidays/scanholiday.c	2007-05-14 03:54:44.000000000 -0400
++++ kdepim-3.5.10-new/libkholidays/scanholiday.c	2009-04-17 16:23:33.000000000 -0400
 @@ -15,6 +15,8 @@
  #define yyrestart kcalrestart
  #define yytext kcaltext
@@ -1132,8 +1226,9 @@
  #line 19 "scanholiday.c"
  /* A lexical scanner generated by flex*/
  
---- kdepim-3.5.8/mimelib/dw_date.cpp	2007-05-14 03:54:54.000000000 -0400
-+++ kdepim-3.5.8-new/mimelib/dw_date.cpp	2007-10-15 10:32:31.000000000 -0400
+diff -Nurd kdepim-3.5.10/mimelib/dw_date.cpp kdepim-3.5.10-new/mimelib/dw_date.cpp
+--- kdepim-3.5.10/mimelib/dw_date.cpp	2007-05-14 03:54:54.000000000 -0400
++++ kdepim-3.5.10-new/mimelib/dw_date.cpp	2009-04-17 16:23:33.000000000 -0400
 @@ -656,7 +656,7 @@
      ""
  };
@@ -1143,8 +1238,9 @@
  {
      struct tm *ptms, tms1, tms2;
      time_t tt;
---- kdepim-3.5.8/mimelib/uuencode.cpp	2007-05-14 03:54:54.000000000 -0400
-+++ kdepim-3.5.8-new/mimelib/uuencode.cpp	2007-10-15 10:32:31.000000000 -0400
+diff -Nurd kdepim-3.5.10/mimelib/uuencode.cpp kdepim-3.5.10-new/mimelib/uuencode.cpp
+--- kdepim-3.5.10/mimelib/uuencode.cpp	2007-05-14 03:54:54.000000000 -0400
++++ kdepim-3.5.10-new/mimelib/uuencode.cpp	2009-04-17 16:23:33.000000000 -0400
 @@ -429,7 +429,7 @@
  
  // Test harness for DwUudecode
@@ -1154,8 +1250,9 @@
  {
  	srand(time(0));
  	DwString binStr;
---- kdepim-3.5.8/networkstatus/Makefile.am	2005-09-10 04:24:02.000000000 -0400
-+++ kdepim-3.5.8-new/networkstatus/Makefile.am	2007-10-15 10:32:31.000000000 -0400
+diff -Nurd kdepim-3.5.10/networkstatus/Makefile.am kdepim-3.5.10-new/networkstatus/Makefile.am
+--- kdepim-3.5.10/networkstatus/Makefile.am	2005-09-10 04:24:02.000000000 -0400
++++ kdepim-3.5.10-new/networkstatus/Makefile.am	2009-04-17 16:23:33.000000000 -0400
 @@ -19,7 +19,7 @@
  	clientiface.skel serviceiface.skel network.cpp
  #kclientiface.skel serviceiface.skel
@@ -1181,8 +1278,9 @@
  
 -networkstatustestservice_SOURCES = testservice.cpp provideriface.skel serviceiface.stub
 +networkstatustestservice_la_SOURCES = testservice.cpp provideriface.skel serviceiface.stub
---- kdepim-3.5.8/networkstatus/testservice.cpp	2005-09-10 04:24:02.000000000 -0400
-+++ kdepim-3.5.8-new/networkstatus/testservice.cpp	2007-10-15 10:32:31.000000000 -0400
+diff -Nurd kdepim-3.5.10/networkstatus/testservice.cpp kdepim-3.5.10-new/networkstatus/testservice.cpp
+--- kdepim-3.5.10/networkstatus/testservice.cpp	2005-09-10 04:24:02.000000000 -0400
++++ kdepim-3.5.10-new/networkstatus/testservice.cpp	2009-04-17 16:23:33.000000000 -0400
 @@ -90,7 +90,7 @@
  	m_service->setNetworkStatus( "test_net", (int)m_status );
  }
@@ -1192,14 +1290,15 @@
  {
  	KApplication app(argc, argv, "testdcop");
  	TestService * test = new TestService;
---- kdepim-3.5.8/wizards/Makefile.am	2005-09-10 04:23:44.000000000 -0400
-+++ kdepim-3.5.8-new/wizards/Makefile.am	2007-10-15 10:32:31.000000000 -0400
+diff -Nurd kdepim-3.5.10/wizards/Makefile.am kdepim-3.5.10-new/wizards/Makefile.am
+--- kdepim-3.5.10/wizards/Makefile.am	2008-02-13 04:39:28.000000000 -0500
++++ kdepim-3.5.10-new/wizards/Makefile.am	2009-04-17 16:23:33.000000000 -0400
 @@ -12,7 +12,7 @@
  bin_PROGRAMS = groupwarewizard egroupwarewizard sloxwizard kolabwizard \
-                groupwisewizard exchangewizard
+                groupwisewizard exchangewizard scalixwizard
  
 -kde_module_LTLIBRARIES = libegroupwarewizard.la libsloxwizard.la \
 +lib_LTLIBRARIES = libegroupwarewizard.la libsloxwizard.la \
                           libkolabwizard.la libgroupwisewizard.la \
-                          libexchangewizard.la
+                          libexchangewizard.la libscalixwizard.la
  

Modified: trunk/dports/kde/kdesdk3/Portfile
===================================================================
--- trunk/dports/kde/kdesdk3/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdesdk3/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,13 +1,12 @@
 # $Id$
 
-#Synced with Fink, Version 3.5.8-1021
+#Synced with Fink, revision 1.25
 
 PortSystem 1.0
 name		kdesdk3
-version		3.5.8
-revision	1
-set kdeadmin	kde-admindir-1024
-categories	kde
+version		3.5.10
+set kdeadmin	kde-admindir-1502
+categories	kde kde3
 maintainers	nomaintainer
 description	KDE SDK. \
 		NB No KDE sound support. \
@@ -15,15 +14,16 @@
 long_description ${description}
 platforms	darwin
 homepage	http://www.kde.org/
-master_sites	kde:stable/${version}/src/:kde358 \
+master_sites	kde:stable/${version}/src/:kde \
 		http://ranger.users.finkproject.org/distfiles/kde-admindir/:admin \
 		http://ranger.befunk.com/fink/kde-admindir/:admin \
 		http://astrange.ithinksw.net/~astrange/ranger-fink/kde-admindir/:admin \
 		http://www.southofheaven.net/befunk/kde-admindir/:admin
 use_bzip2	yes
 distname	kdesdk-${version}
-distfiles	${distname}.tar.bz2:kde358 \
+distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
+dist_subdir     kde3
 depends_build	port:autoconf \
 		port:unsermake
 depends_lib	port:db46 \
@@ -31,16 +31,16 @@
 		port:kdepim3
 #		port:subversion
 
-checksums	${distname}.tar.bz2 md5 c809c15eb8c09a7eb2d070395202910b \
-		${kdeadmin}.tar.bz2 md5 d99491aa5d520fd1d70393a718019322
+checksums	${distname}.tar.bz2 md5 ad711d1ce09242bd13b73a9a005f3143 \
+		${kdeadmin}.tar.bz2 md5 92a60282c1d81f38835ce7d495255cc3
 
 extract.only	${distname}.tar.bz2
 post-extract	{ system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
 
 patchfiles	kdesdk3.patch
 patch		{
-		foreach file $patchfiles {
-		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
+		foreach f $patchfiles {
+		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${f} | patch -p1"
 		}
 		system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' ${worksrcpath}/admin/*"
 }
@@ -49,16 +49,16 @@
 		reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|HOME=/tmp|HOME=${workpath}|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|/tmp/buildlog|${workpath}/buildlog|g" ${worksrcpath}/build-helper.sh
-		foreach file {CompileScript.sh InstallScript.sh} {
-		    file copy ${filespath}/${file} ${worksrcpath}
-		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
-		    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
-		    reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
-		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${file}
-		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${file}
-		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${file}
-		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${file}
-		    file attributes ${worksrcpath}/${file} -permissions 0755
+		foreach f {CompileScript.sh InstallScript.sh} {
+		    copy ${filespath}/${f} ${worksrcpath}
+		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${f}
+		    reinplace "s|%N|${name}|g" ${worksrcpath}/${f}
+		    reinplace "s|%v|${version}|g" ${worksrcpath}/${f}
+		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${f}
+		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${f}
+		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${f}
+		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${f}
+		    file attributes ${worksrcpath}/${f} -permissions 0755
 		}
 		reinplace "s|doc/HTML|doc/kde|g" ${worksrcpath}/scripts/kdedoc
 }
@@ -69,7 +69,7 @@
 
 configure.args	--with-db-name=db-4.6 --with-db-include-dir=${prefix}/include/db46 --with-db-lib-dir=${prefix}/lib/db46 --with-distribution='MacPorts/Mac OS X' --without-subversion --without-arts
 
-configure	{}
+use_configure       no
 use_parallel_build  yes
 build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
 destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }

Modified: trunk/dports/kde/kdesdk3/files/CompileScript.sh
===================================================================
--- trunk/dports/kde/kdesdk3/files/CompileScript.sh	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdesdk3/files/CompileScript.sh	2009-04-23 09:53:52 UTC (rev 50045)
@@ -11,6 +11,6 @@
 	find . -name \*.ll -exec touch {} \;
 
 #fink
-#	./build-helper.sh make      %N %v %r unsermake $UNSERMAKEFLAGS LIB_DBIV=-ldb-4.2
+#	./build-helper.sh make      %N %v %r unsermake $UNSERMAKEFLAGS LIB_DBIV=-ldb-4.7
 #macports
 	./build-helper.sh make      %N %v %r unsermake $UNSERMAKEFLAGS LIB_DBIV=-ldb-4.6

Modified: trunk/dports/kde/kdesdk3/files/kdesdk3.patch
===================================================================
--- trunk/dports/kde/kdesdk3/files/kdesdk3.patch	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdesdk3/files/kdesdk3.patch	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,6 +1,6 @@
-
---- kdesdk-3.5.5/kapptemplate/kapp/app-Makefile.am	2005-09-10 04:20:59.000000000 -0400
-+++ kdesdk-3.5.5-new/kapptemplate/kapp/app-Makefile.am	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kapptemplate/kapp/app-Makefile.am kdesdk-3.5.9-new/kapptemplate/kapp/app-Makefile.am
+--- kdesdk-3.5.9/kapptemplate/kapp/app-Makefile.am	2005-09-10 04:20:59.000000000 -0400
++++ kdesdk-3.5.9-new/kapptemplate/kapp/app-Makefile.am	2008-02-13 22:01:07.000000000 -0500
 @@ -8,28 +8,30 @@
  
  # this is the program that gets installed.  it's name is used for all
@@ -39,8 +39,9 @@
  
  # let automoc handle all of the meta source files (moc)
  METASOURCES = AUTO
---- kdesdk-3.5.5/kapptemplate/kapp/app_client.cpp	2005-09-10 04:20:59.000000000 -0400
-+++ kdesdk-3.5.5-new/kapptemplate/kapp/app_client.cpp	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kapptemplate/kapp/app_client.cpp kdesdk-3.5.9-new/kapptemplate/kapp/app_client.cpp
+--- kdesdk-3.5.9/kapptemplate/kapp/app_client.cpp	2005-09-10 04:20:59.000000000 -0400
++++ kdesdk-3.5.9-new/kapptemplate/kapp/app_client.cpp	2008-02-13 22:01:07.000000000 -0500
 @@ -5,7 +5,7 @@
  #include <qdatastream.h>
  #include <qstring.h>
@@ -50,8 +51,9 @@
  {
      KApplication app(argc, argv, "${APP_NAME_LC}_client", false);
  
---- kdesdk-3.5.5/kapptemplate/kapp/main.cpp	2005-09-10 04:20:59.000000000 -0400
-+++ kdesdk-3.5.5-new/kapptemplate/kapp/main.cpp	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kapptemplate/kapp/main.cpp kdesdk-3.5.9-new/kapptemplate/kapp/main.cpp
+--- kdesdk-3.5.9/kapptemplate/kapp/main.cpp	2005-09-10 04:20:59.000000000 -0400
++++ kdesdk-3.5.9-new/kapptemplate/kapp/main.cpp	2008-02-13 22:01:07.000000000 -0500
 @@ -18,7 +18,7 @@
      KCmdLineLastOption
  };
@@ -61,8 +63,9 @@
  {
      KAboutData about("${APP_NAME_LC}", I18N_NOOP("${APP_NAME}"), version, description, KAboutData::License_GPL, "(C) 2004 ${AUTHOR}", 0, 0, "${EMAIL}");
      about.addAuthor( "${AUTHOR}", 0, "${EMAIL}" );
---- kdesdk-3.5.5/kapptemplate/kpartapp/main.cpp	2005-09-10 04:20:59.000000000 -0400
-+++ kdesdk-3.5.5-new/kapptemplate/kpartapp/main.cpp	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kapptemplate/kpartapp/main.cpp kdesdk-3.5.9-new/kapptemplate/kpartapp/main.cpp
+--- kdesdk-3.5.9/kapptemplate/kpartapp/main.cpp	2005-09-10 04:20:59.000000000 -0400
++++ kdesdk-3.5.9-new/kapptemplate/kpartapp/main.cpp	2008-02-13 22:01:07.000000000 -0500
 @@ -17,7 +17,7 @@
      KCmdLineLastOption
  };
@@ -72,8 +75,9 @@
  {
      KAboutData about("${APP_NAME_LC}", I18N_NOOP("${APP_NAME}"), version, description, KAboutData::License_GPL, "(C) 2004 ${AUTHOR}", 0, 0, "${EMAIL}");
      about.addAuthor( "${AUTHOR}", 0, "${EMAIL}" );
---- kdesdk-3.5.5/kbabel/catalogmanager/Makefile.am	2006-10-01 13:27:34.000000000 -0400
-+++ kdesdk-3.5.5-new/kbabel/catalogmanager/Makefile.am	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kbabel/catalogmanager/Makefile.am kdesdk-3.5.9-new/kbabel/catalogmanager/Makefile.am
+--- kdesdk-3.5.9/kbabel/catalogmanager/Makefile.am	2006-10-01 13:27:34.000000000 -0400
++++ kdesdk-3.5.9-new/kbabel/catalogmanager/Makefile.am	2008-02-13 22:01:07.000000000 -0500
 @@ -7,7 +7,11 @@
  # this is the program that gets installed. Its name is used for all
  # of the other Makefile.am variables
@@ -102,9 +106,23 @@
  
  # these are the headers for your project
  noinst_HEADERS   = catalogmanageriface.h catalogmanager.h \
---- kdesdk-3.5.5/kbabel/catalogmanager/main.cpp	2006-07-22 04:11:51.000000000 -0400
-+++ kdesdk-3.5.5-new/kbabel/catalogmanager/main.cpp	2006-10-30 11:35:10.000000000 -0500
-@@ -178,7 +178,7 @@
+diff -Nurd kdesdk-3.5.9/kbabel/catalogmanager/libsvn/svnhandler.h kdesdk-3.5.9-new/kbabel/catalogmanager/libsvn/svnhandler.h
+--- kdesdk-3.5.9/kbabel/catalogmanager/libsvn/svnhandler.h	2007-05-14 03:40:26.000000000 -0400
++++ kdesdk-3.5.9-new/kbabel/catalogmanager/libsvn/svnhandler.h	2008-02-13 22:01:07.000000000 -0500
+@@ -47,6 +47,9 @@
+ 
+ class KSharedConfig;
+ 
++#undef stderr
++#undef stdout
++
+ /**
+  * This class is the backend for SVN support in Catalog Manager.
+  *
+diff -Nurd kdesdk-3.5.9/kbabel/catalogmanager/main.cpp kdesdk-3.5.9-new/kbabel/catalogmanager/main.cpp
+--- kdesdk-3.5.9/kbabel/catalogmanager/main.cpp	2007-01-15 06:24:26.000000000 -0500
++++ kdesdk-3.5.9-new/kbabel/catalogmanager/main.cpp	2008-02-13 22:01:07.000000000 -0500
+@@ -180,7 +180,7 @@
  };
  
  
@@ -113,8 +131,9 @@
  {
      KLocale::setMainCatalogue("kbabel");
      KAboutData about("catalogmanager",I18N_NOOP("KBabel - Catalog Manager"),VERSION,
---- kdesdk-3.5.5/kbabel/commonui/Makefile.am	2006-10-01 13:27:34.000000000 -0400
-+++ kdesdk-3.5.5-new/kbabel/commonui/Makefile.am	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kbabel/commonui/Makefile.am kdesdk-3.5.9-new/kbabel/commonui/Makefile.am
+--- kdesdk-3.5.9/kbabel/commonui/Makefile.am	2006-10-01 13:27:34.000000000 -0400
++++ kdesdk-3.5.9-new/kbabel/commonui/Makefile.am	2008-02-13 22:01:07.000000000 -0500
 @@ -2,7 +2,7 @@
  
  # this is the program that gets installed.  it's name is used for all
@@ -124,8 +143,9 @@
  
  # set the include path for X, qt and KDE. Put local paths before all_includes.
  INCLUDES         = -I$(srcdir)/../common -I../common -I$(srcdir)/../kbabeldict -I../kbabeldict $(all_includes)
---- kdesdk-3.5.5/kbabel/kbabel/Makefile.am	2006-10-01 13:27:33.000000000 -0400
-+++ kdesdk-3.5.5-new/kbabel/kbabel/Makefile.am	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kbabel/kbabel/Makefile.am kdesdk-3.5.9-new/kbabel/kbabel/Makefile.am
+--- kdesdk-3.5.9/kbabel/kbabel/Makefile.am	2006-10-01 13:27:33.000000000 -0400
++++ kdesdk-3.5.9-new/kbabel/kbabel/Makefile.am	2008-02-13 22:01:07.000000000 -0500
 @@ -5,7 +5,9 @@
  # this is the program that gets installed.  it's name is used for all
  # of the other Makefile.am variables
@@ -152,9 +172,10 @@
  
  # these are the headers for your project
  noinst_HEADERS   = kbabel.h kbabelview.h \
---- kdesdk-3.5.5/kbabel/kbabel/main.cpp	2006-07-22 04:11:50.000000000 -0400
-+++ kdesdk-3.5.5-new/kbabel/kbabel/main.cpp	2006-10-30 11:35:10.000000000 -0500
-@@ -506,7 +506,7 @@
+diff -Nurd kdesdk-3.5.9/kbabel/kbabel/main.cpp kdesdk-3.5.9-new/kbabel/kbabel/main.cpp
+--- kdesdk-3.5.9/kbabel/kbabel/main.cpp	2007-01-15 06:24:25.000000000 -0500
++++ kdesdk-3.5.9-new/kbabel/kbabel/main.cpp	2008-02-13 22:01:07.000000000 -0500
+@@ -542,7 +542,7 @@
  };
  
  
@@ -163,8 +184,9 @@
  {
      KAboutData about("kbabel",I18N_NOOP("KBabel"),VERSION,
         I18N_NOOP("An advanced PO file editor"),KAboutData::License_GPL,
---- kdesdk-3.5.5/kbabel/kbabeldict/Makefile.am	2006-10-01 13:27:33.000000000 -0400
-+++ kdesdk-3.5.5-new/kbabel/kbabeldict/Makefile.am	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kbabel/kbabeldict/Makefile.am kdesdk-3.5.9-new/kbabel/kbabeldict/Makefile.am
+--- kdesdk-3.5.9/kbabel/kbabeldict/Makefile.am	2006-10-01 13:27:33.000000000 -0400
++++ kdesdk-3.5.9-new/kbabel/kbabeldict/Makefile.am	2008-02-13 22:01:07.000000000 -0500
 @@ -6,17 +6,15 @@
  
  pkgincludedir = $(includedir)/kbabel
@@ -201,8 +223,9 @@
  
  # these are the headers for your project
  noinst_HEADERS   =  kbabeldict.h kbabeldictview.h kbabelsplash.h aboutmoduledlg.h
---- kdesdk-3.5.5/kbabel/kbabeldict/main.cpp	2006-07-22 04:11:50.000000000 -0400
-+++ kdesdk-3.5.5-new/kbabel/kbabeldict/main.cpp	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kbabel/kbabeldict/main.cpp kdesdk-3.5.9-new/kbabel/kbabeldict/main.cpp
+--- kdesdk-3.5.9/kbabel/kbabeldict/main.cpp	2006-07-22 04:11:50.000000000 -0400
++++ kdesdk-3.5.9-new/kbabel/kbabeldict/main.cpp	2008-02-13 22:01:07.000000000 -0500
 @@ -107,7 +107,7 @@
  };
  
@@ -212,8 +235,9 @@
  {
      KLocale::setMainCatalogue("kbabel");
      
---- kdesdk-3.5.5/kbugbuster/Makefile.am	2005-09-10 04:21:11.000000000 -0400
-+++ kdesdk-3.5.5-new/kbugbuster/Makefile.am	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kbugbuster/Makefile.am kdesdk-3.5.9-new/kbugbuster/Makefile.am
+--- kdesdk-3.5.9/kbugbuster/Makefile.am	2005-09-10 04:21:11.000000000 -0400
++++ kdesdk-3.5.9-new/kbugbuster/Makefile.am	2008-02-13 22:01:07.000000000 -0500
 @@ -6,12 +6,14 @@
  
  SUBDIRS = backend gui pics $(KRESOURCES_SUBDIR)
@@ -233,8 +257,9 @@
  
  xdg_apps_DATA = kbugbuster.desktop
  
---- kdesdk-3.5.5/kbugbuster/configure.in.in	2005-09-10 04:21:11.000000000 -0400
-+++ kdesdk-3.5.5-new/kbugbuster/configure.in.in	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kbugbuster/configure.in.in kdesdk-3.5.9-new/kbugbuster/configure.in.in
+--- kdesdk-3.5.9/kbugbuster/configure.in.in	2005-09-10 04:21:11.000000000 -0400
++++ kdesdk-3.5.9-new/kbugbuster/configure.in.in	2008-02-13 22:01:07.000000000 -0500
 @@ -2,6 +2,7 @@
  KDE_CHECK_HEADER(libkcal/resourcecalendar.h,HAVE_KCAL=1,
   AC_MSG_WARN([Unable to find libkcal. The Bugzilla todo list \
@@ -243,8 +268,9 @@
  AM_CONDITIONAL(include_kcalresource, test "$HAVE_KCAL" = 1)
  ])
  
---- kdesdk-3.5.5/kbugbuster/main.cpp	2005-09-10 04:21:11.000000000 -0400
-+++ kdesdk-3.5.5-new/kbugbuster/main.cpp	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kbugbuster/main.cpp kdesdk-3.5.9-new/kbugbuster/main.cpp
+--- kdesdk-3.5.9/kbugbuster/main.cpp	2005-09-10 04:21:11.000000000 -0400
++++ kdesdk-3.5.9-new/kbugbuster/main.cpp	2008-02-13 22:01:07.000000000 -0500
 @@ -42,7 +42,7 @@
    KCmdLineLastOption
  };
@@ -254,8 +280,9 @@
  {
      KAboutData aboutData( "kbugbuster", I18N_NOOP( "KBugBuster" ),
          VERSION, description, KAboutData::License_GPL,
---- kdesdk-3.5.5/kcachegrind/kcachegrind/Makefile.am	2005-09-10 04:21:07.000000000 -0400
-+++ kdesdk-3.5.5-new/kcachegrind/kcachegrind/Makefile.am	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kcachegrind/kcachegrind/Makefile.am kdesdk-3.5.9-new/kcachegrind/kcachegrind/Makefile.am
+--- kdesdk-3.5.9/kcachegrind/kcachegrind/Makefile.am	2005-09-10 04:21:07.000000000 -0400
++++ kdesdk-3.5.9-new/kcachegrind/kcachegrind/Makefile.am	2008-02-13 22:01:07.000000000 -0500
 @@ -1,6 +1,8 @@
 -bin_PROGRAMS = kcachegrind
 +kdeinit_LTLIBRARIES = kcachegrind.la
@@ -290,8 +317,9 @@
  rcdir = $(kde_datadir)/kcachegrind
  rc_DATA = kcachegrindui.rc
  
---- kdesdk-3.5.5/kcachegrind/kcachegrind/main.cpp	2005-09-10 04:21:07.000000000 -0400
-+++ kdesdk-3.5.5-new/kcachegrind/kcachegrind/main.cpp	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kcachegrind/kcachegrind/main.cpp kdesdk-3.5.9-new/kcachegrind/kcachegrind/main.cpp
+--- kdesdk-3.5.9/kcachegrind/kcachegrind/main.cpp	2005-09-10 04:21:07.000000000 -0400
++++ kdesdk-3.5.9-new/kcachegrind/kcachegrind/main.cpp	2008-02-13 22:01:07.000000000 -0500
 @@ -40,7 +40,7 @@
    KCmdLineLastOption // End of options.
  };
@@ -301,8 +329,9 @@
  {
    KAboutData aboutData("kcachegrind",
                         I18N_NOOP("KCachegrind"),
---- kdesdk-3.5.5/kcachegrind/kcachegrind/sourceitem.h	2005-09-10 04:21:07.000000000 -0400
-+++ kdesdk-3.5.5-new/kcachegrind/kcachegrind/sourceitem.h	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kcachegrind/kcachegrind/sourceitem.h kdesdk-3.5.9-new/kcachegrind/kcachegrind/sourceitem.h
+--- kdesdk-3.5.9/kcachegrind/kcachegrind/sourceitem.h	2005-09-10 04:21:07.000000000 -0400
++++ kdesdk-3.5.9-new/kcachegrind/kcachegrind/sourceitem.h	2008-02-13 22:01:07.000000000 -0500
 @@ -25,6 +25,7 @@
  
  #include <qlistview.h>
@@ -311,16 +340,18 @@
  
  class SourceView;
  
---- kdesdk-3.5.5/kioslave/svn/configure.in.in	2005-10-10 10:58:25.000000000 -0400
-+++ kdesdk-3.5.5-new/kioslave/svn/configure.in.in	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kioslave/svn/configure.in.in kdesdk-3.5.9-new/kioslave/svn/configure.in.in
+--- kdesdk-3.5.9/kioslave/svn/configure.in.in	2008-02-13 04:38:00.000000000 -0500
++++ kdesdk-3.5.9-new/kioslave/svn/configure.in.in	2008-02-13 22:01:07.000000000 -0500
 @@ -155,3 +155,5 @@
  AC_SUBST(SVN_CPPFLAGS)
  AC_SUBST(SVNLD)
  AM_CONDITIONAL(include_kioslave_svn, test -n "$SVN_SUBDIR")
 +
 +export DO_NOT_COMPILE="$DO_NOT_COMPILE kioslave"
---- kdesdk-3.5.5/kmtrace/Makefile.am	2005-09-10 04:20:58.000000000 -0400
-+++ kdesdk-3.5.5-new/kmtrace/Makefile.am	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kmtrace/Makefile.am kdesdk-3.5.9-new/kmtrace/Makefile.am
+--- kdesdk-3.5.9/kmtrace/Makefile.am	2005-09-10 04:20:58.000000000 -0400
++++ kdesdk-3.5.9-new/kmtrace/Makefile.am	2008-02-13 22:01:07.000000000 -0500
 @@ -21,15 +21,16 @@
  LDADD = $(LIB_KDECORE) -liberty
  INCLUDES = $(all_includes)
@@ -345,8 +376,9 @@
  
  bin_SCRIPTS = kminspector
  
---- kdesdk-3.5.5/kmtrace/demangle.cpp	2005-09-10 04:20:58.000000000 -0400
-+++ kdesdk-3.5.5-new/kmtrace/demangle.cpp	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kmtrace/demangle.cpp kdesdk-3.5.9-new/kmtrace/demangle.cpp
+--- kdesdk-3.5.9/kmtrace/demangle.cpp	2005-09-10 04:20:58.000000000 -0400
++++ kdesdk-3.5.9-new/kmtrace/demangle.cpp	2008-02-13 22:01:07.000000000 -0500
 @@ -36,7 +36,7 @@
  }
  
@@ -356,8 +388,9 @@
  {
     char buf[1024];
  
---- kdesdk-3.5.5/kmtrace/kmtrace.cpp	2005-10-10 10:58:21.000000000 -0400
-+++ kdesdk-3.5.5-new/kmtrace/kmtrace.cpp	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kmtrace/kmtrace.cpp kdesdk-3.5.9-new/kmtrace/kmtrace.cpp
+--- kdesdk-3.5.9/kmtrace/kmtrace.cpp	2005-10-10 10:58:21.000000000 -0400
++++ kdesdk-3.5.9-new/kmtrace/kmtrace.cpp	2008-02-13 22:01:07.000000000 -0500
 @@ -576,7 +576,7 @@
    KCmdLineLastOption
  };
@@ -367,8 +400,9 @@
  {
    KInstance instance("kmtrace");
  
---- kdesdk-3.5.5/kmtrace/match.cpp	2005-09-10 04:20:58.000000000 -0400
-+++ kdesdk-3.5.5-new/kmtrace/match.cpp	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kmtrace/match.cpp kdesdk-3.5.9-new/kmtrace/match.cpp
+--- kdesdk-3.5.9/kmtrace/match.cpp	2005-09-10 04:20:58.000000000 -0400
++++ kdesdk-3.5.9-new/kmtrace/match.cpp	2008-02-13 22:01:07.000000000 -0500
 @@ -13,7 +13,7 @@
  #include <kstandarddirs.h>
  #include <kcmdlineargs.h>
@@ -378,8 +412,9 @@
  {
     char buf[1024];
     if (argc != 3)
---- kdesdk-3.5.5/kompare/Makefile.am	2005-09-10 04:21:05.000000000 -0400
-+++ kdesdk-3.5.5-new/kompare/Makefile.am	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kompare/Makefile.am kdesdk-3.5.9-new/kompare/Makefile.am
+--- kdesdk-3.5.9/kompare/Makefile.am	2005-09-10 04:21:05.000000000 -0400
++++ kdesdk-3.5.9-new/kompare/Makefile.am	2008-02-13 22:01:07.000000000 -0500
 @@ -22,12 +22,14 @@
  #########################################################################
  # this is the program that gets installed.  it's name is used for all
@@ -399,8 +434,9 @@
  	$(top_builddir)/kompare/interfaces/libkompareinterface.la \
  	$(top_builddir)/kompare/libdialogpages/libdialogpages.la \
  	-lktexteditor
---- kdesdk-3.5.5/kompare/main.cpp	2005-09-10 04:21:05.000000000 -0400
-+++ kdesdk-3.5.5-new/kompare/main.cpp	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kompare/main.cpp kdesdk-3.5.9-new/kompare/main.cpp
+--- kdesdk-3.5.9/kompare/main.cpp	2005-09-10 04:21:05.000000000 -0400
++++ kdesdk-3.5.9-new/kompare/main.cpp	2008-02-13 22:01:07.000000000 -0500
 @@ -47,7 +47,7 @@
  	KCmdLineLastOption
  };
@@ -410,8 +446,9 @@
  {
  	KAboutData aboutData( "kompare", I18N_NOOP("Kompare"), version, description,
  	                      KAboutData::License_GPL,
---- kdesdk-3.5.5/kspy/main.cpp	2005-09-10 04:20:58.000000000 -0400
-+++ kdesdk-3.5.5-new/kspy/main.cpp	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kspy/main.cpp kdesdk-3.5.9-new/kspy/main.cpp
+--- kdesdk-3.5.9/kspy/main.cpp	2005-09-10 04:20:58.000000000 -0400
++++ kdesdk-3.5.9-new/kspy/main.cpp	2008-02-13 22:01:07.000000000 -0500
 @@ -32,7 +32,7 @@
    // INSERT YOUR COMMANDLINE OPTIONS HERE
  };
@@ -421,8 +458,9 @@
  {
  
    KAboutData aboutData( "spy", I18N_NOOP("Spy"),
---- kdesdk-3.5.5/kstartperf/Makefile.am	2005-09-10 04:20:58.000000000 -0400
-+++ kdesdk-3.5.5-new/kstartperf/Makefile.am	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kstartperf/Makefile.am kdesdk-3.5.9-new/kstartperf/Makefile.am
+--- kdesdk-3.5.9/kstartperf/Makefile.am	2005-09-10 04:20:58.000000000 -0400
++++ kdesdk-3.5.9-new/kstartperf/Makefile.am	2008-02-13 22:01:07.000000000 -0500
 @@ -5,10 +5,11 @@
  # libkstartperf_la_LIBADD = ../libltdl/libltdlc.la
  libkstartperf_la_SOURCES = libkstartperf.c
@@ -439,8 +477,9 @@
  
  messages:
  	$(XGETTEXT) $(kstartperf_SOURCES) -o $(podir)/kstartperf.pot
---- kdesdk-3.5.5/kstartperf/kstartperf.cpp	2005-09-10 04:20:58.000000000 -0400
-+++ kdesdk-3.5.5-new/kstartperf/kstartperf.cpp	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kstartperf/kstartperf.cpp kdesdk-3.5.9-new/kstartperf/kstartperf.cpp
+--- kdesdk-3.5.9/kstartperf/kstartperf.cpp	2005-09-10 04:20:58.000000000 -0400
++++ kdesdk-3.5.9-new/kstartperf/kstartperf.cpp	2008-02-13 22:01:07.000000000 -0500
 @@ -69,7 +69,7 @@
  }
  
@@ -450,8 +489,9 @@
  {
      KAboutData aboutData("kstartperf", I18N_NOOP("KStartPerf"),
  	    "1.0", I18N_NOOP("Measures start up time of a KDE application"),
---- kdesdk-3.5.5/kuiviewer/Makefile.am	2005-09-10 04:21:10.000000000 -0400
-+++ kdesdk-3.5.5-new/kuiviewer/Makefile.am	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kuiviewer/Makefile.am kdesdk-3.5.9-new/kuiviewer/Makefile.am
+--- kdesdk-3.5.9/kuiviewer/Makefile.am	2005-09-10 04:21:10.000000000 -0400
++++ kdesdk-3.5.9-new/kuiviewer/Makefile.am	2008-02-13 22:01:07.000000000 -0500
 @@ -21,12 +21,14 @@
  #########################################################################
  # this is the program that gets installed.  it's name is used for all
@@ -471,8 +511,9 @@
  
  xdg_apps_DATA =kuiviewer.desktop
  
---- kdesdk-3.5.5/kuiviewer/main.cpp	2005-09-10 04:21:10.000000000 -0400
-+++ kdesdk-3.5.5-new/kuiviewer/main.cpp	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/kuiviewer/main.cpp kdesdk-3.5.9-new/kuiviewer/main.cpp
+--- kdesdk-3.5.9/kuiviewer/main.cpp	2005-09-10 04:21:10.000000000 -0400
++++ kdesdk-3.5.9-new/kuiviewer/main.cpp	2008-02-13 22:01:07.000000000 -0500
 @@ -38,7 +38,7 @@
      KCmdLineLastOption
  };
@@ -482,8 +523,9 @@
  {
      KAboutData about("kuiviewer", I18N_NOOP("KUIViewer"), "0.1",
  		     I18N_NOOP("Displays Designer's UI files"),
---- kdesdk-3.5.5/poxml/Makefile.am	2005-09-10 04:21:06.000000000 -0400
-+++ kdesdk-3.5.5-new/poxml/Makefile.am	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/poxml/Makefile.am kdesdk-3.5.9-new/poxml/Makefile.am
+--- kdesdk-3.5.9/poxml/Makefile.am	2005-09-10 04:21:06.000000000 -0400
++++ kdesdk-3.5.9-new/poxml/Makefile.am	2008-02-13 22:01:07.000000000 -0500
 @@ -1,30 +1,31 @@
 -
 -bin_PROGRAMS = split2po xml2pot po2xml swappo transxx
@@ -499,46 +541,43 @@
 -split2po_SOURCES = split.cpp parser.cpp
 -split2po_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 -split2po_LDADD = $(LIB_QT)
--
++split2po_la_SOURCES = split.cpp parser.cpp
++split2po_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
++split2po_la_LIBADD = $(LIB_QT)
+ 
 -xml2pot_SOURCES = xml2pot.cpp parser.cpp
 -xml2pot_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 -xml2pot_LDADD = $(LIB_QT)
--
++xml2pot_la_SOURCES = xml2pot.cpp parser.cpp
++xml2pot_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
++xml2pot_la_LIBADD = $(LIB_QT)
+ 
 -po2xml_SOURCES = GettextLexer.cpp GettextParser.cpp po2xml.cpp parser.cpp
 -po2xml_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 -po2xml_LDADD = antlr/src/libantlr.la $(LIB_QT)
--
++po2xml_la_SOURCES = GettextLexer.cpp GettextParser.cpp po2xml.cpp parser.cpp
++po2xml_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
++po2xml_la_LIBADD = antlr/src/libantlr.la $(LIB_QT)
+ 
 -swappo_SOURCES = GettextLexer.cpp GettextParser.cpp swappo.cpp parser.cpp
 -swappo_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 -swappo_LDADD = antlr/src/libantlr.la $(LIB_QT)
--
++swappo_la_SOURCES = GettextLexer.cpp GettextParser.cpp swappo.cpp parser.cpp
++swappo_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
++swappo_la_LIBADD = antlr/src/libantlr.la $(LIB_QT)
+ 
 -transxx_SOURCES = GettextLexer.cpp GettextParser.cpp transxx.cpp parser.cpp
 -transxx_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 -transxx_LDADD = antlr/src/libantlr.la $(LIB_QT)
-+split2po_la_SOURCES = split.cpp parser.cpp
-+split2po_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-+split2po_la_LIBADD = $(LIB_QT)
-+
-+xml2pot_la_SOURCES = xml2pot.cpp parser.cpp
-+xml2pot_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-+xml2pot_la_LIBADD = $(LIB_QT)
-+
-+po2xml_la_SOURCES = GettextLexer.cpp GettextParser.cpp po2xml.cpp parser.cpp
-+po2xml_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-+po2xml_la_LIBADD = antlr/src/libantlr.la $(LIB_QT)
-+
-+swappo_la_SOURCES = GettextLexer.cpp GettextParser.cpp swappo.cpp parser.cpp
-+swappo_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-+swappo_la_LIBADD = antlr/src/libantlr.la $(LIB_QT)
-+
 +transxx_la_SOURCES = GettextLexer.cpp GettextParser.cpp transxx.cpp parser.cpp
 +transxx_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 +transxx_la_LIBADD = antlr/src/libantlr.la $(LIB_QT)
  
  parser:
  	cd $(srcdir) &&	java antlr.Tool gettext.g
---- kdesdk-3.5.5/poxml/po2xml.cpp	2005-09-10 04:21:06.000000000 -0400
-+++ kdesdk-3.5.5-new/poxml/po2xml.cpp	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/poxml/po2xml.cpp kdesdk-3.5.9-new/poxml/po2xml.cpp
+--- kdesdk-3.5.9/poxml/po2xml.cpp	2005-09-10 04:21:06.000000000 -0400
++++ kdesdk-3.5.9-new/poxml/po2xml.cpp	2008-02-13 22:01:07.000000000 -0500
 @@ -12,6 +12,8 @@
  #include "antlr/AST.hpp"
  #include "antlr/CommonAST.hpp"
@@ -557,8 +596,9 @@
  {
      if (argc != 3) {
          qWarning("usage: %s english-XML translated-PO", argv[0]);
---- kdesdk-3.5.5/poxml/split.cpp	2005-11-19 05:24:05.000000000 -0500
-+++ kdesdk-3.5.5-new/poxml/split.cpp	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/poxml/split.cpp kdesdk-3.5.9-new/poxml/split.cpp
+--- kdesdk-3.5.9/poxml/split.cpp	2005-11-19 05:24:05.000000000 -0500
++++ kdesdk-3.5.9-new/poxml/split.cpp	2008-02-13 22:01:07.000000000 -0500
 @@ -1,10 +1,11 @@
  #include "parser.h"
  #include <stdlib.h>
@@ -572,8 +612,9 @@
  {
      bool report_mismatches = qstrcmp(getenv("REPORT_MISMATCHES"), "no");
  
---- kdesdk-3.5.5/poxml/swappo.cpp	2005-09-10 04:21:06.000000000 -0400
-+++ kdesdk-3.5.5-new/poxml/swappo.cpp	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/poxml/swappo.cpp kdesdk-3.5.9-new/poxml/swappo.cpp
+--- kdesdk-3.5.9/poxml/swappo.cpp	2005-09-10 04:21:06.000000000 -0400
++++ kdesdk-3.5.9-new/poxml/swappo.cpp	2008-02-13 22:01:07.000000000 -0500
 @@ -3,8 +3,9 @@
  #include "GettextParser.hpp"
  #include <fstream>
@@ -585,8 +626,9 @@
  {
      if ( argc != 2 ) {
          qWarning( "usage: %s pofile", argv[0] );
---- kdesdk-3.5.5/poxml/transxx.cpp	2005-10-10 10:58:21.000000000 -0400
-+++ kdesdk-3.5.5-new/poxml/transxx.cpp	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/poxml/transxx.cpp kdesdk-3.5.9-new/poxml/transxx.cpp
+--- kdesdk-3.5.9/poxml/transxx.cpp	2005-10-10 10:58:21.000000000 -0400
++++ kdesdk-3.5.9-new/poxml/transxx.cpp	2008-02-13 22:01:07.000000000 -0500
 @@ -8,7 +8,9 @@
  #include <qdatetime.h>
  #include <qfileinfo.h>
@@ -598,8 +640,9 @@
  {
      if ( argc != 2 && argc != 4 ) {
          qWarning( "usage: %s [--text translation] potfile", argv[0] );
---- kdesdk-3.5.5/poxml/xml2pot.cpp	2005-09-10 04:21:06.000000000 -0400
-+++ kdesdk-3.5.5-new/poxml/xml2pot.cpp	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/poxml/xml2pot.cpp kdesdk-3.5.9-new/poxml/xml2pot.cpp
+--- kdesdk-3.5.9/poxml/xml2pot.cpp	2005-09-10 04:21:06.000000000 -0400
++++ kdesdk-3.5.9-new/poxml/xml2pot.cpp	2008-02-13 22:01:07.000000000 -0500
 @@ -3,10 +3,11 @@
  #include <iostream>
  #include <qfileinfo.h>
@@ -613,8 +656,9 @@
  {
      if (argc != 2) {
          qWarning("usage: %s english-XML", argv[0]);
---- kdesdk-3.5.5/umbrello/umbrello/Makefile.am	2006-10-01 13:27:44.000000000 -0400
-+++ kdesdk-3.5.5-new/umbrello/umbrello/Makefile.am	2006-10-30 11:36:15.000000000 -0500
+diff -Nurd kdesdk-3.5.9/umbrello/umbrello/Makefile.am kdesdk-3.5.9-new/umbrello/umbrello/Makefile.am
+--- kdesdk-3.5.9/umbrello/umbrello/Makefile.am	2007-01-15 06:24:47.000000000 -0500
++++ kdesdk-3.5.9-new/umbrello/umbrello/Makefile.am	2008-02-13 22:01:07.000000000 -0500
 @@ -1,7 +1,9 @@
 -bin_PROGRAMS = umbrello
 +bin_PROGRAMS = 
@@ -628,7 +672,7 @@
  actor.cpp \
  actorwidget.cpp \
  aligntoolbar.cpp \
-@@ -115,7 +117,7 @@
+@@ -114,7 +116,7 @@
  worktoolbar.cpp
  
  #umbrello_LDADD   = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(AUTOLAYOUT_LIBS) $(LIB_KDEPRINT) $(LIB_KIO)
@@ -637,7 +681,7 @@
  
  ## See section "dnl Not GPL compatible" in ../configure.in.in
  # SUBDIRS = $(AUTOLAYOUT_DIR) codeimport dialogs clipboard pics codegenerators headings refactoring
-@@ -136,7 +138,7 @@
+@@ -135,7 +137,7 @@
  
  METASOURCES = AUTO
  
@@ -646,8 +690,9 @@
  
  messages: rc.cpp
  	$(PREPARETIPS) > tips.cpp
---- kdesdk-3.5.5/umbrello/umbrello/main.cpp	2006-10-01 13:27:44.000000000 -0400
-+++ kdesdk-3.5.5-new/umbrello/umbrello/main.cpp	2006-10-30 11:35:10.000000000 -0500
+diff -Nurd kdesdk-3.5.9/umbrello/umbrello/main.cpp kdesdk-3.5.9-new/umbrello/umbrello/main.cpp
+--- kdesdk-3.5.9/umbrello/umbrello/main.cpp	2007-01-15 06:24:47.000000000 -0500
++++ kdesdk-3.5.9-new/umbrello/umbrello/main.cpp	2008-02-13 22:01:07.000000000 -0500
 @@ -89,7 +89,7 @@
      return 0;
  }
@@ -657,15 +702,3 @@
      KAboutData aboutData( "umbrello", I18N_NOOP("Umbrello UML Modeller"),
                            UMBRELLO_VERSION, description, KAboutData::License_GPL,
                            I18N_NOOP("(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"), 0,
---- kdesdk-3.5.6/kbabel/catalogmanager/libsvn/svnhandler.h	2007-01-15 06:24:26.000000000 -0500
-+++ kdesdk-3.5.6-new/kbabel/catalogmanager/libsvn/svnhandler.h	2007-01-17 16:24:05.000000000 -0500
-@@ -47,6 +47,9 @@
- 
- class KSharedConfig;
- 
-+#undef stderr
-+#undef stdout
-+
- /**
-  * This class is the backend for SVN support in Catalog Manager.
-  *

Modified: trunk/dports/kde/kdetoys3/Portfile
===================================================================
--- trunk/dports/kde/kdetoys3/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdetoys3/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,41 +1,42 @@
 # $Id$
 
-#Synced with Fink, Version 3.5.8-1021
+#Synced with Fink, revision 1.22
 
 PortSystem 1.0
 name		kdetoys3
-version		3.5.8
-set kdeadmin	kde-admindir-1024
-categories	kde
+version		3.5.10
+set kdeadmin	kde-admindir-1502
+categories	kde kde3
 maintainers	nomaintainer
 description	KDE toys. \
 		NB No KDE sound support.
 long_description ${description}
 platforms	darwin
 homepage	http://www.kde.org/
-master_sites	kde:stable/${version}/src/:kde358 \
+master_sites	kde:stable/${version}/src/:kde \
 		http://ranger.users.finkproject.org/distfiles/kde-admindir/:admin \
 		http://ranger.befunk.com/fink/kde-admindir/:admin \
 		http://astrange.ithinksw.net/~astrange/ranger-fink/kde-admindir/:admin \
 		http://www.southofheaven.net/befunk/kde-admindir/:admin
 use_bzip2	yes
 distname	kdetoys-${version}
-distfiles	${distname}.tar.bz2:kde358 \
+distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
+dist_subdir     kde3
 depends_build	port:autoconf \
 		port:unsermake
 depends_lib	port:kdebase3
 
-checksums	${distname}.tar.bz2 md5 b42c1f08e5c4ac93a04aadb75679139f \
-		${kdeadmin}.tar.bz2 md5 d99491aa5d520fd1d70393a718019322
+checksums	${distname}.tar.bz2 md5 1da4383e2d520dfd572edb33b708822d \
+		${kdeadmin}.tar.bz2 md5 92a60282c1d81f38835ce7d495255cc3
 
 extract.only	${distname}.tar.bz2
 post-extract	{ system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
 
 patchfiles	kdetoys3.patch
 patch		{
-		foreach file $patchfiles {
-		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
+		foreach f $patchfiles {
+		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${f} | patch -p1"
 		}
 		system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' ${worksrcpath}/admin/*"
 }
@@ -44,22 +45,22 @@
 		reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|HOME=/tmp|HOME=${workpath}|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|/tmp/buildlog|${workpath}/buildlog|g" ${worksrcpath}/build-helper.sh
-		foreach file {CompileScript.sh InstallScript.sh} {
-		    file copy ${filespath}/${file} ${worksrcpath}
-		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
-		    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
-		    reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
-		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${file}
-		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${file}
-		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${file}
-		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${file}
-		    file attributes ${worksrcpath}/${file} -permissions 0755
+		foreach f {CompileScript.sh InstallScript.sh} {
+		    copy ${filespath}/${f} ${worksrcpath}
+		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${f}
+		    reinplace "s|%N|${name}|g" ${worksrcpath}/${f}
+		    reinplace "s|%v|${version}|g" ${worksrcpath}/${f}
+		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${f}
+		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${f}
+		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${f}
+		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${f}
+		    file attributes ${worksrcpath}/${f} -permissions 0755
 		}
 }
 
 configure.args	--with-distribution='MacPorts/Mac OS X' --without-arts
 
-configure	{}
+use_configure       no
 use_parallel_build  yes
 build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
 destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }

Modified: trunk/dports/kde/kdeutils3/Portfile
===================================================================
--- trunk/dports/kde/kdeutils3/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdeutils3/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,27 +1,28 @@
 # $Id$
 
-#Synced with Fink, Version 3.5.8-1021
+#Synced with Fink, revision 1.23
 
 PortSystem 1.0
 name		kdeutils3
-version		3.5.8
-set kdeadmin	kde-admindir-1024
-categories	kde
+version		3.5.10
+set kdeadmin	kde-admindir-1502
+categories	kde kde3
 maintainers	nomaintainer
 description	KDE utilities. \
 		NB No KDE sound support.
 long_description ${description}
 platforms	darwin
 homepage	http://www.kde.org/
-master_sites	kde:stable/${version}/src/:kde358 \
+master_sites	kde:stable/${version}/src/:kde \
 		http://ranger.users.finkproject.org/distfiles/kde-admindir/:admin \
 		http://ranger.befunk.com/fink/kde-admindir/:admin \
 		http://astrange.ithinksw.net/~astrange/ranger-fink/kde-admindir/:admin \
 		http://www.southofheaven.net/befunk/kde-admindir/:admin
 use_bzip2	yes
 distname	kdeutils-${version}
-distfiles	${distname}.tar.bz2:kde358 \
+distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
+dist_subdir     kde3
 depends_build	port:autoconf \
 		port:unsermake
 depends_lib	port:gmp \
@@ -29,16 +30,16 @@
 #		port:python24
 #		port:xmms
 
-checksums	${distname}.tar.bz2 md5 d1a0fcc83f35428a76cf7523a04ba19c \
-		${kdeadmin}.tar.bz2 md5 d99491aa5d520fd1d70393a718019322
+checksums	${distname}.tar.bz2 md5 038f94275f42df3cae89735506ffbc0b \
+		${kdeadmin}.tar.bz2 md5 92a60282c1d81f38835ce7d495255cc3
 
 extract.only	${distname}.tar.bz2
 post-extract	{ system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
 
 patchfiles	kdeutils3.patch
 patch		{
-		foreach file $patchfiles {
-		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
+		foreach f $patchfiles {
+		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${f} | patch -p1"
 		}
 		system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' ${worksrcpath}/admin/*"
 }
@@ -47,16 +48,16 @@
 		reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|HOME=/tmp|HOME=${workpath}|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|/tmp/buildlog|${workpath}/buildlog|g" ${worksrcpath}/build-helper.sh
-		foreach file {CompileScript.sh InstallScript.sh} {
-		    file copy ${filespath}/${file} ${worksrcpath}
-		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
-		    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
-		    reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
-		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${file}
-		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${file}
-		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${file}
-		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${file}
-		    file attributes ${worksrcpath}/${file} -permissions 0755
+		foreach f {CompileScript.sh InstallScript.sh} {
+		    copy ${filespath}/${f} ${worksrcpath}
+		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${f}
+		    reinplace "s|%N|${name}|g" ${worksrcpath}/${f}
+		    reinplace "s|%v|${version}|g" ${worksrcpath}/${f}
+		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${f}
+		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${f}
+		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${f}
+		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${f}
+		    file attributes ${worksrcpath}/${f} -permissions 0755
 		}
 		# disable ksim which depends on net-snmp which doesn't build
 		# on Mac OS X 10.4
@@ -65,7 +66,7 @@
 
 configure.args	--with-distribution='MacPorts/Mac OS X' --without-arts
 
-configure	{}
+use_configure       no
 use_parallel_build  yes
 build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
 destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }

Modified: trunk/dports/kde/kdeutils3/files/kdeutils3.patch
===================================================================
--- trunk/dports/kde/kdeutils3/files/kdeutils3.patch	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdeutils3/files/kdeutils3.patch	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,6 +1,6 @@
-
---- kdeutils-3.5.8/klaptopdaemon/Makefile.am	2007-10-08 05:49:45.000000000 -0400
-+++ kdeutils-3.5.8-new/klaptopdaemon/Makefile.am	2007-10-15 13:11:26.000000000 -0400
+diff -Nurd kdeutils-3.5.9/klaptopdaemon/Makefile.am kdeutils-3.5.9-new/klaptopdaemon/Makefile.am
+--- kdeutils-3.5.9/klaptopdaemon/Makefile.am	2007-10-08 05:49:45.000000000 -0400
++++ kdeutils-3.5.9-new/klaptopdaemon/Makefile.am	2008-02-13 22:02:23.000000000 -0500
 @@ -21,7 +21,7 @@
  kcm_laptop_la_SOURCES = battery.cpp main.cpp pcmcia.cpp power.cpp warning.cpp \
  	acpi.cpp sony.cpp profile.cpp buttons.cpp apm.cpp  
@@ -10,8 +10,9 @@
  kcm_laptop_la_COMPILE_FIRST = crcresult.h
  
  AM_CPPFLAGS = $(all_includes)
---- kdeutils-3.5.8/ksim/monitors/filesystem/filesystemstats.cpp	2007-10-08 05:49:45.000000000 -0400
-+++ kdeutils-3.5.8-new/ksim/monitors/filesystem/filesystemstats.cpp	2007-10-15 14:15:16.000000000 -0400
+diff -Nurd kdeutils-3.5.9/ksim/monitors/filesystem/filesystemstats.cpp kdeutils-3.5.9-new/ksim/monitors/filesystem/filesystemstats.cpp
+--- kdeutils-3.5.9/ksim/monitors/filesystem/filesystemstats.cpp	2007-10-08 05:49:45.000000000 -0400
++++ kdeutils-3.5.9-new/ksim/monitors/filesystem/filesystemstats.cpp	2008-02-13 22:02:23.000000000 -0500
 @@ -30,7 +30,7 @@
  #include <sys/types.h>
  #include <sys/param.h>
@@ -40,8 +41,9 @@
    return statvfs( file, &stats );
  #elif defined( HAVE_STATFS ) || defined( Q_OS_FREEBSD )
    return statfs( file, &stats );
---- kdeutils-3.5.8/ksim/monitors/lm_sensors/Makefile.am	2005-10-10 10:59:12.000000000 -0400
-+++ kdeutils-3.5.8-new/ksim/monitors/lm_sensors/Makefile.am	2007-10-15 13:11:27.000000000 -0400
+diff -Nurd kdeutils-3.5.9/ksim/monitors/lm_sensors/Makefile.am kdeutils-3.5.9-new/ksim/monitors/lm_sensors/Makefile.am
+--- kdeutils-3.5.9/ksim/monitors/lm_sensors/Makefile.am	2005-10-10 10:59:12.000000000 -0400
++++ kdeutils-3.5.9-new/ksim/monitors/lm_sensors/Makefile.am	2008-02-13 22:02:23.000000000 -0500
 @@ -1,9 +1,9 @@
  kde_module_LTLIBRARIES = ksim_sensors.la
  
@@ -55,24 +57,27 @@
  endif
  
  noinst_LTLIBRARIES = $(NVCTRL_LIB)
---- kdeutils-3.5.8/ksim/monitors/snmp/configure.in.in	2006-07-22 04:12:20.000000000 -0400
-+++ kdeutils-3.5.8-new/ksim/monitors/snmp/configure.in.in	2007-10-15 13:11:26.000000000 -0400
+diff -Nurd kdeutils-3.5.9/ksim/monitors/snmp/configure.in.in kdeutils-3.5.9-new/ksim/monitors/snmp/configure.in.in
+--- kdeutils-3.5.9/ksim/monitors/snmp/configure.in.in	2006-07-22 04:12:20.000000000 -0400
++++ kdeutils-3.5.9-new/ksim/monitors/snmp/configure.in.in	2008-02-13 22:02:23.000000000 -0500
 @@ -37,4 +37,4 @@
    fi
  fi
  
 -AM_CONDITIONAL(include_ksim_monitors_snmp, test "x$enable_snmp" = xyes)
 +AM_CONDITIONAL(include_ksim_monitors_snmp, /usr/bin/false)
---- kdeutils-3.5.8/superkaramba/configure.in.in	2006-01-20 01:49:18.000000000 -0500
-+++ kdeutils-3.5.8-new/superkaramba/configure.in.in	2007-10-15 13:11:26.000000000 -0400
+diff -Nurd kdeutils-3.5.9/superkaramba/configure.in.in kdeutils-3.5.9-new/superkaramba/configure.in.in
+--- kdeutils-3.5.9/superkaramba/configure.in.in	2006-01-20 01:49:18.000000000 -0500
++++ kdeutils-3.5.9-new/superkaramba/configure.in.in	2008-02-13 22:02:23.000000000 -0500
 @@ -75,3 +75,5 @@
  if test -z "$PYTHONINC" ; then
          DO_NOT_COMPILE="$DO_NOT_COMPILE superkaramba"
  fi
 +
 +AC_CHECK_HEADERS(netinet/in.h sys/sockio.h)
---- kdeutils-3.5.8/superkaramba/src/Makefile.am	2006-01-19 11:49:35.000000000 -0500
-+++ kdeutils-3.5.8-new/superkaramba/src/Makefile.am	2007-10-15 13:11:26.000000000 -0400
+diff -Nurd kdeutils-3.5.9/superkaramba/src/Makefile.am kdeutils-3.5.9-new/superkaramba/src/Makefile.am
+--- kdeutils-3.5.9/superkaramba/src/Makefile.am	2006-01-19 11:49:35.000000000 -0500
++++ kdeutils-3.5.9-new/superkaramba/src/Makefile.am	2008-02-13 22:02:23.000000000 -0500
 @@ -40,7 +40,7 @@
  
  # kde_cfg_DATA = superkaramba.kcfg
@@ -82,8 +87,9 @@
  #superkaramba_LDADD = -lkio $(LIB_KDEUI) $(XMMS_LDADD) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
  superkaramba_LDADD = -lkio $(LIB_KDEUI) $(XMMS_LIBS) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
  
---- kdeutils-3.5.8/superkaramba/src/misc_python.cpp	2007-10-08 05:49:47.000000000 -0400
-+++ kdeutils-3.5.8-new/superkaramba/src/misc_python.cpp	2007-10-15 13:11:56.000000000 -0400
+diff -Nurd kdeutils-3.5.9/superkaramba/src/misc_python.cpp kdeutils-3.5.9-new/superkaramba/src/misc_python.cpp
+--- kdeutils-3.5.9/superkaramba/src/misc_python.cpp	2007-10-08 05:49:47.000000000 -0400
++++ kdeutils-3.5.9-new/superkaramba/src/misc_python.cpp	2008-02-13 22:02:23.000000000 -0500
 @@ -653,7 +653,7 @@
  #include <sys/ioctl.h>
  #include <net/if.h>

Modified: trunk/dports/kde/kdewebdev3/Portfile
===================================================================
--- trunk/dports/kde/kdewebdev3/Portfile	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdewebdev3/Portfile	2009-04-23 09:53:52 UTC (rev 50045)
@@ -1,41 +1,42 @@
 # $Id$
 
-#Synced with Fink, Version 3.5.8-1021
+#Synced with Fink, revision 1.22
 
 PortSystem 1.0
 name		kdewebdev3
-version		3.5.8
-set kdeadmin	kde-admindir-1024
-categories	kde
+version		3.5.10
+set kdeadmin	kde-admindir-1502
+categories	kde kde3
 maintainers	nomaintainer
 description	KDE web development tools. \
 		NB No KDE sound support.
 long_description ${description}
 platforms	darwin
 homepage	http://www.kde.org/
-master_sites	kde:stable/${version}/src/:kde358 \
+master_sites	kde:stable/${version}/src/:kde \
 		http://ranger.users.finkproject.org/distfiles/kde-admindir/:admin \
 		http://ranger.befunk.com/fink/kde-admindir/:admin \
 		http://astrange.ithinksw.net/~astrange/ranger-fink/kde-admindir/:admin \
 		http://www.southofheaven.net/befunk/kde-admindir/:admin
 use_bzip2	yes
 distname	kdewebdev-${version}
-distfiles	${distname}.tar.bz2:kde358 \
+distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
+dist_subdir     kde3
 depends_build	port:autoconf \
 		port:unsermake
 depends_lib	port:kdebase3
 
-checksums	${distname}.tar.bz2 md5 6c17c4b71a4d306da4b81a0cfd3116e1 \
-		${kdeadmin}.tar.bz2 md5 d99491aa5d520fd1d70393a718019322
+checksums	${distname}.tar.bz2 md5 7188f351158ca5a7613c3de4a6854b37 \
+		${kdeadmin}.tar.bz2 md5 92a60282c1d81f38835ce7d495255cc3
 
 extract.only	${distname}.tar.bz2
 post-extract	{ system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
 
 patchfiles	
 patch		{
-		foreach file $patchfiles {
-		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
+		foreach f $patchfiles {
+		    system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${f} | patch -p1"
 		}
 		system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' ${worksrcpath}/admin/*"
 }
@@ -44,22 +45,22 @@
 		reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|HOME=/tmp|HOME=${workpath}|g" ${worksrcpath}/environment-helper.sh
 		reinplace "s|/tmp/buildlog|${workpath}/buildlog|g" ${worksrcpath}/build-helper.sh
-		foreach file {CompileScript.sh InstallScript.sh} {
-		    file copy ${filespath}/${file} ${worksrcpath}
-		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
-		    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
-		    reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
-		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${file}
-		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${file}
-		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${file}
-		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${file}
-		    file attributes ${worksrcpath}/${file} -permissions 0755
+		foreach f {CompileScript.sh InstallScript.sh} {
+		    copy ${filespath}/${f} ${worksrcpath}
+		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${f}
+		    reinplace "s|%N|${name}|g" ${worksrcpath}/${f}
+		    reinplace "s|%v|${version}|g" ${worksrcpath}/${f}
+		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${f}
+		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${f}
+		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${f}
+		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${f}
+		    file attributes ${worksrcpath}/${f} -permissions 0755
 		}
 }
 
 configure.args	--with-distribution='MacPorts/Mac OS X' --without-arts
 
-configure	{}
+use_configure       no
 use_parallel_build  yes
 build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
 destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }

Modified: trunk/dports/kde/kdewebdev3/files/CompileScript.sh
===================================================================
--- trunk/dports/kde/kdewebdev3/files/CompileScript.sh	2009-04-23 09:53:04 UTC (rev 50044)
+++ trunk/dports/kde/kdewebdev3/files/CompileScript.sh	2009-04-23 09:53:52 UTC (rev 50045)
@@ -5,4 +5,7 @@
 
 	./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs
 	./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
+
+	perl -pi -e 's,-fvisibility=hidden -fvisibility-inlines-hidden,,g' Makefile
+
 	./build-helper.sh make      %N %v %r unsermake $UNSERMAKEFLAGS
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090423/590f6ea5/attachment-0001.html>


More information about the macports-changes mailing list