[20194] trunk/dports/kde/kdepim3
source_changes at macosforge.org
source_changes at macosforge.org
Fri Oct 27 11:23:31 PDT 2006
Revision: 20194
http://trac.macosforge.org/projects/macports/changeset/20194
Author: takanori at macports.org
Date: 2006-10-27 11:23:30 -0700 (Fri, 27 Oct 2006)
Log Message:
-----------
Version 3.5.4.
Modified Paths:
--------------
trunk/dports/kde/kdepim3/Portfile
trunk/dports/kde/kdepim3/files/CompileScript.sh
trunk/dports/kde/kdepim3/files/InstallScript.sh
trunk/dports/kde/kdepim3/files/kdepim3.patch
Modified: trunk/dports/kde/kdepim3/Portfile
===================================================================
--- trunk/dports/kde/kdepim3/Portfile 2006-10-27 18:23:25 UTC (rev 20193)
+++ trunk/dports/kde/kdepim3/Portfile 2006-10-27 18:23:30 UTC (rev 20194)
@@ -1,60 +1,58 @@
# $Id$
-#Synced with Fink, Version 3.5.1-1024
+#Synced with Fink, Version 3.5.4-1021
PortSystem 1.0
name kdepim3
-version 3.5.1
-revision 4
-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 KDE personal information management tools. \
NB No KDE sound support.
+long_description ${description}
platforms darwin
-master_sites opendarwin::kde351 \
+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 kdepim-${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:cyrus-sasl2 \
- port:gpgme \
+ port:unsermake
+depends_lib port:gpgme \
port:kdeaccessibility3 \
+ port:kdebase3 \
port:libgpg-error
# port:gnokii \ isn't detected :-(
+# port:gtk1
+# port:pilot-link
-checksums ${distname}.tar.bz2 md5 8e87c9cbe1f0c0f983f94d804a5bc8f9 \
- ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e
+checksums ${distname}.tar.bz2 md5 4a01ceaeb6067d03003edb77b104f559 \
+ ${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 kdepim3.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,#include <malloc.h>,,g' libkcal/versit/vcc*"
+ system "perl -pi -e 's/-Xlinker -framework -Xlinker (\\S*)/-Wl,-framework,\$1/g; s/-framework (\\S*)/-Wl,-framework,\$1/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
- }
+ 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}
@@ -66,17 +64,13 @@
}
}
-configure.args --disable-indexlib --with-distribution='DarwinPorts/Mac OS X' --without-gnokii --without-arts
+configure.args --disable-indexlib --with-distribution='MacPorts/Mac OS X' --without-gnokii --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} MAINTAINERS README README.Kolab README.libical ${destroot}${prefix}/share/doc/${name}
+ xinstall -m 644 -W ${worksrcpath} README README.Kolab README.libical ${destroot}${prefix}/share/doc/${name}
}
-
-platform darwin 6 {
- depends_lib-append lib:libdl:dlcompat
-}
Modified: trunk/dports/kde/kdepim3/files/CompileScript.sh
===================================================================
--- trunk/dports/kde/kdepim3/files/CompileScript.sh 2006-10-27 18:23:25 UTC (rev 20193)
+++ trunk/dports/kde/kdepim3/files/CompileScript.sh 2006-10-27 18:23:30 UTC (rev 20194)
@@ -1,15 +1,20 @@
#!/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
+#fink
+# export ac_cv_path_GPGME_CONFIG="%p/bin/gpgme-config --thread=pthread"
+#macports
+ export ac_cv_path_GPGME_CONFIG="%p/bin/gpgme-config --thread=pth"
-#darwinports
- export UNSERMAKE="no"
-
export CC=gcc CXX=g++
+ ranlib %p/lib/libgpg*.a >/dev/null 2>&1
./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"
+
+# perl -pi -e 's,yytext_ptr,libical_ptr,g' libical/src/libical/icallexer.c
+# perl -pi -e 's,yytext_ptr,libicalss_ptr,g' libical/src/libicalss/icalsslexer.c
+# perl -pi -e 's, holidays , ,g' korganizer/plugins/Makefile
+
+ ./build-helper.sh make %N %v %r unsermake $UNSERMAKEFLAGS
Modified: trunk/dports/kde/kdepim3/files/InstallScript.sh
===================================================================
--- trunk/dports/kde/kdepim3/files/InstallScript.sh 2006-10-27 18:23:25 UTC (rev 20193)
+++ trunk/dports/kde/kdepim3/files/InstallScript.sh 2006-10-27 18:23:30 UTC (rev 20194)
@@ -1,13 +1,10 @@
#!/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
Modified: trunk/dports/kde/kdepim3/files/kdepim3.patch
===================================================================
--- trunk/dports/kde/kdepim3/files/kdepim3.patch 2006-10-27 18:23:25 UTC (rev 20193)
+++ trunk/dports/kde/kdepim3/files/kdepim3.patch 2006-10-27 18:23:30 UTC (rev 20194)
@@ -1,5 +1,6 @@
---- kdepim-3.5.0/akregator/src/Makefile.am 2005-10-10 11:02:17.000000000 -0400
-+++ kdepim-3.5.0-new/akregator/src/Makefile.am 2005-12-04 13:02:32.000000000 -0500
+
+--- kdepim-3.5.4/akregator/src/Makefile.am 2006-05-22 14:10:40.000000000 -0400
++++ kdepim-3.5.4-new/akregator/src/Makefile.am 2006-07-30 12:26:42.000000000 -0400
@@ -16,12 +16,13 @@
#########################################################################
# this is the program that gets installed. it's name is used for all
@@ -27,8 +28,8 @@
libakregatorprivate_la_LIBADD = $(top_builddir)/libkdepim/libkdepim.la \
$(top_builddir)/akregator/src/librss/librsslocal.la $(LIB_KHTML)
---- kdepim-3.5.0/akregator/src/main.cpp 2005-09-10 04:23:38.000000000 -0400
-+++ kdepim-3.5.0-new/akregator/src/main.cpp 2005-12-04 11:37:56.000000000 -0500
+--- kdepim-3.5.4/akregator/src/main.cpp 2005-09-10 04:23:38.000000000 -0400
++++ kdepim-3.5.4-new/akregator/src/main.cpp 2006-07-30 12:26:42.000000000 -0400
@@ -83,7 +83,7 @@
} // namespace Akregator
@@ -38,8 +39,8 @@
{
Akregator::AboutData about;
KCmdLineArgs::init(argc, argv, &about);
---- kdepim-3.5.0/certmanager/Makefile.am 2005-09-10 04:23:51.000000000 -0400
-+++ kdepim-3.5.0-new/certmanager/Makefile.am 2005-12-04 11:37:53.000000000 -0500
+--- kdepim-3.5.4/certmanager/Makefile.am 2005-09-10 04:23:51.000000000 -0400
++++ kdepim-3.5.4-new/certmanager/Makefile.am 2006-07-30 12:26:42.000000000 -0400
@@ -4,9 +4,11 @@
INCLUDES = -I$(srcdir)/lib -I$(top_srcdir)/libkdenetwork $(GPGME_CFLAGS) $(all_includes)
@@ -65,8 +66,8 @@
rcdir = $(kde_datadir)/kleopatra
rc_DATA = kleopatraui.rc
---- kdepim-3.5.0/certmanager/conf/Makefile.am 2005-10-10 11:02:19.000000000 -0400
-+++ kdepim-3.5.0-new/certmanager/conf/Makefile.am 2005-12-04 13:02:46.000000000 -0500
+--- kdepim-3.5.4/certmanager/conf/Makefile.am 2005-10-10 11:02:19.000000000 -0400
++++ kdepim-3.5.4-new/certmanager/conf/Makefile.am 2006-07-30 12:26:42.000000000 -0400
@@ -15,7 +15,7 @@
appearanceconfigwidget.cpp \
dnorderconfigpage.cpp
@@ -76,8 +77,8 @@
kcm_kleopatra_la_LIBADD = ../lib/libkleopatra.la $(LIB_KDEUI)
kde_services_DATA = \
---- kdepim-3.5.0/certmanager/kwatchgnupg/Makefile.am 2005-09-10 04:23:49.000000000 -0400
-+++ kdepim-3.5.0-new/certmanager/kwatchgnupg/Makefile.am 2005-12-04 11:37:53.000000000 -0500
+--- kdepim-3.5.4/certmanager/kwatchgnupg/Makefile.am 2005-09-10 04:23:49.000000000 -0400
++++ kdepim-3.5.4-new/certmanager/kwatchgnupg/Makefile.am 2006-07-30 12:26:42.000000000 -0400
@@ -2,9 +2,11 @@
INCLUDES = -I$(top_srcdir)/certmanager/lib -I$(top_srcdir)/libkdenetwork $(GPGME_CFLAGS) $(all_includes)
@@ -103,8 +104,8 @@
rcdir = $(kde_datadir)/kwatchgnupg
rc_DATA = kwatchgnupgui.rc
---- kdepim-3.5.0/certmanager/kwatchgnupg/main.cpp 2005-09-10 04:23:49.000000000 -0400
-+++ kdepim-3.5.0-new/certmanager/kwatchgnupg/main.cpp 2005-12-04 11:37:53.000000000 -0500
+--- kdepim-3.5.4/certmanager/kwatchgnupg/main.cpp 2005-09-10 04:23:49.000000000 -0400
++++ kdepim-3.5.4-new/certmanager/kwatchgnupg/main.cpp 2006-07-30 12:26:42.000000000 -0400
@@ -74,7 +74,7 @@
return KUniqueApplication::newInstance();
}
@@ -114,8 +115,8 @@
{
AboutData aboutData;
---- kdepim-3.5.0/certmanager/main.cpp 2005-09-10 04:23:51.000000000 -0400
-+++ kdepim-3.5.0-new/certmanager/main.cpp 2005-12-04 11:37:53.000000000 -0500
+--- kdepim-3.5.4/certmanager/main.cpp 2005-09-10 04:23:51.000000000 -0400
++++ kdepim-3.5.4-new/certmanager/main.cpp 2006-07-30 12:26:42.000000000 -0400
@@ -46,7 +46,7 @@
#include <kglobal.h>
#include <kiconloader.h>
@@ -125,8 +126,8 @@
{
AboutData aboutData;
---- kdepim-3.5.0/kabc/frontend/Makefile.am 2005-09-10 04:24:24.000000000 -0400
-+++ kdepim-3.5.0-new/kabc/frontend/Makefile.am 2005-12-04 11:37:53.000000000 -0500
+--- kdepim-3.5.4/kabc/frontend/Makefile.am 2005-09-10 04:24:24.000000000 -0400
++++ kdepim-3.5.4-new/kabc/frontend/Makefile.am 2006-07-30 12:26:42.000000000 -0400
@@ -2,9 +2,11 @@
METASOURCES = AUTO
@@ -143,8 +144,8 @@
+kabcfrontend_la_LIBADD = -lkabc $(LIB_KDECORE)
+kabcfrontend_la_SOURCES = main.cpp mainWindow.ui
---- kdepim-3.5.0/kabc/frontend/main.cpp 2005-09-10 04:24:24.000000000 -0400
-+++ kdepim-3.5.0-new/kabc/frontend/main.cpp 2005-12-04 11:37:53.000000000 -0500
+--- kdepim-3.5.4/kabc/frontend/main.cpp 2005-09-10 04:24:24.000000000 -0400
++++ kdepim-3.5.4-new/kabc/frontend/main.cpp 2006-07-30 12:26:42.000000000 -0400
@@ -6,7 +6,7 @@
#include "mainWindow.h"
@@ -154,8 +155,8 @@
{
KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
KCmdLineArgs::init(argc,argv,&aboutData);
---- kdepim-3.5.0/kabc/kabc2mutt/Makefile.am 2005-09-10 04:24:24.000000000 -0400
-+++ kdepim-3.5.0-new/kabc/kabc2mutt/Makefile.am 2005-12-04 11:37:53.000000000 -0500
+--- kdepim-3.5.4/kabc/kabc2mutt/Makefile.am 2005-09-10 04:24:24.000000000 -0400
++++ kdepim-3.5.4-new/kabc/kabc2mutt/Makefile.am 2006-07-30 12:26:42.000000000 -0400
@@ -2,11 +2,13 @@
METASOURCES = AUTO
@@ -174,8 +175,8 @@
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kabc2mutt.pot
---- kdepim-3.5.0/kabc/kabc2mutt/main.cpp 2005-09-10 04:24:24.000000000 -0400
-+++ kdepim-3.5.0-new/kabc/kabc2mutt/main.cpp 2005-12-04 11:37:53.000000000 -0500
+--- kdepim-3.5.4/kabc/kabc2mutt/main.cpp 2005-09-10 04:24:24.000000000 -0400
++++ kdepim-3.5.4-new/kabc/kabc2mutt/main.cpp 2006-07-30 12:26:42.000000000 -0400
@@ -41,7 +41,7 @@
};
@@ -185,8 +186,8 @@
{
KApplication::disableAutoDcopRegistration();
KCmdLineArgs::init( argc, argv, appName, programName, description, version );
---- kdepim-3.5.0/kaddressbook/Makefile.am 2005-10-10 11:02:25.000000000 -0400
-+++ kdepim-3.5.0-new/kaddressbook/Makefile.am 2005-12-04 13:01:19.000000000 -0500
+--- kdepim-3.5.4/kaddressbook/Makefile.am 2005-10-10 11:02:25.000000000 -0400
++++ kdepim-3.5.4-new/kaddressbook/Makefile.am 2006-07-30 12:26:43.000000000 -0400
@@ -15,11 +15,12 @@
-I$(top_srcdir)/akregator/src \
$(all_includes)
@@ -213,8 +214,8 @@
rcdir = $(kde_datadir)/kaddressbook
rc_DATA = kaddressbookui.rc kaddressbook_part.rc
---- kdepim-3.5.0/kaddressbook/main.cpp 2005-11-08 17:33:33.000000000 -0500
-+++ kdepim-3.5.0-new/kaddressbook/main.cpp 2005-12-04 11:37:53.000000000 -0500
+--- kdepim-3.5.4/kaddressbook/main.cpp 2005-11-08 17:33:33.000000000 -0500
++++ kdepim-3.5.4-new/kaddressbook/main.cpp 2006-07-30 12:26:43.000000000 -0400
@@ -109,7 +109,7 @@
return 0;
}
@@ -224,8 +225,8 @@
{
KLocale::setMainCatalogue( "kaddressbook" );
---- kdepim-3.5.0/kandy/src/Makefile.am 2005-09-10 04:24:42.000000000 -0400
-+++ kdepim-3.5.0-new/kandy/src/Makefile.am 2005-12-04 13:03:00.000000000 -0500
+--- kdepim-3.5.4/kandy/src/Makefile.am 2005-09-10 04:24:42.000000000 -0400
++++ kdepim-3.5.4-new/kandy/src/Makefile.am 2006-07-30 12:26:43.000000000 -0400
@@ -1,10 +1,12 @@
-bin_PROGRAMS = kandy kandy_client
+bin_PROGRAMS =
@@ -256,8 +257,8 @@
METASOURCES = AUTO
---- kdepim-3.5.0/kandy/src/kandy_client.cpp 2005-09-10 04:24:42.000000000 -0400
-+++ kdepim-3.5.0-new/kandy/src/kandy_client.cpp 2005-12-04 11:37:54.000000000 -0500
+--- kdepim-3.5.4/kandy/src/kandy_client.cpp 2005-09-10 04:24:42.000000000 -0400
++++ kdepim-3.5.4-new/kandy/src/kandy_client.cpp 2006-07-30 12:26:43.000000000 -0400
@@ -27,7 +27,7 @@
#include <qdatastream.h>
#include <qstring.h>
@@ -267,8 +268,8 @@
{
KApplication app(argc, argv, "kandy_client", false);
---- kdepim-3.5.0/kandy/src/main.cpp 2005-09-10 04:24:42.000000000 -0400
-+++ kdepim-3.5.0-new/kandy/src/main.cpp 2005-12-04 11:37:54.000000000 -0500
+--- kdepim-3.5.4/kandy/src/main.cpp 2005-09-10 04:24:42.000000000 -0400
++++ kdepim-3.5.4-new/kandy/src/main.cpp 2006-07-30 12:26:43.000000000 -0400
@@ -85,7 +85,7 @@
#endif
}
@@ -278,8 +279,8 @@
{
KAboutData about("kandy", I18N_NOOP("Kandy"), version, description,
KAboutData::License_GPL, "(C) 2001 Cornelius Schumacher",0,
---- kdepim-3.5.0/kitchensync/kitchensync/Makefile.am 2005-09-10 04:24:23.000000000 -0400
-+++ kdepim-3.5.0-new/kitchensync/kitchensync/Makefile.am 2005-12-04 11:37:54.000000000 -0500
+--- kdepim-3.5.4/kitchensync/kitchensync/Makefile.am 2005-09-10 04:24:23.000000000 -0400
++++ kdepim-3.5.4-new/kitchensync/kitchensync/Makefile.am 2006-07-30 12:26:43.000000000 -0400
@@ -8,10 +8,12 @@
METASOURCES = AUTO
@@ -297,8 +298,8 @@
../libksync/libksync2.la
-kitchensync_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+kitchensync_la_LDFLAGS = $(KDE_RPATH) -module $(all_libraries)
---- kdepim-3.5.0/kitchensync/kitchensync/main.cpp 2005-09-10 04:24:23.000000000 -0400
-+++ kdepim-3.5.0-new/kitchensync/kitchensync/main.cpp 2005-12-04 11:37:54.000000000 -0500
+--- kdepim-3.5.4/kitchensync/kitchensync/main.cpp 2005-09-10 04:24:23.000000000 -0400
++++ kdepim-3.5.4-new/kitchensync/kitchensync/main.cpp 2006-07-30 12:26:43.000000000 -0400
@@ -37,7 +37,7 @@
KCmdLineLastOption
};
@@ -308,40 +309,40 @@
{
KSync::AboutData aboutData;
---- kdepim-3.5.0/kitchensync/libkonnector2/plugins/dummy/Makefile.am 2005-09-10 04:24:23.000000000 -0400
-+++ kdepim-3.5.0-new/kitchensync/libkonnector2/plugins/dummy/Makefile.am 2005-12-04 13:17:49.000000000 -0500
+--- kdepim-3.5.4/kitchensync/libkonnector2/plugins/dummy/Makefile.am 2005-09-10 04:24:23.000000000 -0400
++++ kdepim-3.5.4-new/kitchensync/libkonnector2/plugins/dummy/Makefile.am 2006-07-30 12:26:43.000000000 -0400
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libdummykonnector.la
+kde_module_LTLIBRARIES = libdummykonnector.la
INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/kitchensync/libksync -I$(top_srcdir)/kitchensync/libkonnector2 -I$(top_srcdir)/libkcal $(all_includes)
---- kdepim-3.5.0/kitchensync/libkonnector2/plugins/kabc/Makefile.am 2005-09-10 04:24:23.000000000 -0400
-+++ kdepim-3.5.0-new/kitchensync/libkonnector2/plugins/kabc/Makefile.am 2005-12-04 13:17:53.000000000 -0500
+--- kdepim-3.5.4/kitchensync/libkonnector2/plugins/kabc/Makefile.am 2005-09-10 04:24:23.000000000 -0400
++++ kdepim-3.5.4-new/kitchensync/libkonnector2/plugins/kabc/Makefile.am 2006-07-30 12:26:43.000000000 -0400
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libkabckonnector.la
+kde_module_LTLIBRARIES = libkabckonnector.la
INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/kitchensync/libksync \
-I$(top_srcdir)/kitchensync/libkonnector2 $(all_includes)
---- kdepim-3.5.0/kitchensync/libkonnector2/plugins/kcal/Makefile.am 2005-09-10 04:24:23.000000000 -0400
-+++ kdepim-3.5.0-new/kitchensync/libkonnector2/plugins/kcal/Makefile.am 2005-12-04 13:17:57.000000000 -0500
+--- kdepim-3.5.4/kitchensync/libkonnector2/plugins/kcal/Makefile.am 2005-09-10 04:24:23.000000000 -0400
++++ kdepim-3.5.4-new/kitchensync/libkonnector2/plugins/kcal/Makefile.am 2006-07-30 12:26:43.000000000 -0400
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libkcalkonnector.la
+kde_module_LTLIBRARIES = libkcalkonnector.la
INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/kitchensync/libksync \
-I$(top_srcdir)/kitchensync/libkonnector2 $(all_includes)
---- kdepim-3.5.0/kitchensync/libkonnector2/plugins/local/Makefile.am 2005-09-10 04:24:23.000000000 -0400
-+++ kdepim-3.5.0-new/kitchensync/libkonnector2/plugins/local/Makefile.am 2005-12-04 13:18:01.000000000 -0500
+--- kdepim-3.5.4/kitchensync/libkonnector2/plugins/local/Makefile.am 2005-09-10 04:24:23.000000000 -0400
++++ kdepim-3.5.4-new/kitchensync/libkonnector2/plugins/local/Makefile.am 2006-07-30 12:26:43.000000000 -0400
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = liblocalkonnector.la
+kde_module_LTLIBRARIES = liblocalkonnector.la
INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/kitchensync/libksync -I$(top_srcdir)/kitchensync/libkonnector2 \
-I$(top_srcdir)/libkcal $(all_includes)
---- kdepim-3.5.0/kitchensync/libkonnector2/plugins/qtopia/Makefile.am 2005-09-10 04:24:23.000000000 -0400
-+++ kdepim-3.5.0-new/kitchensync/libkonnector2/plugins/qtopia/Makefile.am 2005-12-04 13:18:09.000000000 -0500
+--- kdepim-3.5.4/kitchensync/libkonnector2/plugins/qtopia/Makefile.am 2005-09-10 04:24:23.000000000 -0400
++++ kdepim-3.5.4-new/kitchensync/libkonnector2/plugins/qtopia/Makefile.am 2006-07-30 12:26:43.000000000 -0400
@@ -18,7 +18,7 @@
#SUBDIRS = tests
@@ -351,16 +352,16 @@
INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/kitchensync/libksync -I$(top_srcdir)/kitchensync/libkonnector2 -I$(top_srcdir)/libkcal \
$(all_includes)
---- kdepim-3.5.0/kitchensync/libkonnector2/plugins/remote/Makefile.am 2005-09-10 04:24:23.000000000 -0400
-+++ kdepim-3.5.0-new/kitchensync/libkonnector2/plugins/remote/Makefile.am 2005-12-04 13:18:18.000000000 -0500
+--- kdepim-3.5.4/kitchensync/libkonnector2/plugins/remote/Makefile.am 2005-09-10 04:24:23.000000000 -0400
++++ kdepim-3.5.4-new/kitchensync/libkonnector2/plugins/remote/Makefile.am 2006-07-30 12:26:43.000000000 -0400
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libremotekonnector.la
+kde_module_LTLIBRARIES = libremotekonnector.la
INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/kitchensync/libksync -I$(top_srcdir)/kitchensync/libkonnector2 \
-I$(top_srcdir)/libkcal $(all_includes)
---- kdepim-3.5.0/kitchensync/libkonnector2/plugins/threadedkonnector/Makefile.am 2005-09-10 04:24:23.000000000 -0400
-+++ kdepim-3.5.0-new/kitchensync/libkonnector2/plugins/threadedkonnector/Makefile.am 2005-12-04 13:18:25.000000000 -0500
+--- kdepim-3.5.4/kitchensync/libkonnector2/plugins/threadedkonnector/Makefile.am 2005-09-10 04:24:23.000000000 -0400
++++ kdepim-3.5.4-new/kitchensync/libkonnector2/plugins/threadedkonnector/Makefile.am 2006-07-30 12:26:43.000000000 -0400
@@ -16,7 +16,7 @@
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
@@ -370,8 +371,8 @@
INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/kitchensync/libksync -I$(top_srcdir)/kitchensync/libkonnector2 -I$(top_srcdir)/libkcal $(all_includes)
---- kdepim-3.5.0/kitchensync/multisynk/Makefile.am 2005-09-10 04:24:19.000000000 -0400
-+++ kdepim-3.5.0-new/kitchensync/multisynk/Makefile.am 2005-12-04 11:37:54.000000000 -0500
+--- kdepim-3.5.4/kitchensync/multisynk/Makefile.am 2005-09-10 04:24:19.000000000 -0400
++++ kdepim-3.5.4-new/kitchensync/multisynk/Makefile.am 2006-07-30 12:26:43.000000000 -0400
@@ -7,11 +7,12 @@
$(all_includes)
@@ -389,8 +390,8 @@
xdg_apps_DATA = multisynk.desktop
---- kdepim-3.5.0/kitchensync/multisynk/main.cpp 2005-09-10 04:24:19.000000000 -0400
-+++ kdepim-3.5.0-new/kitchensync/multisynk/main.cpp 2005-12-04 11:37:54.000000000 -0500
+--- kdepim-3.5.4/kitchensync/multisynk/main.cpp 2005-09-10 04:24:19.000000000 -0400
++++ kdepim-3.5.4-new/kitchensync/multisynk/main.cpp 2006-07-30 12:26:43.000000000 -0400
@@ -34,7 +34,7 @@
KCmdLineLastOption
};
@@ -400,8 +401,8 @@
{
KAboutData *about = MainWidget::aboutData();
---- kdepim-3.5.0/kmail/Makefile.am 2005-11-08 17:33:29.000000000 -0500
-+++ kdepim-3.5.0-new/kmail/Makefile.am 2005-12-04 13:25:45.000000000 -0500
+--- kdepim-3.5.4/kmail/Makefile.am 2005-11-08 17:33:29.000000000 -0500
++++ kdepim-3.5.4-new/kmail/Makefile.am 2006-07-30 12:26:43.000000000 -0400
@@ -23,21 +23,21 @@
endif
@@ -454,8 +455,8 @@
libkmailpart_la_SOURCES = kmailpartIface.skel kmail_part.cpp
---- kdepim-3.5.0/kmail/main.cpp 2005-09-10 04:24:02.000000000 -0400
-+++ kdepim-3.5.0-new/kmail/main.cpp 2005-12-04 11:37:54.000000000 -0500
+--- kdepim-3.5.4/kmail/main.cpp 2005-09-10 04:24:02.000000000 -0400
++++ kdepim-3.5.4-new/kmail/main.cpp 2006-07-30 12:26:43.000000000 -0400
@@ -64,7 +64,7 @@
return 0;
}
@@ -465,8 +466,8 @@
{
// WABA: KMail is a KUniqueApplication. Unfortunately this makes debugging
// a bit harder: You should pass --nofork as commandline argument when using
---- kdepim-3.5.0/kmailcvt/Makefile.am 2005-09-10 04:24:16.000000000 -0400
-+++ kdepim-3.5.0-new/kmailcvt/Makefile.am 2005-12-04 11:37:54.000000000 -0500
+--- kdepim-3.5.4/kmailcvt/Makefile.am 2005-09-10 04:24:16.000000000 -0400
++++ kdepim-3.5.4-new/kmailcvt/Makefile.am 2006-07-30 12:26:43.000000000 -0400
@@ -1,6 +1,9 @@
-bin_PROGRAMS = kmailcvt
@@ -501,8 +502,8 @@
KDE_ICON=AUTO
---- kdepim-3.5.0/kmailcvt/main.cpp 2005-09-10 04:24:16.000000000 -0400
-+++ kdepim-3.5.0-new/kmailcvt/main.cpp 2005-12-04 11:37:54.000000000 -0500
+--- kdepim-3.5.4/kmailcvt/main.cpp 2005-09-10 04:24:16.000000000 -0400
++++ kdepim-3.5.4-new/kmailcvt/main.cpp 2006-07-30 12:26:43.000000000 -0400
@@ -26,7 +26,7 @@
KCmdLineLastOption
};
@@ -512,8 +513,8 @@
{
KLocale::setMainCatalogue("kmailcvt");
---- kdepim-3.5.0/kmobile/Makefile.am 2005-09-10 04:23:39.000000000 -0400
-+++ kdepim-3.5.0-new/kmobile/Makefile.am 2005-12-04 11:37:54.000000000 -0500
+--- kdepim-3.5.4/kmobile/Makefile.am 2005-09-10 04:23:39.000000000 -0400
++++ kdepim-3.5.4-new/kmobile/Makefile.am 2006-07-30 12:26:43.000000000 -0400
@@ -2,15 +2,16 @@
SUBDIRS = . devices # kioslave
@@ -535,8 +536,8 @@
pref.cpp kmobileiface.skel kmobile_selectiondialog.ui \
systemtray.cpp
---- kdepim-3.5.0/kmobile/main.cpp 2005-09-10 04:23:39.000000000 -0400
-+++ kdepim-3.5.0-new/kmobile/main.cpp 2005-12-04 11:37:54.000000000 -0500
+--- kdepim-3.5.4/kmobile/main.cpp 2005-09-10 04:23:39.000000000 -0400
++++ kdepim-3.5.4-new/kmobile/main.cpp 2006-07-30 12:26:43.000000000 -0400
@@ -35,7 +35,7 @@
KCmdLineLastOption
};
@@ -546,8 +547,8 @@
{
KAboutData about("kmobile", I18N_NOOP("KMobile"), version, description,
KAboutData::License_GPL, "(C) 2003-2005 Helge Deller", 0, 0, "deller at kde.org");
---- kdepim-3.5.0/knode/Makefile.am 2005-09-10 04:24:04.000000000 -0400
-+++ kdepim-3.5.0-new/knode/Makefile.am 2005-12-04 13:30:43.000000000 -0500
+--- kdepim-3.5.4/knode/Makefile.am 2005-09-10 04:24:04.000000000 -0400
++++ kdepim-3.5.4-new/knode/Makefile.am 2006-07-30 12:26:43.000000000 -0400
@@ -10,22 +10,23 @@
lib_LTLIBRARIES = libknodecommon.la
@@ -596,8 +597,8 @@
xdg_apps_DATA = KNode.desktop
---- kdepim-3.5.0/knode/main.cpp 2005-09-10 04:24:04.000000000 -0400
-+++ kdepim-3.5.0-new/knode/main.cpp 2005-12-04 11:37:54.000000000 -0500
+--- kdepim-3.5.4/knode/main.cpp 2006-01-19 11:55:48.000000000 -0500
++++ kdepim-3.5.4-new/knode/main.cpp 2006-07-30 12:26:43.000000000 -0400
@@ -25,7 +25,7 @@
#include "knode_options.h"
using KNode::AboutData;
@@ -607,8 +608,8 @@
{
AboutData aboutData;
---- kdepim-3.5.0/knotes/Makefile.am 2005-10-10 11:02:28.000000000 -0400
-+++ kdepim-3.5.0-new/knotes/Makefile.am 2005-12-04 13:04:21.000000000 -0500
+--- kdepim-3.5.4/knotes/Makefile.am 2005-10-10 11:02:28.000000000 -0400
++++ kdepim-3.5.4-new/knotes/Makefile.am 2006-07-30 12:26:43.000000000 -0400
@@ -2,7 +2,9 @@
SUBDIRS = . pics icons
@@ -637,8 +638,8 @@
kde_module_LTLIBRARIES = knotes_local.la
knotes_local_la_SOURCES = resourcelocal_plugin.cpp
---- kdepim-3.5.0/knotes/main.cpp 2005-09-10 04:24:41.000000000 -0400
-+++ kdepim-3.5.0-new/knotes/main.cpp 2005-12-04 11:37:54.000000000 -0500
+--- kdepim-3.5.4/knotes/main.cpp 2006-03-17 05:16:01.000000000 -0500
++++ kdepim-3.5.4-new/knotes/main.cpp 2006-07-30 12:26:43.000000000 -0400
@@ -86,7 +86,7 @@
return KUniqueApplication::newInstance();
}
@@ -648,8 +649,8 @@
{
QString version = QString::number( KNOTES_VERSION );
---- kdepim-3.5.0/kode/Makefile.am 2005-09-10 04:23:43.000000000 -0400
-+++ kdepim-3.5.0-new/kode/Makefile.am 2005-12-04 11:37:54.000000000 -0500
+--- kdepim-3.5.4/kode/Makefile.am 2005-09-10 04:23:43.000000000 -0400
++++ kdepim-3.5.4-new/kode/Makefile.am 2006-07-30 12:26:43.000000000 -0400
@@ -12,10 +12,11 @@
-version-info 1:0:0 -no-undefined
libkode_la_LIBADD = -lkdecore
@@ -666,8 +667,8 @@
+kode_la_SOURCES = kodemain.cpp
METASOURCES = AUTO
---- kdepim-3.5.0/kode/kodemain.cpp 2005-09-10 04:23:43.000000000 -0400
-+++ kdepim-3.5.0-new/kode/kodemain.cpp 2005-12-04 11:37:55.000000000 -0500
+--- kdepim-3.5.4/kode/kodemain.cpp 2005-09-10 04:23:43.000000000 -0400
++++ kdepim-3.5.4-new/kode/kodemain.cpp 2006-07-30 12:26:43.000000000 -0400
@@ -607,7 +607,7 @@
return 0;
}
@@ -677,8 +678,8 @@
{
KAboutData aboutData( "kode", I18N_NOOP("KDE Code Generator"), "0.1" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher at kde.org" );
---- kdepim-3.5.0/kode/kxml_compiler/Makefile.am 2005-09-10 04:23:43.000000000 -0400
-+++ kdepim-3.5.0-new/kode/kxml_compiler/Makefile.am 2005-12-04 11:37:55.000000000 -0500
+--- kdepim-3.5.4/kode/kxml_compiler/Makefile.am 2005-09-10 04:23:43.000000000 -0400
++++ kdepim-3.5.4-new/kode/kxml_compiler/Makefile.am 2006-07-30 12:26:43.000000000 -0400
@@ -1,9 +1,11 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libkdepim $(all_includes)
@@ -695,8 +696,8 @@
+kxml_compiler_la_SOURCES = parser.cpp creator.cpp kxml_compiler.cpp
METASOURCES = AUTO
---- kdepim-3.5.0/kode/kxml_compiler/kxml_compiler.cpp 2005-09-10 04:23:43.000000000 -0400
-+++ kdepim-3.5.0-new/kode/kxml_compiler/kxml_compiler.cpp 2005-12-04 11:37:55.000000000 -0500
+--- kdepim-3.5.4/kode/kxml_compiler/kxml_compiler.cpp 2005-09-10 04:23:43.000000000 -0400
++++ kdepim-3.5.4-new/kode/kxml_compiler/kxml_compiler.cpp 2006-07-30 12:26:43.000000000 -0400
@@ -55,7 +55,7 @@
KCmdLineLastOption
};
@@ -706,8 +707,8 @@
{
KAboutData aboutData( "kxml_compiler", I18N_NOOP("KDE xml compiler"), "0.1",
I18N_NOOP("KDE XML Compiler") , KAboutData::License_LGPL );
---- kdepim-3.5.0/konsolekalendar/Makefile.am 2005-11-08 17:33:45.000000000 -0500
-+++ kdepim-3.5.0-new/konsolekalendar/Makefile.am 2005-12-04 13:04:28.000000000 -0500
+--- kdepim-3.5.4/konsolekalendar/Makefile.am 2005-11-08 17:33:45.000000000 -0500
++++ kdepim-3.5.4-new/konsolekalendar/Makefile.am 2006-07-30 12:26:43.000000000 -0400
@@ -6,14 +6,16 @@
METASOURCES = AUTO
@@ -729,8 +730,8 @@
appsdir = $(kde_appsdir)/Utilities
xdg_apps_DATA = konsolekalendar.desktop
---- kdepim-3.5.0/konsolekalendar/main.cpp 2005-11-20 05:47:52.000000000 -0500
-+++ kdepim-3.5.0-new/konsolekalendar/main.cpp 2005-12-04 11:37:55.000000000 -0500
+--- kdepim-3.5.4/konsolekalendar/main.cpp 2006-07-22 04:14:27.000000000 -0400
++++ kdepim-3.5.4-new/konsolekalendar/main.cpp 2006-07-30 12:26:43.000000000 -0400
@@ -165,7 +165,7 @@
KCmdLineLastOption
};
@@ -740,8 +741,8 @@
{
KAboutData aboutData(
progName, // internal program name
---- kdepim-3.5.0/kontact/src/Makefile.am 2005-09-10 04:24:42.000000000 -0400
-+++ kdepim-3.5.0-new/kontact/src/Makefile.am 2005-12-04 13:04:39.000000000 -0500
+--- kdepim-3.5.4/kontact/src/Makefile.am 2005-09-10 04:24:42.000000000 -0400
++++ kdepim-3.5.4-new/kontact/src/Makefile.am 2006-07-30 12:26:43.000000000 -0400
@@ -5,23 +5,29 @@
lib_LTLIBRARIES = libkontact.la
libkontact_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
@@ -780,9 +781,9 @@
kcm_kontact_la_LIBADD = libkontact.la $(top_builddir)/libkdepim/libkdepim.la
kcm_kontact_la_COMPILE_FIRST = prefs.h
---- kdepim-3.5.0/kontact/src/main.cpp 2005-09-10 04:24:42.000000000 -0400
-+++ kdepim-3.5.0-new/kontact/src/main.cpp 2005-12-04 11:37:55.000000000 -0500
-@@ -143,7 +143,7 @@
+--- kdepim-3.5.4/kontact/src/main.cpp 2006-05-23 07:31:20.000000000 -0400
++++ kdepim-3.5.4-new/kontact/src/main.cpp 2006-07-30 12:26:43.000000000 -0400
+@@ -127,7 +127,7 @@
return KUniqueApplication::newInstance();
}
@@ -791,8 +792,8 @@
{
KAboutData about( "kontact", I18N_NOOP( "Kontact" ), version, description,
KAboutData::License_GPL, I18N_NOOP("(C) 2001-2004 The Kontact developers"), 0, "http://kontact.org" );
---- kdepim-3.5.0/korganizer/Makefile.am 2005-09-10 04:24:47.000000000 -0400
-+++ kdepim-3.5.0-new/korganizer/Makefile.am 2005-12-04 13:04:52.000000000 -0500
+--- kdepim-3.5.4/korganizer/Makefile.am 2006-05-22 14:11:16.000000000 -0400
++++ kdepim-3.5.4-new/korganizer/Makefile.am 2006-07-30 12:26:43.000000000 -0400
@@ -12,18 +12,19 @@
-I$(top_builddir) \
$(all_includes)
@@ -828,8 +829,8 @@
koagendaview.cpp koagenda.cpp koagendaitem.cpp \
datenavigator.cpp kdatenavigator.cpp datenavigatorcontainer.cpp \
datechecker.cpp \
---- kdepim-3.5.0/korganizer/korgac/Makefile.am 2005-09-10 04:24:44.000000000 -0400
-+++ kdepim-3.5.0-new/korganizer/korgac/Makefile.am 2005-12-04 11:37:55.000000000 -0500
+--- kdepim-3.5.4/korganizer/korgac/Makefile.am 2005-09-10 04:24:44.000000000 -0400
++++ kdepim-3.5.4-new/korganizer/korgac/Makefile.am 2006-07-30 12:26:43.000000000 -0400
@@ -1,11 +1,13 @@
INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/korganizer $(all_includes)
@@ -859,9 +860,9 @@
noinst_HEADERS = alarmclientiface.h alarmdialog.h \
alarmdockwindow.h koalarmclient.h
---- kdepim-3.5.0/korganizer/korgac/korgacmain.cpp 2005-09-10 04:24:44.000000000 -0400
-+++ kdepim-3.5.0-new/korganizer/korgac/korgacmain.cpp 2005-12-04 11:37:55.000000000 -0500
-@@ -58,7 +58,7 @@
+--- kdepim-3.5.4/korganizer/korgac/korgacmain.cpp 2006-01-19 11:56:25.000000000 -0500
++++ kdepim-3.5.4-new/korganizer/korgac/korgacmain.cpp 2006-07-30 12:26:43.000000000 -0400
+@@ -59,7 +59,7 @@
{ 0, 0, 0 }
};
@@ -870,8 +871,8 @@
{
KLocale::setMainCatalogue( "korganizer" );
KAboutData aboutData( "korgac", I18N_NOOP("KOrganizer Reminder Daemon"),
---- kdepim-3.5.0/korganizer/korgplugins.cpp 2005-09-10 04:24:47.000000000 -0400
-+++ kdepim-3.5.0-new/korganizer/korgplugins.cpp 2005-12-04 11:37:55.000000000 -0500
+--- kdepim-3.5.4/korganizer/korgplugins.cpp 2005-09-10 04:24:47.000000000 -0400
++++ kdepim-3.5.4-new/korganizer/korgplugins.cpp 2006-07-30 12:26:43.000000000 -0400
@@ -32,7 +32,7 @@
#include "kocore.h"
@@ -881,8 +882,8 @@
{
KAboutData aboutData("korgplugins",I18N_NOOP("KOrgPlugins"),"0.1");
KCmdLineArgs::init(argc,argv,&aboutData);
---- kdepim-3.5.0/korganizer/main.cpp 2005-09-10 04:24:47.000000000 -0400
-+++ kdepim-3.5.0-new/korganizer/main.cpp 2005-12-04 11:37:55.000000000 -0500
+--- kdepim-3.5.4/korganizer/main.cpp 2005-09-10 04:24:47.000000000 -0400
++++ kdepim-3.5.4-new/korganizer/main.cpp 2006-07-30 12:26:43.000000000 -0400
@@ -35,7 +35,7 @@
#include "korganizer.h"
#include "korganizer_options.h"
@@ -892,8 +893,8 @@
{
KOrg::AboutData aboutData;
---- kdepim-3.5.0/korganizer/timezone.cpp 2005-09-10 04:24:47.000000000 -0400
-+++ kdepim-3.5.0-new/korganizer/timezone.cpp 2005-12-04 11:37:55.000000000 -0500
+--- kdepim-3.5.4/korganizer/timezone.cpp 2005-09-10 04:24:47.000000000 -0400
++++ kdepim-3.5.4-new/korganizer/timezone.cpp 2006-07-30 12:26:43.000000000 -0400
@@ -34,7 +34,7 @@
#include "koprefs.h"
@@ -903,8 +904,8 @@
{
KAboutData aboutData("timezone",I18N_NOOP("KOrganizer Timezone Test"),"0.1");
KCmdLineArgs::init(argc,argv,&aboutData);
---- kdepim-3.5.0/korn/Makefile.am 2005-11-08 17:33:32.000000000 -0500
-+++ kdepim-3.5.0-new/korn/Makefile.am 2005-12-04 11:37:55.000000000 -0500
+--- kdepim-3.5.4/korn/Makefile.am 2005-11-08 17:33:32.000000000 -0500
++++ kdepim-3.5.4-new/korn/Makefile.am 2006-07-30 12:26:44.000000000 -0400
@@ -6,11 +6,15 @@
METASOURCES = AUTO
@@ -924,8 +925,8 @@
accountmanager.cpp \
account_input.cpp \
boxcontainer.cpp \
---- kdepim-3.5.0/korn/main.cpp 2005-11-08 17:33:32.000000000 -0500
-+++ kdepim-3.5.0-new/korn/main.cpp 2005-12-04 11:37:55.000000000 -0500
+--- kdepim-3.5.4/korn/main.cpp 2006-07-22 04:14:20.000000000 -0400
++++ kdepim-3.5.4-new/korn/main.cpp 2006-07-30 12:26:44.000000000 -0400
@@ -14,7 +14,7 @@
static const char version[] = "0.4";
@@ -935,8 +936,8 @@
{
KAboutData aboutData(argv[0], I18N_NOOP("Korn"),
version, description, KAboutData::License_GPL,
---- kdepim-3.5.0/kpilot/conduits/docconduit/Makefile.am 2005-11-08 17:33:38.000000000 -0500
-+++ kdepim-3.5.0-new/kpilot/conduits/docconduit/Makefile.am 2005-12-04 11:37:55.000000000 -0500
+--- kdepim-3.5.4/kpilot/conduits/docconduit/Makefile.am 2005-11-08 17:33:38.000000000 -0500
++++ kdepim-3.5.4-new/kpilot/conduits/docconduit/Makefile.am 2006-07-30 12:26:44.000000000 -0400
@@ -14,7 +14,9 @@
noinst_LTLIBRARIES = libpalmdoc_shared.la
@@ -961,8 +962,8 @@
xdg_apps_DATA = kpalmdoc.desktop
servicetypedir = $(kde_servicetypesdir)
---- kdepim-3.5.0/kpilot/conduits/docconduit/kpalmdoc.cpp 2005-09-10 04:24:37.000000000 -0400
-+++ kdepim-3.5.0-new/kpilot/conduits/docconduit/kpalmdoc.cpp 2005-12-04 11:37:55.000000000 -0500
+--- kdepim-3.5.4/kpilot/conduits/docconduit/kpalmdoc.cpp 2005-09-10 04:24:37.000000000 -0400
++++ kdepim-3.5.4-new/kpilot/conduits/docconduit/kpalmdoc.cpp 2006-07-30 12:26:44.000000000 -0400
@@ -36,7 +36,7 @@
@@ -972,8 +973,8 @@
{
KAboutData about("converter", I18N_NOOP("KPalmDOC"), "-0.0.1",
---- kdepim-3.5.0/kpilot/conduits/malconduit/mal-conduit.cc 2005-09-10 04:24:37.000000000 -0400
-+++ kdepim-3.5.0-new/kpilot/conduits/malconduit/mal-conduit.cc 2005-12-04 11:37:55.000000000 -0500
+--- kdepim-3.5.4/kpilot/conduits/malconduit/mal-conduit.cc 2005-09-10 04:24:37.000000000 -0400
++++ kdepim-3.5.4-new/kpilot/conduits/malconduit/mal-conduit.cc 2006-07-30 12:26:44.000000000 -0400
@@ -34,6 +34,7 @@
#include "options.h"
@@ -982,8 +983,8 @@
#include <qregexp.h>
#include <kconfig.h>
#include <kdebug.h>
---- kdepim-3.5.0/kpilot/kpilot/Makefile.am 2005-09-10 04:24:40.000000000 -0400
-+++ kdepim-3.5.0-new/kpilot/kpilot/Makefile.am 2005-12-04 13:05:06.000000000 -0500
+--- kdepim-3.5.4/kpilot/kpilot/Makefile.am 2005-09-10 04:24:40.000000000 -0400
++++ kdepim-3.5.4-new/kpilot/kpilot/Makefile.am 2006-07-30 12:26:44.000000000 -0400
@@ -9,9 +9,10 @@
SUBDIRS = Icons
@@ -1055,8 +1056,8 @@
../lib/libkpilot.la libconfiguration.la
xdg_apps_DATA = kpilot.desktop kpilotdaemon.desktop
---- kdepim-3.5.0/kpilot/kpilot/kpilot.cc 2005-09-10 04:24:39.000000000 -0400
-+++ kdepim-3.5.0-new/kpilot/kpilot/kpilot.cc 2005-12-04 11:37:55.000000000 -0500
+--- kdepim-3.5.4/kpilot/kpilot/kpilot.cc 2005-09-10 04:24:39.000000000 -0400
++++ kdepim-3.5.4-new/kpilot/kpilot/kpilot.cc 2006-07-30 12:26:44.000000000 -0400
@@ -1102,7 +1102,7 @@
@@ -1066,8 +1067,8 @@
{
FUNCTIONSETUP;
---- kdepim-3.5.0/kpilot/kpilot/pilotDaemon.cc 2005-09-10 04:24:39.000000000 -0400
-+++ kdepim-3.5.0-new/kpilot/kpilot/pilotDaemon.cc 2005-12-04 11:37:55.000000000 -0500
+--- kdepim-3.5.4/kpilot/kpilot/pilotDaemon.cc 2005-09-10 04:24:39.000000000 -0400
++++ kdepim-3.5.4-new/kpilot/kpilot/pilotDaemon.cc 2006-07-30 12:26:44.000000000 -0400
@@ -1265,7 +1265,7 @@
} ;
@@ -1077,8 +1078,8 @@
{
FUNCTIONSETUP;
---- kdepim-3.5.0/kresources/featureplan/benchmarkfeaturelist.cpp 2005-09-10 04:23:46.000000000 -0400
-+++ kdepim-3.5.0-new/kresources/featureplan/benchmarkfeaturelist.cpp 2005-12-04 11:37:55.000000000 -0500
+--- kdepim-3.5.4/kresources/featureplan/benchmarkfeaturelist.cpp 2005-09-10 04:23:46.000000000 -0400
++++ kdepim-3.5.4-new/kresources/featureplan/benchmarkfeaturelist.cpp 2006-07-30 12:26:44.000000000 -0400
@@ -67,7 +67,7 @@
}
}
@@ -1088,8 +1089,8 @@
{
KAboutData aboutData( "benchmarkfeaturelist",
"Benchmark for feature list XML parser",
---- kdepim-3.5.0/kresources/featureplan/dumpfeaturelist.cpp 2005-09-10 04:23:46.000000000 -0400
-+++ kdepim-3.5.0-new/kresources/featureplan/dumpfeaturelist.cpp 2005-12-04 11:37:55.000000000 -0500
+--- kdepim-3.5.4/kresources/featureplan/dumpfeaturelist.cpp 2006-05-22 14:10:46.000000000 -0400
++++ kdepim-3.5.4-new/kresources/featureplan/dumpfeaturelist.cpp 2006-07-30 12:26:44.000000000 -0400
@@ -67,7 +67,7 @@
}
}
@@ -1099,8 +1100,8 @@
{
KAboutData aboutData( "dumpfeaturelist", "Dump XML feature list to stdout",
"0.1" );
---- kdepim-3.5.0/kresources/groupwise/soap/soapdebug.cpp 2005-09-10 04:23:46.000000000 -0400
-+++ kdepim-3.5.0-new/kresources/groupwise/soap/soapdebug.cpp 2005-12-04 11:37:55.000000000 -0500
+--- kdepim-3.5.4/kresources/groupwise/soap/soapdebug.cpp 2005-09-10 04:23:46.000000000 -0400
++++ kdepim-3.5.4-new/kresources/groupwise/soap/soapdebug.cpp 2006-07-30 12:26:44.000000000 -0400
@@ -44,7 +44,7 @@
KCmdLineLastOption
};
@@ -1110,8 +1111,8 @@
{
KAboutData aboutData( "soapdebug", I18N_NOOP("Groupwise Soap Debug"), "0.1" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher at kde.org" );
---- kdepim-3.5.0/ksync/src/Makefile.am 2005-09-10 04:23:48.000000000 -0400
-+++ kdepim-3.5.0-new/ksync/src/Makefile.am 2005-12-04 11:37:55.000000000 -0500
+--- kdepim-3.5.4/ksync/src/Makefile.am 2005-09-10 04:23:48.000000000 -0400
++++ kdepim-3.5.4-new/ksync/src/Makefile.am 2006-07-30 12:26:44.000000000 -0400
@@ -1,7 +1,10 @@
-bin_PROGRAMS = ksync
-ksync_SOURCES = ksyncview.cpp ksync.cpp main.cpp
@@ -1127,8 +1128,8 @@
EXTRA_DIST = main.cpp ksync.cpp ksync.h ksyncdoc.cpp ksyncdoc.h ksyncview.cpp ksyncview.h ksyncui.rc ksync.desktop lo32-app-ksync.png lo16-app-ksync.png
---- kdepim-3.5.0/ksync/src/main.cpp 2005-09-10 04:23:48.000000000 -0400
-+++ kdepim-3.5.0-new/ksync/src/main.cpp 2005-12-04 11:37:56.000000000 -0500
+--- kdepim-3.5.4/ksync/src/main.cpp 2005-09-10 04:23:48.000000000 -0400
++++ kdepim-3.5.4-new/ksync/src/main.cpp 2006-07-30 12:26:44.000000000 -0400
@@ -37,7 +37,7 @@
// INSERT YOUR COMMANDLINE OPTIONS HERE
};
@@ -1138,8 +1139,8 @@
{
KAboutData aboutData( "ksync", I18N_NOOP("KSync"),
---- kdepim-3.5.0/ktnef/gui/Makefile.am 2005-09-10 04:24:43.000000000 -0400
-+++ kdepim-3.5.0-new/ktnef/gui/Makefile.am 2005-12-04 11:37:56.000000000 -0500
+--- kdepim-3.5.4/ktnef/gui/Makefile.am 2005-09-10 04:24:43.000000000 -0400
++++ kdepim-3.5.4-new/ktnef/gui/Makefile.am 2006-07-30 12:26:44.000000000 -0400
@@ -2,14 +2,16 @@
SUBDIRS = pics
@@ -1163,8 +1164,8 @@
noinst_HEADERS = ktnefmain.h ktnefview.h attachpropertydialog.h \
qwmf.h wmfstruct.h metafuncs.h
---- kdepim-3.5.0/ktnef/gui/main.cpp 2005-09-10 04:24:43.000000000 -0400
-+++ kdepim-3.5.0-new/ktnef/gui/main.cpp 2005-12-04 11:37:56.000000000 -0500
+--- kdepim-3.5.4/ktnef/gui/main.cpp 2005-09-10 04:24:43.000000000 -0400
++++ kdepim-3.5.4-new/ktnef/gui/main.cpp 2006-07-30 12:26:44.000000000 -0400
@@ -33,7 +33,7 @@
// INSERT YOUR COMMANDLINE OPTIONS HERE
};
@@ -1174,8 +1175,8 @@
{
KAboutData aboutData( "ktnef", I18N_NOOP("KTnef"),
---- kdepim-3.5.0/libkcal/convertqtopia.cpp 2005-09-10 04:24:36.000000000 -0400
-+++ kdepim-3.5.0-new/libkcal/convertqtopia.cpp 2005-12-04 11:37:56.000000000 -0500
+--- kdepim-3.5.4/libkcal/convertqtopia.cpp 2005-09-10 04:24:36.000000000 -0400
++++ kdepim-3.5.4-new/libkcal/convertqtopia.cpp 2006-07-30 12:26:44.000000000 -0400
@@ -48,7 +48,7 @@
KCmdLineLastOption
};
@@ -1185,8 +1186,8 @@
{
KAboutData aboutData("convertqtopia",I18N_NOOP("Qtopia calendar file converter"),"0.1");
aboutData.addAuthor("Cornelius Schumacher", 0, "schumacher at kde.org");
---- kdepim-3.5.0/libkcal/versit/vcc.c 2005-09-10 04:24:36.000000000 -0400
-+++ kdepim-3.5.0-new/libkcal/versit/vcc.c 2005-12-04 11:37:56.000000000 -0500
+--- kdepim-3.5.4/libkcal/versit/vcc.c 2005-09-10 04:24:36.000000000 -0400
++++ kdepim-3.5.4-new/libkcal/versit/vcc.c 2006-07-30 12:26:44.000000000 -0400
@@ -198,9 +198,6 @@
#endif
@@ -1197,8 +1198,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
---- kdepim-3.5.0/libkdepim/cfgc/autoexample.cpp 2005-09-10 04:24:24.000000000 -0400
-+++ kdepim-3.5.0-new/libkdepim/cfgc/autoexample.cpp 2005-12-04 11:37:56.000000000 -0500
+--- kdepim-3.5.4/libkdepim/cfgc/autoexample.cpp 2005-09-10 04:24:24.000000000 -0400
++++ kdepim-3.5.4-new/libkdepim/cfgc/autoexample.cpp 2006-07-30 12:26:44.000000000 -0400
@@ -36,7 +36,7 @@
#include <qlabel.h>
@@ -1208,8 +1209,8 @@
{
KAboutData aboutData( "example", I18N_NOOP("autoconfig example"), "0.1" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher at kde.org" );
---- kdepim-3.5.0/libkdepim/cfgc/example.cpp 2005-09-10 04:24:24.000000000 -0400
-+++ kdepim-3.5.0-new/libkdepim/cfgc/example.cpp 2005-12-04 11:37:56.000000000 -0500
+--- kdepim-3.5.4/libkdepim/cfgc/example.cpp 2005-09-10 04:24:24.000000000 -0400
++++ kdepim-3.5.4-new/libkdepim/cfgc/example.cpp 2006-07-30 12:26:44.000000000 -0400
@@ -32,7 +32,7 @@
#include <libkdepim/kprefsdialog.h>
@@ -1219,8 +1220,8 @@
{
KAboutData aboutData( "example", I18N_NOOP("cfgc example"), "0.1" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher at kde.org" );
---- kdepim-3.5.0/libkholidays/Makefile.am 2005-09-10 04:24:19.000000000 -0400
-+++ kdepim-3.5.0-new/libkholidays/Makefile.am 2005-12-04 11:37:56.000000000 -0500
+--- kdepim-3.5.4/libkholidays/Makefile.am 2006-07-22 04:14:21.000000000 -0400
++++ kdepim-3.5.4-new/libkholidays/Makefile.am 2006-07-30 12:26:44.000000000 -0400
@@ -7,7 +7,7 @@
lib_LTLIBRARIES = libkholidays.la
@@ -1230,21 +1231,34 @@
libkholidays_la_SOURCES = kholidays.cpp scanholiday.c parseholiday.h parseholiday.c lunarphase.cpp
#the lex/flex and yacc/bison files are in CVS and NOT generated
---- kdepim-3.5.0/libkholidays/parseholiday.c 2005-09-10 04:24:19.000000000 -0400
-+++ kdepim-3.5.0-new/libkholidays/parseholiday.c 2005-12-04 11:37:56.000000000 -0500
-@@ -106,7 +106,7 @@
+--- kdepim-3.5.4/libkholidays/parseholiday.c 2006-07-22 04:14:21.000000000 -0400
++++ kdepim-3.5.4-new/libkholidays/parseholiday.c 2006-07-30 12:27:25.000000000 -0400
+@@ -111,8 +111,8 @@
+ int year, int off, int length);
/*** Variables and structures ***/
static int m, d, y;
- int kcallineno; /* current line # being parsed */
+-int kcallineno; /* current line # being parsed */
-FILE *kcalin; /* file currently being processed */
++extern int kcallineno; /* current line # being parsed */
+extern FILE *kcalin; /* file currently being processed */
int yacc_small; /* small string or on its own line? */
int yacc_stringcolor; /* color of holiday name text, 1..8 */
char *yacc_string; /* holiday name text */
---- kdepim-3.5.0/mimelib/dw_date.cpp 2005-09-10 04:24:49.000000000 -0400
-+++ kdepim-3.5.0-new/mimelib/dw_date.cpp 2005-12-04 11:37:56.000000000 -0500
-@@ -673,7 +673,7 @@
- "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+--- kdepim-3.5.4/libkholidays/scanholiday.c 2006-07-22 04:14:21.000000000 -0400
++++ kdepim-3.5.4-new/libkholidays/scanholiday.c 2006-07-30 12:27:35.000000000 -0400
+@@ -347,7 +347,7 @@
+
+ extern int kcallineno;
+
+-int kcallineno = 1;
++kcallineno = 1;
+
+ extern char *kcaltext;
+ #define yytext_ptr kcaltext
+--- kdepim-3.5.4/mimelib/dw_date.cpp 2006-01-19 11:56:38.000000000 -0500
++++ kdepim-3.5.4-new/mimelib/dw_date.cpp 2006-07-30 12:26:44.000000000 -0400
+@@ -658,7 +658,7 @@
+ ""
};
-int main()
@@ -1252,8 +1266,8 @@
{
struct tm *ptms, tms1, tms2;
time_t tt;
---- kdepim-3.5.0/mimelib/uuencode.cpp 2005-09-10 04:24:49.000000000 -0400
-+++ kdepim-3.5.0-new/mimelib/uuencode.cpp 2005-12-04 11:37:56.000000000 -0500
+--- kdepim-3.5.4/mimelib/uuencode.cpp 2005-09-10 04:24:49.000000000 -0400
++++ kdepim-3.5.4-new/mimelib/uuencode.cpp 2006-07-30 12:26:44.000000000 -0400
@@ -431,7 +431,7 @@
// Test harness for DwUudecode
@@ -1263,8 +1277,8 @@
{
srand(time(0));
DwString binStr;
---- kdepim-3.5.0/networkstatus/Makefile.am 2005-09-10 04:24:02.000000000 -0400
-+++ kdepim-3.5.0-new/networkstatus/Makefile.am 2005-12-04 13:05:15.000000000 -0500
+--- kdepim-3.5.4/networkstatus/Makefile.am 2005-09-10 04:24:02.000000000 -0400
++++ kdepim-3.5.4-new/networkstatus/Makefile.am 2006-07-30 12:26:44.000000000 -0400
@@ -19,7 +19,7 @@
clientiface.skel serviceiface.skel network.cpp
#kclientiface.skel serviceiface.skel
@@ -1290,8 +1304,8 @@
-networkstatustestservice_SOURCES = testservice.cpp provideriface.skel serviceiface.stub
+networkstatustestservice_la_SOURCES = testservice.cpp provideriface.skel serviceiface.stub
---- kdepim-3.5.0/networkstatus/testservice.cpp 2005-09-10 04:24:02.000000000 -0400
-+++ kdepim-3.5.0-new/networkstatus/testservice.cpp 2005-12-04 11:37:56.000000000 -0500
+--- kdepim-3.5.4/networkstatus/testservice.cpp 2005-09-10 04:24:02.000000000 -0400
++++ kdepim-3.5.4-new/networkstatus/testservice.cpp 2006-07-30 12:26:44.000000000 -0400
@@ -90,7 +90,7 @@
m_service->setNetworkStatus( "test_net", (int)m_status );
}
@@ -1301,8 +1315,8 @@
{
KApplication app(argc, argv, "testdcop");
TestService * test = new TestService;
---- kdepim-3.5.0/wizards/Makefile.am 2005-09-10 04:23:44.000000000 -0400
-+++ kdepim-3.5.0-new/wizards/Makefile.am 2005-12-04 11:37:56.000000000 -0500
+--- kdepim-3.5.4/wizards/Makefile.am 2005-09-10 04:23:44.000000000 -0400
++++ kdepim-3.5.4-new/wizards/Makefile.am 2006-07-30 12:26:44.000000000 -0400
@@ -12,7 +12,7 @@
bin_PROGRAMS = groupwarewizard egroupwarewizard sloxwizard kolabwizard \
groupwisewizard exchangewizard
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20061027/fd0477f8/attachment.html
More information about the macports-changes
mailing list