diff options
author | skrll <skrll@pkgsrc.org> | 2003-01-02 09:12:19 +0000 |
---|---|---|
committer | skrll <skrll@pkgsrc.org> | 2003-01-02 09:12:19 +0000 |
commit | 42861251c282c37bda020c5e0ae0940c0461f7a9 (patch) | |
tree | 1ab9a94a1fd0409896e232322846793727e9e77a /misc | |
parent | 89fcd02fac594d7b0f01bd59d1a6f1508ec74be2 (diff) | |
download | pkgsrc-42861251c282c37bda020c5e0ae0940c0461f7a9.tar.gz |
Update KDE to the 3.0.5a distribution. Packages are numbered 3.0.5.1 or
1.0.5.1 accordingly.
Fixes and changes are:
Multiple vulnerabilities.
kdelibs
KHTML : Fixed several crashes and misrenderings.
rlogin.protocol: fixed command execution in specially crafted
urls.
kdebase
KAddressbook: Don't squeeze columns on startup/properly restore
column width settings.
kdenetwork
lisa, reslisa: Fixed several security vulnerabilities.
kdesdk
Cervisia: Show long lines in diff view always completely.
Diffstat (limited to 'misc')
-rw-r--r-- | misc/kdeaddons3/Makefile | 5 | ||||
-rw-r--r-- | misc/kdeaddons3/distinfo | 6 | ||||
-rw-r--r-- | misc/kdeadmin3/Makefile | 5 | ||||
-rw-r--r-- | misc/kdeadmin3/distinfo | 6 | ||||
-rw-r--r-- | misc/kdeartwork3/Makefile | 5 | ||||
-rw-r--r-- | misc/kdeartwork3/PLIST | 5 | ||||
-rw-r--r-- | misc/kdeartwork3/distinfo | 6 | ||||
-rw-r--r-- | misc/kdeedu3/Makefile | 5 | ||||
-rw-r--r-- | misc/kdeedu3/distinfo | 8 | ||||
-rw-r--r-- | misc/kdeedu3/patches/patch-ab | 60 | ||||
-rw-r--r-- | misc/kdepim3/Makefile | 5 | ||||
-rw-r--r-- | misc/kdepim3/PLIST | 14 | ||||
-rw-r--r-- | misc/kdepim3/distinfo | 8 | ||||
-rw-r--r-- | misc/kdepim3/patches/patch-ah | 159 | ||||
-rw-r--r-- | misc/kdeutils3/Makefile | 5 | ||||
-rw-r--r-- | misc/kdeutils3/distinfo | 12 | ||||
-rw-r--r-- | misc/kdeutils3/patches/patch-ab | 168 | ||||
-rw-r--r-- | misc/kdeutils3/patches/patch-af | 176 | ||||
-rw-r--r-- | misc/kdeutils3/patches/patch-ak | 246 |
19 files changed, 575 insertions, 329 deletions
diff --git a/misc/kdeaddons3/Makefile b/misc/kdeaddons3/Makefile index 1e8da970d08..f57dcd6041e 100644 --- a/misc/kdeaddons3/Makefile +++ b/misc/kdeaddons3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2002/12/24 06:10:14 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2003/01/02 09:12:26 skrll Exp $ -DISTNAME= kdeaddons-3.0.4 -PKGREVISION= 1 +DISTNAME= kdeaddons-3.0.5a CATEGORIES= misc COMMENT= Add ons for the KDE integrated X11 desktop diff --git a/misc/kdeaddons3/distinfo b/misc/kdeaddons3/distinfo index fd3dbe180a0..062065a6df5 100644 --- a/misc/kdeaddons3/distinfo +++ b/misc/kdeaddons3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/10/14 09:13:48 skrll Exp $ +$NetBSD: distinfo,v 1.5 2003/01/02 09:12:26 skrll Exp $ -SHA1 (kdeaddons-3.0.4.tar.bz2) = 2f7707023b57820ad8aafbe94f6bf01770f5c35b -Size (kdeaddons-3.0.4.tar.bz2) = 938774 bytes +SHA1 (kdeaddons-3.0.5a.tar.bz2) = 9d9f8d72cb2918298232b113bac7f6e28cd0b391 +Size (kdeaddons-3.0.5a.tar.bz2) = 933612 bytes diff --git a/misc/kdeadmin3/Makefile b/misc/kdeadmin3/Makefile index c32ea76ab9f..ef1cff5606d 100644 --- a/misc/kdeadmin3/Makefile +++ b/misc/kdeadmin3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2002/12/24 06:10:14 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2003/01/02 09:12:26 skrll Exp $ -DISTNAME= kdeadmin-3.0.4 -PKGREVISION= 1 +DISTNAME= kdeadmin-3.0.5a CATEGORIES= misc COMMENT= System administration tools for the KDE integrated X11 desktop diff --git a/misc/kdeadmin3/distinfo b/misc/kdeadmin3/distinfo index 1101bfd40a8..d29c160b5e3 100644 --- a/misc/kdeadmin3/distinfo +++ b/misc/kdeadmin3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/10/14 09:13:48 skrll Exp $ +$NetBSD: distinfo,v 1.5 2003/01/02 09:12:26 skrll Exp $ -SHA1 (kdeadmin-3.0.4.tar.bz2) = 6902fbae53a329336761f8de6fd649752bf810bc -Size (kdeadmin-3.0.4.tar.bz2) = 1267550 bytes +SHA1 (kdeadmin-3.0.5a.tar.bz2) = 4884a08a2817aa0597cd0e300666c1d47f21ff73 +Size (kdeadmin-3.0.5a.tar.bz2) = 1266326 bytes diff --git a/misc/kdeartwork3/Makefile b/misc/kdeartwork3/Makefile index c8d11f6464f..bda46b09c27 100644 --- a/misc/kdeartwork3/Makefile +++ b/misc/kdeartwork3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2002/12/24 06:10:14 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2003/01/02 09:12:27 skrll Exp $ -DISTNAME= kdeartwork-3.0.4 -PKGREVISION= 1 +DISTNAME= kdeartwork-3.0.5a CATEGORIES= misc COMMENT= Artwork for the KDE integrated X11 desktop diff --git a/misc/kdeartwork3/PLIST b/misc/kdeartwork3/PLIST index 5fb4b1535ff..68743394658 100644 --- a/misc/kdeartwork3/PLIST +++ b/misc/kdeartwork3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/25 03:09:12 markd Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/01/02 09:12:27 skrll Exp $ bin/kbanner.kss bin/kblob.kss bin/kbouboule.kss @@ -2868,9 +2868,12 @@ share/kde/wallpapers/winter_theme_1.jpg @dirrm share/kde/icons/Locolor @dirrm share/kde/apps/kworldclock/maps/rainfall @dirrm share/kde/apps/kworldclock/maps/mggd +@unexec ${RMDIR} -p %D hare/kde/apps/kworldclock/maps/depths >/dev/null || true @dirrm share/kde/apps/kworldclock/maps/caida_bw @dirrm share/kde/apps/kworldclock/maps/caida @dirrm share/kde/apps/kworldclock/maps/bio @dirrm share/kde/apps/kworldclock/maps/alt +@unexec ${RMDIR} -p %D hare/kde/apps/kworldclock/maps >/dev/null || true +@unexec ${RMDIR} -p %D hare/kde/apps/kworldclock >/dev/null || true @dirrm share/kde/apps/kwin/icewm-themes/Model @dirrm share/kde/apps/kwin/icewm-themes/MenschMaschine diff --git a/misc/kdeartwork3/distinfo b/misc/kdeartwork3/distinfo index 9fe1ce2e04d..8b1927d25bd 100644 --- a/misc/kdeartwork3/distinfo +++ b/misc/kdeartwork3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/10/14 09:13:49 skrll Exp $ +$NetBSD: distinfo,v 1.5 2003/01/02 09:12:27 skrll Exp $ -SHA1 (kdeartwork-3.0.4.tar.bz2) = 0f3318986981bfa25d3bcddda5dfe7b4989b2831 -Size (kdeartwork-3.0.4.tar.bz2) = 10910760 bytes +SHA1 (kdeartwork-3.0.5a.tar.bz2) = decc46a3c2be6ab564cc6dee2e3f1aea19655df9 +Size (kdeartwork-3.0.5a.tar.bz2) = 10915790 bytes diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile index 27561f893c9..ef8660611e3 100644 --- a/misc/kdeedu3/Makefile +++ b/misc/kdeedu3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2002/12/24 06:10:15 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2003/01/02 09:12:27 skrll Exp $ -DISTNAME= kdeedu-3.0.4 -PKGREVISION= 1 +DISTNAME= kdeedu-3.0.5a CATEGORIES= misc COMMENT= Edu{tainment,cation} tools for the KDE integrated X11 desktop diff --git a/misc/kdeedu3/distinfo b/misc/kdeedu3/distinfo index 6b18bc8e640..c75db4c3d8c 100644 --- a/misc/kdeedu3/distinfo +++ b/misc/kdeedu3/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2002/10/14 09:13:49 skrll Exp $ +$NetBSD: distinfo,v 1.5 2003/01/02 09:12:27 skrll Exp $ -SHA1 (kdeedu-3.0.4.tar.bz2) = f64f1226d8b69d2fd6d407ba441ce95c35072785 -Size (kdeedu-3.0.4.tar.bz2) = 9104479 bytes +SHA1 (kdeedu-3.0.5a.tar.bz2) = a2f8ab56b0590d11cf0d33a749f2d5a539af5a59 +Size (kdeedu-3.0.5a.tar.bz2) = 9109155 bytes SHA1 (patch-aa) = ee916dc502be8b66c3d0a95e3cdec8f787284b9c -SHA1 (patch-ab) = 38336518e06cd7eb1c48c4a4dbc0667d82858bdf +SHA1 (patch-ab) = f814ff0a501530d5b17e6450d09b40eecef090ec diff --git a/misc/kdeedu3/patches/patch-ab b/misc/kdeedu3/patches/patch-ab index 79b35e0b428..f3e687256e4 100644 --- a/misc/kdeedu3/patches/patch-ab +++ b/misc/kdeedu3/patches/patch-ab @@ -1,17 +1,17 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:20:58 skrll Exp $ +$NetBSD: patch-ab,v 1.2 2003/01/02 09:12:28 skrll Exp $ ---- kvoctrain/kvoctrain/Makefile.in.orig Mon May 27 08:01:18 2002 +--- kvoctrain/kvoctrain/Makefile.in.orig Mon Dec 30 13:25:46 2002 +++ kvoctrain/kvoctrain/Makefile.in -@@ -578,7 +578,7 @@ +@@ -590,7 +590,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=kvoctrain.h kvoctrainview.h kvoctrain.lsm.tpl kvoctrain.dtd x-kvtml.desktop kvoctrain.desktop kv_resource.h rowtable.h -+KDE_DIST=kvoctrainview.h kvoctrain.h spotlight2kvtml x-kvtml.desktop kv_resource.h rowtable.h kvoctrain.lsm.tpl kvoctrain.dtd kvoctrain.desktop kvoctrain +-KDE_DIST=rowtable.h kvoctrainview.h x-kvtml.desktop kvoctrain.dtd kvoctrain.lsm.tpl kvoctrain.h kv_resource.h kvoctrain.desktop ++KDE_DIST=rowtable.h kvoctrainview.h kvoctrain.lsm.tpl kvoctrain.h kvoctrain.dtd kvoctrain.desktop x-kvtml.desktop kv_resource.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -712,7 +712,7 @@ +@@ -724,7 +724,7 @@ uninstall-info: uninstall-info-recursive install-data-local: $(mkinstalldirs) $(DESTDIR)$(kde_bindir) @@ -20,12 +20,42 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:20:58 skrll Exp $ $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Edutainment/ $(INSTALL_DATA) $(srcdir)/kvoctrain.desktop $(DESTDIR)$(kde_appsdir)/Edutainment/kvoctrain.desktop $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/ -@@ -839,7 +839,7 @@ - -rm -f kvoctrain_meta_unload.cpp - - #>+ 11 --kvoctrain.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kva_io.cpp $(srcdir)/kvoctrain.cpp $(srcdir)/kvoctrainview.cpp $(srcdir)/rowtable.cpp $(srcdir)/main.cpp $(srcdir)/kva_init.cpp $(srcdir)/kva_config.cpp $(srcdir)/kva_header.cpp $(srcdir)/kva_clip.cpp $(srcdir)/kva_query.cpp kvoctrain_meta_unload.cpp kvoctrainview.moc rowtable.moc kvoctrain.moc -+kvoctrain.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kva_io.cpp $(srcdir)/kvoctrain.cpp $(srcdir)/kvoctrainview.cpp $(srcdir)/rowtable.cpp $(srcdir)/main.cpp $(srcdir)/kva_init.cpp $(srcdir)/kva_config.cpp $(srcdir)/kva_header.cpp $(srcdir)/kva_clip.cpp $(srcdir)/kva_query.cpp $(srcdir)/kvoctrain_meta_unload.cpp kvoctrainview.moc rowtable.moc kvoctrain.moc - @echo 'creating kvoctrain.all_cpp.cpp ...'; \ - rm -f kvoctrain.all_cpp.files kvoctrain.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kvoctrain.all_cpp.final; \ +@@ -808,10 +808,6 @@ messages-local: + .NOEXPORT: + + #>+ 3 +-kvoctrain.moc: $(srcdir)/kvoctrain.h +- $(MOC) $(srcdir)/kvoctrain.h -o kvoctrain.moc +- +-#>+ 3 + kvoctrainview.moc: $(srcdir)/kvoctrainview.h + $(MOC) $(srcdir)/kvoctrainview.h -o kvoctrainview.moc + +@@ -820,8 +816,12 @@ rowtable.moc: $(srcdir)/rowtable.h + $(MOC) $(srcdir)/rowtable.h -o rowtable.moc + + #>+ 3 ++kvoctrain.moc: $(srcdir)/kvoctrain.h ++ $(MOC) $(srcdir)/kvoctrain.h -o kvoctrain.moc ++ ++#>+ 3 + clean-metasources: +- -rm -f kvoctrain.moc kvoctrainview.moc rowtable.moc ++ -rm -f kvoctrainview.moc rowtable.moc kvoctrain.moc + + #>+ 2 + docs-am: +@@ -870,9 +870,9 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 7 +-kvoctrain.o: kvoctrain.moc +-rowtable.lo: rowtable.moc + rowtable.o: rowtable.moc +-kvoctrain.lo: kvoctrain.moc +-kvoctrainview.lo: kvoctrainview.moc + kvoctrainview.o: kvoctrainview.moc ++rowtable.lo: rowtable.moc ++kvoctrain.o: kvoctrain.moc ++kvoctrainview.lo: kvoctrainview.moc ++kvoctrain.lo: kvoctrain.moc diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile index b5e3f6e88fb..59013e86b95 100644 --- a/misc/kdepim3/Makefile +++ b/misc/kdepim3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2002/12/24 06:10:15 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2003/01/02 09:12:28 skrll Exp $ -DISTNAME= kdepim-3.0.4 -PKGREVISION= 1 +DISTNAME= kdepim-3.0.5a CATEGORIES= misc COMMENT= Personal Information Management tools for the KDE desktop diff --git a/misc/kdepim3/PLIST b/misc/kdepim3/PLIST index aa3bfd3a050..43552bb1b92 100644 --- a/misc/kdepim3/PLIST +++ b/misc/kdepim3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/08/28 07:15:36 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/01/02 09:12:28 skrll Exp $ bin/ical2vcal bin/kabcfrontend bin/kalarm @@ -389,7 +389,7 @@ share/kde/servicetypes/calendarplugin.desktop share/kde/servicetypes/korganizerpart.desktop share/kde/servicetypes/kpilotconduit.desktop @comment dirrm share/kde/servicetypes -@comment dirrm share/kde/services/korganizer +@dirrm share/kde/services/korganizer @comment dirrm share/kde/services @comment dirrm share/kde/icons/locolor/32x32/apps @comment dirrm share/kde/icons/locolor/16x16/apps @@ -434,12 +434,22 @@ share/kde/servicetypes/kpilotconduit.desktop @dirrm share/kde/apps/kandy @dirrm share/kde/apps/kalarmdgui/icons/hicolor/22x22/actions @dirrm share/kde/apps/kalarm/icons/locolor/32x32/apps +@dirrm share/kde/apps/kalarm/icons/locolor/32x32 @dirrm share/kde/apps/kalarm/icons/locolor/16x16/apps +@dirrm share/kde/apps/kalarm/icons/locolor/16x16 +@dirrm share/kde/apps/kalarm/icons/locolor @dirrm share/kde/apps/kalarm/icons/hicolor/48x48/apps +@dirrm share/kde/apps/kalarm/icons/hicolor/48x48 @dirrm share/kde/apps/kalarm/icons/hicolor/32x32/apps +@dirrm share/kde/apps/kalarm/icons/hicolor/32x32 @dirrm share/kde/apps/kalarm/icons/hicolor/22x22/actions +@dirrm share/kde/apps/kalarm/icons/hicolor/22x22 @dirrm share/kde/apps/kalarm/icons/hicolor/16x16/apps @dirrm share/kde/apps/kalarm/icons/hicolor/16x16/actions +@dirrm share/kde/apps/kalarm/icons/hicolor/16x16 +@dirrm share/kde/apps/kalarm/icons/hicolor +@dirrm share/kde/apps/kalarm/icons +@dirrm share/kde/apps/kalarm @comment dirrm share/kde/apps @comment dirrm share/kde/applnk/Utilities @comment dirrm share/kde/applnk/Settings/System diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo index 651b7032bc6..0574693cf88 100644 --- a/misc/kdepim3/distinfo +++ b/misc/kdepim3/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2002/10/14 09:13:50 skrll Exp $ +$NetBSD: distinfo,v 1.6 2003/01/02 09:12:28 skrll Exp $ -SHA1 (kdepim-3.0.4.tar.bz2) = 992f0a21681fa72348c57b101899d1aec4db6ef2 -Size (kdepim-3.0.4.tar.bz2) = 3182779 bytes +SHA1 (kdepim-3.0.5a.tar.bz2) = b25d27ef2cef2b375307775410daab80b5bf686d +Size (kdepim-3.0.5a.tar.bz2) = 3192923 bytes SHA1 (patch-aa) = 28d07a7e4063df62a055a40129338f9831b61c49 SHA1 (patch-ab) = 24a1da2c4ef1c7625e750a8bee958abe15bea717 SHA1 (patch-ac) = 86ab25fdb17ce974668946dcaab5417df33d8f96 @@ -9,4 +9,4 @@ SHA1 (patch-ad) = 636a472961d9869bf0792b6eea0e02ddadbd99fe SHA1 (patch-ae) = 04a75a4a00012fc9a03ae25755abb8580f166e98 SHA1 (patch-af) = 5e9e463878c145f4d0b21fe98eb2e16e83e51904 SHA1 (patch-ag) = 9d53fcf4f5b14cd979bc1c416951dec6796fc4c2 -SHA1 (patch-ah) = 5d3848a86ca9e4ba9204e3f7526cea0acfe52a62 +SHA1 (patch-ah) = f41a62dc725f5f65509d021f7dc14a3e323aeaff diff --git a/misc/kdepim3/patches/patch-ah b/misc/kdepim3/patches/patch-ah index e718082652e..f08c9bf005e 100644 --- a/misc/kdepim3/patches/patch-ah +++ b/misc/kdepim3/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.1 2002/10/03 12:08:47 markd Exp $ +$NetBSD: patch-ah,v 1.2 2003/01/02 09:12:28 skrll Exp $ ---- kpilot/conduits/vcalconduit/Makefile.in.orig Thu Aug 8 06:10:09 2002 -+++ kpilot/conduits/vcalconduit/Makefile.in Thu Oct 3 15:27:32 2002 -@@ -255,7 +255,7 @@ +--- kpilot/conduits/vcalconduit/Makefile.in.orig Mon Dec 30 16:23:28 2002 ++++ kpilot/conduits/vcalconduit/Makefile.in +@@ -254,7 +254,7 @@ libvcalconduit_la_SOURCES= vcal-factoryb vcal-setup.cc vcal-conduitbase.cc vcal-conduit.cc korganizerConduit.cc libvcalconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib -L../../../libkcal @@ -10,8 +10,8 @@ $NetBSD: patch-ah,v 1.1 2002/10/03 12:08:47 markd Exp $ +libvcalconduit_la_LIBADD = ../../lib/libkpilot.la ../../../libkcal/libkcal.la #>- libtodoconduit_la_SOURCES = korganizertodoConduit.ui vcal-factorybase.cc todo-factory.cc \ - #>- todo-setup.cc vcal-conduitbase.cc todo-conduit.cc -@@ -264,7 +264,7 @@ + #>- todo-setup.cc vcal-conduitbase.cc todo-conduit.cc +@@ -263,14 +263,15 @@ libtodoconduit_la_SOURCES= vcal-factoryb todo-setup.cc vcal-conduitbase.cc todo-conduit.cc korganizertodoConduit.cc libtodoconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib -L../../../libkcal @@ -20,3 +20,150 @@ $NetBSD: patch-ah,v 1.1 2002/10/03 12:08:47 markd Exp $ subdir = kpilot/conduits/vcalconduit mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + +-libtodoconduit_la_DEPENDENCIES = ++libtodoconduit_la_DEPENDENCIES = ../../lib/libkpilot.la \ ++ ../../../libkcal/libkcal.la + am_libtodoconduit_la_OBJECTS = vcal-factorybase.lo todo-factory.lo \ + todo-setup.lo vcal-conduitbase.lo todo-conduit.lo + #>- libtodoconduit_la_OBJECTS = $(am_libtodoconduit_la_OBJECTS) +@@ -280,7 +281,8 @@ libtodoconduit_la_nofinal_OBJECTS = vcal + todo-setup.lo vcal-conduitbase.lo todo-conduit.lo korganizertodoConduit.lo + @KDE_USE_FINAL_FALSE@libtodoconduit_la_OBJECTS = $(libtodoconduit_la_nofinal_OBJECTS) + @KDE_USE_FINAL_TRUE@libtodoconduit_la_OBJECTS = $(libtodoconduit_la_final_OBJECTS) +-libvcalconduit_la_DEPENDENCIES = ++libvcalconduit_la_DEPENDENCIES = ../../lib/libkpilot.la \ ++ ../../../libkcal/libkcal.la + am_libvcalconduit_la_OBJECTS = vcal-factorybase.lo vcal-factory.lo \ + vcal-setup.lo vcal-conduitbase.lo vcal-conduit.lo + #>- libvcalconduit_la_OBJECTS = $(am_libvcalconduit_la_OBJECTS) +@@ -484,7 +486,7 @@ distclean-tags: + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=todo-conduit.h vcal-conduit.desktop todo-factory.h vcal-conduitbase.h vcal-factory.h vcal-conduitbase.cc vcal-conduit.h todo-setup.cc vcal-setup.cc vcal-conduit.cc vcal-setup.h todo-conduit.cc todo-conduit.desktop korganizertodoConduit.ui korganizerConduit.ui todo-setup.h vcal-factorybase.h ++KDE_DIST=todo-setup.h todo-conduit.cc vcal-conduitbase.cc vcal-factory.h todo-setup.cc vcal-factorybase.h todo-factory.h vcal-conduit.cc vcal-conduitbase.h vcal-setup.cc vcal-conduit.h korganizerConduit.ui todo-conduit.h vcal-conduit.desktop vcal-setup.h todo-conduit.desktop korganizertodoConduit.ui + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -620,36 +622,36 @@ korganizertodoConduit.moc: korganizertod + $(MOC) korganizertodoConduit.h -o korganizertodoConduit.moc + + #>+ 3 +-vcal-conduit.moc: $(srcdir)/vcal-conduit.h +- $(MOC) $(srcdir)/vcal-conduit.h -o vcal-conduit.moc ++vcal-setup.moc: $(srcdir)/vcal-setup.h ++ $(MOC) $(srcdir)/vcal-setup.h -o vcal-setup.moc + + #>+ 3 +-vcal-factorybase.moc: $(srcdir)/vcal-factorybase.h +- $(MOC) $(srcdir)/vcal-factorybase.h -o vcal-factorybase.moc ++todo-factory.moc: $(srcdir)/todo-factory.h ++ $(MOC) $(srcdir)/todo-factory.h -o todo-factory.moc + + #>+ 3 + todo-conduit.moc: $(srcdir)/todo-conduit.h + $(MOC) $(srcdir)/todo-conduit.h -o todo-conduit.moc + + #>+ 3 +-todo-factory.moc: $(srcdir)/todo-factory.h +- $(MOC) $(srcdir)/todo-factory.h -o todo-factory.moc ++vcal-factorybase.moc: $(srcdir)/vcal-factorybase.h ++ $(MOC) $(srcdir)/vcal-factorybase.h -o vcal-factorybase.moc + + #>+ 3 + vcal-conduitbase.moc: $(srcdir)/vcal-conduitbase.h + $(MOC) $(srcdir)/vcal-conduitbase.h -o vcal-conduitbase.moc + + #>+ 3 +-vcal-setup.moc: $(srcdir)/vcal-setup.h +- $(MOC) $(srcdir)/vcal-setup.h -o vcal-setup.moc ++vcal-factory.moc: $(srcdir)/vcal-factory.h ++ $(MOC) $(srcdir)/vcal-factory.h -o vcal-factory.moc + + #>+ 3 + todo-setup.moc: $(srcdir)/todo-setup.h + $(MOC) $(srcdir)/todo-setup.h -o todo-setup.moc + + #>+ 3 +-vcal-factory.moc: $(srcdir)/vcal-factory.h +- $(MOC) $(srcdir)/vcal-factory.h -o vcal-factory.moc ++vcal-conduit.moc: $(srcdir)/vcal-conduit.h ++ $(MOC) $(srcdir)/vcal-conduit.h -o vcal-conduit.moc + + #>+ 14 + korganizerConduit.cc: $(srcdir)/korganizerConduit.ui korganizerConduit.h korganizerConduit.moc +@@ -668,7 +670,7 @@ korganizerConduit.moc: korganizerConduit + + #>+ 3 + clean-metasources: +- -rm -f vcal-conduit.moc vcal-factorybase.moc todo-conduit.moc todo-factory.moc vcal-conduitbase.moc vcal-setup.moc todo-setup.moc vcal-factory.moc ++ -rm -f vcal-setup.moc todo-factory.moc todo-conduit.moc vcal-factorybase.moc vcal-conduitbase.moc vcal-factory.moc todo-setup.moc vcal-conduit.moc + + #>+ 5 + clean-ui: +@@ -687,7 +689,7 @@ force-reedit: + + + #>+ 11 +-libtodoconduit_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/vcal-factorybase.cc $(srcdir)/todo-factory.cc $(srcdir)/todo-setup.cc $(srcdir)/vcal-conduitbase.cc $(srcdir)/todo-conduit.cc korganizertodoConduit.cc todo-conduit.moc vcal-factorybase.moc todo-setup.moc todo-factory.moc vcal-conduitbase.moc ++libtodoconduit_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/vcal-factorybase.cc $(srcdir)/todo-factory.cc $(srcdir)/todo-setup.cc $(srcdir)/vcal-conduitbase.cc $(srcdir)/todo-conduit.cc korganizertodoConduit.cc vcal-factorybase.moc todo-factory.moc todo-conduit.moc vcal-conduitbase.moc todo-setup.moc + @echo 'creating libtodoconduit_la.all_cc.cc ...'; \ + rm -f libtodoconduit_la.all_cc.files libtodoconduit_la.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> libtodoconduit_la.all_cc.final; \ +@@ -699,7 +701,7 @@ libtodoconduit_la.all_cc.cc: $(srcdir)/M + rm -f libtodoconduit_la.all_cc.final libtodoconduit_la.all_cc.files + + #>+ 11 +-libvcalconduit_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/vcal-factorybase.cc $(srcdir)/vcal-factory.cc $(srcdir)/vcal-setup.cc $(srcdir)/vcal-conduitbase.cc $(srcdir)/vcal-conduit.cc korganizerConduit.cc vcal-factorybase.moc vcal-setup.moc vcal-conduit.moc vcal-conduitbase.moc vcal-factory.moc ++libvcalconduit_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/vcal-factorybase.cc $(srcdir)/vcal-factory.cc $(srcdir)/vcal-setup.cc $(srcdir)/vcal-conduitbase.cc $(srcdir)/vcal-conduit.cc korganizerConduit.cc vcal-factorybase.moc vcal-factory.moc vcal-conduit.moc vcal-setup.moc vcal-conduitbase.moc + @echo 'creating libvcalconduit_la.all_cc.cc ...'; \ + rm -f libvcalconduit_la.all_cc.files libvcalconduit_la.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> libvcalconduit_la.all_cc.final; \ +@@ -735,27 +737,27 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 25 +-todo-factory.o: todo-factory.moc +-todo-conduit.o: todo-conduit.moc +-vcal-conduit.lo: vcal-conduit.moc +-todo-setup.lo: todo-setup.moc +-$(srcdir)/vcal-factorybase.cc: korganizertodoConduit.h korganizerConduit.h +-$(srcdir)/todo-setup.cc: korganizertodoConduit.h +-vcal-conduitbase.lo: vcal-conduitbase.moc + $(srcdir)/vcal-setup.cc: korganizerConduit.h +-$(srcdir)/vcal-conduitbase.cc: korganizertodoConduit.h korganizerConduit.h +-vcal-factory.o: vcal-factory.moc + vcal-factory.lo: vcal-factory.moc +-$(srcdir)/todo-factory.cc: korganizertodoConduit.h +-vcal-conduit.o: vcal-conduit.moc + vcal-factorybase.lo: vcal-factorybase.moc +-vcal-setup.lo: vcal-setup.moc +-$(srcdir)/vcal-conduit.cc: korganizerConduit.h ++todo-conduit.lo: todo-conduit.moc ++vcal-setup.o: vcal-setup.moc ++vcal-conduitbase.lo: vcal-conduitbase.moc ++todo-setup.lo: todo-setup.moc + $(srcdir)/vcal-factory.cc: korganizerConduit.h ++$(srcdir)/todo-conduit.cc: korganizertodoConduit.h + todo-setup.o: todo-setup.moc ++vcal-conduit.lo: vcal-conduit.moc ++vcal-factory.o: vcal-factory.moc ++vcal-setup.lo: vcal-setup.moc ++todo-factory.o: todo-factory.moc ++vcal-factorybase.o: vcal-factorybase.moc ++$(srcdir)/vcal-conduit.cc: korganizerConduit.h ++$(srcdir)/vcal-factorybase.cc: korganizertodoConduit.h korganizerConduit.h ++$(srcdir)/todo-setup.cc: korganizertodoConduit.h ++$(srcdir)/vcal-conduitbase.cc: korganizertodoConduit.h korganizerConduit.h + todo-factory.lo: todo-factory.moc + vcal-conduitbase.o: vcal-conduitbase.moc +-vcal-factorybase.o: vcal-factorybase.moc +-$(srcdir)/todo-conduit.cc: korganizertodoConduit.h +-todo-conduit.lo: todo-conduit.moc +-vcal-setup.o: vcal-setup.moc ++vcal-conduit.o: vcal-conduit.moc ++$(srcdir)/todo-factory.cc: korganizertodoConduit.h ++todo-conduit.o: todo-conduit.moc diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile index 30eff858b87..ec7c70b2aad 100644 --- a/misc/kdeutils3/Makefile +++ b/misc/kdeutils3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2002/12/24 06:10:15 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2003/01/02 09:12:28 skrll Exp $ -DISTNAME= kdeutils-3.0.4 -PKGREVISION= 1 +DISTNAME= kdeutils-3.0.5a COMMENT= Utilities for the KDE integrated X11 desktop .include "../../x11/kde3/Makefile.kde3" diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo index e83fa465d8b..d75f480f767 100644 --- a/misc/kdeutils3/distinfo +++ b/misc/kdeutils3/distinfo @@ -1,18 +1,18 @@ -$NetBSD: distinfo,v 1.6 2002/10/14 09:13:50 skrll Exp $ +$NetBSD: distinfo,v 1.7 2003/01/02 09:12:29 skrll Exp $ -SHA1 (kdeutils-3.0.4.tar.bz2) = c5a174a088a0d9ee4fdab6a4e2cd1d84ebb2b102 -Size (kdeutils-3.0.4.tar.bz2) = 1514778 bytes +SHA1 (kdeutils-3.0.5a.tar.bz2) = 63104afb1686c5eaed7939e1bd8b6ec6b2cda7fd +Size (kdeutils-3.0.5a.tar.bz2) = 1515962 bytes SHA1 (patch-aa) = ac87861b38a93564e79e57cf5c8dc0de7f8c720a -SHA1 (patch-ab) = 96c698f05666f61aa653528688535cdb33221842 +SHA1 (patch-ab) = 7e29e85c52c585b795f0a1a9f8c2a92bef6804a0 SHA1 (patch-ac) = bb2f28bb4bc5d84d19ebf3a1d19aa5e7d21f61d3 SHA1 (patch-ad) = 0661f7e149c704291d3c668384363bb1e8246c8f SHA1 (patch-ae) = 481cb84d321ab9d6cbe8c1723319f0899969cb82 -SHA1 (patch-af) = 7118c3f53ea1d5831c53c071cc0fba6317f6b2d9 +SHA1 (patch-af) = 4091778400aded8120d59707eeeeaa4e8864cd34 SHA1 (patch-ag) = 28d4e0e634f886df60212b4f54fc870217f5dbe6 SHA1 (patch-ah) = fe2b3a94957a2d9cf6a294cbd3a77d100af84164 SHA1 (patch-ai) = a7a6505e5cf5a9411a47a65ba6ff1d8c34203095 SHA1 (patch-aj) = 1e6833cfb320f353e62e7be5ccae18deac8b8aef -SHA1 (patch-ak) = 1199959fd27b5084094c065f377cd48747bd8102 +SHA1 (patch-ak) = c45e16590bcc44b08d58f28ef5144545fbdceabc SHA1 (patch-al) = 289d94cf7ae64565639250a0e29662074466c8b3 SHA1 (patch-am) = 1f9931d683654159686151206db4c628253e875e SHA1 (patch-an) = ffd5589988aaa4e581cdfa9bfb7bdb9067f505fe diff --git a/misc/kdeutils3/patches/patch-ab b/misc/kdeutils3/patches/patch-ab index bda279f740b..94c76fcd3d9 100644 --- a/misc/kdeutils3/patches/patch-ab +++ b/misc/kdeutils3/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $ +$NetBSD: patch-ab,v 1.3 2003/01/02 09:12:29 skrll Exp $ ---- kcalc/Makefile.in.orig Wed May 8 21:11:41 2002 +--- kcalc/Makefile.in.orig Mon Dec 30 16:23:59 2002 +++ kcalc/Makefile.in -@@ -228,22 +228,25 @@ +@@ -227,22 +227,25 @@ x_includes = @x_includes@ x_libraries = @x_libraries@ bin_PROGRAMS = kcalc @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $ -kcalc_la_SOURCES = kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp \ +libkcalc_main_la_SOURCES = kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp \ - optiondialog.cpp + optiondialog.cpp +libkcalc_main_la_LIBADD = $(LIB_KDEUI) -lm + @@ -34,7 +34,7 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $ kcalc_LDFLAGS = $(all_libraries) $(KDE_RPATH) pics_DATA = -@@ -261,25 +264,31 @@ +@@ -260,24 +263,30 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -51,16 +51,14 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $ +am_libkcalc_main_la_OBJECTS = kcalc.lo kcalc_core.lo dlabel.lo stats.lo \ + optiondialog.lo +#>- libkcalc_main_la_OBJECTS = $(am_libkcalc_main_la_OBJECTS) - #>+ 6 + #>+ 5 -kcalc_la_final_OBJECTS = kcalc_la.all_cpp.lo -kcalc_la_nofinal_OBJECTS = kcalc.lo kcalc_core.lo dlabel.lo stats.lo \ +libkcalc_main_la_final_OBJECTS = libkcalc_main_la.all_cpp.lo +libkcalc_main_la_nofinal_OBJECTS = kcalc.lo kcalc_core.lo dlabel.lo stats.lo \ - optiondialog.lo \ -- kcalc_la_meta_unload.lo + optiondialog.lo -@KDE_USE_FINAL_FALSE@kcalc_la_OBJECTS = $(kcalc_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kcalc_la_OBJECTS = $(kcalc_la_final_OBJECTS) -+ libkcalc_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkcalc_main_la_OBJECTS = $(libkcalc_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkcalc_main_la_OBJECTS = $(libkcalc_main_la_final_OBJECTS) bin_PROGRAMS = kcalc$(EXEEXT) @@ -77,21 +75,37 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -287,9 +296,10 @@ +@@ -285,16 +294,19 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dlabel.Plo $(DEPDIR)/dummy.Po \ -- @AMDEP_TRUE@ $(DEPDIR)/kcalc.Plo $(DEPDIR)/kcalc_core.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/optiondialog.Plo $(DEPDIR)/stats.Plo -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dlabel.Plo $(DEPDIR)/kcalc.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kcalc_core.Plo $(DEPDIR)/kcalc_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kcalc_main.Po $(DEPDIR)/optiondialog.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/stats.Plo +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dlabel.Plo $(DEPDIR)/dummy.Po \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/kcalc.Plo $(DEPDIR)/kcalc_core.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/optiondialog.Plo $(DEPDIR)/stats.Plo +-#>+ 7 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcalc_la.all_cpp.P $(DEPDIR)/dlabel.Plo $(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcalc.Plo $(DEPDIR)/kcalc_core.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/optiondialog.Plo $(DEPDIR)/stats.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/dlabel.Plo $(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcalc.Plo $(DEPDIR)/kcalc_core.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/optiondialog.Plo $(DEPDIR)/stats.Plo ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dlabel.Plo $(DEPDIR)/kcalc.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kcalc_core.Plo $(DEPDIR)/kcalc_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kcalc_main.Po $(DEPDIR)/optiondialog.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/stats.Plo ++#>+ 9 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkcalc_main_la.all_cpp.P $(DEPDIR)/dlabel.Plo $(DEPDIR)/kcalc.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcalc_core.Plo $(DEPDIR)/kcalc_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcalc_main.Po $(DEPDIR)/optiondialog.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/stats.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/dlabel.Plo $(DEPDIR)/kcalc.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcalc_core.Plo $(DEPDIR)/kcalc_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcalc_main.Po $(DEPDIR)/optiondialog.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/stats.Plo + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -309,14 +319,15 @@ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -315,14 +327,15 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -109,7 +123,7 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $ #>- all: all-am #>+ 1 -@@ -365,6 +376,8 @@ +@@ -371,6 +384,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) kcalc.la: $(kcalc_la_OBJECTS) $(kcalc_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kcalc_la_LDFLAGS) $(kcalc_la_OBJECTS) $(kcalc_la_LIBADD) $(LIBS) @@ -118,7 +132,7 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -400,9 +413,10 @@ +@@ -406,9 +421,10 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dlabel.Plo@am__quote@ @@ -130,16 +144,16 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/optiondialog.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stats.Plo@am__quote@ -@@ -497,7 +511,7 @@ +@@ -503,7 +519,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=kcalclogo.xpm optiondialog.h hi32-app-kcalc.png ToDo configure.in.in hi16-app-kcalc.png kcalc.desktop hi48-app-kcalc.png version.h -+KDE_DIST=kcalclogo.xpm configure.in.in optiondialog.h hi16-app-kcalc.png kcalc version.h hi32-app-kcalc.png kcalc.desktop hi48-app-kcalc.png ToDo +-KDE_DIST=hi16-app-kcalc.png optiondialog.h kcalc.desktop hi48-app-kcalc.png kcalclogo.xpm configure.in.in hi32-app-kcalc.png ToDo version.h ++KDE_DIST=kcalclogo.xpm configure.in.in optiondialog.h hi16-app-kcalc.png version.h hi32-app-kcalc.png kcalc.desktop hi48-app-kcalc.png ToDo DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -620,9 +634,6 @@ +@@ -626,9 +642,6 @@ uninstall-am: uninstall-kde-icons unins messages: $(XGETTEXT) *.cpp -o $(podir)/kcalc.pot @@ -149,79 +163,55 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -@@ -668,28 +679,28 @@ - - - #>+ 12 --kcalc_la_meta_unload.cpp: kcalc.moc optiondialog.moc dlabel.moc -- @echo 'creating kcalc_la_meta_unload.cpp' -- @-rm -f kcalc_la_meta_unload.cpp -+libkcalc_main_la_meta_unload.cpp: kcalc.moc optiondialog.moc dlabel.moc -+ @echo 'creating libkcalc_main_la_meta_unload.cpp' -+ @-rm -f libkcalc_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kcalc_la[] = {' > kcalc_la_meta_unload.cpp ;\ -- cat kcalc.moc optiondialog.moc dlabel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcalc_la_meta_unload.cpp ;\ -- echo '0};' >> kcalc_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kcalc_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kcalc_la)' >> kcalc_la_meta_unload.cpp ;\ -- else echo > kcalc_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkcalc_main_la[] = {' > libkcalc_main_la_meta_unload.cpp ;\ -+ cat kcalc.moc optiondialog.moc dlabel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcalc_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkcalc_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkcalc_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkcalc_main_la)' >> libkcalc_main_la_meta_unload.cpp ;\ -+ else echo > libkcalc_main_la_meta_unload.cpp; fi +@@ -638,16 +651,16 @@ kcalc.moc: $(srcdir)/kcalc.h + $(MOC) $(srcdir)/kcalc.h -o kcalc.moc + #>+ 3 +-dlabel.moc: $(srcdir)/dlabel.h +- $(MOC) $(srcdir)/dlabel.h -o dlabel.moc +- +-#>+ 3 + optiondialog.moc: $(srcdir)/optiondialog.h + $(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc #>+ 3 - clean-moc-classes: -- -rm -f kcalc_la_meta_unload.cpp -+ -rm -f libkcalc_main_la_meta_unload.cpp ++dlabel.moc: $(srcdir)/dlabel.h ++ $(MOC) $(srcdir)/dlabel.h -o dlabel.moc ++ ++#>+ 3 + clean-metasources: +- -rm -f kcalc.moc dlabel.moc optiondialog.moc ++ -rm -f kcalc.moc optiondialog.moc dlabel.moc + + #>+ 2 + docs-am: +@@ -674,33 +687,33 @@ force-reedit: - #>+ 11 --kcalc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc.cpp $(srcdir)/kcalc_core.cpp $(srcdir)/dlabel.cpp $(srcdir)/stats.cpp $(srcdir)/optiondialog.cpp kcalc_la_meta_unload.cpp kcalc.moc optiondialog.moc dlabel.moc -+kcalc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc_main.cpp kcalc.moc optiondialog.moc dlabel.moc - @echo 'creating kcalc_la.all_cpp.cpp ...'; \ - rm -f kcalc_la.all_cpp.files kcalc_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kcalc_la.all_cpp.final; \ -- for file in kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp optiondialog.cpp kcalc_la_meta_unload.cpp ; do \ -+ for file in kcalc_main.cpp ; do \ - echo "#include \"$$file\"" >> kcalc_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcalc_la.all_cpp.final; \ - done; \ -@@ -697,11 +708,23 @@ - rm -f kcalc_la.all_cpp.final kcalc_la.all_cpp.files #>+ 11 --kcalc.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkcalc_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc.cpp $(srcdir)/kcalc_core.cpp $(srcdir)/dlabel.cpp $(srcdir)/stats.cpp $(srcdir)/optiondialog.cpp $(srcdir)/libkcalc_main_la_meta_unload.cpp +-kcalc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc.cpp $(srcdir)/kcalc_core.cpp $(srcdir)/dlabel.cpp $(srcdir)/stats.cpp $(srcdir)/optiondialog.cpp kcalc.moc dlabel.moc optiondialog.moc +- @echo 'creating kcalc_la.all_cpp.cpp ...'; \ +- rm -f kcalc_la.all_cpp.files kcalc_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kcalc_la.all_cpp.final; \ ++libkcalc_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc.cpp $(srcdir)/kcalc_core.cpp $(srcdir)/dlabel.cpp $(srcdir)/stats.cpp $(srcdir)/optiondialog.cpp kcalc.moc optiondialog.moc dlabel.moc + @echo 'creating libkcalc_main_la.all_cpp.cpp ...'; \ + rm -f libkcalc_main_la.all_cpp.files libkcalc_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkcalc_main_la.all_cpp.final; \ -+ for file in kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp optiondialog.cpp libkcalc_main_la_meta_unload.cpp ; do \ + for file in kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp optiondialog.cpp ; do \ +- echo "#include \"$$file\"" >> kcalc_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcalc_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkcalc_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcalc_main_la.all_cpp.final; \ -+ done; \ -+ cat libkcalc_main_la.all_cpp.final libkcalc_main_la.all_cpp.files > libkcalc_main_la.all_cpp.cpp; \ -+ rm -f libkcalc_main_la.all_cpp.final libkcalc_main_la.all_cpp.files -+ -+#>+ 11 -+kcalc.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc_main.cpp - @echo 'creating kcalc.all_cpp.cpp ...'; \ - rm -f kcalc.all_cpp.files kcalc.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kcalc.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kcalc_main.cpp ; do \ - echo "#include \"$$file\"" >> kcalc.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcalc.all_cpp.final; \ done; \ -@@ -710,20 +733,20 @@ +- cat kcalc_la.all_cpp.final kcalc_la.all_cpp.files > kcalc_la.all_cpp.cpp; \ +- rm -f kcalc_la.all_cpp.final kcalc_la.all_cpp.files ++ cat libkcalc_main_la.all_cpp.final libkcalc_main_la.all_cpp.files > libkcalc_main_la.all_cpp.cpp; \ ++ rm -f libkcalc_main_la.all_cpp.final libkcalc_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f kcalc_la.all_cpp.cpp kcalc.all_cpp.cpp -+ -rm -f kcalc_la.all_cpp.cpp libkcalc_main_la.all_cpp.cpp kcalc.all_cpp.cpp +- -rm -f kcalc_la.all_cpp.cpp ++ -rm -f libkcalc_main_la.all_cpp.cpp #>+ 2 final: @@ -241,4 +231,12 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $ + $(MAKE) libkcalc_main_la_OBJECTS="$(libkcalc_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean + $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean +@@ -713,6 +726,6 @@ kde-rpo-clean: + optiondialog.o: optiondialog.moc + kcalc.lo: kcalc.moc + optiondialog.lo: optiondialog.moc +-dlabel.lo: dlabel.moc + kcalc.o: kcalc.moc ++dlabel.lo: dlabel.moc + dlabel.o: dlabel.moc diff --git a/misc/kdeutils3/patches/patch-af b/misc/kdeutils3/patches/patch-af index 5395b324c3a..d7cdbf2f2f0 100644 --- a/misc/kdeutils3/patches/patch-af +++ b/misc/kdeutils3/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ +$NetBSD: patch-af,v 1.2 2003/01/02 09:12:29 skrll Exp $ ---- kedit/Makefile.in.orig Wed May 8 21:11:41 2002 +--- kedit/Makefile.in.orig Mon Dec 30 16:24:30 2002 +++ kedit/Makefile.in -@@ -237,16 +237,20 @@ +@@ -236,16 +236,20 @@ x_libraries = @x_libraries@ INCLUDES = $(all_includes) bin_PROGRAMS = kedit @@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ -kedit_la_SOURCES = kedit.cpp ktextfiledlg.cpp\ +libkedit_main_la_SOURCES = kedit.cpp ktextfiledlg.cpp\ - mail.cpp optiondialog.cpp + mail.cpp optiondialog.cpp -kedit_la_LIBADD = -lkdeprint -lkspell $(LIB_KFILE) $(LIB_KIO) +libkedit_main_la_LIBADD = -lkdeprint -lkspell $(LIB_KFILE) $(LIB_KIO) @@ -28,7 +28,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ kedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) noinst_HEADERS = kedit.h ktextfiledlg.h\ -@@ -270,23 +274,30 @@ +@@ -269,22 +273,29 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -37,10 +37,9 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ +kedit_la_DEPENDENCIES = libkedit_main.la +am_kedit_la_OBJECTS = kedit_main.lo #>- kedit_la_OBJECTS = $(am_kedit_la_OBJECTS) --#>+ 5 +-#>+ 4 -kedit_la_final_OBJECTS = kedit_la.all_cpp.lo --kedit_la_nofinal_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo optiondialog.lo \ -- kedit_la_meta_unload.lo +-kedit_la_nofinal_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo optiondialog.lo -@KDE_USE_FINAL_FALSE@kedit_la_OBJECTS = $(kedit_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kedit_la_OBJECTS = $(kedit_la_final_OBJECTS) +#>+ 1 @@ -49,11 +48,10 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ +am_libkedit_main_la_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo \ + optiondialog.lo +#>- libkedit_main_la_OBJECTS = $(am_libkedit_main_la_OBJECTS) -+#>+ 6 ++#>+ 5 +libkedit_main_la_final_OBJECTS = libkedit_main_la.all_cpp.lo +libkedit_main_la_nofinal_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo \ -+ optiondialog.lo \ -+ libkedit_main_la_meta_unload.lo ++ optiondialog.lo +@KDE_USE_FINAL_FALSE@libkedit_main_la_OBJECTS = $(libkedit_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkedit_main_la_OBJECTS = $(libkedit_main_la_final_OBJECTS) bin_PROGRAMS = kedit$(EXEEXT) @@ -70,20 +68,33 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -294,9 +305,9 @@ +@@ -292,16 +303,16 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kedit.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/ktextfiledlg.Plo $(DEPDIR)/mail.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/optiondialog.Plo -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kedit.Plo $(DEPDIR)/kedit_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kedit_main.Po $(DEPDIR)/ktextfiledlg.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/mail.Plo $(DEPDIR)/optiondialog.Plo +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kedit.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/ktextfiledlg.Plo $(DEPDIR)/mail.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/optiondialog.Plo ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kedit.Plo $(DEPDIR)/kedit_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kedit_main.Po $(DEPDIR)/ktextfiledlg.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/mail.Plo $(DEPDIR)/optiondialog.Plo + #>+ 7 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kedit_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/kedit.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ktextfiledlg.Plo $(DEPDIR)/mail.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/optiondialog.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kedit.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ktextfiledlg.Plo $(DEPDIR)/mail.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/optiondialog.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkedit_main_la.all_cpp.P $(DEPDIR)/kedit.Plo $(DEPDIR)/kedit_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kedit_main.Po $(DEPDIR)/ktextfiledlg.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/mail.Plo $(DEPDIR)/optiondialog.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kedit.Plo $(DEPDIR)/kedit_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kedit_main.Po $(DEPDIR)/ktextfiledlg.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/mail.Plo $(DEPDIR)/optiondialog.Plo + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -316,7 +327,8 @@ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -322,7 +333,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -93,7 +104,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ DATA = $(apps_DATA) $(rc_DATA) HEADERS = $(noinst_HEADERS) -@@ -329,7 +341,7 @@ +@@ -335,7 +347,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r DIST_COMMON = README $(noinst_HEADERS) ChangeLog Makefile.am \ Makefile.in TODO DIST_SUBDIRS = $(SUBDIRS) @@ -102,7 +113,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ #>- all: all-recursive #>+ 1 -@@ -378,6 +390,8 @@ +@@ -384,6 +396,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) kedit.la: $(kedit_la_OBJECTS) $(kedit_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kedit_la_LDFLAGS) $(kedit_la_OBJECTS) $(kedit_la_LIBADD) $(LIBS) @@ -111,7 +122,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -412,8 +426,9 @@ +@@ -418,8 +432,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -122,16 +133,16 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ktextfiledlg.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mail.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/optiondialog.Plo@am__quote@ -@@ -569,7 +584,7 @@ +@@ -575,7 +590,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=optionstate.h KEdit.desktop keditui.rc -+KDE_DIST=KEdit.desktop kedit keditui.rc dummy.cpp optionstate.h +-KDE_DIST=optionstate.h keditui.rc KEdit.desktop ++KDE_DIST=KEdit.desktop keditui.rc optionstate.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -708,9 +723,6 @@ +@@ -714,14 +729,15 @@ uninstall-info: uninstall-info-recursive messages: rc.cpp $(XGETTEXT) rc.cpp *.cpp -o $(podir)/kedit.pot @@ -141,79 +152,56 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -@@ -746,28 +758,28 @@ - - - #>+ 12 --kedit_la_meta_unload.cpp: optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc -- @echo 'creating kedit_la_meta_unload.cpp' -- @-rm -f kedit_la_meta_unload.cpp -+libkedit_main_la_meta_unload.cpp: optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc -+ @echo 'creating libkedit_main_la_meta_unload.cpp' -+ @-rm -f libkedit_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kedit_la[] = {' > kedit_la_meta_unload.cpp ;\ -- cat optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kedit_la_meta_unload.cpp ;\ -- echo '0};' >> kedit_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kedit_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kedit_la)' >> kedit_la_meta_unload.cpp ;\ -- else echo > kedit_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkedit_main_la[] = {' > libkedit_main_la_meta_unload.cpp ;\ -+ cat optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkedit_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkedit_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkedit_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkedit_main_la)' >> libkedit_main_la_meta_unload.cpp ;\ -+ else echo > libkedit_main_la_meta_unload.cpp; fi + #>+ 3 ++optiondialog.moc: $(srcdir)/optiondialog.h ++ $(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc ++ ++#>+ 3 + mail.moc: $(srcdir)/mail.h + $(MOC) $(srcdir)/mail.h -o mail.moc + +@@ -734,12 +750,8 @@ kedit.moc: $(srcdir)/kedit.h + $(MOC) $(srcdir)/kedit.h -o kedit.moc #>+ 3 - clean-moc-classes: -- -rm -f kedit_la_meta_unload.cpp -+ -rm -f libkedit_main_la_meta_unload.cpp +-optiondialog.moc: $(srcdir)/optiondialog.h +- $(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc +- +-#>+ 3 + clean-metasources: +- -rm -f mail.moc ktextfiledlg.moc kedit.moc optiondialog.moc ++ -rm -f optiondialog.moc mail.moc ktextfiledlg.moc kedit.moc + + #>+ 2 + docs-am: +@@ -752,33 +764,33 @@ force-reedit: - #>+ 11 --kedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp kedit_la_meta_unload.cpp optiondialog.moc mail.moc ktextfiledlg.moc kedit.moc -+kedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit_main.cpp optiondialog.moc mail.moc ktextfiledlg.moc kedit.moc - @echo 'creating kedit_la.all_cpp.cpp ...'; \ - rm -f kedit_la.all_cpp.files kedit_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kedit_la.all_cpp.final; \ -- for file in kedit.cpp ktextfiledlg.cpp mail.cpp optiondialog.cpp kedit_la_meta_unload.cpp ; do \ -+ for file in kedit_main.cpp ; do \ - echo "#include \"$$file\"" >> kedit_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kedit_la.all_cpp.final; \ - done; \ -@@ -775,11 +787,23 @@ - rm -f kedit_la.all_cpp.final kedit_la.all_cpp.files #>+ 11 --kedit.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkedit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp $(srcdir)/libkedit_main_la_meta_unload.cpp +-kedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp mail.moc kedit.moc ktextfiledlg.moc optiondialog.moc +- @echo 'creating kedit_la.all_cpp.cpp ...'; \ +- rm -f kedit_la.all_cpp.files kedit_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kedit_la.all_cpp.final; \ ++libkedit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc + @echo 'creating libkedit_main_la.all_cpp.cpp ...'; \ + rm -f libkedit_main_la.all_cpp.files libkedit_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkedit_main_la.all_cpp.final; \ -+ for file in kedit.cpp ktextfiledlg.cpp mail.cpp optiondialog.cpp libkedit_main_la_meta_unload.cpp ; do \ + for file in kedit.cpp ktextfiledlg.cpp mail.cpp optiondialog.cpp ; do \ +- echo "#include \"$$file\"" >> kedit_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kedit_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkedit_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkedit_main_la.all_cpp.final; \ -+ done; \ -+ cat libkedit_main_la.all_cpp.final libkedit_main_la.all_cpp.files > libkedit_main_la.all_cpp.cpp; \ -+ rm -f libkedit_main_la.all_cpp.final libkedit_main_la.all_cpp.files -+ -+#>+ 11 -+kedit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit_main.cpp - @echo 'creating kedit.all_cpp.cpp ...'; \ - rm -f kedit.all_cpp.files kedit.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kedit.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kedit_main.cpp ; do \ - echo "#include \"$$file\"" >> kedit.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kedit.all_cpp.final; \ done; \ -@@ -788,20 +812,20 @@ +- cat kedit_la.all_cpp.final kedit_la.all_cpp.files > kedit_la.all_cpp.cpp; \ +- rm -f kedit_la.all_cpp.final kedit_la.all_cpp.files ++ cat libkedit_main_la.all_cpp.final libkedit_main_la.all_cpp.files > libkedit_main_la.all_cpp.cpp; \ ++ rm -f libkedit_main_la.all_cpp.final libkedit_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f kedit_la.all_cpp.cpp kedit.all_cpp.cpp -+ -rm -f kedit_la.all_cpp.cpp libkedit_main_la.all_cpp.cpp kedit.all_cpp.cpp +- -rm -f kedit_la.all_cpp.cpp ++ -rm -f libkedit_main_la.all_cpp.cpp #>+ 2 final: @@ -233,4 +221,18 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ + $(MAKE) libkedit_main_la_OBJECTS="$(libkedit_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean + $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean +@@ -789,10 +801,10 @@ kde-rpo-clean: + + #>+ 9 + optiondialog.o: optiondialog.moc +-mail.o: mail.moc ++mail.lo: mail.moc + optiondialog.lo: optiondialog.moc ++mail.o: mail.moc + kedit.lo: kedit.moc +-ktextfiledlg.lo: ktextfiledlg.moc + ktextfiledlg.o: ktextfiledlg.moc +-mail.lo: mail.moc ++ktextfiledlg.lo: ktextfiledlg.moc + kedit.o: kedit.moc diff --git a/misc/kdeutils3/patches/patch-ak b/misc/kdeutils3/patches/patch-ak index 80184cdf168..cc41ec9cbc7 100644 --- a/misc/kdeutils3/patches/patch-ak +++ b/misc/kdeutils3/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ +$NetBSD: patch-ak,v 1.2 2003/01/02 09:12:29 skrll Exp $ ---- klaptopdaemon/Makefile.in.orig Wed May 8 21:11:42 2002 +--- klaptopdaemon/Makefile.in.orig Mon Dec 30 16:24:30 2002 +++ klaptopdaemon/Makefile.in -@@ -227,18 +227,22 @@ +@@ -226,18 +226,22 @@ qt_libraries = @qt_libraries@ x_includes = @x_includes@ x_libraries = @x_libraries@ @@ -30,8 +30,8 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ kcm_laptop_la_SOURCES = battery.cpp main.cpp pcmcia.cpp power.cpp warning.cpp portable.cpp -@@ -267,25 +271,31 @@ - kcm_laptop_la_meta_unload.lo +@@ -265,24 +269,30 @@ kcm_laptop_la_nofinal_OBJECTS = battery. + warning.lo portable.lo @KDE_USE_FINAL_FALSE@kcm_laptop_la_OBJECTS = $(kcm_laptop_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@kcm_laptop_la_OBJECTS = $(kcm_laptop_la_final_OBJECTS) -klaptopdaemon_la_DEPENDENCIES = @@ -46,18 +46,16 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ +am_libklaptopdaemon_main_la_OBJECTS = laptop_daemon.lo kpcmcia.lo \ + kpcmciainfo.lo daemondock.lo notify.lo portable.lo +#>- libklaptopdaemon_main_la_OBJECTS = \ -+#>- $(am_libklaptopdaemon_main_la_OBJECTS) - #>+ 6 ++#>- $(am_libklaptopdaemon_main_la_OBJECTS) + #>+ 5 -klaptopdaemon_la_final_OBJECTS = klaptopdaemon_la.all_cpp.lo -klaptopdaemon_la_nofinal_OBJECTS = laptop_daemon.lo kpcmcia.lo kpcmciainfo.lo \ -- daemondock.lo notify.lo portable.lo \ -- klaptopdaemon_la_meta_unload.lo +- daemondock.lo notify.lo portable.lo -@KDE_USE_FINAL_FALSE@klaptopdaemon_la_OBJECTS = $(klaptopdaemon_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@klaptopdaemon_la_OBJECTS = $(klaptopdaemon_la_final_OBJECTS) +libklaptopdaemon_main_la_final_OBJECTS = libklaptopdaemon_main_la.all_cpp.lo +libklaptopdaemon_main_la_nofinal_OBJECTS = laptop_daemon.lo kpcmcia.lo \ -+ kpcmciainfo.lo daemondock.lo notify.lo portable.lo \ -+ libklaptopdaemon_main_la_meta_unload.lo ++ kpcmciainfo.lo daemondock.lo notify.lo portable.lo +@KDE_USE_FINAL_FALSE@libklaptopdaemon_main_la_OBJECTS = $(libklaptopdaemon_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libklaptopdaemon_main_la_OBJECTS = $(libklaptopdaemon_main_la_final_OBJECTS) bin_PROGRAMS = klaptopdaemon$(EXEEXT) @@ -74,19 +72,42 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -293,8 +303,9 @@ +@@ -290,23 +300,26 @@ CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/battery.Plo $(DEPDIR)/daemondock.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/kpcmcia.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/kpcmciainfo.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/klaptopdaemon_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/klaptopdaemon_main.Po \ -+ @AMDEP_TRUE@ $(DEPDIR)/kpcmcia.Plo $(DEPDIR)/kpcmciainfo.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/laptop_daemon.Plo $(DEPDIR)/main.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/notify.Plo $(DEPDIR)/pcmcia.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/portable.Plo $(DEPDIR)/power.Plo \ -@@ -319,7 +330,7 @@ + #>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/battery.Plo $(DEPDIR)/daemondock.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/kpcmcia.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/kpcmciainfo.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/klaptopdaemon_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/klaptopdaemon_main.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kpcmcia.Plo $(DEPDIR)/kpcmciainfo.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/laptop_daemon.Plo $(DEPDIR)/main.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/notify.Plo $(DEPDIR)/pcmcia.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/portable.Plo $(DEPDIR)/power.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/warning.Plo +-#>+ 15 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcm_laptop_la.all_cpp.P $(DEPDIR)/klaptopdaemon_la.all_cpp.P $(DEPDIR)/battery.Plo $(DEPDIR)/daemondock.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/kpcmcia.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kpcmciainfo.Plo \ ++#>+ 17 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcm_laptop_la.all_cpp.P $(DEPDIR)/libklaptopdaemon_main_la.all_cpp.P $(DEPDIR)/battery.Plo $(DEPDIR)/daemondock.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/klaptopdaemon_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/klaptopdaemon_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kpcmcia.Plo $(DEPDIR)/kpcmciainfo.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/laptop_daemon.Plo $(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/notify.Plo $(DEPDIR)/pcmcia.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/portable.Plo $(DEPDIR)/power.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/warning.Plo + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/battery.Plo $(DEPDIR)/daemondock.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/kpcmcia.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kpcmciainfo.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/klaptopdaemon_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/klaptopdaemon_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kpcmcia.Plo $(DEPDIR)/kpcmciainfo.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/laptop_daemon.Plo $(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/notify.Plo $(DEPDIR)/pcmcia.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/portable.Plo $(DEPDIR)/power.Plo \ +@@ -332,7 +345,7 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(kcm_laptop_la_SOURCES) $(klaptopdaemon_la_SOURCES) \ @@ -95,7 +116,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ uninstall-info-recursive all-recursive install-data-recursive \ -@@ -327,7 +338,7 @@ +@@ -340,7 +353,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = README Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -104,7 +125,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ #>- all: all-recursive #>+ 1 -@@ -400,6 +411,8 @@ +@@ -413,6 +426,8 @@ clean-libLTLIBRARIES: $(CXXLINK) -rpath $(kde_moduledir) $(kcm_laptop_la_LDFLAGS) $(kcm_laptop_la_OBJECTS) $(kcm_laptop_la_LIBADD) $(LIBS) klaptopdaemon.la: $(klaptopdaemon_la_OBJECTS) $(klaptopdaemon_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(klaptopdaemon_la_LDFLAGS) $(klaptopdaemon_la_OBJECTS) $(klaptopdaemon_la_LIBADD) $(LIBS) @@ -113,7 +134,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -436,7 +449,8 @@ +@@ -449,7 +464,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/battery.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/daemondock.Plo@am__quote@ @@ -123,16 +144,16 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kpcmcia.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kpcmciainfo.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/laptop_daemon.Plo@am__quote@ -@@ -564,7 +578,7 @@ +@@ -577,7 +593,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=pcmcia.h configure.in.in battery.h notify.h power.h warning.h kpcmciainfo.h version.h daemondock.h portable.h kpcmcia.h laptop_daemon.h -+KDE_DIST=power.h warning.h configure.in.in kpcmciainfo.h battery.h version.h klaptopdaemon portable.h daemondock.h pcmcia.h kcm_laptop.la.closure kpcmcia.h laptop_daemon.h notify.h dummy.cpp +-KDE_DIST=pcmcia.h power.h portable.h daemondock.h laptop_daemon.h kpcmciainfo.h warning.h kpcmcia.h notify.h configure.in.in battery.h version.h ++KDE_DIST=power.h warning.h configure.in.in kpcmciainfo.h battery.h version.h portable.h daemondock.h pcmcia.h kpcmcia.h laptop_daemon.h notify.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -708,9 +722,6 @@ +@@ -721,9 +737,6 @@ uninstall-info: uninstall-info-recursive messages: $(XGETTEXT) $(klaptopdaemon_la_SOURCES) -o $(podir)/klaptopdaemon.pot $(XGETTEXT) $(kcm_laptop_la_SOURCES) -o $(podir)/kcmlaptop.pot @@ -142,88 +163,97 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -@@ -792,24 +803,24 @@ - - - #>+ 12 --klaptopdaemon_la_meta_unload.cpp: daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc -- @echo 'creating klaptopdaemon_la_meta_unload.cpp' -- @-rm -f klaptopdaemon_la_meta_unload.cpp -+libklaptopdaemon_main_la_meta_unload.cpp: daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc -+ @echo 'creating libklaptopdaemon_main_la_meta_unload.cpp' -+ @-rm -f libklaptopdaemon_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_klaptopdaemon_la[] = {' > klaptopdaemon_la_meta_unload.cpp ;\ -- cat daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> klaptopdaemon_la_meta_unload.cpp ;\ -- echo '0};' >> klaptopdaemon_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> klaptopdaemon_la_meta_unload.cpp ;\ -- echo '_UNLOAD(klaptopdaemon_la)' >> klaptopdaemon_la_meta_unload.cpp ;\ -- else echo > klaptopdaemon_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libklaptopdaemon_main_la[] = {' > libklaptopdaemon_main_la_meta_unload.cpp ;\ -+ cat daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libklaptopdaemon_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libklaptopdaemon_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libklaptopdaemon_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libklaptopdaemon_main_la)' >> libklaptopdaemon_main_la_meta_unload.cpp ;\ -+ else echo > libklaptopdaemon_main_la_meta_unload.cpp; fi +@@ -738,20 +751,28 @@ kcm_laptop.la.closure: $(kcm_laptop_la_O + + + #>+ 3 ++kpcmciainfo.moc: $(srcdir)/kpcmciainfo.h ++ $(MOC) $(srcdir)/kpcmciainfo.h -o kpcmciainfo.moc ++ ++#>+ 3 + kpcmcia.moc: $(srcdir)/kpcmcia.h + $(MOC) $(srcdir)/kpcmcia.h -o kpcmcia.moc + + #>+ 3 +-kpcmciainfo.moc: $(srcdir)/kpcmciainfo.h +- $(MOC) $(srcdir)/kpcmciainfo.h -o kpcmciainfo.moc ++pcmcia.moc: $(srcdir)/pcmcia.h ++ $(MOC) $(srcdir)/pcmcia.h -o pcmcia.moc ++ ++#>+ 3 ++daemondock.moc: $(srcdir)/daemondock.h ++ $(MOC) $(srcdir)/daemondock.h -o daemondock.moc + + #>+ 3 + battery.moc: $(srcdir)/battery.h + $(MOC) $(srcdir)/battery.h -o battery.moc + + #>+ 3 +-daemondock.moc: $(srcdir)/daemondock.h +- $(MOC) $(srcdir)/daemondock.h -o daemondock.moc ++notify.moc: $(srcdir)/notify.h ++ $(MOC) $(srcdir)/notify.h -o notify.moc + + #>+ 3 + power.moc: $(srcdir)/power.h +@@ -762,20 +783,12 @@ warning.moc: $(srcdir)/warning.h + $(MOC) $(srcdir)/warning.h -o warning.moc + #>+ 3 +-pcmcia.moc: $(srcdir)/pcmcia.h +- $(MOC) $(srcdir)/pcmcia.h -o pcmcia.moc +- +-#>+ 3 +-notify.moc: $(srcdir)/notify.h +- $(MOC) $(srcdir)/notify.h -o notify.moc +- +-#>+ 3 + laptop_daemon.moc: $(srcdir)/laptop_daemon.h + $(MOC) $(srcdir)/laptop_daemon.h -o laptop_daemon.moc #>+ 3 - clean-moc-classes: -- -rm -f kcm_laptop_la_meta_unload.cpp klaptopdaemon_la_meta_unload.cpp -+ -rm -f kcm_laptop_la_meta_unload.cpp libklaptopdaemon_main_la_meta_unload.cpp + clean-metasources: +- -rm -f kpcmcia.moc kpcmciainfo.moc battery.moc daemondock.moc power.moc warning.moc pcmcia.moc notify.moc laptop_daemon.moc ++ -rm -f kpcmciainfo.moc kpcmcia.moc pcmcia.moc daemondock.moc battery.moc notify.moc power.moc warning.moc laptop_daemon.moc + + #>+ 3 + clean-closures: +@@ -792,7 +805,7 @@ force-reedit: + #>+ 11 --kcm_laptop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/battery.cpp $(srcdir)/main.cpp $(srcdir)/pcmcia.cpp $(srcdir)/power.cpp $(srcdir)/warning.cpp $(srcdir)/portable.cpp kcm_laptop_la_meta_unload.cpp kpcmciainfo.moc kpcmcia.moc pcmcia.moc daemondock.moc battery.moc notify.moc power.moc warning.moc laptop_daemon.moc -+kcm_laptop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/battery.cpp $(srcdir)/main.cpp $(srcdir)/pcmcia.cpp $(srcdir)/power.cpp $(srcdir)/warning.cpp $(srcdir)/portable.cpp $(srcdir)/kcm_laptop_la_meta_unload.cpp kpcmciainfo.moc kpcmcia.moc pcmcia.moc daemondock.moc battery.moc notify.moc power.moc warning.moc laptop_daemon.moc +-kcm_laptop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/battery.cpp $(srcdir)/main.cpp $(srcdir)/pcmcia.cpp $(srcdir)/power.cpp $(srcdir)/warning.cpp $(srcdir)/portable.cpp battery.moc pcmcia.moc warning.moc power.moc ++kcm_laptop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/battery.cpp $(srcdir)/main.cpp $(srcdir)/pcmcia.cpp $(srcdir)/power.cpp $(srcdir)/warning.cpp $(srcdir)/portable.cpp pcmcia.moc battery.moc power.moc warning.moc @echo 'creating kcm_laptop_la.all_cpp.cpp ...'; \ rm -f kcm_laptop_la.all_cpp.files kcm_laptop_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kcm_laptop_la.all_cpp.final; \ -@@ -821,11 +832,11 @@ +@@ -804,33 +817,33 @@ kcm_laptop_la.all_cpp.cpp: $(srcdir)/Mak rm -f kcm_laptop_la.all_cpp.final kcm_laptop_la.all_cpp.files #>+ 11 --klaptopdaemon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/laptop_daemon.cpp $(srcdir)/kpcmcia.cpp $(srcdir)/kpcmciainfo.cpp $(srcdir)/daemondock.cpp $(srcdir)/notify.cpp $(srcdir)/portable.cpp klaptopdaemon_la_meta_unload.cpp -+klaptopdaemon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klaptopdaemon_main.cpp - @echo 'creating klaptopdaemon_la.all_cpp.cpp ...'; \ - rm -f klaptopdaemon_la.all_cpp.files klaptopdaemon_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> klaptopdaemon_la.all_cpp.final; \ -- for file in laptop_daemon.cpp kpcmcia.cpp kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp klaptopdaemon_la_meta_unload.cpp ; do \ -+ for file in klaptopdaemon_main.cpp ; do \ - echo "#include \"$$file\"" >> klaptopdaemon_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klaptopdaemon_la.all_cpp.final; \ - done; \ -@@ -833,11 +844,23 @@ - rm -f klaptopdaemon_la.all_cpp.final klaptopdaemon_la.all_cpp.files - - #>+ 11 --klaptopdaemon.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libklaptopdaemon_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/laptop_daemon.cpp $(srcdir)/kpcmcia.cpp $(srcdir)/kpcmciainfo.cpp $(srcdir)/daemondock.cpp $(srcdir)/notify.cpp $(srcdir)/portable.cpp libklaptopdaemon_main_la_meta_unload.cpp +-klaptopdaemon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/laptop_daemon.cpp $(srcdir)/kpcmcia.cpp $(srcdir)/kpcmciainfo.cpp $(srcdir)/daemondock.cpp $(srcdir)/notify.cpp $(srcdir)/portable.cpp daemondock.moc kpcmcia.moc laptop_daemon.moc notify.moc kpcmciainfo.moc +- @echo 'creating klaptopdaemon_la.all_cpp.cpp ...'; \ +- rm -f klaptopdaemon_la.all_cpp.files klaptopdaemon_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> klaptopdaemon_la.all_cpp.final; \ ++libklaptopdaemon_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/laptop_daemon.cpp $(srcdir)/kpcmcia.cpp $(srcdir)/kpcmciainfo.cpp $(srcdir)/daemondock.cpp $(srcdir)/notify.cpp $(srcdir)/portable.cpp daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc + @echo 'creating libklaptopdaemon_main_la.all_cpp.cpp ...'; \ + rm -f libklaptopdaemon_main_la.all_cpp.files libklaptopdaemon_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libklaptopdaemon_main_la.all_cpp.final; \ -+ for file in laptop_daemon.cpp kpcmcia.cpp kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp libklaptopdaemon_main_la_meta_unload.cpp ; do \ + for file in laptop_daemon.cpp kpcmcia.cpp kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp ; do \ +- echo "#include \"$$file\"" >> klaptopdaemon_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klaptopdaemon_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libklaptopdaemon_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libklaptopdaemon_main_la.all_cpp.final; \ -+ done; \ -+ cat libklaptopdaemon_main_la.all_cpp.final libklaptopdaemon_main_la.all_cpp.files > libklaptopdaemon_main_la.all_cpp.cpp; \ -+ rm -f libklaptopdaemon_main_la.all_cpp.final libklaptopdaemon_main_la.all_cpp.files -+ -+#>+ 11 -+klaptopdaemon.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klaptopdaemon_main.cpp - @echo 'creating klaptopdaemon.all_cpp.cpp ...'; \ - rm -f klaptopdaemon.all_cpp.files klaptopdaemon.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> klaptopdaemon.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in klaptopdaemon_main.cpp ; do \ - echo "#include \"$$file\"" >> klaptopdaemon.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klaptopdaemon.all_cpp.final; \ done; \ -@@ -846,20 +869,20 @@ +- cat klaptopdaemon_la.all_cpp.final klaptopdaemon_la.all_cpp.files > klaptopdaemon_la.all_cpp.cpp; \ +- rm -f klaptopdaemon_la.all_cpp.final klaptopdaemon_la.all_cpp.files ++ cat libklaptopdaemon_main_la.all_cpp.final libklaptopdaemon_main_la.all_cpp.files > libklaptopdaemon_main_la.all_cpp.cpp; \ ++ rm -f libklaptopdaemon_main_la.all_cpp.final libklaptopdaemon_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f kcm_laptop_la.all_cpp.cpp klaptopdaemon_la.all_cpp.cpp klaptopdaemon.all_cpp.cpp -+ -rm -f kcm_laptop_la.all_cpp.cpp klaptopdaemon_la.all_cpp.cpp libklaptopdaemon_main_la.all_cpp.cpp klaptopdaemon.all_cpp.cpp +- -rm -f kcm_laptop_la.all_cpp.cpp klaptopdaemon_la.all_cpp.cpp ++ -rm -f kcm_laptop_la.all_cpp.cpp libklaptopdaemon_main_la.all_cpp.cpp #>+ 2 final: @@ -243,4 +273,36 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ + $(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_nofinal_OBJECTS)" libklaptopdaemon_main_la_OBJECTS="$(libklaptopdaemon_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean + $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean +@@ -841,20 +854,20 @@ kde-rpo-clean: + + #>+ 19 + kpcmcia.o: kpcmcia.moc +-battery.lo: battery.moc +-notify.o: notify.moc +-pcmcia.lo: pcmcia.moc + kpcmcia.lo: kpcmcia.moc +-laptop_daemon.lo: laptop_daemon.moc ++laptop_daemon.o: laptop_daemon.moc ++notify.o: notify.moc + power.o: power.moc +-daemondock.o: daemondock.moc +-power.lo: power.moc + notify.lo: notify.moc ++warning.lo: warning.moc ++warning.o: warning.moc ++laptop_daemon.lo: laptop_daemon.moc ++kpcmciainfo.o: kpcmciainfo.moc + battery.o: battery.moc +-pcmcia.o: pcmcia.moc ++pcmcia.lo: pcmcia.moc ++battery.lo: battery.moc + daemondock.lo: daemondock.moc +-warning.o: warning.moc ++daemondock.o: daemondock.moc ++pcmcia.o: pcmcia.moc + kpcmciainfo.lo: kpcmciainfo.moc +-laptop_daemon.o: laptop_daemon.moc +-warning.lo: warning.moc +-kpcmciainfo.o: kpcmciainfo.moc ++power.lo: power.moc |