Import of KDE 2.1 kdebase package.

a.out doesn't build at the moment, but I'm looking into it.

24 files changed, 508 insertions, 0 deletions

diff --git a/x11/kdebase2/patches/patch-aa b/x11/kdebase2/patches/patch-aa
new file mode 100644
index 00000000000..95207740c35
--- /dev/null
+++ b/x11/kdebase2/patches/patch-aa
@@ -0,0 +1,37 @@
+$NetBSD: patch-aa,v 1.1.1.1 2001/03/14 16:03:11 skrll Exp $
+
+--- configure.orig	Thu Feb 22 13:17:34 2001
++++ configure
+@@ -11108,7 +11108,7 @@
+ 
+     ac_save_ldflags="$LDFLAGS"
+     ac_save_cflags="$CFLAGS"
+-    LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries -lMesaGL -lMesaGLU -lX11 -lXext -lm $LIBSOCKET"
++    LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries -lGL -lGLU -lX11 -lXext -lm $LIBSOCKET"
+     CFLAGS="$CFLAGS $X_INCLUDES"
+     test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
+     cat > conftest.$ac_ext <<EOF
+@@ -11173,13 +11173,13 @@
+ 
+     if test "$GL_LDFLAGS" = ""; then
+        if test "$ac_cv_have_gl" = "mesa"; then
+-          GLLIB='-lMesaGL -lMesaGLU $(LIB_X11)'
++          GLLIB='-lGL -lGLU $(LIB_X11)'
+        else
+           GLLIB='-lGL -lGLU $(LIB_X11)'
+        fi
+     else
+        if test "$ac_cv_have_gl" = "mesa"; then
+-          GLLIB="$GL_LDFLAGS -lMesaGL -lMesaGLU "'$(LIB_X11)'
++          GLLIB="$GL_LDFLAGS -lGL -lGLU "'$(LIB_X11)'
+        else
+           GLLIB="$GL_LDFLAGS -lGL -lGLU "'$(LIB_X11)'
+        fi
+@@ -11576,6 +11576,7 @@
+ case "$host" in 
+   *-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
+   *-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
++  *-*-netbsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
+ #  *-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
+   *) ksysguard_compile=no; UNAME='' ;;
+ esac
diff --git a/x11/kdebase2/patches/patch-ab b/x11/kdebase2/patches/patch-ab
new file mode 100644
index 00000000000..f031673f0f4
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ab
@@ -0,0 +1,33 @@
+$NetBSD: patch-ab,v 1.1.1.1 2001/03/14 16:03:11 skrll Exp $
+
+--- kcontrol/info/info_netbsd.cpp.orig	Tue Jun  6 15:29:57 2000
++++ kcontrol/info/info_netbsd.cpp
+@@ -181,14 +181,15 @@
+ 	}
+ 
+ 	pos = s.find(" irq ");
+-	irqnum = (pos < 0) ? 0 : atoi(&(((const char *)s)[pos+5]));
++	irqnum = (pos < 0) ? 0 : atoi(&(s.ascii()[pos+5]));
++
+ 	if (irqnum) {
+-		s.sprintf("%02d%s", irqnum, (const char *)s);
++		s.sprintf("%02d%s", irqnum, s.ascii());
+ 	}
+ 	else {
+-		s.sprintf("??%s", (const char *)s);
++		s.sprintf("??%s", s.ascii());
+ 	}
+-	strlist->inSort(s);
++	strlist->inSort(s.ascii());
+ }
+ 
+ bool GetInfo_IRQ (QListView *lBox)
+@@ -284,7 +285,7 @@
+ 
+ 	QListViewItem *olditem = 0;
+ 	while ((s = t->readLine()) != "") {
+-		orig_line = line = strdup(s);
++		orig_line = line = strdup(s.ascii());
+ 
+ 		device = strsep(&line, " ");
+ 
diff --git a/x11/kdebase2/patches/patch-ac b/x11/kdebase2/patches/patch-ac
new file mode 100644
index 00000000000..7a1f4289b40
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1.1.1 2001/03/14 16:03:11 skrll Exp $
+
+--- kdm/Makefile.am.orig	Mon Feb 19 11:21:43 2001
++++ kdm/Makefile.am
+@@ -24,7 +24,8 @@
+ LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(PASSLIB) \
+     $(LIB_LIBS) $(KERBEROS_LIBS) $(LIBSOCKET) \
+     $(LIBCRYPT) $(LIBUCB) $(LIBDL) $(LIBUTIL) $(LIBRESOLV)
+-kdm_LDADD = $(LDADD) $(KDM_GREET_LIBS)
++kdm_LDADD = "-dlopen" greeter/libKdmGreet.la $(LDADD) $(KDM_GREET_LIBS)
++kdm_DEPENDENCIES = greeter/libKdmGreet.la
+ 
+ # Sources for kdm:
+ kdm_SOURCES = access.c \
diff --git a/x11/kdebase2/patches/patch-ad b/x11/kdebase2/patches/patch-ad
new file mode 100644
index 00000000000..ecd9aa3ef9a
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1.1.1 2001/03/14 16:03:11 skrll Exp $
+
+--- kdm/resource.c.orig	Mon Jan 22 12:10:47 2001
++++ kdm/resource.c
+@@ -140,7 +140,7 @@
+ #define DEF_RANDOM_FILE _PATH_MEM
+ #endif
+ #ifndef DEF_GREETER_LIB
+-#define DEF_GREETER_LIB "libKdmGreet.so"
++#define DEF_GREETER_LIB "libKdmGreet.la"
+ #endif
+ #ifndef DEF_PID_FILE
+ #  if defined(__FreeBSD__) || defined(__NetBSD__)
diff --git a/x11/kdebase2/patches/patch-ae b/x11/kdebase2/patches/patch-ae
new file mode 100644
index 00000000000..5922b61bb6e
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ae
@@ -0,0 +1,44 @@
+$NetBSD: patch-ae,v 1.1.1.1 2001/03/14 16:03:12 skrll Exp $
+
+--- kdm/session.c.orig	Sun Feb 18 15:28:17 2001
++++ kdm/session.c
+@@ -77,10 +77,7 @@
+ #endif
+ 
+ #ifndef GREET_USER_STATIC
+-# include <dlfcn.h>
+-# ifndef RTLD_NOW
+-#  define RTLD_NOW 1
+-# endif
++#  include <ltdl.h>
+ #endif
+ 
+ #ifdef CSRG_BASED
+@@ -293,7 +290,7 @@
+     greet_user_rtn	greet_stat;
+     static GreetUserProc greet_user_proc = NULL;
+ #ifndef GREET_USER_STATIC
+-    void		*greet_lib_handle;
++    lt_dlhandle		greet_lib_handle;
+ #endif
+ 
+     Debug ("ManageSession %s\n", d->name);
+@@ -309,12 +306,15 @@
+     greet_user_proc = GreetUser;
+ #else
+     Debug("ManageSession: loading greeter library %s\n", greeterLib);
+-    greet_lib_handle = dlopen(greeterLib, RTLD_NOW);
++    LTDL_SET_PRELOADED_SYMBOLS();
++    lt_dlinit();
++    greet_lib_handle = lt_dlopen(greeterLib);
+     if (greet_lib_handle != NULL)
+-	greet_user_proc = (GreetUserProc)dlsym(greet_lib_handle, "GreetUser");
++	greet_user_proc = (GreetUserProc)lt_dlsym(greet_lib_handle, "GreetUser");
+     if (greet_user_proc == NULL)
+     {
+-	LogError("%s while loading %s\n", dlerror(), greeterLib);
++        Debug("ManageSession: lt_dlsym returned null\n");
++	LogError("%s while loading %s\n", lt_dlerror(), greeterLib);
+ 	exit(UNMANAGE_DISPLAY);
+     }
+ #endif
diff --git a/x11/kdebase2/patches/patch-af b/x11/kdebase2/patches/patch-af
new file mode 100644
index 00000000000..7e497b27579
--- /dev/null
+++ b/x11/kdebase2/patches/patch-af
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.1.1.1 2001/03/14 16:03:12 skrll Exp $
+
+--- kicker/share/pluginmgr.cpp.orig	Wed Dec 13 18:25:06 2000
++++ kicker/share/pluginmgr.cpp
+@@ -59,7 +59,7 @@
+ 	return(NULL);
+     }
+ 
+-    lt_ptr_t init_func = lt_dlsym(handle, "init");
++    lt_ptr init_func = lt_dlsym(handle, "init");
+     if(!init_func){
+ 	kdWarning() << libStr << " is not a kicker applet!" << endl;
+ 	lt_dlclose(handle);
+@@ -104,7 +104,7 @@
+ 	return(NULL);
+     }
+ 
+-    lt_ptr_t init_func = lt_dlsym(handle, "init");
++    lt_ptr init_func = lt_dlsym(handle, "init");
+     if(!init_func){
+ 	kdWarning() << libStr << " is not a kicker extension!" << endl;
+ 	lt_dlclose(handle);
diff --git a/x11/kdebase2/patches/patch-ag b/x11/kdebase2/patches/patch-ag
new file mode 100644
index 00000000000..e7444535c3e
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ag
@@ -0,0 +1,55 @@
+$NetBSD: patch-ag,v 1.1.1.1 2001/03/14 16:03:12 skrll Exp $
+
+--- konsole/src/TEPty.C.orig	Sun Feb 18 15:28:28 2001
++++ konsole/src/TEPty.C
+@@ -179,9 +179,18 @@
+ // param grant: 1 to grant, 0 to revoke
+ // returns 1 on success 0 on fail
+ {
++  struct sigaction newsa, oldsa;
++  newsa.sa_handler = SIG_DFL;
++  newsa.sa_mask = sigset_t();
++  newsa.sa_flags = 0;
++  sigaction(SIGCHLD, &newsa, &oldsa);
++
+   pid_t pid = fork();
+   if (pid < 0)
+   {
++    // restore previous SIGCHLD handler
++    sigaction(SIGCHLD, &oldsa, NULL);
++
+     return 0;
+   }
+   if (pid == 0)
+@@ -194,14 +203,6 @@
+   }
+ 
+   if (pid > 0) {
+-    // ### FreeBSD seems to need the SIGCHLD sighandler resett to default for
+-    // waitpid() to work. - Brad
+-    struct sigaction newsa, oldsa;
+-    newsa.sa_handler = SIG_DFL;
+-    newsa.sa_mask = sigset_t();
+-    newsa.sa_flags = 0;
+-    sigaction(SIGCHLD, &newsa, &oldsa);
+-
+     int w;
+ retry:
+     int rc = waitpid (pid, &w, 0);
+@@ -238,7 +239,7 @@
+ #ifdef HAVE_UTEMPTER
+   removeLineFromUtmp(ttynam, fd);
+ #elif defined(USE_LOGIN)
+-  char *tty_name=ttyname(0);
++  char *tty_name=ttyname(fd);
+   if (tty_name)
+   {
+   	if (strncmp(tty_name, "/dev/", 5) == 0)
+@@ -296,6 +297,7 @@
+       strncpy(ptynam, name, 50);
+       strncpy(ttynam, name, 50);
+       ttynam[5]='t';
++      ptynam[5]='p';
+       // one needs to look into who owns what to make sure chownpty is needed
+       // FIXME: further, the logic of openPty has to adjusted to pass a file
+       //        handle instead of a name.
diff --git a/x11/kdebase2/patches/patch-ah b/x11/kdebase2/patches/patch-ah
new file mode 100644
index 00000000000..e2cebab263f
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ah
@@ -0,0 +1,16 @@
+$NetBSD: patch-ah,v 1.1.1.1 2001/03/14 16:03:12 skrll Exp $
+
+--- ksysguard/ksysguardd/FreeBSD/CPU.c.orig	Tue Aug  8 23:53:56 2000
++++ ksysguard/ksysguardd/FreeBSD/CPU.c
+@@ -25,7 +25,11 @@
+ 
+ #include <kvm.h>
+ #include <nlist.h>
++#ifdef __NetBSD__
++#include <sys/sched.h>		/* CPUSTATES */
++#else
+ #include <devstat.h>
++#endif
+ #include <fcntl.h>
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/x11/kdebase2/patches/patch-ai b/x11/kdebase2/patches/patch-ai
new file mode 100644
index 00000000000..b7825cb59b6
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ai
@@ -0,0 +1,62 @@
+$NetBSD: patch-ai,v 1.1.1.1 2001/03/14 16:03:13 skrll Exp $
+
+--- ksysguard/ksysguardd/FreeBSD/Memory.c.orig	Fri Jul 28 00:59:28 2000
++++ ksysguard/ksysguardd/FreeBSD/Memory.c
+@@ -65,9 +65,16 @@
+         struct vmtotal p;
+         FILE *file;
+         char buf[256];
++	int rc;
+ 
+         len = sizeof (Total);
++#ifdef __NetBSD__
++        mib[0] = CTL_HW;
++        mib[1] = HW_PHYSMEM;
++        sysctl(mib, sizeof(mib), &Total, &len, NULL, 0);
++#else
+         sysctlbyname("hw.physmem", &Total, &len, NULL, 0);
++#endif
+         Total /= 1024;
+ 
+         /* Q&D hack for swap display. Borrowed from xsysinfo-1.4 */
+@@ -92,23 +99,40 @@
+ 	}
+ 
+ 
++#ifdef __NetBSD__
++        /* NetBSD doesn't know about vfs.bufspace */
++        Buffers = -1;
++#else
+         len = sizeof (Buffers);
+         if ((sysctlbyname("vfs.bufspace", &Buffers, &len, NULL, 0) == -1) || !len)
+                 Buffers = 0; /* Doesn't work under FreeBSD v2.2.x */
++#endif
+         Buffers /= 1024;
+ 
+ 
++#ifdef __NetBSD__
++	/* NetBSD doesn't know about vm.stats */
++	Cached = -1;
++#else
+         len = sizeof (Cached);
+         if ((sysctlbyname("vm.stats.vm.v_cache_count", &Cached, &len, NULL, 0) == -1) || !len)
+                 Cached = 0; /* Doesn't work under FreeBSD v2.2.x */
++#endif
+         Cached *= getpagesize() / 1024;
+ 
+ 
++#ifdef __NetBSD__
++	/* No idea where to get them right now.
++	 * I don't want to start kmem-digging... */
++	MFree = -1;
++	Used = -1;
++#else
+ 	/* initializes the pointer to the vmmeter struct */
+ 	len = sizeof (p);
+ 	sysctlbyname("vm.vmmeter", &p, &len, NULL, 0);
+         MFree = p.t_free * getpagesize() / 1024;
+         Used = p.t_arm * getpagesize() / 1024 + Buffers + Cached;
++#endif
+ 
+ 	return 0;
+ }
diff --git a/x11/kdebase2/patches/patch-aj b/x11/kdebase2/patches/patch-aj
new file mode 100644
index 00000000000..7ca4d28b992
--- /dev/null
+++ b/x11/kdebase2/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1.1.1 2001/03/14 16:03:13 skrll Exp $
+
+--- ksysguard/ksysguardd/FreeBSD/ProcessList.c.orig	Mon Jan 22 12:12:05 2001
++++ ksysguard/ksysguardd/FreeBSD/ProcessList.c
+@@ -199,7 +199,7 @@
+ #if __FreeBSD_version >= 300000
+         ps->userTime = p.kp_proc.p_runtime / 10000;
+ #else
+-        ps->userTime = p.kp_proc.p_rtime.tv_sec*100+p.kp_proc.p_rtime.tv_usec/100
++        ps->userTime = p.kp_proc.p_rtime.tv_sec*100+p.kp_proc.p_rtime.tv_usec/100;
+ #endif
+         ps->sysTime  = 0;
+         ps->userLoad = p.kp_proc.p_pctcpu / 100;
diff --git a/x11/kdebase2/patches/patch-ak b/x11/kdebase2/patches/patch-ak
new file mode 100644
index 00000000000..fb9df80d1bc
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ak
@@ -0,0 +1,31 @@
+$NetBSD: patch-ak,v 1.1.1.1 2001/03/14 16:03:13 skrll Exp $
+
+--- kwin/Makefile.am.orig	Wed Feb 21 10:39:04 2001
++++ kwin/Makefile.am
+@@ -3,13 +3,13 @@
+ SUBDIRS = default . pics clients
+ 
+ bin_PROGRAMS = kwin
+-lib_LTLIBRARIES = kwin.la
++lib_LTLIBRARIES = libkwin.la
+ 
+-kwin_la_SOURCES = atoms.cpp  client.cpp main.cpp workspace.cpp \
++libkwin_la_SOURCES = atoms.cpp  client.cpp main.cpp workspace.cpp \
+ 	tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \
+ 	killwindow.cpp 
+-kwin_la_LIBADD = $(LIB_KDEUI) $(top_builddir)/kwin/default/libkwindefault.la
+-kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version
++libkwin_la_LIBADD = $(LIB_KDEUI) $(top_builddir)/kwin/default/libkwindefault.la
++libkwin_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
+ include_HEADERS = KWinInterface.h
+ 
+@@ -17,7 +17,7 @@
+ kwininclude_HEADERS = options.h client.h workspace.h
+ 
+ kwin_SOURCES = kwin_main.cpp
+-kwin_LDADD = kwin.la
++kwin_LDADD = libkwin.la
+ kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+ KDE_ICON = kwin
diff --git a/x11/kdebase2/patches/patch-al b/x11/kdebase2/patches/patch-al
new file mode 100644
index 00000000000..cd5023d92e2
--- /dev/null
+++ b/x11/kdebase2/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1.1.1 2001/03/14 16:03:13 skrll Exp $
+
+--- kwin/clients/b2/Makefile.am.orig	Wed Dec 13 18:25:17 2000
++++ kwin/clients/b2/Makefile.am
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = libkwinb2.la
+ 
+ libkwinb2_la_SOURCES = b2client.cpp
+-libkwinb2_la_LIBADD = ../../kwin.la
++libkwinb2_la_LIBADD = ../../libkwin.la
+ libkwinb2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-am b/x11/kdebase2/patches/patch-am
new file mode 100644
index 00000000000..9cf42ce36a5
--- /dev/null
+++ b/x11/kdebase2/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1.1.1 2001/03/14 16:03:13 skrll Exp $
+
+--- kwin/clients/kde/Makefile.am.orig	Wed Dec 13 18:25:17 2000
++++ kwin/clients/kde/Makefile.am
+@@ -16,7 +16,7 @@
+ TitleBar.cpp \
+ TitleText.cpp \
+ Static.cpp
+-libkwindefault_la_LIBADD = ../../kwin.la
++libkwindefault_la_LIBADD = ../../libkwin.la
+ libkwindefault_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-an b/x11/kdebase2/patches/patch-an
new file mode 100644
index 00000000000..1013f1200bd
--- /dev/null
+++ b/x11/kdebase2/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1.1.1 2001/03/14 16:03:13 skrll Exp $
+
+--- kwin/clients/kde1/Makefile.am.orig	Wed Dec 13 18:25:17 2000
++++ kwin/clients/kde1/Makefile.am
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = libkwinkde1.la
+ 
+ libkwinkde1_la_SOURCES = kde1client.cpp
+-libkwinkde1_la_LIBADD = ../../kwin.la
++libkwinkde1_la_LIBADD = ../../libkwin.la
+ libkwinkde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-ao b/x11/kdebase2/patches/patch-ao
new file mode 100644
index 00000000000..b345d6cb535
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1.1.1 2001/03/14 16:03:13 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
+ 
+ libkwinkstep_la_SOURCES = nextclient.cpp
+-libkwinkstep_la_LIBADD = ../../kwin.la
++libkwinkstep_la_LIBADD = ../../libkwin.la
+ libkwinkstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-ap b/x11/kdebase2/patches/patch-ap
new file mode 100644
index 00000000000..fc6b9cc0954
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1.1.1 2001/03/14 16:03:13 skrll Exp $
+
+--- kwin/clients/kwmtheme/Makefile.am.orig	Wed Dec 13 18:25:17 2000
++++ kwin/clients/kwmtheme/Makefile.am
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = libkwinkwmtheme.la
+ 
+ libkwinkwmtheme_la_SOURCES = kwmthemeclient.cpp
+-libkwinkwmtheme_la_LIBADD = ../../kwin.la
++libkwinkwmtheme_la_LIBADD = ../../libkwin.la
+ libkwinkwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-aq b/x11/kdebase2/patches/patch-aq
new file mode 100644
index 00000000000..38804aabd66
--- /dev/null
+++ b/x11/kdebase2/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1.1.1 2001/03/14 16:03:13 skrll Exp $
+
+--- kwin/clients/laptop/Makefile.am.orig	Wed Dec 13 18:25:18 2000
++++ kwin/clients/laptop/Makefile.am
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = libkwinlaptop.la
+ 
+ libkwinlaptop_la_SOURCES = laptopclient.cpp
+-libkwinlaptop_la_LIBADD = ../../kwin.la
++libkwinlaptop_la_LIBADD = ../../libkwin.la
+ libkwinlaptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-ar b/x11/kdebase2/patches/patch-ar
new file mode 100644
index 00000000000..943a7ff5be8
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1.1.1 2001/03/14 16:03:15 skrll Exp $
+
+--- kwin/clients/modernsystem/Makefile.am.orig	Wed Dec 13 18:25:18 2000
++++ kwin/clients/modernsystem/Makefile.am
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = libkwinmodernsys.la
+ 
+ libkwinmodernsys_la_SOURCES = modernsys.cpp
+-libkwinmodernsys_la_LIBADD = ../../kwin.la
++libkwinmodernsys_la_LIBADD = ../../libkwin.la
+ libkwinmodernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-as b/x11/kdebase2/patches/patch-as
new file mode 100644
index 00000000000..baa4a4689dd
--- /dev/null
+++ b/x11/kdebase2/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.1.1.1 2001/03/14 16:03:15 skrll Exp $
+
+--- kwin/clients/mwm/Makefile.am.orig	Wed Dec 13 18:25:18 2000
++++ kwin/clients/mwm/Makefile.am
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = libkwinmwm.la
+ 
+ libkwinmwm_la_SOURCES = mwmclient.cpp
+-libkwinmwm_la_LIBADD = ../../kwin.la
++libkwinmwm_la_LIBADD = ../../libkwin.la
+ libkwinmwm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-at b/x11/kdebase2/patches/patch-at
new file mode 100644
index 00000000000..6a18913ba91
--- /dev/null
+++ b/x11/kdebase2/patches/patch-at
@@ -0,0 +1,13 @@
+$NetBSD: patch-at,v 1.1.1.1 2001/03/14 16:03:15 skrll Exp $
+
+--- kwin/clients/riscos/Makefile.am.orig	Wed Dec 13 18:25:18 2000
++++ kwin/clients/riscos/Makefile.am
+@@ -12,7 +12,7 @@
+ StickyButton.cpp \
+ HelpButton.cpp \
+ Static.cpp
+-libkwinriscos_la_LIBADD = ../../kwin.la
++libkwinriscos_la_LIBADD = ../../libkwin.la
+ libkwinriscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-au b/x11/kdebase2/patches/patch-au
new file mode 100644
index 00000000000..afc6c3d58e8
--- /dev/null
+++ b/x11/kdebase2/patches/patch-au
@@ -0,0 +1,13 @@
+$NetBSD: patch-au,v 1.1.1.1 2001/03/14 16:03:15 skrll Exp $
+
+--- kwin/clients/system/Makefile.am.orig	Wed Dec 13 18:25:18 2000
++++ kwin/clients/system/Makefile.am
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = libkwinsystem.la
+ 
+ libkwinsystem_la_SOURCES = systemclient.cpp
+-libkwinsystem_la_LIBADD = ../../kwin.la
++libkwinsystem_la_LIBADD = ../../libkwin.la
+ libkwinsystem_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-av b/x11/kdebase2/patches/patch-av
new file mode 100644
index 00000000000..e0d8fe88d51
--- /dev/null
+++ b/x11/kdebase2/patches/patch-av
@@ -0,0 +1,13 @@
+$NetBSD: patch-av,v 1.1.1.1 2001/03/14 16:03:15 skrll Exp $
+
+--- kwin/clients/win2k/Makefile.am.orig	Thu Jan 11 12:24:04 2001
++++ kwin/clients/win2k/Makefile.am
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = libkwin2k.la
+ 
+ libkwin2k_la_SOURCES = win2k.cpp
+-libkwin2k_la_LIBADD = ../../kwin.la
++libkwin2k_la_LIBADD = ../../libkwin.la
+ libkwin2k_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-aw b/x11/kdebase2/patches/patch-aw
new file mode 100644
index 00000000000..aa7ab95bf9a
--- /dev/null
+++ b/x11/kdebase2/patches/patch-aw
@@ -0,0 +1,13 @@
+$NetBSD: patch-aw,v 1.1.1.1 2001/03/14 16:03:15 skrll Exp $
+
+--- kwin/plugins.cpp.orig	Thu Feb 22 13:04:03 2001
++++ kwin/plugins.cpp
+@@ -164,7 +164,7 @@
+ 
+ 	if( !path.isEmpty() ) {
+ 	    if ( (handle = lt_dlopen(path.latin1() ) ) ) {
+-		lt_ptr_t alloc_func = lt_dlsym(handle, "allocate");
++		lt_ptr alloc_func = lt_dlsym(handle, "allocate");
+ 		if(alloc_func) {
+ 		    alloc_ptr = (Client* (*)(Workspace *ws, WId w, int tool))alloc_func;
+ 		} else{
diff --git a/x11/kdebase2/patches/patch-ax b/x11/kdebase2/patches/patch-ax
new file mode 100644
index 00000000000..b4e9604308c
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ax
@@ -0,0 +1,12 @@
+$NetBSD: patch-ax,v 1.1.1.1 2001/03/14 16:03:15 skrll Exp $
+
+--- nsplugins/pluginscan.cpp.orig	Sun Feb 18 15:28:44 2001
++++ nsplugins/pluginscan.cpp
+@@ -22,6 +22,7 @@
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+ */
++#include <stdlib.h>
+ 
+ #include <qdir.h>
+ #include <qfile.h>