Fix more {kde_module,lib}_LTLIBRARIES lossage.

6 files changed, 123 insertions, 6 deletions

diff --git a/x11/kdelibs3/PLIST b/x11/kdelibs3/PLIST
index f4e708fd30e..362eab8e72a 100644
--- a/x11/kdelibs3/PLIST
+++ b/x11/kdelibs3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/06/26 10:37:09 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/06/27 07:10:13 skrll Exp $
 bin/artsmessage
 bin/checkXML
 ${CUPS}bin/cupsdconf
@@ -547,6 +547,9 @@ lib/kde3/kdeprint_rlpr.so
 lib/kde3/kgzipfilter.a
 lib/kde3/kgzipfilter.la
 lib/kde3/kgzipfilter.so
+lib/kde3/khtmlimagepart.a
+lib/kde3/khtmlimagepart.la
+lib/kde3/khtmlimagepart.so
 lib/kde3/kimg_eps.a
 lib/kde3/kimg_eps.la
 lib/kde3/kimg_eps.so
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index c78d741f810..d8d7bfe464e 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/31 13:16:42 skrll Exp $
+$NetBSD: distinfo,v 1.2 2002/06/27 07:10:14 skrll Exp $
 
 SHA1 (kdelibs-3.0.1.tar.bz2) = 2d2f33d4f76d6f3c8bad0e1f4e486e8521b8c3ba
 Size (kdelibs-3.0.1.tar.bz2) = 7593201 bytes
@@ -41,7 +41,7 @@ SHA1 (patch-bj) = 36f1e6e2b4dc8be210d7e1cd8e0f80bec08f6a93
 SHA1 (patch-bk) = 62b9f296f7e0a0001c38daf3d862b35ba055e7eb
 SHA1 (patch-bl) = 9d4fbc90cb5a638739c3748fbedf74707e96d342
 SHA1 (patch-bm) = 3d9cc7de58f13aa55a5035153174a73aad082ff3
-SHA1 (patch-bn) = 5e1e346dcdb9a5fcc76965aa2b64888f14b5d3eb
+SHA1 (patch-bn) = 9525a052f60249ebfe2b5d425099e95c0ddea358
 SHA1 (patch-bo) = 5be3545572b4b9ba703f09fd65dfcd3357307e20
 SHA1 (patch-bp) = f63f0d5bbcf632bc11d28c8cf8034ec9549cd8e2
 SHA1 (patch-bq) = f2aaa203c1c2b968530ea0e2b1c0d2767769093b
@@ -50,3 +50,6 @@ SHA1 (patch-bs) = 97857ea3a7f43ce73b327e2a2fe10a0e4a5ce1c8
 SHA1 (patch-bt) = 8849d373460f275ab8fdc736f558d8b8daa653a5
 SHA1 (patch-bu) = 65aca46f30be04c0d8177498eac149437b21ba56
 SHA1 (patch-bv) = b25498d7705b1c9fae59dbe3ef68dd8bb5145419
+SHA1 (patch-bw) = 246c7123c8ec52944bd99cab1ec8b1226435f5e0
+SHA1 (patch-bx) = bdb54c677c9e21ecf0a67b617e17f26f5fd40019
+SHA1 (patch-by) = b3eec86ae3ffbf5a17fa808c973f0968e6c680e6
diff --git a/x11/kdelibs3/patches/patch-bn b/x11/kdelibs3/patches/patch-bn
index b635bcb3ce4..55ce6de7421 100644
--- a/x11/kdelibs3/patches/patch-bn
+++ b/x11/kdelibs3/patches/patch-bn
@@ -1,6 +1,6 @@
-$NetBSD: patch-bn,v 1.1.1.1 2002/05/31 13:16:48 skrll Exp $
+$NetBSD: patch-bn,v 1.2 2002/06/27 07:10:14 skrll Exp $
 
---- kioslave/http/Makefile.in.orig	Tue May 21 15:42:15 2002
+--- kioslave/http/Makefile.in.orig	Wed Jun 26 08:21:42 2002
 +++ kioslave/http/Makefile.in
 @@ -273,19 +273,22 @@
  
@@ -120,10 +120,19 @@ $NetBSD: patch-bn,v 1.1.1.1 2002/05/31 13:16:48 skrll Exp $
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=README.http_cache_cleaner README.webdav THOUGHTS https.protocol rfc2616.txt rfc2617.txt http.protocol http_cache_cleaner.desktop webdavs.protocol webdav.protocol 
-+KDE_DIST=README.http_cache_cleaner http_cache_cleaner.desktop webdavs.protocol http.protocol webdav.protocol README.webdav https.protocol rfc2616.txt rfc2617.txt THOUGHTS 
++KDE_DIST=README.http_cache_cleaner http_cache_cleaner.desktop webdavs.protocol http.protocol webdav.protocol README.webdav https.protocol rfc2616.txt rfc2617.txt kio_http.la.closure THOUGHTS kio_http_cache_cleaner 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
+@@ -729,7 +746,7 @@
+ 
+ #>- install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+ #>+ 1
+-install-exec-am: install-kde_moduleLTLIBRARIES install-binPROGRAMS install-libLTLIBRARIES
++install-exec-am: install-binPROGRAMS install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
+ 
+ install-info: install-info-recursive
+ 
 @@ -774,9 +791,6 @@
  	uninstall-kdelnkDATA uninstall-libLTLIBRARIES \
  	uninstall-recursive
diff --git a/x11/kdelibs3/patches/patch-bw b/x11/kdelibs3/patches/patch-bw
new file mode 100644
index 00000000000..915702fa739
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-bw
@@ -0,0 +1,22 @@
+$NetBSD: patch-bw,v 1.1 2002/06/27 07:10:15 skrll Exp $
+
+--- admin/am_edit.orig	Wed Jun 26 08:27:56 2002
++++ admin/am_edit
+@@ -384,7 +384,16 @@
+     # all modules are installed.  automake doesn't know this, so we need to move
+     # this here from install-data to install-exec.
+     if ($MakefileData =~ m/\nkde_module_LTLIBRARIES\s*=/) {
+-      $target_adds{"install-exec-am"} .= "install-kde_moduleLTLIBRARIES";
++      my $lookup2 = 'install-exec-am:\s*([^\n]*)';
++      if ($MakefileData =~ /\n$lookup2\n/) {
++        my $newdeps = $1;
++        if ($newdeps =~ m/\s*install-libLTLIBRARIES\s*/) {
++	  $newdeps =~ s/(install-libLTLIBRARIES)/$1 install-kde_moduleLTLIBRARIES/g;
++	  substituteLine($lookup2, "install-exec-am: " . $newdeps);
++        } else {
++          $target_adds{"install-exec-am"} .= "install-kde_moduleLTLIBRARIES";
++        }
++      }
+       my $lookup = 'install-data-am:\s*(.*)';
+       if ($MakefileData =~ /\n$lookup\n/) {
+         my $newdeps = $1;
diff --git a/x11/kdelibs3/patches/patch-bx b/x11/kdelibs3/patches/patch-bx
new file mode 100644
index 00000000000..5ce76c826b3
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-bx
@@ -0,0 +1,40 @@
+$NetBSD: patch-bx,v 1.1 2002/06/27 07:10:15 skrll Exp $
+
+--- khtml/Makefile.in.orig	Wed Jun 26 08:21:40 2002
++++ khtml/Makefile.in
+@@ -833,7 +833,7 @@
+ 
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=khtmlimage.desktop domtreeview.h khtml_events.cpp TODO-3.0 khtml_browser.rc configure.in.in khtml_iface.cc khtml.rc khtml_factory.h khtml_printsettings.cpp khtml_pagecache.cpp khtml_iface.h khtml_run.h khtml_ext.cpp DESIGN.html khtml.desktop khtml_find.cpp SECURITY khtml_popupmenu.rc 
++KDE_DIST=khtml_iface.h khtmlimage.desktop khtml.desktop khtml_find.cpp domtreeview.h configure.in.in khtml_iface.cc khtml_events.cpp SECURITY khtml_popupmenu.rc khtml_run.h khtml_iface_skel.cc TODO-3.0 libkhtml.la.closure khtml_ext.cpp khtml.rc khtmlimagepart.la.closure khtml_iface.kidl khtml_factory.h khtml_printsettings.cpp khtml_pagecache.cpp khtml_browser.rc DESIGN.html 
+ 
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ 
+@@ -932,7 +932,7 @@
+ 
+ #>- install-exec-am: install-libLTLIBRARIES
+ #>+ 1
+-install-exec-am: install-kde_moduleLTLIBRARIES install-libLTLIBRARIES
++install-exec-am: install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
+ 
+ install-info: install-info-recursive
+ 
+@@ -1186,7 +1186,7 @@
+ 	rm -f khtmlimagepart_la.all_cpp.final khtmlimagepart_la.all_cpp.files
+ 
+ #>+ 11
+-khtmlimagepart_la.all_cc.cc: $(srcdir)/Makefile.in khtmlimagepart_la_meta_unload.cc  
++khtmlimagepart_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/khtmlimagepart_la_meta_unload.cc  
+ 	@echo 'creating khtmlimagepart_la.all_cc.cc ...'; \
+ 	rm -f khtmlimagepart_la.all_cc.files khtmlimagepart_la.all_cc.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> khtmlimagepart_la.all_cc.final; \
+@@ -1210,7 +1210,7 @@
+ 	rm -f libkhtml_la.all_cpp.final libkhtml_la.all_cpp.files
+ 
+ #>+ 11
+-libkhtml_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/khtml_settings.cc $(srcdir)/khtml_iface.cc khtml_iface_skel.cc libkhtml_la_meta_unload.cc   testrender.moc khtml_part.moc khtml_run.moc khtmlimage.moc testkhtml.moc khtml_factory.moc domtreeview.moc khtml_ext.moc khtml_pagecache.moc khtml_find.moc test_regression.moc khtmlview.moc khtml_printsettings.moc 
++libkhtml_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/khtml_settings.cc $(srcdir)/khtml_iface.cc $(srcdir)/khtml_iface_skel.cc $(srcdir)/libkhtml_la_meta_unload.cc   testrender.moc khtml_part.moc khtml_run.moc khtmlimage.moc testkhtml.moc khtml_factory.moc domtreeview.moc khtml_ext.moc khtml_pagecache.moc khtml_find.moc test_regression.moc khtmlview.moc khtml_printsettings.moc 
+ 	@echo 'creating libkhtml_la.all_cc.cc ...'; \
+ 	rm -f libkhtml_la.all_cc.files libkhtml_la.all_cc.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkhtml_la.all_cc.final; \
diff --git a/x11/kdelibs3/patches/patch-by b/x11/kdelibs3/patches/patch-by
new file mode 100644
index 00000000000..54c7e394047
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-by
@@ -0,0 +1,40 @@
+$NetBSD: patch-by,v 1.1 2002/06/27 07:10:15 skrll Exp $
+
+--- kdeprint/Makefile.in.orig	Wed Jun 26 08:21:44 2002
++++ kdeprint/Makefile.in
+@@ -843,7 +843,7 @@
+ 
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=kprinter.cpp kmdbentry.cpp printerfilter.cpp kprintfilter.h kprinterimpl.cpp util.cpp kpqtpage.cpp kprintpreview.cpp configure.in.in kmthreadjob.cpp kpfilterpage.cpp maticparser.cpp.h kprintaction.cpp driveritem.cpp signal_proc.c kmspecialmanager.cpp kdeprintcheck.cpp kxmlcommand.cpp specials.desktop matic.cpp kpcopiespage.cpp kpreloadobject.cpp testprint.ps kprintdialog.cpp treecombobox.cpp kfilelist.cpp driver.cpp kdeprintd.desktop plugincombobox.cpp kpfileselectpage.cpp kmvirtualmanager.cpp kpdriverpage.cpp kmfiltermanager.cpp kdeprintrc kprintdialogpage.cpp kmfiltermanager.h kpipeprocess.cpp driverview.cpp maticscanner.cpp kprinterpropertydialog.cpp kmuimanager.cpp kpgeneralpage.cpp kprintfilter.cpp maticparser.cpp droptionview.cpp 
++KDE_DIST=kdeprintd.kidl kprinter.cpp testprint.ps kprintdialog.cpp treecombobox.cpp kfilelist.cpp driver.cpp kdeprintd.desktop kmdbentry.cpp libkdeprint.la.closure plugincombobox.cpp printerfilter.cpp kprintfilter.h kpfileselectpage.cpp kmvirtualmanager.cpp kpdriverpage.cpp libdriverparse.a kmfiltermanager.cpp kprinterimpl.cpp util.cpp kpqtpage.cpp kdeprintrc kmfactory.kidl kprintdialogpage.cpp kpipeprocess.cpp kmfiltermanager.h kprintpreview.cpp configure.in.in kmthreadjob.cpp driverview.cpp kmfactory_skel.cpp maticscanner.cpp kpfilterpage.cpp maticparser.cpp.h kprinterpropertydialog.cpp kprintaction.cpp kmuimanager.cpp driveritem.cpp signal_proc.c kpgeneralpage.cpp kmspecialmanager.cpp kprintfilter.cpp kdeprintcheck.cpp kxmlcommand.cpp maticparser.cpp specials.desktop matic.cpp kpcopiespage.cpp droptionview.cpp kpreloadobject.cpp 
+ 
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ 
+@@ -943,7 +943,7 @@
+ 
+ #>- install-exec-am: install-libLTLIBRARIES
+ #>+ 1
+-install-exec-am: install-kde_moduleLTLIBRARIES install-libLTLIBRARIES
++install-exec-am: install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
+ 
+ install-info: install-info-recursive
+ 
+@@ -1161,7 +1161,7 @@
+ 	-rm -f  kded_kdeprintd_la_meta_unload.cpp libkdeprint_la_meta_unload.cpp
+ 
+ #>+ 11
+-kded_kdeprintd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdeprintd.cpp $(srcdir)/kprintprocess.cpp kdeprintd_skel.cpp kded_kdeprintd_la_meta_unload.cpp  
++kded_kdeprintd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdeprintd.cpp $(srcdir)/kprintprocess.cpp $(srcdir)/kdeprintd_skel.cpp $(srcdir)/kded_kdeprintd_la_meta_unload.cpp  
+ 	@echo 'creating kded_kdeprintd_la.all_cpp.cpp ...'; \
+ 	rm -f kded_kdeprintd_la.all_cpp.files kded_kdeprintd_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kded_kdeprintd_la.all_cpp.final; \
+@@ -1173,7 +1173,7 @@
+ 	rm -f kded_kdeprintd_la.all_cpp.final kded_kdeprintd_la.all_cpp.files
+ 
+ #>+ 11
+-libkdeprint_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmfactory.cpp $(srcdir)/kmjob.cpp $(srcdir)/kmjobmanager.cpp $(srcdir)/kmmanager.cpp $(srcdir)/kmprinter.cpp $(srcdir)/kmuimanager.cpp $(srcdir)/kmvirtualmanager.cpp $(srcdir)/driver.cpp $(srcdir)/driveritem.cpp $(srcdir)/droptionview.cpp $(srcdir)/driverview.cpp $(srcdir)/maticscanner.cpp $(srcdir)/maticparser.cpp $(srcdir)/matic.cpp $(srcdir)/kmdbentry.cpp $(srcdir)/kprintpreview.cpp $(srcdir)/kprintdialog.cpp $(srcdir)/kprinter.cpp $(srcdir)/kprinterimpl.cpp $(srcdir)/kprintdialogpage.cpp $(srcdir)/kpcopiespage.cpp $(srcdir)/kpdriverpage.cpp $(srcdir)/kprinterpropertydialog.cpp $(srcdir)/kpgeneralpage.cpp $(srcdir)/kpqtpage.cpp $(srcdir)/kmthreadjob.cpp $(srcdir)/kpipeprocess.cpp $(srcdir)/kpfilterpage.cpp $(srcdir)/kmspecialmanager.cpp $(srcdir)/kdeprintcheck.cpp $(srcdir)/plugincombobox.cpp $(srcdir)/kpreloadobject.cpp $(srcdir)/kfilelist.cpp $(srcdir)/kprintaction.cpp $(srcdir)/kpfileselectpage.cpp $(srcdir)/treecombobox.cpp $(srcdir)/kxmlcommand.cpp $(srcdir)/util.cpp $(srcdir)/printerfilter.cpp kmfactory_skel.cpp libkdeprint_la_meta_unload.cpp   kmjobmanager.moc kprinterpropertydialog.moc kmfactory.moc kprintpreview.moc kpfilterpage.moc kpcopiespage.moc kprintdialogpage.moc kpqtpage.moc kprintprocess.moc kpgeneralpage.moc kmmanager.moc kfilelist.moc droptionview.moc kdeprintd.moc kprintaction.moc driverview.moc plugincombobox.moc kprinterimpl.moc kprintdialog.moc 
++libkdeprint_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmfactory.cpp $(srcdir)/kmjob.cpp $(srcdir)/kmjobmanager.cpp $(srcdir)/kmmanager.cpp $(srcdir)/kmprinter.cpp $(srcdir)/kmuimanager.cpp $(srcdir)/kmvirtualmanager.cpp $(srcdir)/driver.cpp $(srcdir)/driveritem.cpp $(srcdir)/droptionview.cpp $(srcdir)/driverview.cpp $(srcdir)/maticscanner.cpp $(srcdir)/maticparser.cpp $(srcdir)/matic.cpp $(srcdir)/kmdbentry.cpp $(srcdir)/kprintpreview.cpp $(srcdir)/kprintdialog.cpp $(srcdir)/kprinter.cpp $(srcdir)/kprinterimpl.cpp $(srcdir)/kprintdialogpage.cpp $(srcdir)/kpcopiespage.cpp $(srcdir)/kpdriverpage.cpp $(srcdir)/kprinterpropertydialog.cpp $(srcdir)/kpgeneralpage.cpp $(srcdir)/kpqtpage.cpp $(srcdir)/kmthreadjob.cpp $(srcdir)/kpipeprocess.cpp $(srcdir)/kpfilterpage.cpp $(srcdir)/kmspecialmanager.cpp $(srcdir)/kdeprintcheck.cpp $(srcdir)/plugincombobox.cpp $(srcdir)/kpreloadobject.cpp $(srcdir)/kfilelist.cpp $(srcdir)/kprintaction.cpp $(srcdir)/kpfileselectpage.cpp $(srcdir)/treecombobox.cpp $(srcdir)/kxmlcommand.cpp $(srcdir)/util.cpp $(srcdir)/printerfilter.cpp $(srcdir)/kmfactory_skel.cpp $(srcdir)/libkdeprint_la_meta_unload.cpp   kmjobmanager.moc kprinterpropertydialog.moc kmfactory.moc kprintpreview.moc kpfilterpage.moc kpcopiespage.moc kprintdialogpage.moc kpqtpage.moc kprintprocess.moc kpgeneralpage.moc kmmanager.moc kfilelist.moc droptionview.moc kdeprintd.moc kprintaction.moc driverview.moc plugincombobox.moc kprinterimpl.moc kprintdialog.moc 
+ 	@echo 'creating libkdeprint_la.all_cpp.cpp ...'; \
+ 	rm -f libkdeprint_la.all_cpp.files libkdeprint_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkdeprint_la.all_cpp.final; \