Ticket #10933: kde354_1.patch

kde/Portfile

@@ -2 +2 @@
 
 PortSystem 1.0
 name            kde
-version         3.5.1
+version         3.5.4
 categories      kde
 maintainers     ben@macports.org takanori@macports.org
 description     KDE Desktop bundle

kdeaccessibility3/files/InstallScript.sh

@@ -1 +1 @@
 #!/bin/sh -e
 
-        export PREFIX="%p"
+        export PREFIX="%p" USE_UNSERMAKE=1
         . ./environment-helper.sh
+ 
+        ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d
 
-#darwinports
-        export UNSERMAKE="no"
-
-        ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
-
         mkdir -p %i/share/doc/installed-packages
         touch %i/share/doc/installed-packages/%N
         touch %i/share/doc/installed-packages/%N-base
 
-        rm -rf %i/share/doc/kde/en/kmouth
+        rm -rf %i/share/doc/kde/en/kmouth %i/share/man/man1/kmouth*
         install -d -m 755 %i/share/config
-        cat <<EOF #!/bin/sh -e
-END > %i/share/config/kttsdrc
+        cat <<END > %i/share/config/kttsdrc
 [FreeTTS]
 FreeTTSJarPath=%p/share/java/freetts/freetts.jar
 

kdeaccessibility3/files/CompileScript.sh

@@ -1 +1 @@
 #!/bin/sh -e
 
-        export HOME=/tmp
-        export PREFIX="%p"
+        export PREFIX="%p" USE_UNSERMAKE=1
         . ./environment-helper.sh
-        export lt_cv_sys_max_cmd_len=65536
+        export ac_cv_path_freetts_bindir="%p/share/java/freetts"
 
-#darwinports
-        export UNSERMAKE="no"
-
         export DO_NOT_COMPILE="kmouth"
 
-        export CC=gcc CXX=g++
-
         ./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs
         ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
-        ./build-helper.sh make      %N %v %r make all all_libraries="$ALL_LIBRARIES"
+        ./build-helper.sh make      %N %v %r unsermake $UNSERMAKEFLAGS

kdeaccessibility3/Portfile

@@ -1 +1 @@
 # $Id$
 
-#Synced with Fink, Version 3.5.1-1023
+#Synced with Fink, Version 3.5.4-1021
 
 PortSystem 1.0
 name            kdeaccessibility3
-version         3.5.1
-revision        1
-set kdeadmin    kde-admindir-3.5.1
+version         3.5.4
+set kdeadmin    kde-admindir-252
 categories      kde
 maintainers     ben@macports.org takanori@macports.org
 description     KDE accessibility tools. \
                 NB No KDE sound support.
 platforms       darwin
-master_sites    opendarwin::kde351 \
+master_sites    opendarwin::kde354 \
                 opendarwin::admin
 #               kde:stable/${version}/src
 #               http://ranger.befunk.com/fink/:admin
-extract.suffix  .tar.bz2
 use_bzip2       yes
 distname        kdeaccessibility-${version}
-distfiles       ${distname}.tar.bz2:kde351 \
+distfiles       ${distname}.tar.bz2:kde354 \
                 ${kdeadmin}.tar.bz2:admin
 depends_build   port:autoconf \
-                port:automake
+                port:unsermake
 depends_lib     port:kdebase3
+#               port:freetts
+#               port:gstreamer
 
-checksums       ${distname}.tar.bz2 md5 cc0773103053a6800b3d35e6021b6719 \
-                ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e
+checksums       ${distname}.tar.bz2 md5 bc64350a56a585e4d2c88fe3fc8b24f8 \
+                ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e
 
-extract.only ${distname}.tar.bz2
-post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
+extract.only    ${distname}.tar.bz2
+post-extract    { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
 
 patchfiles      
 patch           {
                 cd ${worksrcpath}
                 foreach file $patchfiles {
-                    system "sed -e 's,@FINKPREFIX@,${prefix},g' ${portpath}/${filesdir}/${file} | patch -p1"
+                    system "sed -e 's,@FINKPREFIX@,${prefix},g' ${filespath}/${file} | 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;' admin/*"
 }
-post-patch      {
-                reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh
-                reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh
+post-patch      {
+                reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh
                 reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
-                reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh
-                foreach file [glob ${worksrcpath}/admin/*] {
-                    reinplace "s|-O2|-Os|g" $file
-                    reinplace "s|doc/HTML|doc/kde|g" $file
-                    reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file
-                }
                 foreach file {CompileScript.sh InstallScript.sh} {
-                    file copy ${portpath}/${filesdir}/${file} ${worksrcpath}
+                    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}
@@ -61 +55 @@
                 }
 }
 
-configure.args  --enable-kttsd-gstreamer --with-distribution='DarwinPorts/Mac OS X' --without-arts
+configure.args  --enable-kttsd-gstreamer --with-distribution='MacPorts/Mac OS X' --without-arts
 
 configure       {}
 build           { system "cd ${worksrcpath} && ./CompileScript.sh" }
 destroot        { system "cd ${worksrcpath} && ./InstallScript.sh" }
 
-post-destroot   {
+post-destroot   {
                 xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
                 xinstall -m 644 -W ${worksrcpath} COPYING INSTALL ${destroot}${prefix}/share/doc/${name}
 }
-
-platform darwin 6 {
-        depends_lib-append      lib:libdl:dlcompat
-}

kdeaddons3/files/InstallScript.sh

@@ -1 +1 @@
 #!/bin/sh -e
 
-        export HOME=/tmp PREFIX="%p" QTDOCDIR="%p/share/doc/qt3/html"
+        export PREFIX="%p" USE_UNSERMAKE=1
         . ./environment-helper.sh
 
-#darwinports
-        export UNSERMAKE="no"
+        ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d
 
-        ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
-
         mkdir -p %i/share/doc/installed-packages
         touch %i/share/doc/installed-packages/%N
         touch %i/share/doc/installed-packages/%N-base

kdeaddons3/files/CompileScript.sh

@@ -1 +1 @@
 #!/bin/sh -e
 
-        export HOME=/tmp PREFIX="%p" QTDOCDIR="%p/share/doc/qt3/html"
+        export PREFIX="%p" USE_UNSERMAKE=1
         . ./environment-helper.sh
-        export lt_cv_sys_max_cmd_len=65536
 
-#darwinports
-        export UNSERMAKE="no"
-
         export CC=gcc CXX=g++
 
         ./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs
         ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
-        ./build-helper.sh make      %N %v %r make all all_libraries="$ALL_LIBRARIES"
+        ./build-helper.sh make      %N %v %r unsermake $UNSERMAKEFLAGS

kdeaddons3/Portfile

@@ -1 +1 @@
 # $Id$
 
-#Synced with Fink, Version 3.5.1-1023
+#Synced with Fink, Version 3.5.4-1021
 
 PortSystem 1.0
 name            kdeaddons3
-version         3.5.1
-revision        2
-set kdeadmin    kde-admindir-3.5.1
+version         3.5.4
+set kdeadmin    kde-admindir-252
 categories      kde
 maintainers     ben@macports.org takanori@macports.org
 description     KDE addons. \
                 NB No KDE sound support.
 platforms       darwin
-master_sites    opendarwin::kde351 \
+master_sites    opendarwin::kde354 \
                 opendarwin::admin
 #               kde:stable/${version}/src
 #               http://ranger.befunk.com/fink/:admin
-extract.suffix  .tar.bz2
 use_bzip2       yes
 distname        kdeaddons-${version}
-distfiles       ${distname}.tar.bz2:kde351 \
+distfiles       ${distname}.tar.bz2:kde354 \
                 ${kdeadmin}.tar.bz2:admin
 depends_build   port:autoconf \
-                port:automake
-depends_lib     port:kdebase3 \
+                port:unsermake
+depends_lib     port:doxygen \
+                port:kdebase3 \
                 port:kdegames3 \
-                port:libsdl \
-                port:doxygen
+                port:kdepim3
+#               port:gtk1
+#               port:libsdl
 
-checksums       ${distname}.tar.bz2 md5 cbd2a6f65ae7338736d93b72bfdf5ae3 \
-                ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e
+checksums       ${distname}.tar.bz2 md5 840d18fbcadec9f94bb70563876b4dcd \
+                ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e
 
-extract.only ${distname}.tar.bz2
-post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
+extract.only    ${distname}.tar.bz2
+post-extract    { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
 
 patchfiles      kdeaddons3.patch
 patch           {
                 cd ${worksrcpath}
                 foreach file $patchfiles {
-                    system "sed -e 's,@FINKPREFIX@,${prefix},g' ${portpath}/${filesdir}/${file} | patch -p1"
+                    system "sed -e 's,@FINKPREFIX@,${prefix},g' ${filespath}/${file} | 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;' admin/*"
 }
-post-patch      {
-                reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh
-                reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh
+post-patch      {
+                reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh
                 reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
-                reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh
-                foreach file [glob ${worksrcpath}/admin/*] {
-                    reinplace "s|-O2|-Os|g" $file
-                    reinplace "s|doc/HTML|doc/kde|g" $file
-                    reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file
-                }
                 foreach file {CompileScript.sh InstallScript.sh} {
-                    file copy ${portpath}/${filesdir}/${file} ${worksrcpath}
+                    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}
@@ -64 +58 @@
                 }
 }
 
-configure.args  --with-sdl-prefix=${prefix} --disable-sdltest --with-distribution='DarwinPorts/Mac OS X' --without-arts
+configure.args  --with-sdl-prefix=${prefix} --disable-sdltest --with-distribution='MacPorts/Mac OS X' --without-arts
 
 configure       {}
 build           { system "cd ${worksrcpath} && ./CompileScript.sh" }
 destroot        { system "cd ${worksrcpath} && ./InstallScript.sh" }
 
-post-destroot   {
+post-destroot   {
                 xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
                 xinstall -m 644 -W ${worksrcpath} README ${destroot}${prefix}/share/doc/${name}
 }
-
-platform darwin 6 {
-        depends_lib-append      lib:libdl:dlcompat
-}

kdeartwork3/files/InstallScript.sh

@@ -1 +1 @@
 #!/bin/sh -e
 
-        export PREFIX="%p"
+        export PREFIX="%p" USE_UNSERMAKE=1
         . ./environment-helper.sh
 
-#darwinports
-        export UNSERMAKE="no"
+        ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d
 
-        ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
-
         mkdir -p %i/share/doc/installed-packages
         touch %i/share/doc/installed-packages/%N
         touch %i/share/doc/installed-packages/%N-base

kdeartwork3/files/CompileScript.sh

@@ -1 +1 @@
 #!/bin/sh -e
 
-        export HOME=/tmp
-        export PREFIX="%p"
+        export PREFIX="%p" USE_UNSERMAKE=1
         . ./environment-helper.sh
-        export lt_cv_sys_max_cmd_len=65536
 
-#darwinports
-        export UNSERMAKE="no"
-
-        export CC=gcc CXX=g++
-
         ./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs
         ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
-        ./build-helper.sh make      %N %v %r make all all_libraries="$ALL_LIBRARIES"
+        ./build-helper.sh make      %N %v %r unsermake $UNSERMAKEFLAGS

kdeartwork3/files/kdeartwork3.patch

@@ -1 @@
-diff -uNr kdeartwork-3.5.0/kscreensaver/kdesavers/rotation.h kdeartwork-3.5.0-new/kscreensaver/kdesavers/rotation.h
---- kdeartwork-3.5.0/kscreensaver/kdesavers/rotation.h  Mon Oct 10 10:53:54 2005
-+++ kdeartwork-3.5.0-new/kscreensaver/kdesavers/rotation.h      Sat Jan 14 13:08:14 2006
-@@ -41,10 +41,10 @@
-     * @param t Time in seconds, integration variable
-     * @param dt Initial time increment in seconds for integration, auto adjusted
-     * later to guarantee precision
--    * @param _A Moment of inertia along 1. figure axis
--    * @param _B Moment of inertia along 2. figure axis
--    * @param _C Moment of inertia along 3. figure axis
--    * @param _y Vector of 12 elements containing the initial rotation vector
-+    * @param fooA Moment of inertia along 1. figure axis
-+    * @param fooB Moment of inertia along 2. figure axis
-+    * @param fooC Moment of inertia along 3. figure axis
-+    * @param fooy Vector of 12 elements containing the initial rotation vector
-     * omega (elements 0 to 2), and the initial rotating systems coordinate
-     * vectors e1, e2, e3 (elements 3 to 5, 6 to 8, and 9 to 11).
-     * @param eps Relative precision per integration step, see
-@@ -52,10 +52,10 @@
-    EulerOdeSolver(
-       const double &t,
-       const double &dt,
--      const double &_A,
--      const double &_B,
--      const double &_C,
--      std::valarray<double> &_y,
-+      const double &fooA,
-+      const double &fooB,
-+      const double &fooC,
-+      std::valarray<double> &fooy,
-       const double &eps);
- 
-   protected:

kdeartwork3/Portfile

@@ -1 +1 @@
 # $Id$
 
-#Synced with Fink, Version 3.5.1-1023
+#Synced with Fink, Version 3.5.4-1021
 
 PortSystem 1.0
 name            kdeartwork3
-version         3.5.1
-revision        1
-set kdeadmin    kde-admindir-3.5.1
+version         3.5.4
+set kdeadmin    kde-admindir-252
 categories      kde
 maintainers     ben@macports.org takanori@macports.org
 description     KDE additional artwork. \
                 NB No KDE sound support.
 platforms       darwin
-master_sites    opendarwin::kde351 \
+master_sites    opendarwin::kde354 \
                 opendarwin::admin
 #               kde:stable/${version}/src
 #               http://ranger.befunk.com/fink/:admin
-extract.suffix  .tar.bz2
 use_bzip2       yes
 distname        kdeartwork-${version}
-distfiles       ${distname}.tar.bz2:kde351 \
+distfiles       ${distname}.tar.bz2:kde354 \
                 ${kdeadmin}.tar.bz2:admin
 depends_build   port:autoconf \
-                port:automake
+                port:unsermake
 depends_lib     port:kdebase3
+#               port:xscreensaver
 
-checksums       ${distname}.tar.bz2 md5 8053bb1a1b2a5844b29f5f96328b1d96 \
-                ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e
+checksums       ${distname}.tar.bz2 md5 c7ff9048b9b68c976de08ed418598e40 \
+                ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e
 
-extract.only ${distname}.tar.bz2
-post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
+extract.only    ${distname}.tar.bz2
+post-extract    { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
 
-patchfiles      kdeartwork3.patch
+patchfiles      
 patch           {
                 cd ${worksrcpath}
                 foreach file $patchfiles {
-                    system "sed -e 's,@FINKPREFIX@,${prefix},g' ${portpath}/${filesdir}/${file} | patch -p1"
+                    system "sed -e 's,@FINKPREFIX@,${prefix},g' ${filespath}/${file} | 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;' admin/*"
 }
-post-patch      {
-                reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh
-                reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh
+post-patch      {
+                reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh
                 reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
-                reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh
-                foreach file [glob ${worksrcpath}/admin/*] {
-                    reinplace "s|-O2|-Os|g" $file
-                    reinplace "s|doc/HTML|doc/kde|g" $file
-                    reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file
-                }
                 foreach file {CompileScript.sh InstallScript.sh} {
-                    file copy ${portpath}/${filesdir}/${file} ${worksrcpath}
+                    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}
@@ -61 +54 @@
                 }
 }
 
-configure.args  --with-distribution='DarwinPorts/Mac OS X' --without-arts
+configure.args  --with-distribution='MacPorts/Mac OS X' --without-arts
 
 configure       {}
 build           { system "cd ${worksrcpath} && ./CompileScript.sh" }
 destroot        { system "cd ${worksrcpath} && ./InstallScript.sh" }
 
-post-destroot   {
+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/16x16/apps/ktimemon.png
-                file delete ${destroot}${prefix}/share/icons/Locolor/32x32/apps/kbabel.png
-                file delete ${destroot}${prefix}/share/icons/Locolor/32x32/apps/ktimemon.png
+                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
-
 }
-
-platform darwin 6 {
-        depends_lib-append      lib:libdl:dlcompat
-}

kdebase3/files/kdebase3-unified.patch

@@ -1 @@
---- kdebase-3.5.0/drkonqi/Makefile.am   2005-09-10 04:25:55.000000000 -0400
-+++ kdebase-3.5.0-new/drkonqi/Makefile.am       2005-11-13 08:25:50.000000000 -0500
+
+--- kdebase-3.5.4/applnk/Makefile.am    2005-09-10 04:25:45.000000000 -0400
++++ kdebase-3.5.4-new/applnk/Makefile.am        2006-08-03 12:16:55.000000000 -0400
+@@ -3,7 +3,7 @@
+ xdg_menu_DATA = kde-settings.menu kde-information.menu kde-screensavers.menu
+ 
+ xdg_mergedmenu_DATA = kde-essential.menu
+-xdg_mergedmenudir = $(xdg_menudir)/applications-merged
++xdg_mergedmenudir = $(xdg_menudir)/kde-applications-merged
+ 
+ xdg_directory_DATA = \
+ kde-main.directory \
+--- kdebase-3.5.4/doc/userguide/kde-for-admins.docbook  2006-07-22 04:15:40.000000000 -0400
++++ kdebase-3.5.4-new/doc/userguide/kde-for-admins.docbook      2006-08-03 12:16:55.000000000 -0400
+@@ -1669,7 +1669,7 @@
+ </para>
+ 
+ <informalexample>
+-<para>Example from <filename>applications.menu</filename>:
++<para>Example from <filename>kde-applications.menu</filename>:
+ <programlisting>
+ <markup>
+        &lt;Menu&gt;
+@@ -1743,7 +1743,7 @@
+ information, see <ulink url="http://www.freedesktop.org/Standards/basedir-spec">http://www.freedesktop.org/Standards/basedir-spec</ulink></para>
+ 
+ <informalexample>
+-<para>Example from <filename>applications.menu</filename>:
++<para>Example from <filename>kde-applications.menu</filename>:
+ <programlisting>
+ <markup>
+              &lt;Menu&gt;
+@@ -1795,7 +1795,7 @@
+ <title>Essential Menus</title>
+ 
+ <para><filename
+-class="directory">$<envar>KDEDIR</envar>/etc/xdg/menus/applications-merged/</filename>
++class="directory">$<envar>KDEDIR</envar>/etc/xdg/menus/kde-applications-merged/</filename>
+ 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.4/drkonqi/Makefile.am   2005-09-10 04:25:55.000000000 -0400
++++ kdebase-3.5.4-new/drkonqi/Makefile.am       2006-08-03 12:16:55.000000000 -0400
 @@ -8,15 +8,17 @@
  
  EXTRA_DIST = LICENSE
@@ -22 +63 @@
  
  
  check_PROGRAMS = crashtest
---- kdebase-3.5.0/drkonqi/main.cpp      2005-09-10 04:25:55.000000000 -0400
-+++ kdebase-3.5.0-new/drkonqi/main.cpp  2005-11-13 08:25:50.000000000 -0500
+--- kdebase-3.5.4/drkonqi/main.cpp      2006-07-22 04:15:52.000000000 -0400
++++ kdebase-3.5.4-new/drkonqi/main.cpp  2006-08-03 12:16:55.000000000 -0400
 @@ -57,7 +57,7 @@
    KCmdLineLastOption
  };
@@ -33 +74 @@
  {
    // Drop privs.
    setgid(getgid());
---- kdebase-3.5.0/kappfinder/Makefile.am        2005-09-10 04:25:41.000000000 -0400
-+++ kdebase-3.5.0-new/kappfinder/Makefile.am    2005-11-13 08:25:50.000000000 -0500
+--- kdebase-3.5.4/kappfinder/Makefile.am        2005-09-10 04:25:41.000000000 -0400
++++ kdebase-3.5.4-new/kappfinder/Makefile.am    2006-08-03 12:16:56.000000000 -0400
 @@ -1,9 +1,17 @@
  SUBDIRS = apps
  
@@ -57 +98 @@
  
  noinst_PROGRAMS = kappfinder_install
  kappfinder_install_SOURCES = main_install.cpp common.cpp
---- kdebase-3.5.0/kappfinder/main.cpp   2005-10-10 11:04:07.000000000 -0400
-+++ kdebase-3.5.0-new/kappfinder/main.cpp       2005-11-13 08:25:50.000000000 -0500
+--- kdebase-3.5.4/kappfinder/main.cpp   2005-10-10 11:04:07.000000000 -0400
++++ kdebase-3.5.4-new/kappfinder/main.cpp       2006-08-03 12:16:56.000000000 -0400
 @@ -31,7 +31,7 @@
    KCmdLineLastOption
  };
@@ -68 +109 @@
  {
    KAboutData aboutData( "kappfinder", I18N_NOOP( "KAppfinder" ),
                          "1.0", description, KAboutData::License_GPL,
---- kdebase-3.5.0/kcontrol/filetypes/Makefile.am        2005-09-10 04:25:08.000000000 -0400
-+++ kdebase-3.5.0-new/kcontrol/filetypes/Makefile.am    2005-11-13 08:25:50.000000000 -0500
+--- kdebase-3.5.4/kcontrol/filetypes/Makefile.am        2005-09-10 04:25:08.000000000 -0400
++++ kdebase-3.5.4-new/kcontrol/filetypes/Makefile.am    2006-08-03 12:16:56.000000000 -0400
 @@ -12,16 +12,18 @@
         kservicelistwidget.h typeslistitem.h newtypedlg.h \
         kserviceselectdlg.h
@@ -93 +134 @@
  
  messages:
         $(XGETTEXT) *.cpp -o $(podir)/filetypes.pot
---- kdebase-3.5.0/kcontrol/filetypes/keditfiletype.cpp  2005-10-10 11:03:47.000000000 -0400
-+++ kdebase-3.5.0-new/kcontrol/filetypes/keditfiletype.cpp      2005-11-13 08:25:51.000000000 -0500
+--- kdebase-3.5.4/kcontrol/filetypes/keditfiletype.cpp  2005-10-10 11:03:47.000000000 -0400
++++ kdebase-3.5.4-new/kcontrol/filetypes/keditfiletype.cpp      2006-08-03 12:16:56.000000000 -0400
 @@ -108,7 +108,7 @@
    KCmdLineLastOption
  };
@@ -104 +145 @@
  {
    KServiceTypeProfile::setConfigurationMode();
    KLocale::setMainCatalogue("filetypes");
---- kdebase-3.5.0/kdcop/Makefile.am     2005-09-10 04:25:53.000000000 -0400
-+++ kdebase-3.5.0-new/kdcop/Makefile.am 2005-11-13 08:25:51.000000000 -0500
+--- kdebase-3.5.4/kcontrol/fonts/Makefile.am    2006-03-17 05:17:12.000000000 -0500
++++ kdebase-3.5.4-new/kcontrol/fonts/Makefile.am        2006-08-03 12:16:56.000000000 -0400
+@@ -4,13 +4,13 @@
+ libkxftconfig_la_LIBADD = $(LIBFONTCONFIG_LIBS)
+ libkxftconfig_la_LDFLAGS = $(LIBFONTCONFIG_RPATH)
+ 
+-AM_CPPFLAGS  = $(all_includes) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE
++AM_CPPFLAGS  = $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE $(all_includes)
+ 
+ kde_module_LTLIBRARIES = kcm_fonts.la
+ 
+ kcm_fonts_la_SOURCES = fonts.cpp
+ kcm_fonts_la_LDFLAGS = $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) -module -avoid-version $(all_libraries) -no-undefined
+-kcm_fonts_la_LIBADD = libkxftconfig.la $(top_builddir)/kcontrol/krdb/libkrdb.la $(LIB_KDEUI) $(LIBFONTCONFIG_LIBS)
++kcm_fonts_la_LIBADD = $(LIBFONTCONFIG_LIBS) libkxftconfig.la $(top_builddir)/kcontrol/krdb/libkrdb.la $(LIB_KDEUI)
+ METASOURCES = AUTO
+ 
+ noinst_HEADERS = fonts.h kxftconfig.h
+--- kdebase-3.5.4/kcontrol/fonts/configure.in.in        2005-09-10 04:25:04.000000000 -0400
++++ kdebase-3.5.4-new/kcontrol/fonts/configure.in.in    2006-08-03 12:16:56.000000000 -0400
+@@ -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], [
+             AC_MSG_WARN([Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ ])
+         ])
+-])
+ 
+ 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.4/kcontrol/kfontinst/configure.in.in    2006-01-19 12:00:50.000000000 -0500
++++ kdebase-3.5.4-new/kcontrol/kfontinst/configure.in.in        2006-08-03 12:16:56.000000000 -0400
+@@ -36,11 +36,9 @@
+ 
+     KFI_FOUND_FONTCONFIG=0
+     # check for fontconfig...
+-    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], [
+                 AC_MSG_WARN([Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ ])
+             ])
+-    ])
+ 
+     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.4/kcontrol/kfontinst/kcmfontinst/Makefile.am    2005-09-10 04:25:09.000000000 -0400
++++ kdebase-3.5.4-new/kcontrol/kfontinst/kcmfontinst/Makefile.am        2006-08-03 12:16:56.000000000 -0400
+@@ -4,10 +4,10 @@
+ endif
+ 
+ kde_module_LTLIBRARIES = kcm_fontinst.la
+-kcm_fontinst_la_LIBADD  = $(LIB_KIO) $(FONTINST_PRINT_LIB) $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) ../lib/libkfontinst.la
++kcm_fontinst_la_LIBADD  = $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) $(LIB_KIO) $(FONTINST_PRINT_LIB) ../lib/libkfontinst.la
+ METASOURCES = AUTO
+ kcm_fontinst_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
+-AM_CPPFLAGS = -I$(srcdir)/../lib $(FONTINST_PRINT_INC) -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)
++AM_CPPFLAGS = -I$(srcdir)/../lib $(FONTINST_PRINT_INC) -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) $(all_includes)
+  
+ xdg_apps_DATA = kcmfontinst.desktop
+  
+--- kdebase-3.5.4/kcontrol/kfontinst/kfile-plugin/Makefile.am   2005-09-10 04:25:09.000000000 -0400
++++ kdebase-3.5.4-new/kcontrol/kfontinst/kfile-plugin/Makefile.am       2006-08-03 12:16:56.000000000 -0400
+@@ -1,13 +1,13 @@
+ kde_module_LTLIBRARIES = kfile_font.la
+ 
+ kfile_font_la_SOURCES = KFileFont.cpp
+-kfile_font_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN)
+-kfile_font_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS) ../lib/libkfontinst.la
++kfile_font_la_LDFLAGS = $(LIBFREETYPE_RPATH) $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
++kfile_font_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_KIO) ../lib/libkfontinst.la
+ 
+ kdelnkdir = $(kde_servicesdir)
+ kde_services_DATA = kfile_font.desktop
+ 
+-AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS)
++AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(all_includes)
+ 
+ METASOURCES = AUTO
+ noinst_HEADERS = KFileFont.h
+--- kdebase-3.5.4/kcontrol/kfontinst/kfontinst/Main.cpp 2005-10-10 11:03:47.000000000 -0400
++++ kdebase-3.5.4-new/kcontrol/kfontinst/kfontinst/Main.cpp     2006-08-03 12:16:56.000000000 -0400
+@@ -190,7 +190,7 @@
+         KFI::CXConfig::refreshPaths(true);
+ }
+ 
+-int main(int argc, char *argv[])
++extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
+ {
+ #ifdef HAVE_GETOPT_H
+     static struct option options[]=
+--- kdebase-3.5.4/kcontrol/kfontinst/kfontinst/Makefile.am      2005-09-10 04:25:09.000000000 -0400
++++ kdebase-3.5.4-new/kcontrol/kfontinst/kfontinst/Makefile.am  2006-08-03 12:16:56.000000000 -0400
+@@ -1,5 +1,8 @@
+-bin_PROGRAMS = kfontinst
+-kfontinst_SOURCES = \
++bin_PROGRAMS = 
++lib_LTLIBRARIES =
++kdeinit_LTLIBRARIES = kfontinst.la
++
++kfontinst_la_SOURCES = \
+ CompressedFile.cpp \
+ Main.cpp \
+ Encodings.cpp \
+@@ -15,6 +18,6 @@
+ Fontmap.h \
+ XConfig.h
+ 
+-kfontinst_LDADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_FONT_ENC) $(LIBZ) $(LIB_KIO) ../lib/libkfontinst.la
+-kfontinst_LDFLAGS = $(all_libraries) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(KDE_RPATH)
+-AM_CPPFLAGS= -DOS_$(UNAME) -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)
++kfontinst_la_LIBADD = $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_FONT_ENC) ../../fonts/libkxftconfig.la $(LIBZ) $(LIB_KIO) ../lib/libkfontinst.la
++kfontinst_la_LDFLAGS = $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(all_libraries) $(KDE_PLUGIN) -module
++AM_CPPFLAGS= -DOS_$(UNAME) -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) $(all_includes)
+--- kdebase-3.5.4/kcontrol/kfontinst/kio/Makefile.am    2005-09-10 04:25:09.000000000 -0400
++++ kdebase-3.5.4-new/kcontrol/kfontinst/kio/Makefile.am        2006-08-03 12:16:56.000000000 -0400
+@@ -2,9 +2,9 @@
+ kio_fonts_la_SOURCES = \
+ KioFonts.cpp
+ 
+-kio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -lkdesu ../lib/libkfontinst.la
+-kio_fonts_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -module -avoid-version -no-undefined
+-AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE
++kio_fonts_la_LIBADD = $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) ../../fonts/libkxftconfig.la $(LIB_KIO) -lkdesu ../lib/libkfontinst.la
++kio_fonts_la_LDFLAGS = $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
++AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE $(all_includes)
+ 
+ # The kxftconfig stuf really belongs to kdebase/kcontrol/fonts - here only so that can distribute this as an archive.
+ noinst_HEADERS = \
+--- kdebase-3.5.4/kcontrol/kfontinst/lib/FcEngine.h     2005-09-10 04:25:09.000000000 -0400
++++ kdebase-3.5.4-new/kcontrol/kfontinst/lib/FcEngine.h 2006-08-03 12:16:56.000000000 -0400
+@@ -5,6 +5,8 @@
+ #include "config.h"
+ #endif
+ 
++#define KFI_FC_NO_WIDTHS 1
++
+ #include <qstring.h>
+ #include <qvaluevector.h>
+ #include <qfont.h>
+--- kdebase-3.5.4/kcontrol/kfontinst/lib/Makefile.am    2005-09-10 04:25:09.000000000 -0400
++++ kdebase-3.5.4-new/kcontrol/kfontinst/lib/Makefile.am        2006-08-03 12:16:56.000000000 -0400
+@@ -9,6 +9,6 @@
+ FcEngine.h \
+ KfiConstants.h
+ 
+-libkfontinst_la_LIBADD = $(LIB_KDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) $(LIBXFT_LIB)
+-libkfontinst_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -no-undefined
+-AM_CPPFLAGS= $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE
++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.4/kcontrol/kfontinst/thumbnail/Makefile.am      2005-09-10 04:25:09.000000000 -0400
++++ kdebase-3.5.4-new/kcontrol/kfontinst/thumbnail/Makefile.am  2006-08-03 12:16:56.000000000 -0400
+@@ -2,7 +2,7 @@
+ 
+ fontthumbnail_la_SOURCES = FontThumbnail.cpp
+ fontthumbnail_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_KDECORE) $(LIB_KIO) ../lib/libkfontinst.la
+-fontthumbnail_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN)
++fontthumbnail_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN) $(all_libraries)
+ METASOURCES = AUTO
+ 
+ noinst_HEADERS = FontThumbnail.h
+@@ -11,4 +11,4 @@
+ 
+ kde_services_DATA = fontthumbnail.desktop
+ 
+-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.4/kcontrol/kfontinst/viewpart/FontViewerApp.cpp 2005-10-10 11:03:47.000000000 -0400
++++ kdebase-3.5.4-new/kcontrol/kfontinst/viewpart/FontViewerApp.cpp     2006-08-03 12:16:56.000000000 -0400
+@@ -116,7 +116,7 @@
+                             KAboutData::License_GPL,
+                             I18N_NOOP("(c) Craig Drummond, 2004"));
+ 
+-int main(int argc, char **argv)
++extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
+ {
+     KCmdLineArgs::init(argc, argv, &aboutData);
+     KCmdLineArgs::addCmdLineOptions(options);
+--- kdebase-3.5.4/kcontrol/kfontinst/viewpart/Makefile.am       2005-09-10 04:25:09.000000000 -0400
++++ kdebase-3.5.4-new/kcontrol/kfontinst/viewpart/Makefile.am   2006-08-03 12:16:56.000000000 -0400
+@@ -13,18 +13,21 @@
+ 
+ kde_services_DATA = kfontviewpart.desktop
+ 
+-AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)
++AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) $(all_includes)
+ METASOURCES = AUTO
+ 
+-kfontview_LDADD = $(LIB_KPARTS)
+-kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH)
++kfontview_la_LIBADD = $(LIB_KPARTS)
++kfontview_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
++
++bin_PROGRAMS = 
++lib_LTLIBRARIES =
++kdeinit_LTLIBRARIES = kfontview.la
+ 
+-bin_PROGRAMS = kfontview
+ xdg_apps_DATA = kfontview.desktop
+ 
+ appdata_DATA = kfontviewpart.rc kfontviewui.rc
+ appdatadir = $(kde_datadir)/kfontview
+ 
+-kfontview_SOURCES = FontViewerApp.cpp
++kfontview_la_SOURCES = FontViewerApp.cpp
+ 
+ 
+--- kdebase-3.5.4/kdcop/Makefile.am     2005-09-10 04:25:53.000000000 -0400
++++ kdebase-3.5.4-new/kdcop/Makefile.am 2006-08-03 12:16:56.000000000 -0400
 @@ -7,10 +7,13 @@
  
  INCLUDES = $(all_includes)
@@ -124 +371 @@
  
  noinst_HEADERS = kdcopwindow.h
  METASOURCES =  AUTO
---- kdebase-3.5.0/kdcop/kdcop.cpp       2005-09-10 04:25:53.000000000 -0400
-+++ kdebase-3.5.0-new/kdcop/kdcop.cpp   2005-11-13 08:25:51.000000000 -0500
+--- kdebase-3.5.4/kdcop/kdcop.cpp       2005-09-10 04:25:53.000000000 -0400
++++ kdebase-3.5.4-new/kdcop/kdcop.cpp   2006-08-03 12:16:56.000000000 -0400
 @@ -15,7 +15,7 @@
      KCmdLineLastOption
  };
@@ -135 +382 @@
  {
    KAboutData aboutData( "kdcop", I18N_NOOP("KDCOP"),
                         "0.1", I18N_NOOP( "A graphical DCOP browser/client" ),
---- kdebase-3.5.0/kdebugdialog/Makefile.am      2005-09-10 04:24:57.000000000 -0400
-+++ kdebase-3.5.0-new/kdebugdialog/Makefile.am  2005-11-13 08:25:51.000000000 -0500
+--- kdebase-3.5.4/kdebugdialog/Makefile.am      2005-09-10 04:24:57.000000000 -0400
++++ kdebase-3.5.4-new/kdebugdialog/Makefile.am  2006-08-03 12:16:56.000000000 -0400
 @@ -4,12 +4,14 @@
  
  ####### Files
@@ -157 +404 @@
  
  messages:
         $(XGETTEXT) *.cpp -o $(podir)/kdebugdialog.pot  
---- kdebase-3.5.0/kdebugdialog/main.cpp 2005-10-10 11:03:40.000000000 -0400
-+++ kdebase-3.5.0-new/kdebugdialog/main.cpp     2005-11-13 08:25:51.000000000 -0500
+--- kdebase-3.5.4/kdebugdialog/main.cpp 2005-10-10 11:03:40.000000000 -0400
++++ kdebase-3.5.4-new/kdebugdialog/main.cpp     2006-08-03 12:16:56.000000000 -0400
 @@ -75,7 +75,7 @@
    KCmdLineLastOption
  };
@@ -168 +415 @@
  {
    KAboutData data( "kdebugdialog", I18N_NOOP( "KDebugDialog"),
      "1.0", I18N_NOOP("A dialog box for setting preferences for debug output"),
---- kdebase-3.5.0/kdepasswd/Makefile.am 2005-09-10 04:24:59.000000000 -0400
-+++ kdebase-3.5.0-new/kdepasswd/Makefile.am     2005-11-13 08:25:51.000000000 -0500
+--- kdebase-3.5.4/kdepasswd/Makefile.am 2005-09-10 04:24:59.000000000 -0400
++++ kdebase-3.5.4-new/kdepasswd/Makefile.am     2006-08-03 12:16:56.000000000 -0400
 @@ -1,10 +1,13 @@
  
  SUBDIRS = kcm
@@ -188 +435 @@
  
  METASOURCES =  AUTO
  AM_CPPFLAGS= -I$(top_srcdir)/libkonq $(all_includes)
---- kdebase-3.5.0/kdepasswd/kdepasswd.cpp       2005-09-10 04:24:59.000000000 -0400
-+++ kdebase-3.5.0-new/kdepasswd/kdepasswd.cpp   2005-11-13 08:25:51.000000000 -0500
+--- kdebase-3.5.4/kdepasswd/kdepasswd.cpp       2005-09-10 04:24:59.000000000 -0400
++++ kdebase-3.5.4-new/kdepasswd/kdepasswd.cpp   2006-08-03 12:16:56.000000000 -0400
 @@ -26,7 +26,7 @@
  };
  
@@ -199 +446 @@
  {
      KAboutData aboutData("kdepasswd", I18N_NOOP("KDE passwd"),
              VERSION, I18N_NOOP("Changes a UNIX password."),
---- kdebase-3.5.0/kdeprint/kdeprintfax/Makefile.am      2005-09-10 04:25:38.000000000 -0400
-+++ kdebase-3.5.0-new/kdeprint/kdeprintfax/Makefile.am  2005-11-13 08:25:51.000000000 -0500
+--- kdebase-3.5.4/kdeprint/kdeprintfax/Makefile.am      2005-09-10 04:25:38.000000000 -0400
++++ kdebase-3.5.4-new/kdeprint/kdeprintfax/Makefile.am  2006-08-03 12:16:56.000000000 -0400
 @@ -1,11 +1,14 @@
  INCLUDES= $(all_includes)
  
@@ -221 +468 @@
  
  xdg_apps_DATA = kdeprintfax.desktop
  
---- kdebase-3.5.0/kdeprint/kdeprintfax/main.cpp 2005-10-10 11:04:02.000000000 -0400
-+++ kdebase-3.5.0-new/kdeprint/kdeprintfax/main.cpp     2005-11-13 08:25:51.000000000 -0500
+--- kdebase-3.5.4/kdeprint/kdeprintfax/main.cpp 2005-10-10 11:04:02.000000000 -0400
++++ kdebase-3.5.4-new/kdeprint/kdeprintfax/main.cpp     2006-08-03 12:16:56.000000000 -0400
 @@ -44,7 +44,7 @@
    // INSERT YOUR COMMANDLINE OPTIONS HERE
  };
@@ -232 +479 @@
  {
  
    KAboutData aboutData( "kdeprintfax", I18N_NOOP("KdeprintFax"),
---- kdebase-3.5.0/kdeprint/kprinter/printwrapper.cpp    2005-10-10 11:04:05.000000000 -0400
-+++ kdebase-3.5.0-new/kdeprint/kprinter/printwrapper.cpp        2005-11-13 08:25:51.000000000 -0500
+--- kdebase-3.5.4/kdeprint/kprinter/printwrapper.cpp    2005-10-10 11:04:05.000000000 -0400
++++ kdebase-3.5.4-new/kdeprint/kprinter/printwrapper.cpp        2006-08-03 12:16:56.000000000 -0400
 @@ -137,10 +137,6 @@
  {
         KCmdLineArgs    *args = KCmdLineArgs::parsedArgs();
@@ -256 +503 @@
  #  if defined(HAVE_SIGSET)
                 sigset(SIGHUP, signal_handler);
                 sigset(SIGINT, signal_handler);
---- kdebase-3.5.0/kdesktop/Makefile.am  2005-09-10 04:25:45.000000000 -0400
-+++ kdebase-3.5.0-new/kdesktop/Makefile.am      2005-11-13 08:29:01.000000000 -0500
+--- kdebase-3.5.4/kdesktop/Makefile.am  2006-05-22 14:12:51.000000000 -0400
++++ kdebase-3.5.4-new/kdesktop/Makefile.am      2006-08-03 12:16:56.000000000 -0400
 @@ -8,9 +8,9 @@
  
  ####### Files
@@ -283 +530 @@
  
  METASOURCES = AUTO
  
---- kdebase-3.5.0/kdesktop/init.h       2005-10-10 11:04:11.000000000 -0400
-+++ kdebase-3.5.0-new/kdesktop/init.h   2005-11-13 08:25:51.000000000 -0500
-@@ -27,4 +27,18 @@
-  */
- void testLocalInstallation();
- 
-+typedef struct fileinfobuf {
-+   u_int32_t info_length;
-+   union {
-+     struct {
-+       u_int32_t type;
-+       u_int32_t creator;
-+       u_int16_t fdFlags;
-+       u_int16_t location;
-+       u_int32_t padding[4];
-+     } finder;
-+     off_t rsrcForkSize;
-+   } data;
-+} fileinfobuf;
-+
- #endif
---- kdebase-3.5.1/kdesktop/kcheckrunning.cpp.orig       2006-02-27 14:36:42.000000000 -0500
-+++ kdebase-3.5.1/kdesktop/kcheckrunning.cpp    2006-02-27 14:37:11.000000000 -0500
+--- kdebase-3.5.4/kdesktop/kcheckrunning.cpp    2005-10-10 11:04:11.000000000 -0400
++++ kdebase-3.5.4-new/kdesktop/kcheckrunning.cpp        2006-08-03 12:16:56.000000000 -0400
 @@ -18,8 +18,9 @@
  */
  
@@ -317 +543 @@
      {
      Display* dpy = XOpenDisplay( NULL );
      if( dpy == NULL )
---- kdebase-3.5.0/kdesktop/kwebdesktop/Makefile.am      2005-09-10 04:25:45.000000000 -0400
-+++ kdebase-3.5.0-new/kdesktop/kwebdesktop/Makefile.am  2005-11-13 08:25:52.000000000 -0500
+--- kdebase-3.5.4/kdesktop/kwebdesktop/Makefile.am      2005-09-10 04:25:45.000000000 -0400
++++ kdebase-3.5.4-new/kdesktop/kwebdesktop/Makefile.am  2006-08-03 12:16:56.000000000 -0400
 @@ -2,12 +2,15 @@
  INCLUDES= $(all_includes)
  LDADD = $(LIB_KHTML)
@@ -338 +564 @@
  
  kdesktop_kwebdesktop_data_DATA = kwebdesktop.desktop
  kdesktop_kwebdesktop_datadir = $(kde_datadir)/kdesktop/programs
---- kdebase-3.5.0/kdesktop/kwebdesktop/kwebdesktop.cpp  2005-10-10 11:04:07.000000000 -0400
-+++ kdebase-3.5.0-new/kdesktop/kwebdesktop/kwebdesktop.cpp      2005-11-13 08:25:52.000000000 -0500
+--- kdebase-3.5.4/kdesktop/kwebdesktop/kwebdesktop.cpp  2006-05-22 14:12:50.000000000 -0400
++++ kdebase-3.5.4-new/kdesktop/kwebdesktop/kwebdesktop.cpp      2006-08-03 12:16:56.000000000 -0400
 @@ -84,7 +84,7 @@
  }
  
@@ -349 +575 @@
  {
      KAboutData data( "kwebdesktop", I18N_NOOP("KDE Web Desktop"),
                       VERSION,
---- kdebase-3.5.0/kdesktop/lock/Makefile.am     2005-09-10 04:25:41.000000000 -0400
-+++ kdebase-3.5.0-new/kdesktop/lock/Makefile.am 2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/kdesktop/lock/Makefile.am     2005-09-10 04:25:41.000000000 -0400
++++ kdebase-3.5.4-new/kdesktop/lock/Makefile.am 2006-08-03 12:16:56.000000000 -0400
 @@ -1,14 +1,16 @@
  ## Makefile.am of kdebase/kdesktop/lock
  
@@ -372 +598 @@
  
  noinst_HEADERS = lockprocess.h lockdlg.h autologout.h main.h
  
---- kdebase-3.5.0/kdesktop/lock/main.cc 2005-10-10 11:04:07.000000000 -0400
-+++ kdebase-3.5.0-new/kdesktop/lock/main.cc     2005-11-13 08:25:52.000000000 -0500
-@@ -58,7 +58,7 @@
+--- kdebase-3.5.4/kdesktop/lock/main.cc 2006-03-17 05:17:37.000000000 -0500
++++ kdebase-3.5.4-new/kdesktop/lock/main.cc     2006-08-03 12:16:56.000000000 -0400
+@@ -59,7 +59,7 @@
  
  // -----------------------------------------------------------------------------
  
@@ -383 +609 @@
  {
      KLocale::setMainCatalogue("kdesktop");
  
---- kdebase-3.5.0/kdesu/kdesu/Makefile.am       2005-09-10 04:26:14.000000000 -0400
-+++ kdebase-3.5.0-new/kdesu/kdesu/Makefile.am   2005-11-13 08:25:52.000000000 -0500
+--- kdebase-3.5.4/kdesu/kdesu/Makefile.am       2005-09-10 04:26:14.000000000 -0400
++++ kdebase-3.5.4-new/kdesu/kdesu/Makefile.am   2006-08-03 12:16:56.000000000 -0400
 @@ -3,11 +3,14 @@
  INCLUDES= $(all_includes)
  
@@ -405 +631 @@
  noinst_HEADERS = sudlg.h
  
  ## Messages
---- kdebase-3.5.0/kdesu/kdesu/kdesu.cpp 2005-11-08 17:37:00.000000000 -0500
-+++ kdebase-3.5.0-new/kdesu/kdesu/kdesu.cpp     2005-11-13 08:25:52.000000000 -0500
-@@ -85,7 +85,7 @@
+--- kdebase-3.5.4/kdesu/kdesu/kdesu.cpp 2006-05-22 14:13:07.000000000 -0400
++++ kdebase-3.5.4-new/kdesu/kdesu/kdesu.cpp     2006-08-03 12:16:56.000000000 -0400
+@@ -86,7 +86,7 @@
  
  static int startApp();
  
@@ -416 +642 @@
  {
      // FIXME: this can be considered a poor man's solution, as it's not
      // directly obvious to a gui user. :)
---- kdebase-3.5.0/kdesu/kdesud/Makefile.am      2005-09-10 04:26:13.000000000 -0400
-+++ kdebase-3.5.0-new/kdesu/kdesud/Makefile.am  2005-11-13 08:30:17.000000000 -0500
+--- kdebase-3.5.4/kdesu/kdesud/Makefile.am      2005-09-10 04:26:13.000000000 -0400
++++ kdebase-3.5.4-new/kdesu/kdesud/Makefile.am  2006-08-03 12:16:56.000000000 -0400
 @@ -4,10 +4,13 @@
  
  KDE_CXXFLAGS = $(KDE_USE_FPIE)
@@ -436 +662 @@
  noinst_HEADERS = repo.h handler.h lexer.h secure.h
  
  ## kdesud needs to be suid or sgid something
---- kdebase-3.5.0/kdesu/kdesud/kdesud.cpp       2005-09-10 04:26:13.000000000 -0400
-+++ kdebase-3.5.0-new/kdesu/kdesud/kdesud.cpp   2005-11-13 08:25:52.000000000 -0500
+--- kdebase-3.5.4/kdesu/kdesud/kdesud.cpp       2005-09-10 04:26:13.000000000 -0400
++++ kdebase-3.5.4-new/kdesu/kdesud/kdesud.cpp   2006-08-03 12:16:56.000000000 -0400
 @@ -246,7 +246,7 @@
   * Main program
   */
@@ -447 +673 @@
  {
      KAboutData aboutData("kdesud", I18N_NOOP("KDE su daemon"),
              Version, I18N_NOOP("Daemon used by kdesu"),
---- kdebase-3.5.0/kdialog/Makefile.am   2005-09-10 04:25:36.000000000 -0400
-+++ kdebase-3.5.0-new/kdialog/Makefile.am       2005-11-13 08:25:52.000000000 -0500
+--- kdebase-3.5.4/kdialog/Makefile.am   2005-09-10 04:25:36.000000000 -0400
++++ kdebase-3.5.4-new/kdialog/Makefile.am       2006-08-03 12:16:56.000000000 -0400
 @@ -1,11 +1,13 @@
  KDE_CXXFLAGS = -DQT_NO_CAST_ASCII -DQT_NO_ASCII_CAST
  INCLUDES = $(all_includes)
@@ -467 +693 @@
  
  METASOURCES = AUTO
  
---- kdebase-3.5.0/kdialog/kdialog.cpp   2005-10-10 11:04:00.000000000 -0400
-+++ kdebase-3.5.0-new/kdialog/kdialog.cpp       2005-11-13 08:25:52.000000000 -0500
-@@ -661,7 +661,7 @@
+--- kdebase-3.5.4/kdialog/kdialog.cpp   2006-05-22 14:12:42.000000000 -0400
++++ kdebase-3.5.4-new/kdialog/kdialog.cpp       2006-08-03 12:16:56.000000000 -0400
+@@ -660,7 +660,7 @@
  }
  
  
@@ -478 +704 @@
  {
    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.0/kfind/Makefile.am     2005-09-10 04:25:00.000000000 -0400
-+++ kdebase-3.5.0-new/kfind/Makefile.am 2005-11-13 08:25:52.000000000 -0500
+--- kdebase-3.5.4/kdm/kfrontend/kdm_greet.c     2005-10-10 11:04:31.000000000 -0400
++++ kdebase-3.5.4-new/kdm/kfrontend/kdm_greet.c 2006-08-03 12:17:53.000000000 -0400
+@@ -44,8 +44,9 @@
+ # include <sched.h>
+ #endif
+ 
++#include <X11/Xlib.h>
++
+ #if defined(HAVE_XTEST) || defined(HAVE_XKB)
+-# include <X11/Xlib.h>
+ # include <X11/keysym.h>
+ #endif
+ 
+--- kdebase-3.5.4/kfind/Makefile.am     2005-09-10 04:25:00.000000000 -0400
++++ kdebase-3.5.4-new/kfind/Makefile.am 2006-08-03 12:16:56.000000000 -0400
 @@ -28,9 +28,12 @@
  
  #And this is for kfind
@@ -497 +736 @@
  # the library search path.
 -kfind_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 +kfind_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
---- kdebase-3.5.0/kfind/main.cpp        2005-09-10 04:25:00.000000000 -0400
-+++ kdebase-3.5.0-new/kfind/main.cpp    2005-11-13 08:25:52.000000000 -0500
+--- kdebase-3.5.4/kfind/main.cpp        2005-09-10 04:25:00.000000000 -0400
++++ kdebase-3.5.4-new/kfind/main.cpp    2006-08-03 12:16:56.000000000 -0400
 @@ -19,7 +19,7 @@
    KCmdLineLastOption
  };
@@ -508 +747 @@
  {
    KLocale::setMainCatalogue("kfindpart");
    KAboutData aboutData( "kfind", I18N_NOOP("KFind"),
---- kdebase-3.5.0/khelpcenter/Makefile.am       2005-09-10 04:25:18.000000000 -0400
-+++ kdebase-3.5.0-new/khelpcenter/Makefile.am   2005-11-13 08:25:52.000000000 -0500
+--- kdebase-3.5.4/khelpcenter/Makefile.am       2005-09-10 04:25:18.000000000 -0400
++++ kdebase-3.5.4-new/khelpcenter/Makefile.am   2006-08-03 12:16:56.000000000 -0400
 @@ -3,14 +3,14 @@
  INCLUDES = $(all_includes)
  METASOURCES = AUTO
@@ -530 +769 @@
  
  khelpcenter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
  khelpcenter_la_LIBADD = $(LIB_KHTML)
---- kdebase-3.5.0/khelpcenter/htmlsearch/Makefile.am    2005-09-10 04:25:18.000000000 -0400
-+++ kdebase-3.5.0-new/khelpcenter/htmlsearch/Makefile.am        2005-11-13 08:25:52.000000000 -0500
+--- kdebase-3.5.4/khelpcenter/htmlsearch/Makefile.am    2005-09-10 04:25:18.000000000 -0400
++++ kdebase-3.5.4-new/khelpcenter/htmlsearch/Makefile.am        2006-08-03 12:16:56.000000000 -0400
 @@ -21,14 +21,15 @@
  
  xdg_apps_DATA = htmlsearch.desktop
@@ -552 +791 @@
  
  xpm_DATA = unchecked.xpm checked.xpm
  xpmdir = $(kde_datadir)/khelpcenter/pics
---- kdebase-3.5.0/khelpcenter/htmlsearch/index.cpp      2005-09-10 04:25:18.000000000 -0400
-+++ kdebase-3.5.0-new/khelpcenter/htmlsearch/index.cpp  2005-11-13 08:25:52.000000000 -0500
+--- kdebase-3.5.4/khelpcenter/htmlsearch/index.cpp      2005-09-10 04:25:18.000000000 -0400
++++ kdebase-3.5.4-new/khelpcenter/htmlsearch/index.cpp  2006-08-03 12:16:56.000000000 -0400
 @@ -13,7 +13,7 @@
  };
  
@@ -563 +802 @@
  {
    KAboutData aboutData( "khtmlindex", I18N_NOOP("KHtmlIndex"),
         "",
---- kdebase-3.5.0/khelpcenter/khc_indexbuilder.cpp      2005-10-10 11:03:57.000000000 -0400
-+++ kdebase-3.5.0-new/khelpcenter/khc_indexbuilder.cpp  2005-11-13 08:25:52.000000000 -0500
+--- kdebase-3.5.4/khelpcenter/khc_indexbuilder.cpp      2005-10-10 11:03:57.000000000 -0400
++++ kdebase-3.5.4-new/khelpcenter/khc_indexbuilder.cpp  2006-08-03 12:16:56.000000000 -0400
 @@ -163,7 +163,7 @@
    KCmdLineLastOption
  };
@@ -574 +813 @@
  {
    KAboutData aboutData( "khc_indexbuilder",
                          I18N_NOOP("KHelpCenter Index Builder"),
---- kdebase-3.5.0/kicker/extensions/kasbar/Makefile.am  2005-09-10 04:25:29.000000000 -0400
-+++ kdebase-3.5.0-new/kicker/extensions/kasbar/Makefile.am      2005-11-13 08:25:52.000000000 -0500
+--- kdebase-3.5.4/kicker/extensions/kasbar/Makefile.am  2005-09-10 04:25:29.000000000 -0400
++++ kdebase-3.5.4-new/kicker/extensions/kasbar/Makefile.am      2006-08-03 12:16:56.000000000 -0400
 @@ -35,10 +35,12 @@
  
  EXTRA_DIST = $(lnk_DATA)
@@ -593 +832 @@
                 $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
  
  
---- kdebase-3.5.0/kicker/extensions/kasbar/kasbarapp.cpp        2005-10-10 11:03:59.000000000 -0400
-+++ kdebase-3.5.0-new/kicker/extensions/kasbar/kasbarapp.cpp    2005-11-13 08:25:52.000000000 -0500
+--- kdebase-3.5.4/kicker/extensions/kasbar/kasbarapp.cpp        2005-10-10 11:03:59.000000000 -0400
++++ kdebase-3.5.4-new/kicker/extensions/kasbar/kasbarapp.cpp    2006-08-03 12:16:57.000000000 -0400
 @@ -73,7 +73,7 @@
     KCmdLineLastOption
  };
@@ -604 +843 @@
  {
    KCmdLineArgs::init( argc, argv, "kasbar", "KasBar", I18N_NOOP( "An alternative task manager" ), VERSION_STRING );
    KCmdLineArgs::addCmdLineOptions( options );
---- kdebase-3.5.0/kioslave/info/kde-info2html.conf      2005-09-10 04:25:37.000000000 -0400
-+++ kdebase-3.5.0-new/kioslave/info/kde-info2html.conf  2005-11-13 08:25:52.000000000 -0500
+--- kdebase-3.5.4/kioslave/info/kde-info2html.conf      2005-09-10 04:25:37.000000000 -0400
++++ kdebase-3.5.4-new/kioslave/info/kde-info2html.conf  2006-08-03 12:16:57.000000000 -0400
 @@ -25,6 +25,7 @@
  
  #-- location of info files.
@@ -614 +853 @@
             "/usr/share/info",
             "/usr/info",
             "/usr/lib/info",
---- kdebase-3.5.0/kioslave/media/mounthelper/Makefile.am        2005-09-10 04:25:36.000000000 -0400
-+++ kdebase-3.5.0-new/kioslave/media/mounthelper/Makefile.am    2005-11-13 08:31:13.000000000 -0500
+--- kdebase-3.5.4/kioslave/ldap/configure.in.in 2005-10-10 11:04:01.000000000 -0400
++++ kdebase-3.5.4-new/kioslave/ldap/configure.in.in     2006-08-03 12:16:57.000000000 -0400
+@@ -38,10 +38,11 @@
+ case "$with_ldap" in
+ no) AC_MSG_RESULT(no) ;;
+ framework)
+-  LDAP_LIBS="-Xlinker -framework -Xlinker LDAP"
++  LDAP_LIBS="-Wl,-framework,LDAP"
+   AC_DEFINE_UNQUOTED(HAVE_LIBLDAP, 1, [Define if you have LDAP libraries])
+   LDAP_SUBDIR="ldap"
+   AC_MSG_RESULT(Apple framework)
++  with_ldap=FOUND
+   ;;
+ FOUND)
+   AC_MSG_RESULT(incs=$ldap_incdir libs=$ldap_libdir)
+--- kdebase-3.5.4/kioslave/man/kio_man.cpp      2005-10-10 11:04:01.000000000 -0400
++++ kdebase-3.5.4-new/kioslave/man/kio_man.cpp  2006-08-03 12:16:57.000000000 -0400
+@@ -50,7 +50,7 @@
+ 
+ MANProtocol *MANProtocol::_self = 0;
+ 
+-#define SGML2ROFF_DIRS "/usr/lib/sgml"
++#define SGML2ROFF_DIRS "@FINKPREFIX@/share/sgml"
+ 
+ /*
+  * Drop trailing ".section[.gz]" from name
+@@ -883,6 +883,7 @@
+ 
+     // Default paths
+     static const char *manpaths[] = {
++        "@FINKPREFIX@/share/man",
+         "/usr/X11/man",
+         "/usr/X11R6/man",
+         "/usr/man",
+--- kdebase-3.5.4/kioslave/media/mounthelper/Makefile.am        2006-07-22 04:15:42.000000000 -0400
++++ kdebase-3.5.4-new/kioslave/media/mounthelper/Makefile.am    2006-08-03 12:16:57.000000000 -0400
 @@ -1,12 +1,14 @@
 -bin_PROGRAMS = kio_media_mounthelper
-+bin_PROGRAMS = 
++bin_PROGRAMS =
 +lib_LTLIBRARIES =
 +kdeinit_LTLIBRARIES = kio_media_mounthelper.la
  
@@ -629 +902 @@
 +kio_media_mounthelper_la_SOURCES = kio_media_mounthelper.cpp
  
 -kio_media_mounthelper_LDFLAGS = $(KDE_RPATH) $(all_libraries)
--kio_media_mounthelper_LDADD = $(LIB_KIO) ../libmediacommon/libmediacommon.la
-+kio_media_mounthelper_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module
-+kio_media_mounthelper_la_LIBADD = $(LIB_KIO) ../libmediacommon/libmediacommon.la
+-kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO)
++kio_media_mounthelper_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(KDE_PLUGIN)
++kio_media_mounthelper_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KIO)
  
  METASOURCES = AUTO
  
---- kdebase-3.5.0/kioslave/media/mounthelper/kio_media_mounthelper.cpp  2005-10-10 11:04:00.000000000 -0400
-+++ kdebase-3.5.0-new/kioslave/media/mounthelper/kio_media_mounthelper.cpp      2005-11-13 08:25:53.000000000 -0500
-@@ -191,7 +191,7 @@
+--- kdebase-3.5.4/kioslave/media/mounthelper/kio_media_mounthelper.cpp  2006-07-22 04:15:42.000000000 -0400
++++ kdebase-3.5.4-new/kioslave/media/mounthelper/kio_media_mounthelper.cpp      2006-08-03 12:16:57.000000000 -0400
+@@ -192,7 +192,7 @@
  };
  
  
@@ -646 +919 @@
  {
         KCmdLineArgs::init(argc, argv, "kio_media_mounthelper",
                            "kio_media_mounthelper", "kio_media_mounthelper",
---- kdebase-3.5.0/kioslave/trash/Makefile.am    2005-09-10 04:25:37.000000000 -0400
-+++ kdebase-3.5.0-new/kioslave/trash/Makefile.am        2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/kioslave/nfs/mount_xdr.c      2005-09-10 04:25:37.000000000 -0400
++++ kdebase-3.5.4-new/kioslave/nfs/mount_xdr.c  2006-08-03 12:16:57.000000000 -0400
+@@ -43,6 +43,13 @@
+ 
+ /* from @(#)mount.x    1.3 91/03/11 TIRPC 1.0 */
+ 
++#if defined(__APPLE__) && !defined(IXDR_GET_INT32)
++#define IXDR_GET_INT32(buf)             ((int32_t)ntohl((u_int32_t)*(buf)++))
++#define IXDR_PUT_INT32(buf, v)          (*(buf)++ =(int32_t)htonl((u_int32_t)v))
++#define IXDR_GET_U_INT32(buf)           ((u_int32_t)IXDR_GET_INT32(buf))
++#define IXDR_PUT_U_INT32(buf, v)        IXDR_PUT_INT32((buf), ((int32_t)(v)))
++#endif
++
+ bool_t
+ xdr_fhandle(XDR *xdrs, fhandle objp)
+ {
+--- kdebase-3.5.4/kioslave/trash/Makefile.am    2005-09-10 04:25:37.000000000 -0400
++++ kdebase-3.5.4-new/kioslave/trash/Makefile.am        2006-08-03 12:16:57.000000000 -0400
 @@ -9,10 +9,13 @@
  kio_trash_la_LIBADD  = libtrashcommon.la $(LIB_KIO)
  kio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
@@ -666 +955 @@
  
  kde_services_DATA = trash.protocol
  
---- kdebase-3.5.0/kioslave/trash/ktrash.cpp     2005-10-10 11:04:01.000000000 -0400
-+++ kdebase-3.5.0-new/kioslave/trash/ktrash.cpp 2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/kioslave/trash/ktrash.cpp     2005-10-10 11:04:01.000000000 -0400
++++ kdebase-3.5.4-new/kioslave/trash/ktrash.cpp 2006-08-03 12:16:57.000000000 -0400
 @@ -35,7 +35,7 @@
      KCmdLineLastOption
  };
@@ -677 +966 @@
  {
      KApplication::disableAutoDcopRegistration();
      KCmdLineArgs::init( argc, argv, "ktrash",
---- kdebase-3.5.0/knetattach/Makefile.am        2005-09-10 04:25:49.000000000 -0400
-+++ kdebase-3.5.0-new/knetattach/Makefile.am    2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/knetattach/Makefile.am        2005-09-10 04:25:49.000000000 -0400
++++ kdebase-3.5.4-new/knetattach/Makefile.am    2006-08-03 12:16:57.000000000 -0400
 @@ -1,9 +1,12 @@
  INCLUDES= $(all_includes)
  
@@ -696 +985 @@
  METASOURCES = AUTO
  xdg_apps_DATA = knetattach.desktop
  KDE_ICON = AUTO
---- kdebase-3.5.0/knetattach/main.cpp   2005-10-10 11:04:20.000000000 -0400
-+++ kdebase-3.5.0-new/knetattach/main.cpp       2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/knetattach/main.cpp   2005-10-10 11:04:20.000000000 -0400
++++ kdebase-3.5.4-new/knetattach/main.cpp       2006-08-03 12:16:57.000000000 -0400
 @@ -25,7 +25,7 @@
  
  #include "knetattach.h"
@@ -707 +996 @@
         KAboutData about("knetattach", I18N_NOOP("KDE Network Wizard"), "1.0",
                 I18N_NOOP("KDE Network Wizard"),
                 KAboutData::License_GPL,
---- kdebase-3.5.0/konqueror/keditbookmarks/Makefile.am  2005-09-10 04:25:49.000000000 -0400
-+++ kdebase-3.5.0-new/konqueror/keditbookmarks/Makefile.am      2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/konqueror/keditbookmarks/Makefile.am  2005-09-10 04:25:49.000000000 -0400
++++ kdebase-3.5.4-new/konqueror/keditbookmarks/Makefile.am      2006-08-03 12:16:57.000000000 -0400
 @@ -2,13 +2,13 @@
  
  METASOURCES = AUTO
@@ -728 +1017 @@
  
  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.0/konqueror/keditbookmarks/kbookmarkmerger.cpp  2005-09-10 04:25:49.000000000 -0400
-+++ kdebase-3.5.0-new/konqueror/keditbookmarks/kbookmarkmerger.cpp      2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/konqueror/keditbookmarks/kbookmarkmerger.cpp  2005-09-10 04:25:49.000000000 -0400
++++ kdebase-3.5.4-new/konqueror/keditbookmarks/kbookmarkmerger.cpp      2006-08-03 12:16:57.000000000 -0400
 @@ -55,7 +55,7 @@
         return XGetSelectionOwner( dpy, atom ) != None;
  }
@@ -739 +1028 @@
  {
         const bool kdeRunning = kdeIsRunning();
  
---- kdebase-3.5.0/kpager/Makefile.am    2005-09-10 04:25:36.000000000 -0400
-+++ kdebase-3.5.0-new/kpager/Makefile.am        2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/kpager/Makefile.am    2005-09-10 04:25:36.000000000 -0400
++++ kdebase-3.5.4-new/kpager/Makefile.am        2006-08-03 12:16:57.000000000 -0400
 @@ -1,14 +1,16 @@
  INCLUDES= $(all_includes)
  
@@ -763 +1052 @@
  
  KDE_ICON = kpager
  
---- kdebase-3.5.0/kpager/main.cpp       2005-10-10 11:04:00.000000000 -0400
-+++ kdebase-3.5.0-new/kpager/main.cpp   2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/kpager/main.cpp       2005-10-10 11:04:00.000000000 -0400
++++ kdebase-3.5.4-new/kpager/main.cpp   2006-08-03 12:16:57.000000000 -0400
 @@ -62,7 +62,7 @@
  
  };
@@ -774 +1063 @@
  {
      KAboutData *aboutdata = new KAboutData("kpager", "KPager", "1.5",
                                            I18N_NOOP("Desktop Overview"), KAboutData::License_GPL,
---- kdebase-3.5.0/kpersonalizer/Makefile.am     2005-09-10 04:25:00.000000000 -0400
-+++ kdebase-3.5.0-new/kpersonalizer/Makefile.am 2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/kpersonalizer/Makefile.am     2005-09-10 04:25:00.000000000 -0400
++++ kdebase-3.5.4-new/kpersonalizer/Makefile.am 2006-08-03 12:16:57.000000000 -0400
 @@ -1,11 +1,14 @@
 -bin_PROGRAMS = kpersonalizer
 -kpersonalizer_SOURCES = stylepreview.ui krefinepage.cpp \
@@ -803 +1092 @@
  
  # Uncomment the following two lines if you add a ui.rc file for your application to make use of
  # KDE´s XML GUI builing
---- kdebase-3.5.0/kpersonalizer/main.cpp        2005-09-10 04:25:00.000000000 -0400
-+++ kdebase-3.5.0-new/kpersonalizer/main.cpp    2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/kpersonalizer/main.cpp        2005-09-10 04:25:00.000000000 -0400
++++ kdebase-3.5.4-new/kpersonalizer/main.cpp    2006-08-03 12:16:57.000000000 -0400
 @@ -33,7 +33,7 @@
          KCmdLineLastOption
  };
@@ -814 +1103 @@
  {
         KAboutData aboutData( "kpersonalizer", I18N_NOOP("KPersonalizer"),
                 VERSION, description, KAboutData::License_GPL,
---- kdebase-3.5.0/kreadconfig/Makefile.am       2005-09-10 04:25:36.000000000 -0400
-+++ kdebase-3.5.0-new/kreadconfig/Makefile.am   2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/kreadconfig/Makefile.am       2005-09-10 04:25:36.000000000 -0400
++++ kdebase-3.5.4-new/kreadconfig/Makefile.am   2006-08-03 12:16:57.000000000 -0400
 @@ -1,12 +1,17 @@
  AM_CPPFLAGS = -DQT_NO_CAST_ASCII 
  
@@ -839 +1128 @@
  
  messages:
         $(XGETTEXT) $(kreadconfig_SOURCES) -o $(podir)/kreadconfig.pot
---- kdebase-3.5.0/kreadconfig/kreadconfig.cpp   2005-09-10 04:25:36.000000000 -0400
-+++ kdebase-3.5.0-new/kreadconfig/kreadconfig.cpp       2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/kreadconfig/kreadconfig.cpp   2005-09-10 04:25:36.000000000 -0400
++++ kdebase-3.5.4-new/kreadconfig/kreadconfig.cpp       2006-08-03 12:16:57.000000000 -0400
 @@ -41,7 +41,7 @@
         { "type <type>", I18N_NOOP("Type of variable"), 0 },
          KCmdLineLastOption
@@ -850 +1139 @@
  {
         KAboutData aboutData("kreadconfig", I18N_NOOP("KReadConfig"),
                 "1.0.1",
---- kdebase-3.5.0/kreadconfig/kwriteconfig.cpp  2005-09-10 04:25:36.000000000 -0400
-+++ kdebase-3.5.0-new/kreadconfig/kwriteconfig.cpp      2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/kreadconfig/kwriteconfig.cpp  2005-09-10 04:25:36.000000000 -0400
++++ kdebase-3.5.4-new/kreadconfig/kwriteconfig.cpp      2006-08-03 12:16:57.000000000 -0400
 @@ -23,7 +23,7 @@
         { "+value", I18N_NOOP( "The value to write. Mandatory, on a shell use '' for empty" ), 0 },
          KCmdLineLastOption
@@ -861 +1150 @@
  {
         KAboutData aboutData("kwriteconfig", I18N_NOOP("KWriteConfig"),
                 "1.0.0",
---- kdebase-3.5.0/ksplashml/Makefile.am 2005-09-10 04:25:51.000000000 -0400
-+++ kdebase-3.5.0-new/ksplashml/Makefile.am     2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/ksplashml/Makefile.am 2005-09-10 04:25:51.000000000 -0400
++++ kdebase-3.5.4-new/ksplashml/Makefile.am     2006-08-03 12:16:57.000000000 -0400
 @@ -4,10 +4,13 @@
  
  METASOURCES=AUTO
@@ -881 +1170 @@
  
  noinst_HEADERS = ksplashiface.h wndmain.h
  
---- kdebase-3.5.0/ksplashml/main.cpp    2005-09-10 04:25:51.000000000 -0400
-+++ kdebase-3.5.0-new/ksplashml/main.cpp        2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/ksplashml/main.cpp    2005-09-10 04:25:51.000000000 -0400
++++ kdebase-3.5.4-new/ksplashml/main.cpp        2006-08-03 12:16:57.000000000 -0400
 @@ -37,7 +37,7 @@
    KCmdLineLastOption
  };
@@ -892 +1181 @@
  {
    KAboutData about(
      "ksplash",
---- kdebase-3.5.0/ksplashml/themeengine/simple/Makefile.am      2005-09-10 04:25:50.000000000 -0400
-+++ kdebase-3.5.0-new/ksplashml/themeengine/simple/Makefile.am  2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/ksplashml/themeengine/simple/Makefile.am      2005-09-10 04:25:50.000000000 -0400
++++ kdebase-3.5.4-new/ksplashml/themeengine/simple/Makefile.am  2006-08-03 12:16:57.000000000 -0400
 @@ -1,7 +1,10 @@
  
  INCLUDES = $(all_includes)
@@ -909 +1198 @@
 +ksplashsimple_la_SOURCES = main.cpp
 +ksplashsimple_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 +ksplashsimple_la_LIBADD = $(LIB_XINERAMA) $(LIB_X11)
---- kdebase-3.5.1/ksplashml/themeengine/simple/main.cpp.orig    2006-02-27 10:56:40.000000000 -0500
-+++ kdebase-3.5.1/ksplashml/themeengine/simple/main.cpp 2006-02-27 10:56:55.000000000 -0500
+--- kdebase-3.5.4/ksplashml/themeengine/simple/main.cpp 2006-05-22 14:13:00.000000000 -0400
++++ kdebase-3.5.4-new/ksplashml/themeengine/simple/main.cpp     2006-08-03 12:16:57.000000000 -0400
 @@ -31,10 +31,11 @@
  # endif
  #endif
@@ -924 +1213 @@
      {
      if( fork() != 0 )
          return 0;
---- kdebase-3.5.0/kstart/Makefile.am    2005-09-10 04:25:55.000000000 -0400
-+++ kdebase-3.5.0-new/kstart/Makefile.am        2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/kstart/Makefile.am    2005-09-10 04:25:55.000000000 -0400
++++ kdebase-3.5.4-new/kstart/Makefile.am        2006-08-03 12:16:57.000000000 -0400
 @@ -6,10 +6,13 @@
  
  #######        Files
@@ -944 +1233 @@
  METASOURCES =  kstart.moc 
  
  noinst_HEADERS = kstart.h version.h
---- kdebase-3.5.0/kstart/kstart.cpp     2005-09-10 04:25:55.000000000 -0400
-+++ kdebase-3.5.0-new/kstart/kstart.cpp 2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/kstart/kstart.cpp     2005-09-10 04:25:55.000000000 -0400
++++ kdebase-3.5.4-new/kstart/kstart.cpp 2006-08-03 12:16:57.000000000 -0400
 @@ -283,7 +283,7 @@
    KCmdLineLastOption
  };
@@ -955 +1244 @@
  {
    // David, 05/03/2000
    KAboutData aboutData( "kstart", I18N_NOOP("KStart"), KSTART_VERSION,
---- kdebase-3.5.0/ksysguard/gui/Makefile.am     2005-09-10 04:26:15.000000000 -0400
-+++ kdebase-3.5.0-new/ksysguard/gui/Makefile.am 2005-11-13 08:32:24.000000000 -0500
+--- kdebase-3.5.4/ksysguard/gui/Makefile.am     2005-09-10 04:26:15.000000000 -0400
++++ kdebase-3.5.4-new/ksysguard/gui/Makefile.am 2006-08-03 12:16:57.000000000 -0400
 @@ -18,21 +18,23 @@
   
  ####### This part is very ksysguard specific
@@ -985 +1274 @@
  
  kpm_SOURCES = kpm.c
  
---- kdebase-3.5.0/ksysguard/gui/ksysguard.cc    2005-10-10 11:04:32.000000000 -0400
-+++ kdebase-3.5.0-new/ksysguard/gui/ksysguard.cc        2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/ksysguard/gui/ksysguard.cc    2006-03-17 05:17:48.000000000 -0500
++++ kdebase-3.5.4-new/ksysguard/gui/ksysguard.cc        2006-08-03 12:16:57.000000000 -0400
 @@ -520,7 +520,7 @@
  /*
   * Once upon a time...
@@ -996 +1285 @@
  {
    // initpipe is used to keep the parent process around till the child
    // has registered with dcop.
---- kdebase-3.5.0/ksystraycmd/Makefile.am       2005-09-10 04:26:16.000000000 -0400
-+++ kdebase-3.5.0-new/ksystraycmd/Makefile.am   2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/ksystraycmd/Makefile.am       2005-09-10 04:26:16.000000000 -0400
++++ kdebase-3.5.4-new/ksystraycmd/Makefile.am   2006-08-03 12:16:57.000000000 -0400
 @@ -1,16 +1,19 @@
  ####### Fiddle here
  
@@ -1022 +1311 @@
  
  messages:
         $(XGETTEXT) $(ksystraycmd_SOURCES) -o $(podir)/ksystraycmd.pot
---- kdebase-3.5.0/ksystraycmd/main.cpp  2005-09-10 04:26:16.000000000 -0400
-+++ kdebase-3.5.0-new/ksystraycmd/main.cpp      2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/ksystraycmd/main.cpp  2006-01-19 12:03:19.000000000 -0500
++++ kdebase-3.5.4-new/ksystraycmd/main.cpp      2006-08-03 12:16:57.000000000 -0400
 @@ -45,7 +45,7 @@
    KCmdLineLastOption
  };
@@ -1033 +1322 @@
  {
    KAboutData aboutData( "ksystraycmd", I18N_NOOP( "KSysTrayCmd" ),
                         "KSysTrayCmd 0.1",
---- kdebase-3.5.0/ktip/Makefile.am      2005-09-10 04:25:55.000000000 -0400
-+++ kdebase-3.5.0-new/ktip/Makefile.am  2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/ktip/Makefile.am      2005-09-10 04:25:55.000000000 -0400
++++ kdebase-3.5.4-new/ktip/Makefile.am  2006-08-03 12:16:57.000000000 -0400
 @@ -2,10 +2,13 @@
  
  SUBDIRS = pics
@@ -1053 +1342 @@
  
  METASOURCES = AUTO
  KDE_ICON = AUTO
---- kdebase-3.5.0/ktip/ktipwindow.cpp   2005-10-10 11:04:21.000000000 -0400
-+++ kdebase-3.5.0-new/ktip/ktipwindow.cpp       2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/ktip/ktipwindow.cpp   2005-10-10 11:04:21.000000000 -0400
++++ kdebase-3.5.4-new/ktip/ktipwindow.cpp       2006-08-03 12:16:57.000000000 -0400
 @@ -31,7 +31,7 @@
  
  static const char description[] = I18N_NOOP("Useful tips");
@@ -1064 +1353 @@
  {
         KAboutData aboutData("ktip", I18N_NOOP("KTip"),
                                 "0.3", description, KAboutData::License_GPL,
---- kdebase-3.5.0/kwin/clients/kwmtheme/cli_installer/Makefile.am       2005-09-10 04:25:55.000000000 -0400
-+++ kdebase-3.5.0-new/kwin/clients/kwmtheme/cli_installer/Makefile.am   2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/kwin/clients/kwmtheme/cli_installer/Makefile.am       2005-09-10 04:25:55.000000000 -0400
++++ kdebase-3.5.4-new/kwin/clients/kwmtheme/cli_installer/Makefile.am   2006-08-03 12:16:57.000000000 -0400
 @@ -4,15 +4,17 @@
  
  ####### This part is very kwmtheme specific
@@ -1088 +1377 @@
 -kwmtheme_LDADD   = $(LIB_KDECORE)
 +kwmtheme_la_LIBADD   = $(LIB_KDECORE)
  
---- kdebase-3.5.0/kwin/clients/kwmtheme/cli_installer/main.cpp  2005-09-10 04:25:55.000000000 -0400
-+++ kdebase-3.5.0-new/kwin/clients/kwmtheme/cli_installer/main.cpp      2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/kwin/clients/kwmtheme/cli_installer/main.cpp  2005-09-10 04:25:55.000000000 -0400
++++ kdebase-3.5.4-new/kwin/clients/kwmtheme/cli_installer/main.cpp      2006-08-03 12:16:57.000000000 -0400
 @@ -37,7 +37,7 @@
      copyOutput.close();
  }
@@ -1099 +1388 @@
  {
      KCmdLineArgs::init(argc, argv, "kwmtheme", description, "0.1");
      KCmdLineArgs::addCmdLineOptions( options );
---- kdebase-3.5.0/kwin/killer/Makefile.am       2005-09-10 04:25:55.000000000 -0400
-+++ kdebase-3.5.0-new/kwin/killer/Makefile.am   2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/kwin/killer/Makefile.am       2005-09-10 04:25:55.000000000 -0400
++++ kdebase-3.5.4-new/kwin/killer/Makefile.am   2006-08-03 12:16:57.000000000 -0400
 @@ -1,9 +1,11 @@
  INCLUDES = $(all_includes)
  
@@ -1117 +1406 @@
 +kwin_killer_helper_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
  
  METASOURCES = AUTO
---- kdebase-3.5.0/kwin/killer/killer.cpp        2005-09-10 04:25:55.000000000 -0400
-+++ kdebase-3.5.0-new/kwin/killer/killer.cpp    2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/kwin/killer/killer.cpp        2005-09-10 04:25:55.000000000 -0400
++++ kdebase-3.5.4-new/kwin/killer/killer.cpp    2006-08-03 12:16:57.000000000 -0400
 @@ -43,7 +43,7 @@
          KCmdLineLastOption
      };
@@ -1128 +1417 @@
      {
      KLocale::setMainCatalogue( "kwin" ); // the messages are in kwin's .po file
      KCmdLineArgs::init( argc, argv, "kwin_killer_helper", I18N_NOOP( "KWin" ),
---- kdebase-3.5.0/libkonq/Makefile.am   2005-10-10 11:04:21.000000000 -0400
-+++ kdebase-3.5.0-new/libkonq/Makefile.am       2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/libkonq/Makefile.am   2005-10-10 11:04:21.000000000 -0400
++++ kdebase-3.5.4-new/libkonq/Makefile.am       2006-08-03 12:16:57.000000000 -0400
 @@ -21,7 +21,7 @@
  
  lib_LTLIBRARIES = libkonq.la
@@ -1139 +1428 @@
  
  libkonq_la_SOURCES = konq_popupmenu.cc knewmenu.cc \
     konq_xmlguiclient.cc\
---- kdebase-3.5.0/nsplugins/Makefile.am 2005-09-10 04:25:39.000000000 -0400
-+++ kdebase-3.5.0-new/nsplugins/Makefile.am     2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/nsplugins/Makefile.am 2005-09-10 04:25:39.000000000 -0400
++++ kdebase-3.5.4-new/nsplugins/Makefile.am     2006-08-03 12:16:57.000000000 -0400
 @@ -13,10 +13,13 @@
  libnsplugin_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_PLUGIN) -no-undefined
  libnsplugin_la_LIBADD  = -lkparts
@@ -1159 +1448 @@
  
  kcm_nsplugins_la_SOURCES = kcm_nsplugins.cpp
  kcm_nsplugins_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
---- kdebase-3.5.0/nsplugins/pluginscan.cpp      2005-10-10 11:04:05.000000000 -0400
-+++ kdebase-3.5.0-new/nsplugins/pluginscan.cpp  2005-11-13 08:25:53.000000000 -0500
-@@ -547,7 +547,7 @@
+--- kdebase-3.5.4/nsplugins/pluginscan.cpp      2006-05-22 14:12:46.000000000 -0400
++++ kdebase-3.5.4-new/nsplugins/pluginscan.cpp  2006-08-03 12:16:57.000000000 -0400
+@@ -559,7 +559,7 @@
  };
  
  
@@ -1170 +1459 @@
  {
      KAboutData aboutData( "nspluginscan", I18N_NOOP("nspluginscan"),
                            "0.3", "nspluginscan", KAboutData::License_GPL,
---- kdebase-3.5.0/nsplugins/viewer/Makefile.am  2005-09-10 04:25:39.000000000 -0400
-+++ kdebase-3.5.0-new/nsplugins/viewer/Makefile.am      2005-11-13 08:25:53.000000000 -0500
+--- kdebase-3.5.4/nsplugins/viewer/Makefile.am  2005-09-10 04:25:39.000000000 -0400
++++ kdebase-3.5.4-new/nsplugins/viewer/Makefile.am      2006-08-03 12:16:57.000000000 -0400
 @@ -1,12 +1,14 @@
  INCLUDES = -I$(top_srcdir)/nsplugins -I$(top_builddir)/nsplugins $(all_includes)
  METASOURCES = AUTO
@@ -1191 +1480 @@
  
  NSPluginCallbackIface_DIR = $(srcdir)/..
  
---- kdebase-3.5.0/startkde      2005-11-08 17:37:01.000000000 -0500
-+++ kdebase-3.5.0-new/startkde  2005-11-13 08:33:35.000000000 -0500
+--- kdebase-3.5.4/nsplugins/viewer/viewer.cpp   2006-01-19 12:01:49.000000000 -0500
++++ kdebase-3.5.4-new/nsplugins/viewer/viewer.cpp       2006-08-03 12:16:57.000000000 -0400
+@@ -22,6 +22,9 @@
+ 
+ */
+ 
++#if defined(__APPLE__) && !defined(RLIMIT_AS) && defined(RLIMIT_RSS)
++#define RLIMIT_AS RLIMIT_RSS
++#endif
+ 
+ #include <config.h>
+ 
+@@ -213,7 +216,7 @@
+ #endif
+ 
+ 
+-int main(int argc, char** argv)
++extern "C" KDE_EXPORT int kdemain(int argc, char** argv)
+ {
+     // nspluginviewer is a helper app, it shouldn't do session management at all
+    setenv( "SESSION_MANAGER", "", 1 );
+--- kdebase-3.5.4/startkde      2006-07-23 10:23:24.000000000 -0400
++++ kdebase-3.5.4-new/startkde  2006-08-03 12:16:57.000000000 -0400
 @@ -3,6 +3,11 @@
- #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5 )
+ #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.4 )
  #
  
 +source "@FINKPREFIX@/bin/init.sh"
@@ -1205 +1515 @@
  # When the X server dies we get a HUP signal from xinit. We must ignore it
  # because we still need to do some cleanup.
  trap 'echo GOT SIGHUP' HUP
-@@ -257,20 +262,23 @@
+@@ -254,20 +259,23 @@
  
  echo 'startkde: Starting up...'  1>&2
  
@@ -1243 +1553 @@
  
  # the splashscreen and progress indicator
  case "$ksplashrc_ksplash_theme" in 
-@@ -316,7 +324,29 @@
+@@ -314,7 +322,29 @@
  # We only check for 255 which means that the ksmserver process could not be 
  # started, any problems thereafter, e.g. ksmserver failing to initialize, 
  # will remain undetected.
@@ -1274 +1584 @@
  kwrapper ksmserver $KDEWM 
  if test $? -eq 255; then
    # Startup error
---- kdebase-3.5.0/kioslave/man/kio_man.cpp      2005-10-10 11:04:01.000000000 -0400
-+++ kdebase-3.5.0-new/kioslave/man/kio_man.cpp  2005-11-16 11:25:22.000000000 -0500
-@@ -50,7 +50,7 @@
+------------------------------------------------------------------------
+r570840 | mueller | 2006-08-07 22:26:20 +0200 (Mon, 07 Aug 2006) | 3 lines
+Changed paths:
+   M /branches/KDE/3.5/kdebase/kicker/taskbar/taskbar.cpp
+
+fix stupid typo
+BUG: 128552
+
+------------------------------------------------------------------------
+Index: kicker/taskbar/taskbar.cpp
+===================================================================
+--- kdeb/kicker/taskbar/taskbar.cpp     (revision 570839)
++++ kdeb/kicker/taskbar/taskbar.cpp     (revision 570840)
+@@ -177,14 +177,14 @@ QSize TaskBar::sizeHint( KPanelExtension
  
- MANProtocol *MANProtocol::_self = 0;
+         if (containerCount() == 0)
+         {
+-            actualMax = maxSize.height();
++            actualMax = minButtonHeight;
+         }
  
--#define SGML2ROFF_DIRS "/usr/lib/sgml"
-+#define SGML2ROFF_DIRS "@FINKPREFIX@/share/sgml"
- 
- /*
-  * Drop trailing ".section[.gz]" from name
-@@ -883,6 +883,7 @@
- 
-     // Default paths
-     static const char *manpaths[] = {
-+        "@FINKPREFIX@/share/man",
-         "/usr/X11/man",
-         "/usr/X11R6/man",
-         "/usr/man",
---- kdebase-3.5.0/kioslave/ldap/configure.in.in 2005-10-10 11:04:01.000000000 -0400
-+++ kdebase-3.5.0-new/kioslave/ldap/configure.in.in     2005-11-16 13:59:13.000000000 -0500
-@@ -42,6 +42,7 @@
-   AC_DEFINE_UNQUOTED(HAVE_LIBLDAP, 1, [Define if you have LDAP libraries])
-   LDAP_SUBDIR="ldap"
-   AC_MSG_RESULT(Apple framework)
-+  with_ldap=FOUND
-   ;;
- FOUND)
-   AC_MSG_RESULT(incs=$ldap_incdir libs=$ldap_libdir)
---- kdebase-3.5.0/nsplugins/viewer/viewer.cpp   Mon Oct 10 11:04:05 2005
-+++ kdebase-3.5.0-new/nsplugins/viewer/viewer.cpp       Wed Dec  7 21:54:25 2005
-@@ -54,6 +54,9 @@
- #include "qxteventloop.h"
- #endif
- 
-+#if defined(__APPLE__) && !defined(RLIMIT_AS) && defined(RLIMIT_RSS)
-+#define RLIMIT_AS RLIMIT_RSS
-+#endif
- 
- 
- /**
-@@ -206,7 +209,7 @@
- #endif
- 
- 
--int main(int argc, char** argv)
-+extern "C" KDE_EXPORT int kdemain(int argc, char** argv)
- {
-     // nspluginviewer is a helper app, it shouldn't do session management at all
-    setenv( "SESSION_MANAGER", "", 1 );
---- kdebase-3.5.0/kioslave/nfs/mount.h  Sat Sep 10 04:25:37 2005
-+++ kdebase-3.5.0-new/kioslave/nfs/mount.h      Thu Dec  8 10:09:04 2005
-@@ -8,6 +8,22 @@
- 
- #include <rpc/rpc.h>
- 
-+#if !defined(IXDR_GET_INT32)
-+#define IXDR_GET_INT32(buf)             ((int32_t)ntohl((u_int32_t)*(buf)++))
-+#endif
-+
-+#if !defined(IXDR_PUT_INT32)
-+#define IXDR_PUT_INT32(buf, v)          (*(buf)++ =(int32_t)htonl((u_int32_t)v))
-+#endif
-+
-+#if !defined(IXDR_GET_U_INT32) && defined(IXDR_GET_INT32)
-+#define IXDR_GET_U_INT32(buf)           ((u_int32_t)IXDR_GET_INT32(buf))
-+#endif
-+
-+#if !defined(IXDR_PUT_U_INT32) && defined(IXDR_PUT_INT32)
-+#define IXDR_PUT_U_INT32(buf, v)        IXDR_PUT_INT32((buf), ((int32_t)(v)))
-+#endif
-+
- /*
-  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-  * unrestricted use provided that this legend is included on all tape
---- kdebase-3.5.0/applnk/Makefile.am    Sat Sep 10 04:25:45 2005
-+++ kdebase-3.5.0-patched/applnk/Makefile.am    Mon Dec 12 14:42:14 2005
-@@ -3,7 +3,7 @@
- xdg_menu_DATA = kde-settings.menu kde-information.menu kde-screensavers.menu
- 
- xdg_mergedmenu_DATA = kde-essential.menu
--xdg_mergedmenudir = $(xdg_menudir)/applications-merged
-+xdg_mergedmenudir = $(xdg_menudir)/kde-applications-merged
- 
- xdg_directory_DATA = \
- kde-main.directory \
---- kdebase-3.5.0/doc/userguide/kde-for-admins.docbook  Tue Nov  8 17:36:17 2005
-+++ kdebase-3.5.0-patched/doc/userguide/kde-for-admins.docbook  Mon Dec 12 14:42:42 2005
-@@ -1650,7 +1650,7 @@
- </para>
- 
- <informalexample>
--<para>Example from <filename>applications.menu</filename>:
-+<para>Example from <filename>kde-applications.menu</filename>:
- <programlisting>
- <markup>
-        &lt;Menu&gt;
-@@ -1724,7 +1724,7 @@
- information, see <ulink url="http://www.freedesktop.org/Standards/basedir-spec">http://www.freedesktop.org/Standards/basedir-spec</ulink></para>
- 
- <informalexample>
--<para>Example from <filename>applications.menu</filename>:
-+<para>Example from <filename>kde-applications.menu</filename>:
- <programlisting>
- <markup>
-              &lt;Menu&gt;
-@@ -1776,7 +1776,7 @@
- <title>Essential Menus</title>
- 
- <para><filename
--class="directory">$<envar>KDEDIR</envar>/etc/xdg/menus/applications-merged/</filename>
-+class="directory">$<envar>KDEDIR</envar>/etc/xdg/menus/kde-applications-merged/</filename>
- 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.0/kcontrol/fonts/Makefile.am    Sat Sep 10 04:25:04 2005
-+++ kdebase-3.5.0-patched/kcontrol/fonts/Makefile.am    Mon Dec 12 21:08:01 2005
-@@ -4,13 +4,13 @@
- libkxftconfig_la_LIBADD = $(LIBFONTCONFIG_LIBS)
- libkxftconfig_la_LDFLAGS = $(LIBFONTCONFIG_RPATH)
- 
--AM_CPPFLAGS  = $(all_includes) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE
-+AM_CPPFLAGS  = $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE $(all_includes)
- 
- kde_module_LTLIBRARIES = kcm_fonts.la
- 
- kcm_fonts_la_SOURCES = fonts.cpp
- kcm_fonts_la_LDFLAGS = $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) -module -avoid-version $(all_libraries) -no-undefined
--kcm_fonts_la_LIBADD = libkxftconfig.la $(top_builddir)/kcontrol/krdb/libkrdb.la $(LIB_KDEUI) $(LIBFONTCONFIG_LIBS)
-+kcm_fonts_la_LIBADD = $(LIBFONTCONFIG_LIBS) libkxftconfig.la $(top_builddir)/kcontrol/krdb/libkrdb.la $(LIB_KDEUI)
- METASOURCES = AUTO
- 
- noinst_HEADERS = fonts.h kxftconfig.h
---- kdebase-3.5.0/kcontrol/fonts/configure.in.in        Sat Sep 10 04:25:04 2005
-+++ kdebase-3.5.0-patched/kcontrol/fonts/configure.in.in        Mon Dec 12 17:51:56 2005
-@@ -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], [
-             AC_MSG_WARN([Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ ])
-         ])
--])
- 
- 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.0/kcontrol/kfontinst/configure.in.in    Sat Sep 10 04:25:09 2005
-+++ kdebase-3.5.0-patched/kcontrol/kfontinst/configure.in.in    Mon Dec 12 17:52:09 2005
-@@ -36,11 +36,9 @@
- 
-     KFI_FOUND_FONTCONFIG=0
-     # check for fontconfig...
--    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], [
-                 AC_MSG_WARN([Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ ])
-             ])
--    ])
- 
-     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.0/kcontrol/kfontinst/kcmfontinst/Makefile.am    Sat Sep 10 04:25:09 2005
-+++ kdebase-3.5.0-patched/kcontrol/kfontinst/kcmfontinst/Makefile.am    Mon Dec 12 21:03:23 2005
-@@ -4,10 +4,10 @@
- endif
- 
- kde_module_LTLIBRARIES = kcm_fontinst.la
--kcm_fontinst_la_LIBADD  = $(LIB_KIO) $(FONTINST_PRINT_LIB) $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) ../lib/libkfontinst.la
-+kcm_fontinst_la_LIBADD  = $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) $(LIB_KIO) $(FONTINST_PRINT_LIB) ../lib/libkfontinst.la
- METASOURCES = AUTO
- kcm_fontinst_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
--AM_CPPFLAGS = -I$(srcdir)/../lib $(FONTINST_PRINT_INC) -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)
-+AM_CPPFLAGS = -I$(srcdir)/../lib $(FONTINST_PRINT_INC) -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) $(all_includes)
-  
- xdg_apps_DATA = kcmfontinst.desktop
-  
---- kdebase-3.5.0/kcontrol/kfontinst/kfile-plugin/Makefile.am   Sat Sep 10 04:25:09 2005
-+++ kdebase-3.5.0-patched/kcontrol/kfontinst/kfile-plugin/Makefile.am   Mon Dec 12 21:03:53 2005
-@@ -1,13 +1,13 @@
- kde_module_LTLIBRARIES = kfile_font.la
- 
- kfile_font_la_SOURCES = KFileFont.cpp
--kfile_font_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN)
--kfile_font_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS) ../lib/libkfontinst.la
-+kfile_font_la_LDFLAGS = $(LIBFREETYPE_RPATH) $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
-+kfile_font_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_KIO) ../lib/libkfontinst.la
- 
- kdelnkdir = $(kde_servicesdir)
- kde_services_DATA = kfile_font.desktop
- 
--AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS)
-+AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(all_includes)
- 
- METASOURCES = AUTO
- noinst_HEADERS = KFileFont.h
---- kdebase-3.5.0/kcontrol/kfontinst/kfontinst/Makefile.am      Sat Sep 10 04:25:09 2005
-+++ kdebase-3.5.0-patched/kcontrol/kfontinst/kfontinst/Makefile.am      Mon Dec 12 21:04:33 2005
-@@ -1,5 +1,8 @@
--bin_PROGRAMS = kfontinst
--kfontinst_SOURCES = \
-+bin_PROGRAMS = 
-+lib_LTLIBRARIES =
-+kdeinit_LTLIBRARIES = kfontinst.la
-+
-+kfontinst_la_SOURCES = \
- CompressedFile.cpp \
- Main.cpp \
- Encodings.cpp \
-@@ -15,6 +18,6 @@
- Fontmap.h \
- XConfig.h
- 
--kfontinst_LDADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_FONT_ENC) $(LIBZ) $(LIB_KIO) ../lib/libkfontinst.la
--kfontinst_LDFLAGS = $(all_libraries) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(KDE_RPATH)
--AM_CPPFLAGS= -DOS_$(UNAME) -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)
-+kfontinst_la_LIBADD = $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_FONT_ENC) ../../fonts/libkxftconfig.la $(LIBZ) $(LIB_KIO) ../lib/libkfontinst.la
-+kfontinst_la_LDFLAGS = $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(all_libraries) $(KDE_PLUGIN) -module
-+AM_CPPFLAGS= -DOS_$(UNAME) -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) $(all_includes)
---- kdebase-3.5.0/kcontrol/kfontinst/kio/Makefile.am    Sat Sep 10 04:25:09 2005
-+++ kdebase-3.5.0-patched/kcontrol/kfontinst/kio/Makefile.am    Mon Dec 12 21:05:15 2005
-@@ -2,9 +2,9 @@
- kio_fonts_la_SOURCES = \
- KioFonts.cpp
- 
--kio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -lkdesu ../lib/libkfontinst.la
--kio_fonts_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -module -avoid-version -no-undefined
--AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE
-+kio_fonts_la_LIBADD = $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) ../../fonts/libkxftconfig.la $(LIB_KIO) -lkdesu ../lib/libkfontinst.la
-+kio_fonts_la_LDFLAGS = $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
-+AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE $(all_includes)
- 
- # The kxftconfig stuf really belongs to kdebase/kcontrol/fonts - here only so that can distribute this as an archive.
- noinst_HEADERS = \
---- kdebase-3.5.0/kcontrol/kfontinst/lib/Makefile.am    Sat Sep 10 04:25:09 2005
-+++ kdebase-3.5.0-patched/kcontrol/kfontinst/lib/Makefile.am    Mon Dec 12 21:06:00 2005
-@@ -9,6 +9,6 @@
- FcEngine.h \
- KfiConstants.h
- 
--libkfontinst_la_LIBADD = $(LIB_KDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) $(LIBXFT_LIB)
--libkfontinst_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -no-undefined
--AM_CPPFLAGS= $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE
-+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.0/kcontrol/kfontinst/thumbnail/Makefile.am      Sat Sep 10 04:25:09 2005
-+++ kdebase-3.5.0-patched/kcontrol/kfontinst/thumbnail/Makefile.am      Mon Dec 12 21:06:21 2005
-@@ -2,7 +2,7 @@
- 
- fontthumbnail_la_SOURCES = FontThumbnail.cpp
- fontthumbnail_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_KDECORE) $(LIB_KIO) ../lib/libkfontinst.la
--fontthumbnail_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN)
-+fontthumbnail_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN) $(all_libraries)
- METASOURCES = AUTO
- 
- noinst_HEADERS = FontThumbnail.h
-@@ -11,4 +11,4 @@
- 
- kde_services_DATA = fontthumbnail.desktop
- 
--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.0/kcontrol/kfontinst/viewpart/Makefile.am       Sat Sep 10 04:25:09 2005
-+++ kdebase-3.5.0-patched/kcontrol/kfontinst/viewpart/Makefile.am       Mon Dec 12 21:06:44 2005
-@@ -13,18 +13,21 @@
- 
- kde_services_DATA = kfontviewpart.desktop
- 
--AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)
-+AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) $(all_includes)
- METASOURCES = AUTO
- 
--kfontview_LDADD = $(LIB_KPARTS)
--kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+kfontview_la_LIBADD = $(LIB_KPARTS)
-+kfontview_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
-+
-+bin_PROGRAMS = 
-+lib_LTLIBRARIES =
-+kdeinit_LTLIBRARIES = kfontview.la
- 
--bin_PROGRAMS = kfontview
- xdg_apps_DATA = kfontview.desktop
- 
- appdata_DATA = kfontviewpart.rc kfontviewui.rc
- appdatadir = $(kde_datadir)/kfontview
- 
--kfontview_SOURCES = FontViewerApp.cpp
-+kfontview_la_SOURCES = FontViewerApp.cpp
- 
- 
---- kdebase-3.5.1/kcontrol/kfontinst/viewpart/FontViewerApp.cpp.orig    2006-01-25 20:53:38.000000000 -0500
-+++ kdebase-3.5.1/kcontrol/kfontinst/viewpart/FontViewerApp.cpp 2006-01-25 20:52:35.000000000 -0500
-@@ -116,7 +116,7 @@
-                             KAboutData::License_GPL,
-                             I18N_NOOP("(c) Craig Drummond, 2004"));
- 
--int main(int argc, char **argv)
-+extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
- {
-     KCmdLineArgs::init(argc, argv, &aboutData);
-     KCmdLineArgs::addCmdLineOptions(options);
---- kdebase-3.5.1/kcontrol/kfontinst/lib/FcEngine.h.orig        2006-01-25 23:03:27.000000000 -0500
-+++ kdebase-3.5.1/kcontrol/kfontinst/lib/FcEngine.h     2006-01-25 23:01:15.000000000 -0500
-@@ -5,6 +5,8 @@
- #include "config.h"
- #endif
- 
-+#define KFI_FC_NO_WIDTHS 1
-+
- #include <qstring.h>
- #include <qvaluevector.h>
- #include <qfont.h>
---- kdebase-3.5.1/kcontrol/kfontinst/kfontinst/Main.cpp.orig    2006-01-25 23:04:25.000000000 -0500
-+++ kdebase-3.5.1/kcontrol/kfontinst/kfontinst/Main.cpp 2006-01-25 23:03:41.000000000 -0500
-@@ -190,7 +190,7 @@
-         KFI::CXConfig::refreshPaths(true);
- }
- 
--int main(int argc, char *argv[])
-+extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
- {
- #ifdef HAVE_GETOPT_H
-     static struct option options[]=
---- kdebase-3.5.1/kxkb/rules.cpp.orig   2006-02-03 09:56:15.000000000 -0500
-+++ kdebase-3.5.1/kxkb/rules.cpp        2006-02-03 09:56:40.000000000 -0500
-@@ -300,7 +300,7 @@
-  */
- const QString KeyRules::getLayout(const QString &layvar) const
- {
--  static const char* LAYOUT_PATTERN = "[a-z0-9_-]*";
-+  static const char* LAYOUT_PATTERN = "[a-zA-Z0-9_-]*";
-   QString varLine = layvar.stripWhiteSpace();
-   QRegExp rx(LAYOUT_PATTERN);
-   int pos = rx.search(varLine, 0);
-@@ -318,7 +318,7 @@
-  */
- const QString KeyRules::getVariant(const QString &layvar) const
- {
--  static const char* VARIANT_PATTERN = "\\([a-z0-9_-]*\\)";
-+  static const char* VARIANT_PATTERN = "\\([a-zA-Z0-9_-]*\\)";
-   QString varLine = layvar.stripWhiteSpace();
-   QRegExp rx(VARIANT_PATTERN);
-   int pos = rx.search(varLine, 0);
---- kdebase-3.5.1/kdesktop/krootwm.cc   2005-10-10 11:04:11.000000000 -0400
-+++ kdebase-3.5.1-new/kdesktop/krootwm.cc       2006-02-28 21:07:46.000000000 -0500
-@@ -52,6 +52,7 @@
- #include <kuser.h>
- #include <qfile.h>
- 
-+#include <kprocess.h>
- #include "krootwm.h"
- #include "kdiconview.h"
- #include "desktop.h"
-@@ -82,6 +83,9 @@
-   m_configDialog = 0;
- 
- 
-+  new KAction(i18n("Konsole..." ), "openterm", 0, this, SLOT( slotOpenTerminal() ),
-+               m_actionCollection, "open_terminal" );
-+
-   // Creates the new menu
-   menuBar = 0; // no menubar yet
-   menuNew = 0;
-@@ -135,6 +139,7 @@
-   {
-      new KAction(i18n("Run Command..."), "run", 0, m_pDesktop, SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
-   }
-+
-   if (!KGlobal::config()->isImmutable())
-   {
-      new KAction(i18n("Configure Desktop..."), "configure", 0, this, SLOT( slotConfigureDesktop() ),
-@@ -378,6 +383,13 @@
-     desktopMenu->disconnect( this );
-     bool needSeparator = false;
- 
-+    action = m_actionCollection->action("open_terminal");
-+    if (action)
-+    {
-+       action->plug( desktopMenu );
-+       needSeparator = true;
-+    }
-+
-     if (menuNew)
+         if (actualMax > maxSize.height())
+         {
+             return maxSize;
+         }
+-        return QSize( maxSize.width(), maxSize.height() );
++        return QSize( maxSize.width(), actualMax );
+     }
+     else
      {
-        menuNew->plug( desktopMenu );
-@@ -724,6 +736,13 @@
-   return args;
- }
- 
-+void KRootWm::slotOpenTerminal()
-+{
-+  KProcess proc;
-+  proc << locate("exe", "konsole");
-+  proc.start(KProcess::DontCare);
-+}
-+
- void KRootWm::slotConfigureDesktop() {
-   if (!m_configDialog)
-   {
---- kdebase-3.5.1/kdesktop/krootwm.h    2005-10-10 11:04:11.000000000 -0400
-+++ kdebase-3.5.1-new/kdesktop/krootwm.h        2006-02-28 21:07:46.000000000 -0500
-@@ -119,6 +119,7 @@
-   void slotSessionActivated( int );
-   void slotNewSession();
-   void slotLockNNewSession();
-+  void slotOpenTerminal();
- 
- private:
-   KDesktop* m_pDesktop;
---- kdebase-3.5.1/konsole/konsole/TEWidget.cpp  2005-09-10 04:26:08.000000000 -0400
-+++ kdebase-3.5.1-new/konsole/konsole/TEWidget.cpp      2006-02-28 21:06:55.000000000 -0500
-@@ -393,6 +393,8 @@
-   qApp->installEventFilter( this ); //FIXME: see below
-   KCursor::setAutoHideCursor( this, true );
- 
-+  setInputMethodEnabled( true );
-+
-   // Init DnD ////////////////////////////////////////////////////////////////
-   setAcceptDrops(true); // attempt
-   dragInfo.state = diNone;
---- kdebase-3.5.1/konsole/konsole/TEmuVt102.cpp 2005-09-10 04:26:07.000000000 -0400
-+++ kdebase-3.5.1-new/konsole/konsole/TEmuVt102.cpp     2006-02-28 21:06:23.000000000 -0500
-@@ -952,7 +952,10 @@
-     scr->setHistCursor(scr->getHistLines());
- 
-   if (cmd==CMD_send) {
--    if ((ev->state() & AltButton) && !metaspecified ) sendString("\033");
-+    if ( (ev->state() & AltButton) && 
-+      !metaspecified &&
-+      !(len && txt[0]==27) )
-+      sendString("\033");
-     emit sndBlock(txt,len);
-     return;
-   }
---- kdebase-3.5.1/kwin/events.cpp       2006-01-19 12:01:07.000000000 -0500
-+++ kdebase-3.5.1-new/kwin/events.cpp   2006-02-28 21:09:11.000000000 -0500
-@@ -323,17 +323,7 @@
-             return ( e->xunmap.event != e->xunmap.window ); // hide wm typical event from Qt
-             }
-         case MapNotify:
--            {
--#if KDE_IS_VERSION( 3, 9, 90 )
--#warning Consider dumping this workaround.
--#endif
--            // See bug #100177, especially comments #6 and #14. This workaround shouldn't be
--            // necessary when X.org with that fix becomes available and it's an unnecessary
--            // X roundtrip for an experimental unstable feature.
--            if( addSystemTrayWin( e->xmap.window ))
--                return true;
-             return ( e->xmap.event != e->xmap.window ); // hide wm typical event from Qt
--            }
-         case ReparentNotify:
-             {
-         //do not confuse Qt with these events. After all, _we_ are the

kdebase3/files/InstallScript.sh

@@ -1 +1 @@
 #!/bin/sh -e
 
-        export HOME=/tmp PREFIX="%p" QTDOCDIR="%p/share/doc/qt3/html"
+        export PREFIX="%p" USE_UNSERMAKE=1
         . ./environment-helper.sh
 
-#darwinports
-        export UNSERMAKE="no"
-
-        ./build-helper.sh install        %N %v %r make -j1 install DESTDIR=%d
+        ./build-helper.sh install        %N %v %r unsermake -p -j1 install DESTDIR=%d
 #apidox#./build-helper.sh install-apidox %N %v %r make -j1 install-apidox install-apidox-recurse DESTDIR=%d
 
         mkdir -p %i/share/doc/installed-packages
@@ -24 +21 @@
         install -c -m 444 /etc/pam.d/login %i/etc/pam.d/kdm
         install -c -m 444 /etc/pam.d/login %i/etc/pam.d/kcheckpass
         install -c -m 444 /etc/pam.d/login %i/etc/pam.d/kscreensaver
-        rm -rf %i/share/fonts || true
         rm -rf %i/share/icons/crystalsvg/scalable/apps/artsbuilder.*
 
+        install -d -m 755 "%d`%p/bin/xfontpath basedir`"
 #fink
-#       ./build-helper.sh konsole-install %N %v %r make -C konsole/fonts install fontdir=`%p/bin/xfontpath basedir`/konsole DESTDIR=%d
-#darwinports
-        ./build-helper.sh konsole-install %N %v %r make -C konsole/fonts install fontdir=%p/share/fonts/konsole DESTDIR=%d
+#       mv "%i/share/apps/konsole/fonts" "%d`%p/bin/xfontpath basedir`/konsole"
+#macports
+        mv "%i/share/apps/konsole/fonts" "%d%p/share/fonts/konsole"

kdebase3/files/CompileScript.sh

@@ -1 +1 @@
 #!/bin/sh -e
 
-        export HOME=/tmp PREFIX="%p" QTDOCDIR="%p/share/doc/qt3/html"
+        if [ `id -un` != "root" ]; then
+                echo "you must be root to build this package, it creates setuid binaries!"
+                exit 1
+        fi
+
+        export PREFIX="%p" USE_UNSERMAKE=1
         . ./environment-helper.sh
-        export lt_cv_sys_max_cmd_len=65536
 
-#darwinports
-        export UNSERMAKE="no"
+        perl -pi -e 's,FONTINST_SUBDIR="kfontinst",FONTINST_SUBDIR="",' kcontrol/kfontinst/configure.in.in
 
-        export CC=gcc CXX=g++
-
-        export PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
-
-        case $SW_VERSION in
-                10.[0123])
-                        perl -pi -e 's,FONTINST_SUBDIR="kfontinst",FONTINST_SUBDIR="",' kcontrol/kfontinst/configure.in.in
-                        ;;
-        esac
-
         ./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs
         ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
-        ./build-helper.sh make      %N %v %r make all all_libraries="$ALL_LIBRARIES" KDM_FLAGS="-UHAVE_UTMPX -DBSD_UTMP=1"
+        ./build-helper.sh make      %N %v %r unsermake $UNSERMAKEFLAGS KDM_FLAGS="-UHAVE_UTMPX -DBSD_UTMP=1"
 #apidox#./build-helper.sh apidox    %N %v %r make apidox

kdebase3/Portfile

@@ -1 +1 @@
 # $Id$
 
-#Synced with Fink, Version 3.5.1-1024
+#Synced with Fink, Version 3.5.4-1022
 
 PortSystem 1.0
 name            kdebase3
-version         3.5.1
-revision        3
-set kdeadmin    kde-admindir-3.5.1
+version         3.5.4
+set kdeadmin    kde-admindir-252
 categories      kde
 maintainers     ben@macports.org takanori@macports.org
 description     Base KDE programs -- e.g. kicker (taskbar). \
                 NB No KDE sound support.
 platforms       darwin
-master_sites    opendarwin::kde351 \
-                kde:security_patches/:security \
+master_sites    opendarwin::kde354 \
                 opendarwin::admin
 #               kde:stable/${version}/src
 #               http://ranger.befunk.com/fink/:admin
-extract.suffix  .tar.bz2
 use_bzip2       yes
 distname        kdebase-${version}
-distfiles       ${distname}.tar.bz2:kde351 \
-                post-3.5.0-kdebase-kdm.diff:security \
-                ${kdeadmin}.tar.bz2:admin 
+distfiles       ${distname}.tar.bz2:kde354 \
+                ${kdeadmin}.tar.bz2:admin
 depends_build   port:autoconf \
-                port:automake
+                port:unsermake
 depends_lib     port:cyrus-sasl2 \
                 port:kdelibs3 \
                 port:libusb
+#               port:openmotif
 
-checksums       ${distname}.tar.bz2 md5 484c7b3895ce4f95173f4789571eb1cc \
-                post-3.5.0-kdebase-kdm.diff md5 9daecff07d57dabba35da247e752916a \
-                ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e
+checksums       ${distname}.tar.bz2 md5 882a9729c08b197caef2c8712c980d9c \
+                ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e
 
-extract.only ${distname}.tar.bz2
-post-extract {
-                system "cd ${worksrcpath} && cat ${distpath}/post-3.5.0-kdebase-kdm.diff | patch -p0"
-                system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -"
-}
+extract.only    ${distname}.tar.bz2
+post-extract    { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
 
 patchfiles      kdebase3-unified.patch
 patch           {
                 cd ${worksrcpath}
                 foreach file $patchfiles {
-                    system "sed -e 's,@FINKPREFIX@,${prefix},g' ${portpath}/${filesdir}/${file} | patch -p1"
+                    system "sed -e 's,@FINKPREFIX@,${prefix},g' ${filespath}/${file} | 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;' admin/*"
+                system "perl -pi -e 's/-Xlinker -framework -Xlinker (\\S*)/-Wl,-framework,\$1/g; s/-framework (\\S*)/-Wl,-framework,\$1/g;' configure"
 }
-post-patch      {
-                reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh
-                reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh
+post-patch      {
+                reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh
                 reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
-                reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh
-                foreach file [glob ${worksrcpath}/admin/*] {
-                    reinplace "s|-O2|-Os|g" $file
-                    reinplace "s|doc/HTML|doc/kde|g" $file
-                    reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file
-                }
                 foreach file {CompileScript.sh InstallScript.sh} {
-                    file copy ${portpath}/${filesdir}/${file} ${worksrcpath}
+                    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}
@@ -67 +55 @@
                     reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${file}
                     file attributes ${worksrcpath}/${file} -permissions 0755
                 }
-                # init.sh is not provided by DarwinPorts
-                reinplace "s|source \"${prefix}/bin/init.sh\"|#source \"${prefix}/bin/init.sh\"|g" ${worksrcpath}/startkde
+                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
+                # init.sh doesn't exist in MacPorts
+                reinplace "s|\\(source \"${prefix}/bin/init.sh\"\\)|#\\1|g" ${worksrcpath}/startkde
 }
 
-configure.args  --without-nfs --with-ldap=framework --with-distribution='DarwinPorts/Mac OS X' --without-arts
+configure.args  --without-nfs --with-ldap=framework --with-distribution='MacPorts/Mac OS X' --without-arts
 
 configure       {}
 build           { system "cd ${worksrcpath} && ./CompileScript.sh" }
 destroot        { system "cd ${worksrcpath} && ./InstallScript.sh" }
 
-post-destroot   {
+post-destroot   {
                 xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
                 xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING INSTALL README README.pam ${destroot}${prefix}/share/doc/${name}
 }
 
-platform darwin 6 {
-        depends_lib-append      lib:libdl:dlcompat
+variant apidox  {
+                depends_lib-append port:doxygen
+                post-patch { foreach f {CompileScript.sh InstallScript.sh} { reinplace "s|#apidox#||g" ${worksrcpath}/${f} }}
 }
-
-variant apidox {
-        depends_lib-append port:doxygen
-        post-patch { foreach f {CompileScript.sh InstallScript.sh} { reinplace "s|#apidox#||g" ${worksrcpath}/${f} }}
-}

kdeedu3/files/kdeedu3.patch

@@ -1 @@
---- kdeedu-3.5.0/kalzium/src/Makefile.am        2005-09-10 10:24:07.000000000 -0400
-+++ kdeedu-3.5.0-new/kalzium/src/Makefile.am    2005-11-18 08:01:23.000000000 -0500
+
+--- kdeedu-3.5.3/kalzium/src/Makefile.am        2005-09-10 10:24:07.000000000 -0400
++++ kdeedu-3.5.3-new/kalzium/src/Makefile.am    2006-05-25 00:23:08.000000000 -0400
 @@ -1,8 +1,11 @@
  # set the include path for X, qt and KDE
  INCLUDES= -I$(srcdir)/../../libkdeedu/kdeeduplot -I$(srcdir)/../../libkdeedu/kdeeduui $(all_includes)
@@ -32 +33 @@
  
  #this RegExp-monster grep for <name origin=foo">bar</name> and puts the i18n() around foo and bar
  messages-old: rc.cpp
---- kdeedu-3.5.0/kalzium/src/main.cpp   2005-10-10 10:55:44.000000000 -0400
-+++ kdeedu-3.5.0-new/kalzium/src/main.cpp       2005-11-18 07:58:58.000000000 -0500
+--- kdeedu-3.5.3/kalzium/src/main.cpp   2006-05-22 14:03:43.000000000 -0400
++++ kdeedu-3.5.3-new/kalzium/src/main.cpp       2006-05-25 00:23:08.000000000 -0400
 @@ -43,7 +43,7 @@
  };
  #endif
@@ -43 +44 @@
  {
  #ifdef HAVE_FACILE
      caml_startup(argv);
---- kdeedu-3.5.0/kbruch/src/Makefile.am 2005-09-10 04:18:00.000000000 -0400
-+++ kdeedu-3.5.0-new/kbruch/src/Makefile.am     2005-11-18 07:58:58.000000000 -0500
+--- kdeedu-3.5.3/kbruch/src/Makefile.am 2005-09-10 04:18:00.000000000 -0400
++++ kdeedu-3.5.3-new/kbruch/src/Makefile.am     2006-05-25 00:23:08.000000000 -0400
 @@ -1,10 +1,14 @@
 -bin_PROGRAMS = kbruch
  
@@ -65 +66 @@
  
  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
  
---- kdeedu-3.5.0/kbruch/src/kbruch.cpp  2005-09-10 04:18:00.000000000 -0400
-+++ kdeedu-3.5.0-new/kbruch/src/kbruch.cpp      2005-11-18 07:58:58.000000000 -0500
+--- kdeedu-3.5.3/kbruch/src/kbruch.cpp  2006-01-19 11:35:32.000000000 -0500
++++ kdeedu-3.5.3-new/kbruch/src/kbruch.cpp      2006-05-25 00:23:08.000000000 -0400
 @@ -28,7 +28,7 @@
  #include <kaboutdata.h>
  
@@ -76 +77 @@
  {
         // init random generator
         srand(time(NULL));
---- kdeedu-3.5.0/keduca/keduca/Makefile.am      2005-09-10 04:17:25.000000000 -0400
-+++ kdeedu-3.5.0-new/keduca/keduca/Makefile.am  2005-11-18 07:58:58.000000000 -0500
+--- kdeedu-3.5.3/keduca/keduca/Makefile.am      2005-09-10 04:17:25.000000000 -0400
++++ kdeedu-3.5.3-new/keduca/keduca/Makefile.am  2006-05-25 00:23:08.000000000 -0400
 @@ -1,11 +1,13 @@
  # set the include path for X, qt and KDE
 -INCLUDES= -I../libkeduca $(all_includes)
@@ -97 +98 @@
  
  # Convenience library
  #noinst_LTLIBRARIES = libkeduca_common.la
---- kdeedu-3.5.0/keduca/keduca/main.cpp 2005-09-10 04:17:25.000000000 -0400
-+++ kdeedu-3.5.0-new/keduca/keduca/main.cpp     2005-11-18 07:58:58.000000000 -0500
+--- kdeedu-3.5.3/keduca/keduca/main.cpp 2005-09-10 04:17:25.000000000 -0400
++++ kdeedu-3.5.3-new/keduca/keduca/main.cpp     2006-05-25 00:23:08.000000000 -0400
 @@ -31,7 +31,7 @@
      KCmdLineLastOption
  };
@@ -108 +109 @@
  {
      KAboutData aboutData( "keduca", I18N_NOOP("KEduca"),
                            version, description, KAboutData::License_GPL,
---- kdeedu-3.5.0/keduca/keducabuilder/Makefile.am       2005-09-10 04:17:25.000000000 -0400
-+++ kdeedu-3.5.0-new/keduca/keducabuilder/Makefile.am   2005-11-18 07:58:58.000000000 -0500
+--- kdeedu-3.5.3/keduca/keducabuilder/Makefile.am       2005-09-10 04:17:25.000000000 -0400
++++ kdeedu-3.5.3-new/keduca/keducabuilder/Makefile.am   2006-05-25 00:23:08.000000000 -0400
 @@ -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
@@ -139 +140 @@
  
  # Uncomment the following two lines if you add a ui.rc file for your application to make use of
  # KDE´s XML GUI builing
---- kdeedu-3.5.0/keduca/keducabuilder/main.cpp  2005-09-10 04:17:25.000000000 -0400
-+++ kdeedu-3.5.0-new/keduca/keducabuilder/main.cpp      2005-11-18 07:58:58.000000000 -0500
+--- kdeedu-3.5.3/keduca/keducabuilder/main.cpp  2005-09-10 04:17:25.000000000 -0400
++++ kdeedu-3.5.3-new/keduca/keducabuilder/main.cpp      2006-05-25 00:23:08.000000000 -0400
 @@ -32,7 +32,7 @@
      KCmdLineLastOption
  };
@@ -150 +151 @@
  {
      KAboutData aboutData( "keduca", I18N_NOOP("KEducaBuilder"),
                            version, description, KAboutData::License_GPL,
---- kdeedu-3.5.0/khangman/khangman/Makefile.am  2005-09-10 04:16:50.000000000 -0400
-+++ kdeedu-3.5.0-new/khangman/khangman/Makefile.am      2005-11-18 08:02:27.000000000 -0500
+--- kdeedu-3.5.3/khangman/khangman/Makefile.am  2005-09-10 04:16:50.000000000 -0400
++++ kdeedu-3.5.3-new/khangman/khangman/Makefile.am      2006-05-25 00:23:08.000000000 -0400
 @@ -1,7 +1,11 @@
  ####### kdevelop will overwrite this part!!! (begin)##########
 -bin_PROGRAMS = khangman
@@ -176 +177 @@
  
  rc_DATA = khangmanui.rc
  rcdir = $(kde_datadir)/khangman
---- kdeedu-3.5.0/khangman/khangman/main.cpp     2005-10-10 10:55:19.000000000 -0400
-+++ kdeedu-3.5.0-new/khangman/khangman/main.cpp 2005-11-18 07:58:58.000000000 -0500
+--- kdeedu-3.5.3/khangman/khangman/main.cpp     2005-10-10 10:55:19.000000000 -0400
++++ kdeedu-3.5.3-new/khangman/khangman/main.cpp 2006-05-25 00:23:08.000000000 -0400
 @@ -39,7 +39,7 @@
      KCmdLineLastOption
  };
@@ -187 +188 @@
  {
      KAboutData aboutData( "khangman", I18N_NOOP("KHangMan"),
                                KHM_VERSION, description, KAboutData::License_GPL,
---- kdeedu-3.5.0/kig/kig/Makefile.am    2005-09-10 04:17:20.000000000 -0400
-+++ kdeedu-3.5.0-new/kig/kig/Makefile.am        2005-11-18 07:58:58.000000000 -0500
+--- kdeedu-3.5.3/kig/kig/Makefile.am    2005-09-10 04:17:20.000000000 -0400
++++ kdeedu-3.5.3-new/kig/kig/Makefile.am        2006-05-25 00:23:08.000000000 -0400
 @@ -19,12 +19,14 @@
  #########################################################################
  # this is the program that gets installed.  it's name is used for all
@@ -208 +209 @@
  
  # this is where the desktop file will go 
  xdg_apps_DATA = kig.desktop
---- kdeedu-3.5.0/kig/kig/main.cpp       2005-10-10 10:55:35.000000000 -0400
-+++ kdeedu-3.5.0-new/kig/kig/main.cpp   2005-11-18 07:58:58.000000000 -0500
+--- kdeedu-3.5.3/kig/kig/main.cpp       2005-10-10 10:55:35.000000000 -0400
++++ kdeedu-3.5.3-new/kig/kig/main.cpp   2006-05-25 00:23:08.000000000 -0400
 @@ -101,7 +101,7 @@
    return (*converterfunction)( file, outfile );
  }
@@ -219 +220 @@
  {
    KAboutData *about = kigAboutData( "kig", I18N_NOOP("Kig") );
  
---- kdeedu-3.5.0/kiten/Makefile.am      2005-09-10 04:17:15.000000000 -0400
-+++ kdeedu-3.5.0-new/kiten/Makefile.am  2005-11-18 07:58:58.000000000 -0500
+--- kdeedu-3.5.3/kiten/Makefile.am      2005-09-10 04:17:15.000000000 -0400
++++ kdeedu-3.5.3-new/kiten/Makefile.am  2006-05-25 00:23:08.000000000 -0400
 @@ -2,15 +2,16 @@
  
  SUBDIRS = pics
@@ -242 +243 @@
  
  libkiten_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 1:0:0
  libkiten_la_LIBADD = $(LIB_KDEUI) $(LIB_KDEPRINT)
---- kdeedu-3.5.0/kiten/main.cpp 2005-10-10 10:55:32.000000000 -0400
-+++ kdeedu-3.5.0-new/kiten/main.cpp     2005-11-18 07:58:58.000000000 -0500
+--- kdeedu-3.5.3/kiten/main.cpp 2005-10-10 10:55:32.000000000 -0400
++++ kdeedu-3.5.3-new/kiten/main.cpp     2006-05-25 00:23:08.000000000 -0400
 @@ -37,7 +37,7 @@
         // INSERT YOUR COMMANDLINE OPTIONS HERE
  };
@@ -253 +254 @@
  {
         qInstallMsgHandler(noMessageOutput);
         KAboutData aboutData( "kiten", I18N_NOOP("Kiten"),
---- kdeedu-3.5.0/klatin/klatin/Makefile.am      2005-09-10 04:17:24.000000000 -0400
-+++ kdeedu-3.5.0-new/klatin/klatin/Makefile.am  2005-11-18 07:58:58.000000000 -0500
+--- kdeedu-3.5.3/klatin/klatin/Makefile.am      2005-09-10 04:17:24.000000000 -0400
++++ kdeedu-3.5.3-new/klatin/klatin/Makefile.am  2006-05-25 00:23:08.000000000 -0400
 @@ -6,19 +6,21 @@
  
  # this is the program that gets installed.  it's name is used for all
@@ -281 +282 @@
         klatinchoose.ui settings.kcfgc klatingrammarwidget.ui klatinvocabwidget.ui klatinverbswidget.ui \
         klatinresultsdialog.ui klatinsettings_vocabpage.ui
  
---- kdeedu-3.5.0/klatin/klatin/main.cpp 2005-09-10 04:17:24.000000000 -0400
-+++ kdeedu-3.5.0-new/klatin/klatin/main.cpp     2005-11-18 07:58:58.000000000 -0500
+--- kdeedu-3.5.3/klatin/klatin/main.cpp 2005-09-10 04:17:24.000000000 -0400
++++ kdeedu-3.5.3-new/klatin/klatin/main.cpp     2006-05-25 00:23:08.000000000 -0400
 @@ -29,7 +29,7 @@
         KCmdLineLastOption
  };
@@ -292 +293 @@
  {
  
         KAboutData aboutData( "klatin", I18N_NOOP("KLatin"),
---- kdeedu-3.5.0/klettres/klettres/Makefile.am  2005-09-10 04:16:56.000000000 -0400
-+++ kdeedu-3.5.0-new/klettres/klettres/Makefile.am      2005-11-18 08:03:30.000000000 -0500
+--- kdeedu-3.5.3/klettres/klettres/Makefile.am  2005-09-10 04:16:56.000000000 -0400
++++ kdeedu-3.5.3-new/klettres/klettres/Makefile.am      2006-05-25 00:23:08.000000000 -0400
 @@ -1,10 +1,13 @@
  ####### kdevelop will overwrite this part!!! (begin)##########
 -bin_PROGRAMS = klettres
@@ -320 +321 @@
  
  messages: rc.cpp
         $(XGETTEXT) *.cpp -o $(podir)/klettres.pot;
---- kdeedu-3.5.0/klettres/klettres/main.cpp     2005-10-10 10:55:20.000000000 -0400
-+++ kdeedu-3.5.0-new/klettres/klettres/main.cpp 2005-11-18 07:58:58.000000000 -0500
+--- kdeedu-3.5.3/klettres/klettres/main.cpp     2006-03-17 05:10:09.000000000 -0500
++++ kdeedu-3.5.3-new/klettres/klettres/main.cpp 2006-05-25 00:23:08.000000000 -0400
 @@ -43,7 +43,7 @@
          KCmdLineLastOption
      };
@@ -330 +331 @@
 +extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
  {
      KAboutData about("klettres", I18N_NOOP("KLettres"), KLETTRES_VERSION, description,
-                      KAboutData::License_GPL, "(C) 2001-2005 Anne-Marie Mahfouf",0, "http://edu.kde.org/klettres", "submit@bugs.kde.org");
---- kdeedu-3.5.0/kmplot/kmplot/Makefile.am      2005-09-10 04:17:09.000000000 -0400
-+++ kdeedu-3.5.0-new/kmplot/kmplot/Makefile.am  2005-11-18 07:59:04.000000000 -0500
+                      KAboutData::License_GPL, "(C) 2001-2006 Anne-Marie Mahfouf",0, "http://edu.kde.org/klettres", "submit@bugs.kde.org");
+--- kdeedu-3.5.3/kmplot/kmplot/Makefile.am      2005-09-10 04:17:09.000000000 -0400
++++ kdeedu-3.5.3-new/kmplot/kmplot/Makefile.am  2006-05-25 00:23:08.000000000 -0400
 @@ -21,12 +21,14 @@
  #########################################################################
  # this is the program that gets installed.  it's name is used for all
@@ -352 +353 @@
  
  # this is where the desktop file will go
  appmimedir = $(kde_mimedir)/application
---- kdeedu-3.5.0/kmplot/kmplot/main.cpp 2005-10-10 10:55:30.000000000 -0400
-+++ kdeedu-3.5.0-new/kmplot/kmplot/main.cpp     2005-11-18 07:59:04.000000000 -0500
+--- kdeedu-3.5.3/kmplot/kmplot/main.cpp 2005-10-10 10:55:30.000000000 -0400
++++ kdeedu-3.5.3-new/kmplot/kmplot/main.cpp     2006-05-25 00:23:08.000000000 -0400
 @@ -50,7 +50,7 @@
      };
  
@@ -363 +364 @@
  {
         KAboutData aboutData(
             "kmplot",
---- kdeedu-3.5.0/kpercentage/kpercentage/Makefile.am    2005-09-10 04:16:51.000000000 -0400
-+++ kdeedu-3.5.0-new/kpercentage/kpercentage/Makefile.am        2005-11-18 07:59:04.000000000 -0500
+--- kdeedu-3.5.3/kpercentage/kpercentage/Makefile.am    2005-09-10 04:16:51.000000000 -0400
++++ kdeedu-3.5.3-new/kpercentage/kpercentage/Makefile.am        2006-05-25 00:23:08.000000000 -0400
 @@ -1,6 +1,10 @@
 -bin_PROGRAMS = kpercentage
 -kpercentage_SOURCES =  kanimation.cpp kanswer.cpp kpercentmain.cpp  kpercentage.cpp ksplashscreen.cpp main.cpp
@@ -388 +389 @@
  
  
  stringstocpp:
---- kdeedu-3.5.0/kpercentage/kpercentage/main.cpp       2005-09-10 04:16:51.000000000 -0400
-+++ kdeedu-3.5.0-new/kpercentage/kpercentage/main.cpp   2005-11-18 07:59:04.000000000 -0500
+--- kdeedu-3.5.3/kpercentage/kpercentage/main.cpp       2005-09-10 04:16:51.000000000 -0400
++++ kdeedu-3.5.3-new/kpercentage/kpercentage/main.cpp   2006-05-25 00:23:08.000000000 -0400
 @@ -34,7 +34,7 @@
          KCmdLineLastOption
      };
@@ -399 +400 @@
  {
      KAboutData aboutData
      (
---- kdeedu-3.5.0/kstars/kstars/Makefile.am      2005-09-10 04:17:55.000000000 -0400
-+++ kdeedu-3.5.0-new/kstars/kstars/Makefile.am  2005-11-18 08:04:21.000000000 -0500
+--- kdeedu-3.5.3/kstars/kstars/Makefile.am      2005-09-10 04:17:55.000000000 -0400
++++ kdeedu-3.5.3-new/kstars/kstars/Makefile.am  2006-05-25 00:23:08.000000000 -0400
 @@ -1,6 +1,8 @@
 -bin_PROGRAMS = kstars
 +bin_PROGRAMS = 
@@ -437 +438 @@
  
  # Uncomment the following two lines if you add a ui.rc file for your application to make use of
  # KDE
---- kdeedu-3.5.0/kstars/kstars/indi/fli_ccd.c   2005-10-10 10:55:39.000000000 -0400
-+++ kdeedu-3.5.0-new/kstars/kstars/indi/fli_ccd.c       2005-11-18 07:59:04.000000000 -0500
+--- kdeedu-3.5.3/kstars/kstars/indi/apmount.cpp 2005-10-10 10:55:39.000000000 -0400
++++ kdeedu-3.5.3-new/kstars/kstars/indi/apmount.cpp     2006-05-25 00:23:08.000000000 -0400
+@@ -39,8 +39,9 @@
+ */
+ 
+ 
+-#if !(TIMEZONE_IS_INT)
+-static int daylight = 0;
++/* FIXME: hack!, make a real test for extern int daylight on darwin */
++#if !(TIMEZONE_IS_INT) || defined(__APPLE__)
++int daylight = 0;
+ #endif
+ 
+ static inline double timezoneOffset()
+--- kdeedu-3.5.3/kstars/kstars/indi/fli_ccd.c   2005-10-10 10:55:39.000000000 -0400
++++ kdeedu-3.5.3-new/kstars/kstars/indi/fli_ccd.c       2006-05-25 00:23:08.000000000 -0400
 @@ -19,6 +19,7 @@
  
  #endif
@@ -447 +462 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
---- kdeedu-3.5.0/kstars/kstars/indi/lx200generic.cpp    2005-10-10 10:55:39.000000000 -0400
-+++ kdeedu-3.5.0-new/kstars/kstars/indi/lx200generic.cpp        2005-11-18 07:59:04.000000000 -0500
+--- kdeedu-3.5.3/kstars/kstars/indi/lx200generic.cpp    2005-10-10 10:55:39.000000000 -0400
++++ kdeedu-3.5.3-new/kstars/kstars/indi/lx200generic.cpp        2006-05-25 00:23:08.000000000 -0400
 @@ -41,7 +41,7 @@
  
  
@@ -458 +473 @@
  #endif
  
  static inline double timezoneOffset()
---- kdeedu-3.5.0/kstars/kstars/main.cpp 2005-11-08 17:24:02.000000000 -0500
-+++ kdeedu-3.5.0-new/kstars/kstars/main.cpp     2005-11-18 07:59:04.000000000 -0500
+--- kdeedu-3.5.3/kstars/kstars/indi/webcam/Makefile.am  2005-09-10 04:17:35.000000000 -0400
++++ kdeedu-3.5.3-new/kstars/kstars/indi/webcam/Makefile.am      2006-05-25 00:23:08.000000000 -0400
+@@ -1,7 +1,7 @@
+ if HAVE_V4L2
+    libwebcam_linux = libwebcam_v4l2_linux.la
+ else
+-   libwebcam_linux = libwebcam_v4l1_linux.la
++   libwebcam_linux = 
+ endif
+ 
+ noinst_LTLIBRARIES = libwebcam.la $(libwebcam_linux)
+--- kdeedu-3.5.3/kstars/kstars/main.cpp 2005-11-19 05:33:39.000000000 -0500
++++ kdeedu-3.5.3-new/kstars/kstars/main.cpp     2006-05-25 00:23:08.000000000 -0400
 @@ -49,7 +49,7 @@
         KCmdLineLastOption
  };
@@ -469 +495 @@
  {
         KAboutData aboutData( "kstars", I18N_NOOP("KStars"),
                 KSTARS_VERSION, description, KAboutData::License_GPL,
---- kdeedu-3.5.0/ktouch/src/Makefile.am 2005-09-10 04:17:27.000000000 -0400
-+++ kdeedu-3.5.0-new/ktouch/src/Makefile.am     2005-11-18 08:05:16.000000000 -0500
-@@ -42,7 +42,7 @@
-        ktouchutils.h
+--- kdeedu-3.5.3/ktouch/src/Makefile.am 2006-05-22 14:03:38.000000000 -0400
++++ kdeedu-3.5.3-new/ktouch/src/Makefile.am     2006-05-25 00:23:58.000000000 -0400
+@@ -26,7 +26,7 @@
+                ktouchstatistics.h      ktouchstatus.h  ktouchtrainer.h         ktouchutils.h ktouchcoloreditor.h
  
  # let automoc handle all of the meta source files (moc)
 -ktouch_METASOURCES = AUTO
@@ -480 +506 @@
  
  messages: rc.cpp
         $(XGETTEXT) *.cpp -o $(podir)/ktouch.pot
-@@ -53,10 +53,12 @@
+@@ -37,10 +37,12 @@
  #########################################################################
  # this is the program that gets installed.  it's name is used for all
  # of the other Makefile.am variables
@@ -490 +516 @@
 +kdeinit_LTLIBRARIES = ktouch.la
  
  # the application source, library search path, and link libraries
--ktouch_SOURCES = \
-+ktouch_la_SOURCES = \
-        ktouchchartwidget.cpp \
-        ktouchcolorscheme.cpp \
-        ktouch.cpp \
-@@ -90,11 +92,11 @@
-        prefs.kcfgc
+-ktouch_SOURCES = ktouchchartwidget.cpp ktouchcoloreditor_dlg.ui \
++ktouch_la_SOURCES = ktouchchartwidget.cpp ktouchcoloreditor_dlg.ui \
+        ktouchcolorscheme.cpp ktouch.cpp        ktouchdefaults.cpp ktouchkeyboardwidget.cpp \
+        ktouchkeyconnector.cpp ktouchkey.cpp    ktouchkeys.cpp ktouchlecture.cpp ktouchlectureeditor.cpp \
+        ktouchlectureeditor_dlg.ui      ktouchleveldata.cpp ktouchopenrequest.cpp ktouchopenrequest_dlg.ui \
+@@ -50,11 +52,11 @@
+                ktouchutils.cpp main.cpp prefs.kcfgc ktouchcoloreditor.cpp
  
  # the library search path.
 -ktouch_LDFLAGS = $(KDE_RPATH) $(all_libraries)
@@ -509 +535 @@
  
  rcdir = $(kde_datadir)/ktouch
  rc_DATA = ktouchui.rc
---- kdeedu-3.5.0/ktouch/src/main.cpp    2005-09-10 04:17:27.000000000 -0400
-+++ kdeedu-3.5.0-new/ktouch/src/main.cpp        2005-11-18 07:59:04.000000000 -0500
+--- kdeedu-3.5.3/ktouch/src/main.cpp    2006-05-22 14:03:38.000000000 -0400
++++ kdeedu-3.5.3-new/ktouch/src/main.cpp        2006-05-25 00:23:08.000000000 -0400
 @@ -26,7 +26,7 @@
      KCmdLineLastOption
  };
@@ -520 +546 @@
  {
      KAboutData about("ktouch",
                       I18N_NOOP("KTouch"),
---- kdeedu-3.5.0/kturtle/src/Makefile.am        2005-09-10 04:16:51.000000000 -0400
-+++ kdeedu-3.5.0-new/kturtle/src/Makefile.am    2005-11-18 07:59:04.000000000 -0500
+--- kdeedu-3.5.3/kturtle/src/Makefile.am        2005-09-10 04:16:51.000000000 -0400
++++ kdeedu-3.5.3-new/kturtle/src/Makefile.am    2006-05-25 00:23:08.000000000 -0400
 @@ -6,20 +6,22 @@
  # added from kjots
  AM_LDFLAGS   = $(all_libraries) $(KDE_RPATH)
@@ -550 +576 @@
  
  # 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
---- kdeedu-3.5.0/kturtle/src/main.cpp   2005-10-10 10:55:19.000000000 -0400
-+++ kdeedu-3.5.0-new/kturtle/src/main.cpp       2005-11-18 07:59:05.000000000 -0500
+--- kdeedu-3.5.3/kturtle/src/main.cpp   2005-10-10 10:55:19.000000000 -0400
++++ kdeedu-3.5.3-new/kturtle/src/main.cpp       2006-05-25 00:23:08.000000000 -0400
 @@ -43,7 +43,7 @@
  };
  
@@ -561 +587 @@
  {
         KAboutData about("kturtle", I18N_NOOP("KTurtle"), version, description, KAboutData::License_GPL, copyright, 0, website);
         about.addAuthor("Cies Breijs",
---- kdeedu-3.5.0/kverbos/kverbos/Makefile.am    2005-09-10 04:17:22.000000000 -0400
-+++ kdeedu-3.5.0-new/kverbos/kverbos/Makefile.am        2005-11-18 07:59:05.000000000 -0500
+--- kdeedu-3.5.3/kverbos/kverbos/Makefile.am    2005-09-10 04:17:22.000000000 -0400
++++ kdeedu-3.5.3-new/kverbos/kverbos/Makefile.am        2006-05-25 00:23:08.000000000 -0400
 @@ -1,8 +1,11 @@
  SUBDIRS = icons data
  
@@ -587 +613 @@
  
  rcdir = $(kde_datadir)/kverbos
  rc_DATA = kverbosui.rc
---- kdeedu-3.5.0/kverbos/kverbos/main.cpp       2005-09-10 04:17:22.000000000 -0400
-+++ kdeedu-3.5.0-new/kverbos/kverbos/main.cpp   2005-11-18 07:59:05.000000000 -0500
+--- kdeedu-3.5.3/kverbos/kverbos/main.cpp       2005-09-10 04:17:22.000000000 -0400
++++ kdeedu-3.5.3-new/kverbos/kverbos/main.cpp   2006-05-25 00:23:08.000000000 -0400
 @@ -32,7 +32,7 @@
  
  
@@ -598 +624 @@
  {
  
         KAboutData aboutData( "kverbos", I18N_NOOP("KVerbos"),
---- kdeedu-3.5.0/kwordquiz/src/Makefile.am      2005-09-10 04:16:57.000000000 -0400
-+++ kdeedu-3.5.0-new/kwordquiz/src/Makefile.am  2005-11-18 08:05:43.000000000 -0500
+--- kdeedu-3.5.3/kwordquiz/src/Makefile.am      2005-09-10 04:16:57.000000000 -0400
++++ kdeedu-3.5.3-new/kwordquiz/src/Makefile.am  2006-05-25 00:23:08.000000000 -0400
 @@ -1,9 +1,11 @@
  ####### kdevelop will overwrite this part!!! (begin)##########
 -bin_PROGRAMS = kwordquiz
@@ -632 +658 @@
  
  rcdir = $(kde_datadir)/kwordquiz
  rc_DATA = kwordquizui.rc eventsrc
---- kdeedu-3.5.0/kwordquiz/src/main.cpp 2005-10-10 10:55:21.000000000 -0400
-+++ kdeedu-3.5.0-new/kwordquiz/src/main.cpp     2005-11-18 07:59:05.000000000 -0500
+--- kdeedu-3.5.3/kwordquiz/src/main.cpp 2005-10-10 10:55:21.000000000 -0400
++++ kdeedu-3.5.3-new/kwordquiz/src/main.cpp     2006-05-25 00:23:08.000000000 -0400
 @@ -33,7 +33,7 @@
    { 0, 0, 0 }
  };
@@ -643 +669 @@
  {
    KAboutData aboutData("kwordquiz",
                         I18N_NOOP("KWordQuiz"),
---- kdeedu-3.5.0/kstars/kstars/indi/webcam/Makefile.am  2005-09-10 04:17:35.000000000 -0400
-+++ kdeedu-3.5.0-new/kstars/kstars/indi/webcam/Makefile.am      2005-11-18 15:07:17.000000000 -0500
-@@ -1,7 +1,7 @@
- if HAVE_V4L2
-    libwebcam_linux = libwebcam_v4l2_linux.la
- else
--   libwebcam_linux = libwebcam_v4l1_linux.la
-+   libwebcam_linux = 
- endif
- 
- noinst_LTLIBRARIES = libwebcam.la $(libwebcam_linux)
---- kdeedu-3.5.1/kstars/kstars/indi/apmount.cpp 2005-10-10 10:55:39.000000000 -0400
-+++ kdeedu-3.5.1-new/kstars/kstars/indi/apmount.cpp     2006-02-01 21:27:56.000000000 -0500
-@@ -39,8 +39,9 @@
- */
- 
- 
--#if !(TIMEZONE_IS_INT)
--static int daylight = 0;
-+/* FIXME: hack!, make a real test for extern int daylight on darwin */
-+#if !(TIMEZONE_IS_INT) || defined(__APPLE__)
-+int daylight = 0;
- #endif
- 

kdeedu3/files/InstallScript.sh

@@ -1 +1 @@
 #!/bin/sh -e
 
-        export PREFIX="%p"
+        export PREFIX="%p" USE_UNSERMAKE=1
         . ./environment-helper.sh
 
-#darwinports
-        export UNSERMAKE="no"
+        ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d
 
-        ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
-
         mkdir -p %i/share/doc/installed-packages
         touch %i/share/doc/installed-packages/%N
         touch %i/share/doc/installed-packages/%N-base

kdeedu3/files/CompileScript.sh

@@ -1 +1 @@
 #!/bin/sh -e
 
-        export HOME=/tmp
-        export PREFIX="%p"
+        export PREFIX="%p" USE_UNSERMAKE=1
         . ./environment-helper.sh
         export LDFLAGS="-L%p/lib/python2.4/config"
-        export lt_cv_sys_max_cmd_len=65536
 
-#darwinports
-        export UNSERMAKE="no"
-
-        export CC=gcc CXX=g++
-
         ./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs
         ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
-        ./build-helper.sh make      %N %v %r make all all_libraries="$ALL_LIBRARIES"
+        ./build-helper.sh make      %N %v %r unsermake $UNSERMAKEFLAGS kvoctrain/kvoctrain/common-dialogs/prefs.h all

kdeedu3/Portfile

@@ -1 +1 @@
 # $Id$
 
-#Synced with Fink, Version 3.5.1-1023
+#Synced with Fink, Version 3.5.4-1021
 
 PortSystem 1.0
 name            kdeedu3
-version         3.5.1
-revision        1
-set kdeadmin    kde-admindir-3.5.1
+version         3.5.4
+set kdeadmin    kde-admindir-252
 categories      kde
 maintainers     ben@macports.org takanori@macports.org
 description     KDE educational games and software. \
                 NB No KDE sound support.
 platforms       darwin
-master_sites    opendarwin::kde351 \
+master_sites    opendarwin::kde354 \
                 opendarwin::admin
 #               kde:stable/${version}/src
 #               http://ranger.befunk.com/fink/:admin
-extract.suffix  .tar.bz2
 use_bzip2       yes
 distname        kdeedu-${version}
-distfiles       ${distname}.tar.bz2:kde351 \
+distfiles       ${distname}.tar.bz2:kde354 \
                 ${kdeadmin}.tar.bz2:admin
 depends_build   port:autoconf \
-                port:automake
+                port:unsermake
 depends_lib     port:kdebase3
 
-checksums       ${distname}.tar.bz2 md5 fe31b9a2ec4e299531c6b7beeab09534 \
-                ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e
+checksums       ${distname}.tar.bz2 md5 81dfdea2ed6eaaa440ee868a69b8fc7e \
+                ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e
 
-extract.only ${distname}.tar.bz2
-post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
+extract.only    ${distname}.tar.bz2
+post-extract    { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
 
 patchfiles      kdeedu3.patch
 patch           {
                 cd ${worksrcpath}
                 foreach file $patchfiles {
-                    system "sed -e 's,@FINKPREFIX@,${prefix},g' ${portpath}/${filesdir}/${file} | patch -p1"
+                    system "sed -e 's,@FINKPREFIX@,${prefix},g' ${filespath}/${file} | 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;' admin/*"
 }
-post-patch      {
-                reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh
-                reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh
+post-patch      {
+                reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh
                 reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
-                reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh
-                foreach file [glob ${worksrcpath}/admin/*] {
-                    reinplace "s|-O2|-Os|g" $file
-                    reinplace "s|doc/HTML|doc/kde|g" $file
-                    reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file
-                }
                 foreach file {CompileScript.sh InstallScript.sh} {
-                    file copy ${portpath}/${filesdir}/${file} ${worksrcpath}
+                    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}
@@ -61 +53 @@
                 }
 }
 
-configure.args  --disable-kig-python-scripting --with-distribution='DarwinPorts/Mac OS X' --without-arts
+configure.args  --disable-kig-python-scripting --with-distribution='MacPorts/Mac OS X' --without-arts
 
 configure       {}
 build           { system "cd ${worksrcpath} && ./CompileScript.sh" }
 destroot        { system "cd ${worksrcpath} && ./InstallScript.sh" }
 
-post-destroot   {
+post-destroot   {
                 xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
                 xinstall -m 644 -W ${worksrcpath} COPYING INSTALL README ${destroot}${prefix}/share/doc/${name}
 }
-
-platform darwin 6 {
-        depends_lib-append      lib:libdl:dlcompat
-}

kdegames3/files/InstallScript.sh

@@ -1 +1 @@
 #!/bin/sh -e
 
-        export PREFIX="%p"
+        export PREFIX="%p" USE_UNSERMAKE=1
         . ./environment-helper.sh
 
-#unsermake
-        export UNSERMAKE="no"
+        ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d
 
-        ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
-
         mkdir -p %i/share/doc/installed-packages
         touch %i/share/doc/installed-packages/%N
         touch %i/share/doc/installed-packages/%N-base

kdegames3/files/CompileScript.sh

@@ -1 +1 @@
 #!/bin/sh -e
 
         export HOME=/tmp
-        export PREFIX="%p"
+        export PREFIX="%p" USE_UNSERMAKE=1
         . ./environment-helper.sh
-        export lt_cv_sys_max_cmd_len=65536
 
-#darwinports
-        export UNSERMAKE="no"
-
-        export CC=gcc CXX=g++
-
         ./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs
         ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
-        ./build-helper.sh make      %N %v %r make all all_libraries="$ALL_LIBRARIES"
+        ./build-helper.sh make      %N %v %r unsermake $UNSERMAKEFLAGS

kdegames3/Portfile

@@ -1 +1 @@
 # $Id$
 
-#Synced with Fink, Version 3.5.1-1023
+#Synced with Fink, Version 3.5.4-1021
 
 PortSystem 1.0
 name            kdegames3
-version         3.5.1
-revision        1
-set kdeadmin    kde-admindir-3.5.1
+version         3.5.4
+set kdeadmin    kde-admindir-252
 categories      kde
 maintainers     ben@macports.org takanori@macports.org
 description     KDE games. \
                 NB No KDE sound support.
 platforms       darwin
-master_sites    opendarwin::kde351 \
+master_sites    opendarwin::kde354 \
                 opendarwin::admin
 #               kde:stable/${version}/src
 #               http://ranger.befunk.com/fink/:admin
-extract.suffix  .tar.bz2
 use_bzip2       yes
 distname        kdegames-${version}
-distfiles       ${distname}.tar.bz2:kde351 \
+distfiles       ${distname}.tar.bz2:kde354 \
                 ${kdeadmin}.tar.bz2:admin
 depends_build   port:autoconf \
-                port:automake
+                port:unsermake
 depends_lib     port:kdebase3
+#               port:libcapsinetwork
+#               port:libmath++
 
-checksums       ${distname}.tar.bz2 md5 15a4bb4e193e19be7decd4f147a31396 \
-                ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e
+checksums       ${distname}.tar.bz2 md5 60bb42c51c2e86a826188da457ed21d0 \
+                ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e
 
-extract.only ${distname}.tar.bz2
-post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
+extract.only    ${distname}.tar.bz2
+post-extract    { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
 
 patchfiles      
 patch           {
                 cd ${worksrcpath}
                 foreach file $patchfiles {
-                    system "sed -e 's,@FINKPREFIX@,${prefix},g' ${portpath}/${filesdir}/${file} | patch -p1"
+                    system "sed -e 's,@FINKPREFIX@,${prefix},g' ${filespath}/${file} | 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;' admin/*"
 }
-post-patch      {
-                reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh
-                reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh
+post-patch      {
+                reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh
                 reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
-                reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh
-                foreach file [glob ${worksrcpath}/admin/*] {
-                    reinplace "s|-O2|-Os|g" $file
-                    reinplace "s|doc/HTML|doc/kde|g" $file
-                    reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file
-                }
                 foreach file {CompileScript.sh InstallScript.sh} {
-                    file copy ${portpath}/${filesdir}/${file} ${worksrcpath}
+                    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}
@@ -61 +55 @@
                 }
 }
 
-configure.args  --with-distribution='DarwinPorts/Mac OS X' --without-arts
+configure.args  --with-distribution='MacPorts/Mac OS X' --without-arts
 
 configure       {}
 build           { system "cd ${worksrcpath} && ./CompileScript.sh" }
 destroot        { system "cd ${worksrcpath} && ./InstallScript.sh" }
 
-post-destroot   {
+post-destroot   {
                 xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
                 xinstall -m 644 -W ${worksrcpath} COPYING INSTALL README ${destroot}${prefix}/share/doc/${name}
 }
-
-platform darwin 6 {
-        depends_lib-append      lib:libdl:dlcompat
-}