[20183] trunk/dports/kde/kdebase3

source_changes at macosforge.org source_changes at macosforge.org
Fri Oct 27 11:21:49 PDT 2006 

Revision: 20183
          http://trac.macosforge.org/projects/macports/changeset/20183
Author:   takanori at macports.org
Date:     2006-10-27 11:21:30 -0700 (Fri, 27 Oct 2006)

Log Message:
-----------
Version 3.5.4.

Modified Paths:
--------------
    trunk/dports/kde/kdebase3/Portfile
    trunk/dports/kde/kdebase3/files/CompileScript.sh
    trunk/dports/kde/kdebase3/files/InstallScript.sh
    trunk/dports/kde/kdebase3/files/kdebase3-unified.patch

Modified: trunk/dports/kde/kdebase3/Portfile
===================================================================
--- trunk/dports/kde/kdebase3/Portfile	2006-10-27 18:19:57 UTC (rev 20182)
+++ trunk/dports/kde/kdebase3/Portfile	2006-10-27 18:21:30 UTC (rev 20183)
@@ -1,63 +1,55 @@
 # $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 at macports.org takanori at macports.org
 description	Base KDE programs -- e.g. kicker (taskbar). \
 		NB No KDE sound support.
+long_description ${description}
 platforms	darwin
-master_sites	opendarwin::kde351 \
-		kde:security_patches/:security \
+homepage	http://www.kde.org/
+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, at FINKPREFIX@,${prefix},g' ${portpath}/${filesdir}/${file} | patch -p1"
+		    system "sed -e 's, at 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
-		}
+		reinplace "s|HOME=/tmp|HOME=${workpath}|g" ${worksrcpath}/environment-helper.sh
+		reinplace "s|/tmp/buildlog|${workpath}/buildlog|g" ${worksrcpath}/build-helper.sh
 		foreach file {CompileScript.sh InstallScript.sh} {
-		    file copy ${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,26 +59,28 @@
 		    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
+post-activate	{
+		system "${prefix}/bin/fc-cache -fv ${prefix}/share/fonts"
 }
 
-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} }}
 }

Modified: trunk/dports/kde/kdebase3/files/CompileScript.sh
===================================================================
--- trunk/dports/kde/kdebase3/files/CompileScript.sh	2006-10-27 18:19:57 UTC (rev 20182)
+++ trunk/dports/kde/kdebase3/files/CompileScript.sh	2006-10-27 18:21:30 UTC (rev 20183)
@@ -1,23 +1,16 @@
 #!/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

Modified: trunk/dports/kde/kdebase3/files/InstallScript.sh
===================================================================
--- trunk/dports/kde/kdebase3/files/InstallScript.sh	2006-10-27 18:19:57 UTC (rev 20182)
+++ trunk/dports/kde/kdebase3/files/InstallScript.sh	2006-10-27 18:21:30 UTC (rev 20183)
@@ -1,12 +1,9 @@
 #!/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,10 +21,10 @@
         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"

Modified: trunk/dports/kde/kdebase3/files/kdebase3-unified.patch
===================================================================
--- trunk/dports/kde/kdebase3/files/kdebase3-unified.patch	2006-10-27 18:19:57 UTC (rev 20182)
+++ trunk/dports/kde/kdebase3/files/kdebase3-unified.patch	2006-10-27 18:21:30 UTC (rev 20183)
@@ -1,5 +1,46 @@
---- 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,8 +63,8 @@
  
  
  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,8 +74,8 @@
  {
    // 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,8 +98,8 @@
  
  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,8 +109,8 @@
  {
    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,8 +134,8 @@
  
  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,8 +145,214 @@
  {
    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,8 +371,8 @@
  
  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,8 +382,8 @@
  {
    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,8 +404,8 @@
  
  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,8 +415,8 @@
  {
    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,8 +435,8 @@
  
  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,8 +446,8 @@
  {
      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,8 +468,8 @@
  
  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,8 +479,8 @@
  {
  
    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,8 +503,8 @@
  #  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,29 +530,8 @@
  
  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,8 +543,8 @@
      {
      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,8 +564,8 @@
  
  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,8 +575,8 @@
  {
      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,9 +598,9 @@
  
  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,8 +609,8 @@
  {
      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,9 +631,9 @@
  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,8 +642,8 @@
  {
      // 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,8 +662,8 @@
  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,8 +673,8 @@
  {
      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,9 +693,9 @@
  
  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,8 +704,21 @@
  {
    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,8 +736,8 @@
  # 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,8 +747,8 @@
  {
    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,8 +769,8 @@
  
  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,8 +791,8 @@
  
  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,8 +802,8 @@
  {
    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,8 +813,8 @@
  {
    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,8 +832,8 @@
  		$(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,8 +843,8 @@
  {
    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,11 +853,45 @@
  	    "/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,15 +902,15 @@
 +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,8 +919,24 @@
  {
  	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,8 +955,8 @@
  
  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,8 +966,8 @@
  {
      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,8 +985,8 @@
  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,8 +996,8 @@
  	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,8 +1017,8 @@
  
  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,8 +1028,8 @@
  {
  	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,8 +1052,8 @@
  
  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,8 +1063,8 @@
  {
      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,8 +1092,8 @@
  
  # Uncomment the following two lines if you add a ui.rc file for your application to make use of

More information about the macports-changes mailing list