1 files changed, 75 insertions, 10 deletions
diff --git a/x11/kdebase2/patches/patch-ao b/x11/kdebase2/patches/patch-ao
index b345d6cb535..107acae8a03 100644
--- a/x11/kdebase2/patches/patch-ao
+++ b/x11/kdebase2/patches/patch-ao
@@ -1,13 +1,78 @@
-$NetBSD: patch-ao,v 1.1.1.1 2001/03/14 16:03:13 skrll Exp $
+$NetBSD: patch-ao,v 1.2 2001/10/15 22:46:00 skrll Exp $
 
---- kwin/clients/kstep/Makefile.am.orig	Wed Dec 13 18:25:17 2000
-+++ kwin/clients/kstep/Makefile.am
-@@ -4,7 +4,7 @@
- kde_module_LTLIBRARIES = libkwinkstep.la
+--- kcontrol/kcontrol/Makefile.am.orig	Sun Jul 29 05:56:20 2001
++++ kcontrol/kcontrol/Makefile.am
+@@ -22,41 +22,51 @@
  
- libkwinkstep_la_SOURCES = nextclient.cpp
--libkwinkstep_la_LIBADD = ../../kwin.la
-+libkwinkstep_la_LIBADD = ../../libkwin.la
- libkwinkstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ SUBDIRS = . pics
  
- METASOURCES = AUTO
+-CLEANFILES = dummy.cpp
+-
+ bin_PROGRAMS = kcontrol kcmshell kcminit
+-kde_module_LTLIBRARIES = kcontrol.la kcmshell.la kcminit.la
++kde_module_LTLIBRARIES = libkcontrol_main.la kcontrol.la libkcmshell_main.la \
++	kcmshell.la libkcminit_main.la kcminit.la
+ 
+-kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp \
++libkcontrol_main_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp \
+ 	helpwidget.cpp moduleinfo.cpp utils.cpp modules.cpp proxywidget.cpp \
+ 	modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp \
+ 	quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \
+ 	kecdialog.cpp kcrootonly.cpp 
+ 
+-kcontrol_la_LIBADD  = $(LIB_KDEUI) $(LIB_KSYCOCA)
++libkcontrol_main_la_LIBADD  = $(LIB_KDEUI) $(LIB_KSYCOCA)
++libkcontrol_main_la_LDFLAGS = $(all_libraries)
++
++kcontrol_la_SOURCES = kcontrol_main.cpp
++kcontrol_la_LIBADD  = libkcontrol_main.la
+ kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
+-kcmshell_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp \
++libkcmshell_main_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp \
+ 			utils.cpp proxywidget.cpp kcdialog.cpp global.cpp \
+ 			kcdialog.skel
+-kcmshell_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
++libkcmshell_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
++libkcmshell_main_la_LDFLAGS = $(all_libraries)
++
++kcmshell_la_SOURCES = kcmshell_main.cpp
++kcmshell_la_LIBADD = libkcmshell_main.la
+ kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
++libkcminit_main_la_SOURCES = kcminit.cpp global.cpp utils.cpp
++libkcminit_main_la_LIBADD   = $(LIB_KDEUI) $(LIB_KSYCOCA)
++libkcminit_main_la_LDFLAGS = $(all_libraries)
+ 
+-kcminit_la_SOURCES = kcminit.cpp global.cpp utils.cpp
+-kcminit_la_LIBADD   = $(LIB_KDEUI) $(LIB_KSYCOCA)
++kcminit_la_SOURCES = kcminit_main.cpp
++kcminit_la_LIBADD   = libkcminit_main.la
+ kcminit_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
+-kcontrol_SOURCES = dummy.cpp
+-kcontrol_LDADD = kcontrol.la
++kcontrol_SOURCES = kcontrol_main.cpp
++kcontrol_LDADD = libkcontrol_main.la
+ kcontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
+ 
+-kcmshell_SOURCES = dummy.cpp
+-kcmshell_LDADD = kcmshell.la
++kcmshell_SOURCES = kcmshell_main.cpp
++kcmshell_LDADD = libkcmshell_main.la
+ kcmshell_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
+ 
+-kcminit_SOURCES = dummy.cpp
+-kcminit_LDADD = kcminit.la
++kcminit_SOURCES = kcminit_main.cpp
++kcminit_LDADD = libkcminit_main.la
+ kcminit_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
+ 
+ rcdir = $(kde_datadir)/kcontrol
+@@ -71,6 +81,3 @@
+ 
+ messages: rc.cpp
+ 	$(XGETTEXT) *.cpp -o $(podir)/kcontrol.pot
+-
+-dummy.cpp:
+-	echo > dummy.cpp