Fix more kde_module/lib problems. The most obvious example of this was the

"There was an error loading the module Navigation Panel." when loading
konqueror.

7 files changed, 130 insertions, 6 deletions

diff --git a/x11/kdebase3/patches/patch-ai b/x11/kdebase3/patches/patch-ai
index e7540fc693b..84e9864c037 100644
--- a/x11/kdebase3/patches/patch-ai
+++ b/x11/kdebase3/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/05/31 13:18:42 skrll Exp $
+$NetBSD: patch-ai,v 1.2 2002/06/25 22:14:12 skrll Exp $
 
---- kcontrol/access/Makefile.in.orig	Mon May 13 23:57:36 2002
+--- kcontrol/access/Makefile.in.orig	Tue Jun 25 19:31:44 2002
 +++ kcontrol/access/Makefile.in
 @@ -292,16 +292,20 @@
  
@@ -133,6 +133,15 @@ $NetBSD: patch-ai,v 1.1.1.1 2002/05/31 13:18:42 skrll Exp $
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
+@@ -670,7 +683,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-am
+ 
 @@ -713,9 +726,6 @@
  messages:
  	$(XGETTEXT) $(kaccess_la_SOURCES) -o $(podir)/kaccess.pot
diff --git a/x11/kdebase3/patches/patch-bz b/x11/kdebase3/patches/patch-bz
index d50a56373bd..f1598378027 100644
--- a/x11/kdebase3/patches/patch-bz
+++ b/x11/kdebase3/patches/patch-bz
@@ -1,6 +1,6 @@
-$NetBSD: patch-bz,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $
+$NetBSD: patch-bz,v 1.2 2002/06/25 22:14:12 skrll Exp $
 
---- klipper/Makefile.in.orig	Mon May 13 23:57:48 2002
+--- klipper/Makefile.in.orig	Tue Jun 25 19:31:40 2002
 +++ klipper/Makefile.in
 @@ -290,24 +290,26 @@
  INCLUDES = $(all_includes)
@@ -153,6 +153,15 @@ $NetBSD: patch-bz,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $
  
  distclean-generic:
  	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+@@ -741,7 +751,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-am
+ 
 @@ -863,19 +873,6 @@
  
  
@@ -258,3 +267,12 @@ $NetBSD: patch-bz,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
+@@ -953,7 +975,7 @@
+ 	-rm -f *.rpo
+ 
+ #>+ 5
+-$(srcdir)/configdialog.cpp: configdialog.moc 
+ $(srcdir)/urlgrabber.cpp: urlgrabber.moc 
+ $(srcdir)/toplevel.cpp: toplevel.moc 
++$(srcdir)/configdialog.cpp: configdialog.moc 
+ $(srcdir)/applet.cpp: applet.moc 
diff --git a/x11/kdebase3/patches/patch-ej b/x11/kdebase3/patches/patch-ej
index 03b0056e3d0..776f7019c0a 100644
--- a/x11/kdebase3/patches/patch-ej
+++ b/x11/kdebase3/patches/patch-ej
@@ -1,6 +1,6 @@
-$NetBSD: patch-ej,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-ej,v 1.2 2002/06/25 22:14:12 skrll Exp $
 
---- kxkb/Makefile.in.orig	Mon May 13 23:57:57 2002
+--- kxkb/Makefile.in.orig	Tue Jun 25 19:31:39 2002
 +++ kxkb/Makefile.in
 @@ -292,11 +292,11 @@
  
@@ -133,6 +133,15 @@ $NetBSD: patch-ej,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
+@@ -672,7 +684,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-am
+ 
 @@ -722,9 +734,6 @@
  messages: 
  	$(XGETTEXT) $(kxkb_la_SOURCES) kxkbbindings.cpp -o $(podir)/kxkb.pot
diff --git a/x11/kdebase3/patches/patch-eq b/x11/kdebase3/patches/patch-eq
new file mode 100644
index 00000000000..e9958aa648d
--- /dev/null
+++ b/x11/kdebase3/patches/patch-eq
@@ -0,0 +1,22 @@
+$NetBSD: patch-eq,v 1.1 2002/06/25 22:14:12 skrll Exp $
+
+--- admin/am_edit.orig	Tue Jun 25 10:10:02 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/kdebase3/patches/patch-er b/x11/kdebase3/patches/patch-er
new file mode 100644
index 00000000000..9c304dc1182
--- /dev/null
+++ b/x11/kdebase3/patches/patch-er
@@ -0,0 +1,22 @@
+$NetBSD: patch-er,v 1.1 2002/06/25 22:14:13 skrll Exp $
+
+--- konqueror/sidebar/trees/Makefile.in.orig	Tue Jun 25 19:31:48 2002
++++ konqueror/sidebar/trees/Makefile.in
+@@ -576,7 +576,7 @@
+ 
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=konq_sidebartreetoplevelitem.h konq_sidebartree.h konq_sidebartreemodule.h konqsidebar_tree.h konq_sidebartreeitem.h 
++KDE_DIST=konq_sidebartree.h konq_sidebartreemodule.h konqsidebar_tree.h konq_sidebartreetoplevelitem.h konq_sidebartreeitem.h 
+ 
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ 
+@@ -672,7 +672,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
+ 
diff --git a/x11/kdebase3/patches/patch-es b/x11/kdebase3/patches/patch-es
new file mode 100644
index 00000000000..67fbee37571
--- /dev/null
+++ b/x11/kdebase3/patches/patch-es
@@ -0,0 +1,22 @@
+$NetBSD: patch-es,v 1.1 2002/06/25 22:14:13 skrll Exp $
+
+--- konqueror/sidebar/Makefile.in.orig	Tue Jun 25 19:31:48 2002
++++ konqueror/sidebar/Makefile.in
+@@ -672,7 +672,7 @@
+ 
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=konq_sidebartng.desktop kmultiverttabbar.h konqsidebartng.rc 
++KDE_DIST=kmultiverttabbar.h konqsidebartng.rc konq_sidebartng.desktop 
+ 
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ 
+@@ -770,7 +770,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
+ 
diff --git a/x11/kdebase3/patches/patch-et b/x11/kdebase3/patches/patch-et
new file mode 100644
index 00000000000..b125f2aa9cb
--- /dev/null
+++ b/x11/kdebase3/patches/patch-et
@@ -0,0 +1,22 @@
+$NetBSD: patch-et,v 1.1 2002/06/25 22:14:14 skrll Exp $
+
+--- libkonq/Makefile.in.orig	Tue Jun 25 19:31:42 2002
++++ libkonq/Makefile.in
+@@ -738,7 +738,7 @@
+ 
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=konq_settings.cc konqpopupmenuplugin.desktop konq_xmlguiclient.cc kbookmarkexporter.cc konq_iconviewwidget.cc konq_historymgr.cc konq_undo.cc DESIGN konq_operations.cc konq_bgnddlg.cc kfileivi.cc SERVICEMENUS konq_faviconmgr.cc konq_dirpart.cc konq_events.cc directory_bookmarkbar.desktop konq_historycomm.cc konq_propsview.cc PLUGINS konq_drag.cc konq_sound.cc konq_pixmapprovider.cc 
++KDE_DIST=DESIGN konq_sound.la.closure konq_settings.cc konq_operations.cc konq_drag.cc libkonq.la.closure konq_historycomm_skel.cc konq_sound.cc konq_faviconmgr.kidl konqpopupmenuplugin.desktop konq_xmlguiclient.cc kbookmarkexporter.cc konq_dirpart.cc konq_events.cc konq_bgnddlg.cc konq_faviconmgr_skel.cc directory_bookmarkbar.desktop kfileivi.cc konq_undo.kidl SERVICEMENUS konq_historycomm.cc konq_historycomm.kidl konq_iconviewwidget.cc konq_pixmapprovider.cc konq_historymgr.cc konq_propsview.cc konq_undo_skel.cc konq_faviconmgr.cc konq_undo.cc PLUGINS 
+ 
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ 
+@@ -836,7 +836,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
+