SHARED_LIBS

2006-01-03 09:10:53 +00:00 · 2006-01-03 09:10:53 +00:00 · 8e9a592954
commit 8e9a592954
parent c8f333709e
51 changed files with 797 additions and 68 deletions
--- a/x11/kde/arts3/Makefile
+++ b/x11/kde/arts3/Makefile
@ -1,11 +1,27 @@
-# $OpenBSD: Makefile,v 1.45 2005/12/17 11:27:44 espie Exp $
+# $OpenBSD: Makefile,v 1.46 2006/01/03 09:10:53 espie Exp $

 COMMENT=		"K Desktop Environment, aRTs"
 CATEGORIES=		x11 x11/kde
 VERSION=		3.5.0
 DISTNAME=		arts-1.5.0
 MODKDE_VERSION?=	3.5
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
+SHARED_LIBS=		artsc			0.0 \
+			artscbackend		0.0 \
+			artsdsp			0.0 \
+			artsdsp_st		0.0 \
+			artsflow		1.0 \
+			artsflow_idl		1.0 \
+			artsgslplayobject	0.0 \
+			artswavplayobject	0.0 \
+			gmcop			1.0 \
+			kmedia2			1.0 \
+			kmedia2_idl		1.0 \
+			mcop			1.0 \
+			mcop_mt			1.0 \
+			qtmcop			1.0 \
+			soundserver_idl		1.0 \
+			x11globalcomm		1.0

 SHARED_ONLY=		No
 LIB_DEPENDS= 	audiofile::devel/libaudiofile \
--- a/x11/kde/arts3/patches/patch-artsc_Makefile_in
+++ b/x11/kde/arts3/patches/patch-artsc_Makefile_in
@ -0,0 +1,30 @@
+$OpenBSD: patch-artsc_Makefile_in,v 1.1 2006/01/03 09:10:54 espie Exp $
+--- artsc/Makefile.in.orig	Fri Dec 30 16:49:30 2005
+++ artsc/Makefile.in	Fri Dec 30 16:59:16 2005
+@@ -402,18 +402,22 @@ INCLUDES = -I$(top_srcdir)/mcop -I$(top_
+ 
+ bin_SCRIPTS = artsc-config artsdsp
+ libartsdsp_la_SOURCES = artsdsp.c
+-libartsdsp_la_LDFLAGS = -no-undefined -module $(all_libraries)
+LIBartsdsp_LTVERSION=
+libartsdsp_la_LDFLAGS = -no-undefined -module $(LIBartsdsp_LTVERSION) $(all_libraries)
+ libartsdsp_la_LIBADD = libartsc.la
+ libartsdsp_st_la_SOURCES = artsc.c artsdsp.c
+-libartsdsp_st_la_LDFLAGS = -no-undefined -module $(all_libraries)
+LIBartsdsp_st_LTVERSION=
+libartsdsp_st_la_LDFLAGS = -no-undefined -module $(LIBartsdsp_st_LTVERSION) $(all_libraries)
+ libartsdsp_st_la_LIBADD = $(top_builddir)/libltdl/libltdlc.la
+ libartsc_la_SOURCES = artsc.c
+-libartsc_la_LDFLAGS = -no-undefined $(USE_THREADS) $(all_libraries)
+LIBartsc_LTVERSION=
+libartsc_la_LDFLAGS = -no-undefined $(LIBartsc_LTVERSION) $(USE_THREADS) $(all_libraries)
+ libartsc_la_LIBADD = $(top_builddir)/libltdl/libltdlc.la $(LIBPTHREAD)
+ libartscbackend_la_SOURCES = artscbackend.cc
+ #>- libartscbackend_la_LDFLAGS = -no-undefined -module $(KDE_RPATH) $(all_libraries)
+ #>+ 1
+-libartscbackend_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -module $(KDE_RPATH) $(all_libraries)
+LIBartscbackend_LTVERSION=
+libartscbackend_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) $(LIBartscbackend_LTVERSION) -module $(KDE_RPATH) $(all_libraries)
+ libartscbackend_la_LIBADD = $(FLOWLIBS) \
+     $(top_builddir)/soundserver/libsoundserver_idl.la
+ 
--- a/x11/kde/arts3/patches/patch-configure_in
+++ b/x11/kde/arts3/patches/patch-configure_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-configure_in,v 1.4 2005/03/29 21:18:34 espie Exp $
--- configure.in.orig	Fri Mar  4 10:57:45 2005
-+++ configure.in	Wed Mar 23 08:51:07 2005
-@@ -828,7 +828,7 @@ AC_DEFUN([AC_GSL_REQUIREMENTS],
+$OpenBSD: patch-configure_in,v 1.5 2006/01/03 09:10:54 espie Exp $
+--- configure.in.orig	Sun Nov 20 20:54:54 2005
+++ configure.in	Fri Dec 30 16:43:14 2005
+@@ -911,7 +911,7 @@ AC_DEFUN([AC_GSL_REQUIREMENTS],
           [KDE_CHECK_HEADER(vorbis/vorbisfile.h, ov_headers=`expr $ov_headers + 1`)]
           [KDE_CHECK_HEADER(vorbis/vorbisenc.h, ov_headers=`expr $ov_headers + 1`)]
           ,
--- a/x11/kde/arts3/patches/patch-flow_Makefile_in
+++ b/x11/kde/arts3/patches/patch-flow_Makefile_in
@ -0,0 +1,22 @@
+$OpenBSD: patch-flow_Makefile_in,v 1.1 2006/01/03 09:10:55 espie Exp $
+--- flow/Makefile.in.orig	Fri Dec 30 16:49:30 2005
+++ flow/Makefile.in	Fri Dec 30 16:57:09 2005
+@@ -434,14 +434,16 @@ lib_LTLIBRARIES = libartsflow_idl.la lib
+ libartsflow_idl_la_SOURCES = artsflow.cc
+ #>- libartsflow_idl_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries)
+ #>+ 1
+-libartsflow_idl_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -version-info 1:0 $(all_libraries)
+LIBartsflow_idl_LTVERSION= -version-info 1:0
+libartsflow_idl_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) $(LIBartsflow_idl_LTVERSION) $(all_libraries)
+ libartsflow_idl_la_LIBADD = $(top_builddir)/mcop/libmcop.la $(LIBPOSIX4)
+ libartsflow_la_LIBADD = $(top_builddir)/mcop/libmcop.la libartsflow_idl.la $(top_builddir)/flow/gslpp/libgslpp.la $(LIBAUDIOFILE) $(LIBASOUND) $(LIBAUDIOIO) $(LIBOSSAUDIO) $(LIBAUDIONAS) $(LIBCSL) $(SGILIBAUDIO) $(LIBESD) $(LIBMAS) $(JACK_LIBADD) -lm \
+   $(top_builddir)/flow/gsl/libgsl.la
+ 
+ #>- libartsflow_la_LDFLAGS = $(MAS_LDFLAGS) $(JACK_LDFLAGS) $(LIBAUDIOFILE_LDFLAGS) $(LIBAUDIONAS_LDFLAGS) $(LIBESD_LDFLAGS) -no-undefined -version-info 1:0
+ #>+ 1
+-libartsflow_la_LDFLAGS = $(MAS_LDFLAGS) $(JACK_LDFLAGS) $(LIBAUDIOFILE_LDFLAGS) $(LIBAUDIONAS_LDFLAGS) $(LIBESD_LDFLAGS) -no-undefined $(KDE_NO_UNDEFINED) -version-info 1:0
+LIBartsflow_LTVERSION= -version-info 1:0
+libartsflow_la_LDFLAGS = $(MAS_LDFLAGS) $(JACK_LDFLAGS) $(LIBAUDIOFILE_LDFLAGS) $(LIBAUDIONAS_LDFLAGS) $(LIBESD_LDFLAGS) -no-undefined $(KDE_NO_UNDEFINED) $(LIBartsflow_LTVERSION)
+ libartsflow_la_COMPILE_FIRST = artsflow.h
+ libartsflow_la_SOURCES = synth_play_impl.cc \
+   gslschedule.cc audiosubsys.cc \
--- a/x11/kde/arts3/patches/patch-gmcop_Makefile_in
+++ b/x11/kde/arts3/patches/patch-gmcop_Makefile_in
@ -1,6 +1,6 @@
-$OpenBSD: patch-gmcop_Makefile_in,v 1.7 2005/10/17 11:28:24 espie Exp $
--- gmcop/Makefile.in.orig	Wed Oct  5 20:57:13 2005
-+++ gmcop/Makefile.in	Mon Oct 17 11:57:15 2005
+$OpenBSD: patch-gmcop_Makefile_in,v 1.8 2006/01/03 09:10:55 espie Exp $
+--- gmcop/Makefile.in.orig	Sun Nov 20 20:55:24 2005
+++ gmcop/Makefile.in	Fri Dec 30 16:54:56 2005
@@ -140,7 +140,7 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@ -10,3 +10,13 @@ $OpenBSD: patch-gmcop_Makefile_in,v 1.7 2005/10/17 11:28:24 espie Exp $
 GLIB_LIBADD = @GLIB_LIBADD@
 GSL_CFLAGS = @GSL_CFLAGS@
 GSL_HAVE_LIBMAD = @GSL_HAVE_LIBMAD@
+@@ -364,7 +364,8 @@ libgmcop_la_SOURCES = giomanager.cc
+ libgmcop_la_LIBADD = $(top_builddir)/mcop/libmcop.la $(GLIB_LIBADD)
+ #>- libgmcop_la_LDFLAGS = -no-undefined -version-info 1:0 $(GLIB_LDFLAGS) $(all_libraries)
+ #>+ 1
+-libgmcop_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -version-info 1:0 $(GLIB_LDFLAGS) $(all_libraries)
+LIBgmcop_LTVERSION= -version-info 1:0
+libgmcop_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) $(LIBgmcop_LTVERSION) $(GLIB_LDFLAGS) $(all_libraries)
+ artsincludedir = $(includedir)/arts
+ artsinclude_HEADERS = giomanager.h
+ #>- all: all-am
--- a/x11/kde/arts3/patches/patch-mcop_Makefile_in
+++ b/x11/kde/arts3/patches/patch-mcop_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-mcop_Makefile_in,v 1.1 2006/01/03 09:10:55 espie Exp $
+--- mcop/Makefile.in.orig	Fri Dec 30 16:49:30 2005
+++ mcop/Makefile.in	Fri Dec 30 16:54:06 2005
+@@ -405,7 +405,8 @@ libmcop_la_SOURCES = buffer.cc connectio
+ libmcop_la_LIBADD = $(LIBSOCKET) $(GLIB_LIBADD) $(top_builddir)/libltdl/libltdlc.la
+ #>- libmcop_la_LDFLAGS = -no-undefined -version-info 1:0 $(GLIB_LDFLAGS) $(all_libraries)
+ #>+ 1
+-libmcop_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -version-info 1:0 $(GLIB_LDFLAGS) $(all_libraries)
+LIBmcop_LTVERSION= -version-info 1:0
+libmcop_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) $(LIBmcop_LTVERSION) $(GLIB_LDFLAGS) $(all_libraries)
+ artsincludedir = $(includedir)/arts
+ artsinclude_HEADERS = arts_export.h buffer.h common.h connection.h core.h dispatcher.h \
+   factory.h flowsystem.h idlfilereg.h ifacerepo_impl.h iomanager.h \
--- a/x11/kde/arts3/patches/patch-mcop_mt_Makefile_in
+++ b/x11/kde/arts3/patches/patch-mcop_mt_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-mcop_mt_Makefile_in,v 1.1 2006/01/03 09:10:55 espie Exp $
+--- mcop_mt/Makefile.in.orig	Fri Dec 30 16:49:30 2005
+++ mcop_mt/Makefile.in	Fri Dec 30 16:53:42 2005
+@@ -364,7 +364,8 @@ libmcop_mt_la_LIBADD = $(top_builddir)/m
+ 
+ #>- libmcop_mt_la_LDFLAGS = -no-undefined -version-info 1:0 $(USE_THREADS) $(all_libraries)
+ #>+ 1
+-libmcop_mt_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -version-info 1:0 $(USE_THREADS) $(all_libraries)
+LIBmcop_mt_LTVERSION= -version-info 1:0
+libmcop_mt_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) $(LIBmcop_mt_LTVERSION) $(USE_THREADS) $(all_libraries)
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
--- a/x11/kde/arts3/patches/patch-qtmcop_Makefile_in
+++ b/x11/kde/arts3/patches/patch-qtmcop_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-qtmcop_Makefile_in,v 1.1 2006/01/03 09:10:55 espie Exp $
+--- qtmcop/Makefile.in.orig	Fri Dec 30 16:49:30 2005
+++ qtmcop/Makefile.in	Fri Dec 30 16:54:34 2005
+@@ -366,7 +366,8 @@ libqtmcop_la_LIBADD = $(top_builddir)/mc
+ #>- libqtmcop_la_LDFLAGS = -no-undefined -version-info 1:0 $(KDE_RPATH) \
+ #>- 	$(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(USER_LDFLAGS) $(X_LDFLAGS) $(LDFLAGS_AS_NEEDED)
+ #>+ 2
+-libqtmcop_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -version-info 1:0 $(KDE_RPATH) \
+LIBqtmcop_LTVERSION= -version-info 1:0
+libqtmcop_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) $(LIBqtmcop_LTVERSION) $(KDE_RPATH) \
+ 	$(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(USER_LDFLAGS) $(X_LDFLAGS) $(LDFLAGS_AS_NEEDED)
+ 
+ #>- METASOURCES = qiomanager_p.moc
--- a/x11/kde/arts3/patches/patch-soundserver_Makefile_in
+++ b/x11/kde/arts3/patches/patch-soundserver_Makefile_in
@ -0,0 +1,49 @@
+$OpenBSD: patch-soundserver_Makefile_in,v 1.3 2006/01/03 09:10:55 espie Exp $
+--- soundserver/Makefile.in.orig	Sun Nov 20 20:55:24 2005
+++ soundserver/Makefile.in	Fri Dec 30 17:39:16 2005
+@@ -491,7 +491,7 @@ libsoundserver_idl_la_LIBADD = libkmedia
+ 
+ #>- libsoundserver_idl_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries)
+ #>+ 1
+-libsoundserver_idl_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -version-info 1:0 $(all_libraries)
+libsoundserver_idl_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) $(LIBsoundserver_idl_LTVERSION) $(all_libraries)
+ libsoundserver_idl_la_SOURCES = soundserver.cc
+ libsoundserver_idl_la_COMPILE_FIRST = soundserver.h
+ libkmedia2_idl_la_SOURCES = kmedia2.cc
+@@ -499,12 +499,14 @@ libkmedia2_idl_la_COMPILE_FIRST = kmedia
+ libkmedia2_idl_la_LIBADD = $(top_builddir)/flow/libartsflow.la
+ #>- libkmedia2_idl_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries)
+ #>+ 1
+-libkmedia2_idl_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -version-info 1:0 $(all_libraries)
+LIBkmedia2_idl_LTVERSION= -version-info 1:0
+libkmedia2_idl_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) $(LIBkmedia2_idl_LTVERSION) $(all_libraries)
+ libkmedia2_la_SOURCES = fileinputstream_impl.cc stdoutwriter_impl.cc
+ libkmedia2_la_LIBADD = libkmedia2_idl.la $(FLOWLIBS)
+ #>- libkmedia2_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries)
+ #>+ 1
+-libkmedia2_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -version-info 1:0 $(all_libraries)
+LIBkmedia2_LTVERSION= -version-info 1:0
+libkmedia2_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) $(LIBkmedia2_LTVERSION) $(all_libraries)
+ libkmedia2_la_COMPILE_FIRST = kmedia2.h ../flow/artsflow.h
+ libartswavplayobject_la_SOURCES = wavplayobject_impl.cc
+ libartswavplayobject_la_LIBADD = $(top_builddir)/mcop/libmcop.la \
+@@ -512,7 +514,8 @@ libartswavplayobject_la_LIBADD = $(top_b
+ 
+ #>- libartswavplayobject_la_LDFLAGS = -no-undefined -module $(all_libraries)
+ #>+ 1
+-libartswavplayobject_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -module $(all_libraries)
+LIBartswavplayobject_LTVERSION=
+libartswavplayobject_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -module $(LIBartswavplayobject_LTVERSION) $(all_libraries)
+ libartswavplayobject_la_COMPILE_FIRST = soundserver.h ../flow/artsflow.h
+ libartsgslplayobject_la_SOURCES = gslplayobject_impl.cc
+ libartsgslplayobject_la_LIBADD = $(top_builddir)/mcop/libmcop.la \
+@@ -520,7 +523,8 @@ libartsgslplayobject_la_LIBADD = $(top_b
+ 
+ #>- libartsgslplayobject_la_LDFLAGS = -no-undefined -module $(all_libraries)
+ #>+ 1
+-libartsgslplayobject_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -module $(all_libraries)
+LIBartsgslplayobject_LTVERSION=
+libartsgslplayobject_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -module $(LIBartsgslplayobject_LTVERSION) $(all_libraries)
+ libartsgslplayobject_la_COMPILE_FIRST = soundserver.h ../flow/artsflow.h
+ artsd_LDADD = libsoundserver_idl.la $(FLOWLIBS) \
+               $(top_builddir)/mcop_mt/libmcop_mt.la
--- a/x11/kde/arts3/patches/patch-x11_Makefile_in
+++ b/x11/kde/arts3/patches/patch-x11_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-x11_Makefile_in,v 1.1 2006/01/03 09:10:55 espie Exp $
+--- x11/Makefile.in.orig	Fri Dec 30 16:49:30 2005
+++ x11/Makefile.in	Fri Dec 30 16:57:56 2005
+@@ -372,7 +372,8 @@ x_libraries = @x_libraries@
+ @include_x11_TRUE@lib_LTLIBRARIES = libx11globalcomm.la
+ @include_x11_TRUE@libx11globalcomm_la_SOURCES = x11globalcomm.cc x11globalcomm_impl.cc
+ @include_x11_TRUE@libx11globalcomm_la_LIBADD = $(top_builddir)/mcop/libmcop.la $(LIB_X11)
+-@include_x11_TRUE@libx11globalcomm_la_LDFLAGS = -no-undefined -module -version-info 1:0 $(X_LDFLAGS) $(all_libraries)
+@include_x11_TRUE@LIBx11globalcomm_LTVERSION= -version-info 1:0
+@include_x11_TRUE@libx11globalcomm_la_LDFLAGS = -no-undefined -module $(LIBx11globalcomm_LTVERSION) $(X_LDFLAGS) $(all_libraries)
+ @include_x11_TRUE@DISTCLEANFILES = x11globalcomm.cc x11globalcomm.h \
+ @include_x11_TRUE@                 x11globalcomm.mcoptype x11globalcomm.mcopclass
+ 
--- a/x11/kde/arts3/pkg/PFRAG.shared
+++ b/x11/kde/arts3/pkg/PFRAG.shared
@ -1,17 +1,17 @@
-@comment $OpenBSD: PFRAG.shared,v 1.11 2004/08/10 13:53:37 espie Exp $
-@lib lib/libartsc.so.0.0
-@lib lib/libartscbackend.so.0.0
-@lib lib/libartsdsp.so.0.0
-@lib lib/libartsdsp_st.so.0.0
-@lib lib/libartsflow.so.1.0
-@lib lib/libartsflow_idl.so.1.0
-@lib lib/libartsgslplayobject.so.0.0
-@lib lib/libartswavplayobject.so.0.0
-@lib lib/libgmcop.so.1.0
-@lib lib/libkmedia2.so.1.0
-@lib lib/libkmedia2_idl.so.1.0
-@lib lib/libmcop.so.1.0
-@lib lib/libmcop_mt.so.1.0
-@lib lib/libqtmcop.so.1.0
-@lib lib/libsoundserver_idl.so.1.0
-@lib lib/libx11globalcomm.so.1.0
+@comment $OpenBSD: PFRAG.shared,v 1.12 2006/01/03 09:10:55 espie Exp $
+@lib lib/libartsc.so.${LIBartsc_VERSION}
+@lib lib/libartscbackend.so.${LIBartscbackend_VERSION}
+@lib lib/libartsdsp.so.${LIBartsdsp_VERSION}
+@lib lib/libartsdsp_st.so.${LIBartsdsp_st_VERSION}
+@lib lib/libartsflow.so.${LIBartsflow_VERSION}
+@lib lib/libartsflow_idl.so.${LIBartsflow_idl_VERSION}
+@lib lib/libartsgslplayobject.so.${LIBartsgslplayobject_VERSION}
+@lib lib/libartswavplayobject.so.${LIBartswavplayobject_VERSION}
+@lib lib/libgmcop.so.${LIBgmcop_VERSION}
+@lib lib/libkmedia2.so.${LIBkmedia2_VERSION}
+@lib lib/libkmedia2_idl.so.${LIBkmedia2_idl_VERSION}
+@lib lib/libmcop.so.${LIBmcop_VERSION}
+@lib lib/libmcop_mt.so.${LIBmcop_mt_VERSION}
+@lib lib/libqtmcop.so.${LIBqtmcop_VERSION}
+@lib lib/libsoundserver_idl.so.${LIBsoundserver_idl_VERSION}
+@lib lib/libx11globalcomm.so.${LIBx11globalcomm_VERSION}
--- a/x11/kde/libs3/Makefile
+++ b/x11/kde/libs3/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.60 2005/12/17 11:27:44 espie Exp $
+# $OpenBSD: Makefile,v 1.61 2006/01/03 09:10:55 espie Exp $

 COMMENT=		"K Desktop Environment, libraries"
 COMMENT-cups=		"K Desktop Environment, cups support"
@ -8,6 +8,46 @@ DISTNAME=		kdelibs-${VERSION}
 PKGNAME=		${DISTNAME}p0
 PKGNAME-cups=		kdecups-${VERSION}p0
 MODKDE_VERSION?=	3.5
+SHARED_LIBS=		DCOP			6.0 \
+			artskde			3.0 \
+			kabc			3.0 \
+			kabc_dir		1.0 \
+			kabc_file		1.0 \
+			kabc_ldapkio		1.0 \
+			kabc_net		1.0 \
+			katepartinterfaces	0.0 \
+			kdecore			6.0 \
+			kdefakes		6.0 \
+			kdefx			6.0 \
+			kdeprint		6.0 \
+			kdeprint_management	6.0 \
+			kdesasl			3.0 \
+			kdesu			6.0 \
+			kdeui			6.0 \
+			kdnssd			1.0 \
+			khtml			6.0 \
+			kimproxy		0.0 \
+			kio			6.0 \
+			kjava			1.0 \
+			kjs			3.0 \
+			kmdi			1.0 \
+			kmdi2			1.0 \
+			kmediaplayer		0.0 \
+			kmid			0.95 \
+			knewstuff		1.0 \
+			kntlm			0.0 \
+			kparts			3.0 \
+			kresources		3.0 \
+			kscreensaver		6.0 \
+			kscript			0.0 \
+			kspell			6.0 \
+			kspell2			1.0 \
+			ktexteditor		0.0 \
+			kunittest		1.0 \
+			kutils			3.0 \
+			kwalletbackend		1.0 \
+			kwalletclient		1.1 \
+			vcard			0.0

 FLAVORS=debug
 VMEM_WARNING=	Yes
--- a/x11/kde/libs3/patches/patch-arts_kde_Makefile_in
+++ b/x11/kde/libs3/patches/patch-arts_kde_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-arts_kde_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- arts/kde/Makefile.in.orig	Mon Jan  2 14:04:29 2006
+++ arts/kde/Makefile.in	Mon Jan  2 14:12:12 2006
+@@ -552,7 +552,8 @@ libartskde_la_SOURCES = artskde.cc kioin
+ libartskde_la_LIBADD = $(LIB_KIO) -lqtmcop -lsoundserver_idl
+ #>- libartskde_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
+ #>+ 1
+-libartskde_la_LDFLAGS = $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) -version-info 3:0:2
+LIBartskde_LTVERSION=-version-info 3:0:2
+libartskde_la_LDFLAGS = $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) $(LIBartskde_LTVERSION)
+ #>- libartskde_la_METASOURCES = AUTO
+ libartskde_la_COMPILE_FIRST = artskde.h
+ artskdeincludedir = $(includedir)/arts
--- a/x11/kde/libs3/patches/patch-dcop_Makefile_in
+++ b/x11/kde/libs3/patches/patch-dcop_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-dcop_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- dcop/Makefile.in.orig	Mon Jan  2 14:04:36 2006
+++ dcop/Makefile.in	Mon Jan  2 18:07:14 2006
+@@ -620,7 +620,8 @@ lib_LTLIBRARIES = libDCOP.la   libkdeini
+ libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT)
+ #>- libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 6:0:2 -no-undefined $(all_libraries)
+ #>+ 1
+-libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
+LIBDCOP_LTVERSION=-version-info 6:0:2
+libDCOP_la_LDFLAGS = $(KDE_RPATH) $(LIBDCOP_LTVERSION) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
+ libDCOP_la_NMCHECK = $(srcdir)/libDCOP.nmcheck
+ libDCOP_la_NMCHECKWEAK = $(srcdir)/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck
+ include_HEADERS = dcopclient.h dcopobject.h dcopstub.h dcopref.h dcoptypes.h kdatastream.h
--- a/x11/kde/libs3/patches/patch-dnssd_Makefile_in
+++ b/x11/kde/libs3/patches/patch-dnssd_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-dnssd_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- dnssd/Makefile.in.orig	Mon Jan  2 14:04:36 2006
+++ dnssd/Makefile.in	Mon Jan  2 18:09:13 2006
+@@ -534,7 +534,8 @@ dnssdinclude_HEADERS = domainbrowser.h q
+ 	publicservice.h servicebase.h servicebrowser.h settings.h
+ 
+ libkdnssd_la_LIBADD = ../kdecore/libkdecore.la $(LIB_DNSSD)
+-libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
+LIBkdnssd_LTVERSION=-version-info 1:0
+libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBkdnssd_LTVERSION)
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
--- a/x11/kde/libs3/patches/patch-interfaces_kimproxy_library_Makefile_in
+++ b/x11/kde/libs3/patches/patch-interfaces_kimproxy_library_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-interfaces_kimproxy_library_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- interfaces/kimproxy/library/Makefile.in.orig	Mon Jan  2 14:04:28 2006
+++ interfaces/kimproxy/library/Makefile.in	Mon Jan  2 14:06:50 2006
+@@ -535,7 +535,8 @@ kimproxyinclude_HEADERS = kimproxy.h kim
+ lib_LTLIBRARIES = libkimproxy.la
+ #>- libkimproxy_la_LDFLAGS = -no-undefined $(all_libraries)
+ #>+ 1
+-libkimproxy_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
+LIBkimproxy_LTVERSION=
+libkimproxy_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries) $(LIBkimproxy_LTVERSION)
+ libkimproxy_la_LIBADD = $(LIB_KIO)
+ #>- libkimproxy_la_SOURCES = kimproxy.cpp kimiface.stub kimproxyiface.skel
+ #>+ 1
--- a/x11/kde/libs3/patches/patch-interfaces_kmediaplayer_Makefile_in
+++ b/x11/kde/libs3/patches/patch-interfaces_kmediaplayer_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-interfaces_kmediaplayer_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- interfaces/kmediaplayer/Makefile.in.orig	Mon Jan  2 14:04:28 2006
+++ interfaces/kmediaplayer/Makefile.in	Mon Jan  2 14:07:53 2006
+@@ -537,7 +537,8 @@ lib_LTLIBRARIES = libkmediaplayer.la
+ libkmediaplayer_la_SOURCES=player.cpp  view.cpp playerdcopobject_skel.cpp
+ #>- libkmediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
+ #>+ 1
+-libkmediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined $(KDE_NO_UNDEFINED)
+LIBkmediaplayer_LTVERSION=
+libkmediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined $(KDE_NO_UNDEFINED) $(LIBkmediaplayer_LTVERSION)
+ libkmediaplayer_la_LIBADD = $(LIB_KPARTS)
+ #>- libkmediaplayer_la_METASOURCES = AUTO
+ kmediaplayerinclude_HEADERS = player.h playerdcopobject.h view.h
--- a/x11/kde/libs3/patches/patch-interfaces_kscript_Makefile_in
+++ b/x11/kde/libs3/patches/patch-interfaces_kscript_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-interfaces_kscript_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- interfaces/kscript/Makefile.in.orig	Mon Jan  2 14:04:28 2006
+++ interfaces/kscript/Makefile.in	Mon Jan  2 14:06:21 2006
+@@ -539,7 +539,8 @@ lib_LTLIBRARIES = libkscript.la
+ libkscript_la_SOURCES = scriptmanager.cpp
+ #>- libkscript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
+ #>+ 1
+-libkscript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined $(KDE_NO_UNDEFINED)
+LIBkscript_LTVERSION=
+libkscript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined $(KDE_NO_UNDEFINED) $(LIBkscript_LTVERSION)
+ libkscript_la_LIBADD = $(LIB_KIO)
+ kscriptinclude_HEADERS = scriptinterface.h scriptclientinterface.h scriptmanager.h
+ kscriptincludedir = $(includedir)
--- a/x11/kde/libs3/patches/patch-interfaces_ktexteditor_Makefile_in
+++ b/x11/kde/libs3/patches/patch-interfaces_ktexteditor_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-interfaces_ktexteditor_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- interfaces/ktexteditor/Makefile.in.orig	Mon Jan  2 14:04:28 2006
+++ interfaces/ktexteditor/Makefile.in	Mon Jan  2 14:07:20 2006
+@@ -593,7 +593,8 @@ libktexteditor_la_SOURCES=ktexteditor.cp
+      selectioninterfaceext.cpp  \
+     texthintinterface.cpp editinterfaceext.cpp variableinterface.cpp templateinterface.cpp editdcopinterface_skel.cpp clipboarddcopinterface_skel.cpp selectiondcopinterface_skel.cpp searchdcopinterface_skel.cpp blockselectiondcopinterface_skel.cpp documentdcopinfo_skel.cpp encodingdcopinterface_skel.cpp printdcopinterface_skel.cpp undodcopinterface_skel.cpp viewcursordcopinterface_skel.cpp viewstatusmsgdcopinterface_skel.cpp selectionextdcopinterface_skel.cpp editorchooser_ui.cpp
+ 
+-libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+LIBktexteditor_LTVERSION=
+libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBktexteditor_LTVERSION)
+ libktexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/kabc/libkabc.la
+ ktexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \
+                              selectioninterface.h cursorinterface.h \
--- a/x11/kde/libs3/patches/patch-kabc_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kabc_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-kabc_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kabc/Makefile.in.orig	Mon Jan  2 14:04:33 2006
+++ kabc/Makefile.in	Mon Jan  2 17:39:29 2006
+@@ -574,7 +574,8 @@ CLEANFILES = addressee.h addressee.cpp f
+ lib_LTLIBRARIES = libkabc.la
+ #>- libkabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined
+ #>+ 1
+-libkabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined $(KDE_NO_UNDEFINED)
+LIBkabc_LTVERSION= -version-info 3:0:2
+libkabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIBkabc_LTVERSION) -no-undefined $(KDE_NO_UNDEFINED)
+ libkabc_la_LIBADD = vcard/libvcard.la vcardparser/libvcards.la $(LIB_KIO) \
+                     $(top_builddir)/kresources/libkresources.la
+ 
--- a/x11/kde/libs3/patches/patch-kabc_plugins_dir_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kabc_plugins_dir_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-kabc_plugins_dir_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kabc/plugins/dir/Makefile.in.orig	Mon Jan  2 14:04:33 2006
+++ kabc/plugins/dir/Makefile.in	Mon Jan  2 17:38:37 2006
+@@ -527,7 +527,8 @@ lib_LTLIBRARIES = libkabc_dir.la
+ libkabc_dir_la_SOURCES = resourcedir.cpp resourcedirconfig.cpp
+ #>- libkabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined 
+ #>+ 1
+-libkabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined $(KDE_NO_UNDEFINED) 
+LIBkabc_dir_LTVERSION= -version-info 1:0:0
+libkabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIBkabc_dir_LTVERSION) -no-undefined $(KDE_NO_UNDEFINED) 
+ libkabc_dir_la_LIBADD = $(LIB_KABC)
+ libkabc_dir_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+ kde_module_LTLIBRARIES = kabc_dir.la
--- a/x11/kde/libs3/patches/patch-kabc_plugins_file_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kabc_plugins_file_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-kabc_plugins_file_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kabc/plugins/file/Makefile.in.orig	Mon Jan  2 14:04:33 2006
+++ kabc/plugins/file/Makefile.in	Mon Jan  2 17:37:09 2006
+@@ -527,7 +527,8 @@ lib_LTLIBRARIES = libkabc_file.la
+ libkabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp
+ #>- libkabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
+ #>+ 1
+-libkabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined $(KDE_NO_UNDEFINED)
+LIBkabc_file_LTVERSION=-version-info 1:0:0
+libkabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIBkabc_file_LTVERSION) -no-undefined $(KDE_NO_UNDEFINED)
+ libkabc_file_la_LIBADD = $(LIB_KABC)
+ libkabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+ kde_module_LTLIBRARIES = kabc_file.la
--- a/x11/kde/libs3/patches/patch-kabc_plugins_ldapkio_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kabc_plugins_ldapkio_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-kabc_plugins_ldapkio_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kabc/plugins/ldapkio/Makefile.in.orig	Mon Jan  2 14:04:33 2006
+++ kabc/plugins/ldapkio/Makefile.in	Mon Jan  2 17:37:44 2006
+@@ -531,7 +531,8 @@ lib_LTLIBRARIES = libkabc_ldapkio.la
+ libkabc_ldapkio_la_SOURCES = resourceldapkio.cpp resourceldapkioconfig.cpp
+ #>- libkabc_ldapkio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
+ #>+ 1
+-libkabc_ldapkio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined $(KDE_NO_UNDEFINED)
+LIBkabc_ldapkio_LTVERSION=-version-info 1:0:0
+libkabc_ldapkio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIBkabc_ldapkio_LTVERSION) -no-undefined $(KDE_NO_UNDEFINED)
+ libkabc_ldapkio_la_LIBADD = $(top_builddir)/kabc/libkabc.la $(LIB_KIO)
+ libkabc_ldapkio_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+ kde_module_LTLIBRARIES = kabc_ldapkio.la
--- a/x11/kde/libs3/patches/patch-kabc_plugins_net_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kabc_plugins_net_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-kabc_plugins_net_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kabc/plugins/net/Makefile.in.orig	Mon Jan  2 14:04:33 2006
+++ kabc/plugins/net/Makefile.in	Mon Jan  2 17:38:15 2006
+@@ -528,7 +528,8 @@ lib_LTLIBRARIES = libkabc_net.la
+ libkabc_net_la_SOURCES = resourcenet.cpp resourcenetconfig.cpp
+ #>- libkabc_net_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
+ #>+ 1
+-libkabc_net_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined $(KDE_NO_UNDEFINED)
+LIBkabc_net_LTVERSION=-version-info 1:0:0
+libkabc_net_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIBkabc_net_LTVERSION) -no-undefined $(KDE_NO_UNDEFINED)
+ libkabc_net_la_LIBADD = $(top_builddir)/kabc/libkabc.la $(LIB_KIO)
+ libkabc_net_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+ kde_module_LTLIBRARIES = kabc_net.la
--- a/x11/kde/libs3/patches/patch-kabc_vcard_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kabc_vcard_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-kabc_vcard_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kabc/vcard/Makefile.in.orig	Mon Jan  2 14:04:33 2006
+++ kabc/vcard/Makefile.in	Mon Jan  2 17:38:59 2006
+@@ -524,7 +524,8 @@ INCLUDES = \
+ ### KDE 4.0: either make noinst or rename to something like libkvcard
+ lib_LTLIBRARIES = libvcard.la
+ libvcard_la_SOURCES = vCard-all.cpp
+-libvcard_la_LDFLAGS = $(all_libraries)
+LIBvcard_LTVERSION=
+libvcard_la_LDFLAGS = $(all_libraries) $(LIBvcard_LTVERSION)
+ libvcard_la_LIBADD = $(LIB_KDECORE)
+ testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ testwrite_LDADD = libvcard.la 
--- a/x11/kde/libs3/patches/patch-kate_interfaces_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kate_interfaces_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-kate_interfaces_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kate/interfaces/Makefile.in.orig	Mon Jan  2 14:04:29 2006
+++ kate/interfaces/Makefile.in	Mon Jan  2 21:50:44 2006
+@@ -516,7 +516,8 @@ libkatepartinterfaces_la_SOURCES = inter
+ libkatepartinterfaces_la_LIBADD = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la
+ #>- libkatepartinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
+ #>+ 1
+-libkatepartinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined $(KDE_NO_UNDEFINED)
+LIBkatepartinterfaces_LTVERSION=
+libkatepartinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined $(KDE_NO_UNDEFINED) $(LIBkatepartinterfaces_LTVERSION)
+ kateinclude_HEADERS = document.h view.h
+ kateincludedir = $(includedir)/kate
+ INCLUDES = -I$(top_srcdir)/interfaces -I$(top_srcdir)/kparts -I$(top_srcdir) $(all_includes)
--- a/x11/kde/libs3/patches/patch-kdecore_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kdecore_Makefile_in
@ -0,0 +1,23 @@
+$OpenBSD: patch-kdecore_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kdecore/Makefile.in.orig	Mon Jan  2 14:04:34 2006
+++ kdecore/Makefile.in	Mon Jan  2 18:06:43 2006
+@@ -704,7 +704,8 @@ include_HEADERS = kconfig.h kconfigskele
+ 	kdemacros.h kde_file.h ktimezones.h
+ 
+ libkdefakes_la_SOURCES = fakes.c vsnprintf.c
+-libkdefakes_la_LDFLAGS = -version-info 6:0:2
+LIBkdefakes_LTVERSION= -version-info 6:0:2
+libkdefakes_la_LDFLAGS = $(LIBkdefakes_LTVERSION)
+ libkdefakes_la_LIBADD = $(LIBSOCKET)
+ libkdefakes_nonpic_a_SOURCES = fakes_nonpic.c vsnprintf_nonpic.c
+ noinst_HEADERS = kaccelaction.h kaccelbase.h kaccelprivate.h kckey.h \
+@@ -781,7 +782,8 @@ libkdecore_la_SOURCES=libintl.cpp kappli
+ 
+ #>- libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
+ #>+ 1
+-libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED)
+LIBkdecore_LTVERSION=-version-info 6:0:2 
+libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) $(LIBkdecore_LTVERSION) -no-undefined $(KDE_NO_UNDEFINED)
+ libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la
+ libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
+ libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
--- a/x11/kde/libs3/patches/patch-kdefx_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kdefx_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-kdefx_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kdefx/Makefile.in.orig	Mon Jan  2 14:04:29 2006
+++ kdefx/Makefile.in	Mon Jan  2 14:11:33 2006
+@@ -538,7 +538,8 @@ INCLUDES = $(all_includes)
+ lib_LTLIBRARIES = libkdefx.la
+ #>- libkdefx_la_LDFLAGS = $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(all_libraries) -no-undefined -version-info 6:0:2
+ #>+ 1
+-libkdefx_la_LDFLAGS = $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) -version-info 6:0:2
+LIBkdefx_LTVERSION=-version-info 6:0:2
+libkdefx_la_LDFLAGS = $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) $(LIBkdefx_LTVERSION)
+ libkdefx_la_LIBADD = $(LIB_QT) $(LIB_XRENDER)
+ libkdefx_la_NMCHECK = $(srcdir)/libkdefx.nmcheck
+ libkdefx_la_NMCHECKWEAK = $(srcdir)/libkdefx_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck \
--- a/x11/kde/libs3/patches/patch-kdeprint_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kdeprint_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-kdeprint_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kdeprint/Makefile.in.orig	Mon Jan  2 14:04:36 2006
+++ kdeprint/Makefile.in	Mon Jan  2 18:07:45 2006
+@@ -626,7 +626,8 @@ libkdeprint_la_SOURCES=kmfactory.cpp kmj
+ 
+ #>- libkdeprint_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
+ #>+ 1
+-libkdeprint_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED)
+LIBkdeprint_LTVERSION=-version-info 6:0:2
+libkdeprint_la_LDFLAGS = $(all_libraries) $(LIBkdeprint_LTVERSION) -no-undefined $(KDE_NO_UNDEFINED)
+ libkdeprint_la_LIBADD = $(LIB_KPARTS) $(LIBZ)
+ libkdeprint_la_DEPENDENCIES = $(LIB_KPARTS) 
+ #>- libkdeprint_la_METASOURCES = AUTO
--- a/x11/kde/libs3/patches/patch-kdeprint_management_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kdeprint_management_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-kdeprint_management_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kdeprint/management/Makefile.in.orig	Mon Jan  2 14:04:36 2006
+++ kdeprint/management/Makefile.in	Mon Jan  2 18:08:22 2006
+@@ -615,7 +615,8 @@ libkdeprint_management_la_SOURCES = \
+ 
+ #>- libkdeprint_management_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
+ #>+ 1
+-libkdeprint_management_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED)
+LIBkdeprint_management_LTVERSION=-version-info 6:0:2
+libkdeprint_management_la_LDFLAGS = $(all_libraries) $(LIBkdeprint_management_LTVERSION) -no-undefined $(KDE_NO_UNDEFINED)
+ libkdeprint_management_la_LIBADD = ../libkdeprint.la
+ #>- libkdeprint_management_la_METASOURCES = AUTO
+ libkdeprint_management_module_la_SOURCES = kdeprint_management_module.cpp
--- a/x11/kde/libs3/patches/patch-kdesu_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kdesu_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-kdesu_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kdesu/Makefile.in.orig	Mon Jan  2 14:04:33 2006
+++ kdesu/Makefile.in	Mon Jan  2 17:41:27 2006
+@@ -534,7 +534,8 @@ lib_LTLIBRARIES = libkdesu.la
+ libkdesu_la_SOURCES = client.cpp process.cpp kcookie.cpp su.cpp ssh.cpp stub.cpp kdesu_pty.cpp
+ #>- libkdesu_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) 
+ #>+ 1
+-libkdesu_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries) 
+LIBkdesu_LTVERSION = -version-info 6:0:2
+libkdesu_la_LDFLAGS = $(LIBkdesu_LTVERSION) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries) 
+ libkdesu_la_LIBADD = $(LIB_KDECORE) $(LIBUTIL)
+ libkdesu_la_NMCHECK = $(srcdir)/libkdesu.nmcheck
+ libkdesu_la_NMCHECKWEAK = $(srcdir)/libkdesu_weak.nmcheck $(top_srcdir)/kdecore/libkdecore_weak.nmcheck \
--- a/x11/kde/libs3/patches/patch-kdeui_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kdeui_Makefile_in
@ -0,0 +1,19 @@
+$OpenBSD: patch-kdeui_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kdeui/Makefile.in.orig	Mon Jan  2 14:04:36 2006
+++ kdeui/Makefile.in	Mon Jan  2 18:11:30 2006
+@@ -633,11 +633,13 @@ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFL
+ lib_LTLIBRARIES = libkdeui.la libkspell.la
+ #>- libkdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined -version-info 6:0:2
+ #>+ 1
+-libkdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined $(KDE_NO_UNDEFINED) -version-info 6:0:2
+LIBkdeui_LTVERSION=-version-info 6:0:2
+libkdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined $(KDE_NO_UNDEFINED) $(LIBkdeui_LTVERSION)
+ libkdeui_la_LIBADD = ../kdecore/libkdecore.la
+ #>- libkspell_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 6:0:2 -no-undefined
+ #>+ 1
+-libkspell_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED)
+LIBkspell_LTVERSION=-version-info 6:0:2
+libkspell_la_LDFLAGS = $(KDE_MT_LDFLAGS) $(LIBkspell_LTVERSION) -no-undefined $(KDE_NO_UNDEFINED)
+ libkspell_la_LIBADD = libkdeui.la
+ libkspell_la_SOURCES = dummy.cpp
+ picsdir = $(kde_datadir)/kdeui/pics
--- a/x11/kde/libs3/patches/patch-khtml_Makefile_in
+++ b/x11/kde/libs3/patches/patch-khtml_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-khtml_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- khtml/Makefile.in.orig	Mon Jan  2 14:04:35 2006
+++ khtml/Makefile.in	Mon Jan  2 18:09:43 2006
+@@ -636,7 +636,8 @@ noinst_HEADERS = design.h testkhtml.h te
+ @include_VERSION_SCRIPT_TRUE@VSCRIPT = -Wl,--version-script=$(srcdir)/libkhtml.map
+ #>- libkhtml_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(VSCRIPT) $(all_libraries)
+ #>+ 1
+-libkhtml_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED) $(VSCRIPT) $(all_libraries)
+LIBkhtml_LTVERSION=-version-info 6:0:2
+libkhtml_la_LDFLAGS = $(LIBkhtml_LTVERSION) -no-undefined $(KDE_NO_UNDEFINED) $(VSCRIPT) $(all_libraries)
+ libkhtml_la_LIBADD = ./xml/libkhtmlxml.la ./html/libkhtmlhtml.la \
+ 	./rendering/libkhtmlrender.la ./css/libkhtmlcss.la \
+ 	./misc/libkhtmlmisc.la ecma/libkjs_html.la ./dom/libkhtmldom.la $(LIBKJAVA) \
--- a/x11/kde/libs3/patches/patch-khtml_java_dummy_Makefile_in
+++ b/x11/kde/libs3/patches/patch-khtml_java_dummy_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-khtml_java_dummy_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- khtml/java/dummy/Makefile.in.orig	Mon Jan  2 14:04:34 2006
+++ khtml/java/dummy/Makefile.in	Mon Jan  2 18:02:22 2006
+@@ -503,7 +503,8 @@ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ lib_LTLIBRARIES = libkjava.la
+ libkjava_la_SOURCES = dummy.cpp
+-libkjava_la_LDFLAGS = -version-info 1:0
+LIBkjava_LTVERSION = -version-info 1:0
+libkjava_la_LDFLAGS = $(LIBkjava_LTVERSION)
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
--- a/x11/kde/libs3/patches/patch-kio_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kio_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-kio_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kio/Makefile.in.orig	Mon Jan  2 14:04:31 2006
+++ kio/Makefile.in	Mon Jan  2 14:16:41 2006
+@@ -563,7 +563,8 @@ libkio_la_SOURCES = dummy.cpp
+ #>- libkio_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(all_libraries) \
+ #>- 	$(KDE_MT_LDFLAGS)
+ #>+ 2
+-libkio_la_LDFLAGS = -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries) \
+LIBkio_LTVERSION=	-version-info 6:0:2
+libkio_la_LDFLAGS = $(LIBkio_LTVERSION) -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries) \
+ 	$(KDE_MT_LDFLAGS)
+ 
+ libkio_la_LIBADD = kssl/libkssl.la kio/libkiocore.la \
--- a/x11/kde/libs3/patches/patch-kio_misc_kdesasl_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kio_misc_kdesasl_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-kio_misc_kdesasl_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kio/misc/kdesasl/Makefile.in.orig	Mon Jan  2 14:04:30 2006
+++ kio/misc/kdesasl/Makefile.in	Mon Jan  2 14:15:56 2006
+@@ -515,7 +515,8 @@ kdesaslinclude_HEADERS = kdesasl.h
+ libkdesasl_la_SOURCES = kdesasl.cpp
+ #>- libkdesasl_la_LDFLAGS = $(all_libraries) -version-info 3:0:2 -no-undefined
+ #>+ 1
+-libkdesasl_la_LDFLAGS = $(all_libraries) -version-info 3:0:2 -no-undefined $(KDE_NO_UNDEFINED)
+LIBkdesasl_LTVERSION=-version-info 3:0:2
+libkdesasl_la_LDFLAGS = $(all_libraries) $(LIBkdesasl_LTVERSION) -no-undefined $(KDE_NO_UNDEFINED)
+ libkdesasl_la_LIBADD = $(LIB_KDECORE)
+ #>- all: all-am
+ #>+ 1
--- a/x11/kde/libs3/patches/patch-kio_misc_kntlm_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kio_misc_kntlm_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-kio_misc_kntlm_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kio/misc/kntlm/Makefile.in.orig	Mon Jan  2 14:04:30 2006
+++ kio/misc/kntlm/Makefile.in	Mon Jan  2 14:15:30 2006
+@@ -517,7 +517,8 @@ kntlminclude_HEADERS = kntlm.h
+ libkntlm_la_SOURCES = kntlm.cpp des.cpp
+ #>- libkntlm_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined
+ #>+ 1
+-libkntlm_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined $(KDE_NO_UNDEFINED)
+LIBkntlm_LTVERSION=-version-info 0:0:0
+libkntlm_la_LDFLAGS = $(all_libraries) $(LIBkntlm_LTVERSION) -no-undefined $(KDE_NO_UNDEFINED)
+ libkntlm_la_LIBADD = $(LIB_KDECORE)
+ #>- all: all-am
+ #>+ 1
--- a/x11/kde/libs3/patches/patch-kjs_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kjs_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-kjs_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kjs/Makefile.in.orig	Mon Jan  2 14:04:33 2006
+++ kjs/Makefile.in	Mon Jan  2 18:00:33 2006
+@@ -585,7 +585,8 @@ noinst_HEADERS = internal.h collector.h 
+ #>- libkjs_la_LDFLAGS = -version-info 3:0:2 -no-undefined $(VSCRIPT) \
+ #>-           $(USER_LDFLAGS) $(all_libraries)
+ #>+ 2
+-libkjs_la_LDFLAGS = -version-info 3:0:2 -no-undefined $(KDE_NO_UNDEFINED) $(VSCRIPT) \
+LIBkjs_LTVERSION=-version-info 3:0:2
+libkjs_la_LDFLAGS = $(LIBkjs_LTVERSION) -no-undefined $(KDE_NO_UNDEFINED) $(VSCRIPT) \
+           $(USER_LDFLAGS) $(all_libraries)
+ 
+ libkjs_la_LIBADD = -lm $(LIBPCRE)
--- a/x11/kde/libs3/patches/patch-kmdi_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kmdi_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-kmdi_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kmdi/Makefile.in.orig	Mon Jan  2 14:04:29 2006
+++ kmdi/Makefile.in	Mon Jan  2 14:08:40 2006
+@@ -533,7 +533,8 @@ xdg_menudir = @xdg_menudir@
+ SUBDIRS = kmdi . test
+ INCLUDES = -I$(top_srcdir)/kmdi/res -I$(top_srcdir)/kutils -I$(top_srcdir) -I$(top_srcdir)/kmdi $(all_includes)
+ lib_LTLIBRARIES = libkmdi.la
+-libkmdi_la_LDFLAGS = $(all_libraries) -version-info 1:0
+LIBkmdi_LTVERSION=-version-info 1:0
+libkmdi_la_LDFLAGS = $(all_libraries) $(LIBkmdi_LTVERSION)
+ libkmdi_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kutils/libkutils.la
+ libkmdi_la_SOURCES = kmdichildarea.cpp kmdichildfrm.cpp kmdichildfrmcaption.cpp \
+                      kmdichildview.cpp kmdimainfrm.cpp kmditaskbar.cpp kmdidockcontainer.cpp \
--- a/x11/kde/libs3/patches/patch-kmdi_kmdi_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kmdi_kmdi_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-kmdi_kmdi_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kmdi/kmdi/Makefile.in.orig	Mon Jan  2 14:04:29 2006
+++ kmdi/kmdi/Makefile.in	Mon Jan  2 14:08:20 2006
+@@ -514,7 +514,8 @@ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = -I$(top_srcdir)/kutils -I$(top_srcdir) -I$(top_srcdir)/kmdi $(all_includes)
+ lib_LTLIBRARIES = libkmdi2.la
+-libkmdi2_la_LDFLAGS = $(all_libraries) -version-info 1:0
+LIBkmdi2_LTVERSION=-version-info 1:0
+libkmdi2_la_LDFLAGS = $(all_libraries) $(LIBkmdi2_LTVERSION)
+ libkmdi2_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kutils/libkutils.la
+ libkmdi2_la_SOURCES = mainwindow.cpp dockcontainer.cpp toolviewaccessor.cpp guiclient.cpp tabwidget.cpp
+ kmdiincludedir = $(includedir)/kmdi
--- a/x11/kde/libs3/patches/patch-knewstuff_Makefile_in
+++ b/x11/kde/libs3/patches/patch-knewstuff_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-knewstuff_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- knewstuff/Makefile.in.orig	Mon Jan  2 14:04:33 2006
+++ knewstuff/Makefile.in	Mon Jan  2 18:00:58 2006
+@@ -547,7 +547,8 @@ xdg_menudir = @xdg_menudir@
+ INCLUDES = $(all_includes)
+ #>- METASOURCES = AUTO
+ lib_LTLIBRARIES = libknewstuff.la
+-libknewstuff_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
+LIBknewstuff_LTVERSION= -version-info 1:0
+libknewstuff_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBknewstuff_LTVERSION)
+ libknewstuff_la_LIBADD = $(LIB_KIO)
+ libknewstuff_la_SOURCES = engine.cpp entry.cpp downloaddialog.cpp \
+   uploaddialog.cpp providerdialog.cpp provider.cpp knewstuff.cpp \
--- a/x11/kde/libs3/patches/patch-kparts_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kparts_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-kparts_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kparts/Makefile.in.orig	Mon Jan  2 14:04:36 2006
+++ kparts/Makefile.in	Mon Jan  2 18:10:39 2006
+@@ -527,7 +527,8 @@ INCLUDES = -I$(srcdir)/../ -I$(top_srcdi
+ 
+ #>- libkparts_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 3:0:1 -no-undefined
+ #>+ 1
+-libkparts_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 3:0:1 -no-undefined $(KDE_NO_UNDEFINED)
+LIBkparts_LTVERSION=-version-info 3:0:1
+libkparts_la_LDFLAGS = $(KDE_MT_LDFLAGS) $(LIBkparts_LTVERSION) -no-undefined $(KDE_NO_UNDEFINED)
+ libkparts_la_LIBADD = $(LIB_KIO)
+ 
+ ####### Files
--- a/x11/kde/libs3/patches/patch-kresources_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kresources_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-kresources_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kresources/Makefile.in.orig	Mon Jan  2 14:04:35 2006
+++ kresources/Makefile.in	Mon Jan  2 18:11:02 2006
+@@ -557,7 +557,8 @@ libkresources_la_SOURCES=resource.cpp \
+ 
+ #>- libkresources_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
+ #>+ 1
+-libkresources_la_LDFLAGS = $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) -version-info 3:0:2
+LIBkresources_LTVERSION=-version-info 3:0:2
+libkresources_la_LDFLAGS = $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) $(LIBkresources_LTVERSION)
+ libkresources_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
+ kresincludedir = $(includedir)/kresources
+ kresinclude_HEADERS = resource.h \
--- a/x11/kde/libs3/patches/patch-kspell2_ui_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kspell2_ui_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-kspell2_ui_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kspell2/ui/Makefile.in.orig	Mon Jan  2 14:04:33 2006
+++ kspell2/ui/Makefile.in	Mon Jan  2 17:59:57 2006
+@@ -536,7 +536,8 @@ libkspell2_noinst_la_SOURCES= configwidg
+ libkspell2_la_SOURCES = dialog.cpp
+ #>- libkspell2_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries)
+ #>+ 1
+-libkspell2_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -version-info 1:0:0 $(all_libraries)
+LIBkspell2_LTVERSION= -version-info 1:0:0
+libkspell2_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) $(LIBkspell2_LTVERSION) $(all_libraries)
+ libkspell2_la_LIBADD = libkspell2_noinst.la ../libkspell2base.la
+ #>- all: all-am
+ #>+ 1
--- a/x11/kde/libs3/patches/patch-kunittest_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kunittest_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-kunittest_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kunittest/Makefile.in.orig	Mon Jan  2 14:04:29 2006
+++ kunittest/Makefile.in	Mon Jan  2 14:10:27 2006
+@@ -533,7 +533,8 @@ INCLUDES = $(all_includes)
+ #>- METASOURCES = AUTO
+ lib_LTLIBRARIES = libkunittest.la
+ libkunittest_la_SOURCES = runner.cpp tester.cpp
+-libkunittest_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0:0
+LIBkunittest_LTVERSION=-version-info 1:0:0
+libkunittest_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBkunittest_LTVERSION)
+ libkunittest_la_LIBADD = $(LIB_KDECORE)
+ libkunittestinclude_HEADERS = runner.h tester.h module.h
+ libkunittestincludedir = $(includedir)/kunittest
--- a/x11/kde/libs3/patches/patch-kutils_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kutils_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-kutils_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kutils/Makefile.in.orig	Mon Jan  2 14:04:33 2006
+++ kutils/Makefile.in	Mon Jan  2 17:40:59 2006
+@@ -540,7 +540,8 @@ INCLUDES = -I$(top_srcdir)/interfaces/kr
+ lib_LTLIBRARIES = libkutils.la
+ #>- libkutils_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
+ #>+ 1
+-libkutils_la_LDFLAGS = $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) -version-info 3:0:2
+LIBkutils_LTVERSION=-version-info 3:0:2
+libkutils_la_LDFLAGS = $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) $(LIBkutils_LTVERSION)
+ # Needs KTrader
+ libkutils_la_LIBADD = ../kio/libkio.la ksettings/libksettings.la
+ #>- libkutils_la_SOURCES = kfind.cpp kfinddialog.cpp kreplace.cpp \
--- a/x11/kde/libs3/patches/patch-kwallet_backend_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kwallet_backend_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-kwallet_backend_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kwallet/backend/Makefile.in.orig	Mon Jan  2 14:04:33 2006
+++ kwallet/backend/Makefile.in	Mon Jan  2 17:39:50 2006
+@@ -515,7 +515,8 @@ INCLUDES = -I$(srcdir)/../client $(all_i
+ lib_LTLIBRARIES = libkwalletbackend.la
+ #>- libkwalletbackend_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0 -no-undefined
+ #>+ 1
+-libkwalletbackend_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0 -no-undefined $(KDE_NO_UNDEFINED)
+LIBkwalletbackend_LTVERSION = -version-info 1:0
+libkwalletbackend_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIBkwalletbackend_LTVERSION) -no-undefined $(KDE_NO_UNDEFINED)
+ libkwalletbackend_la_LIBADD = $(LIB_QT) ../../kdecore/libkdecore.la
+ libkwalletbackend_la_SOURCES = blockcipher.cc		\
+ 			       blowfish.cc		\
--- a/x11/kde/libs3/patches/patch-kwallet_client_Makefile_in
+++ b/x11/kde/libs3/patches/patch-kwallet_client_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-kwallet_client_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- kwallet/client/Makefile.in.orig	Mon Jan  2 14:04:33 2006
+++ kwallet/client/Makefile.in	Mon Jan  2 17:40:12 2006
+@@ -513,7 +513,8 @@ INCLUDES = -I$(srcdir) $(all_includes)
+ lib_LTLIBRARIES = libkwalletclient.la
+ #>- libkwalletclient_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:1 -no-undefined
+ #>+ 1
+-libkwalletclient_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:1 -no-undefined $(KDE_NO_UNDEFINED)
+LIBkwalletclient_LTVERSION= -version-info 1:1
+libkwalletclient_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIBkwalletclient_LTVERSION) -no-undefined $(KDE_NO_UNDEFINED)
+ libkwalletclient_la_LIBADD = $(LIB_KDECORE)
+ #>- libkwalletclient_la_SOURCES = kwallet.skel \
+ #>- 				kwallet.cc
--- a/x11/kde/libs3/patches/patch-libkmid_Makefile_in
+++ b/x11/kde/libs3/patches/patch-libkmid_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-libkmid_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- libkmid/Makefile.in.orig	Mon Jan  2 14:04:36 2006
+++ libkmid/Makefile.in	Mon Jan  2 18:10:16 2006
+@@ -536,7 +536,8 @@ libkmid_la_SOURCES = midiout.cc player.c
+ 
+ #>- libkmid_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95  -no-undefined
+ #>+ 1
+-libkmid_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95  -no-undefined $(KDE_NO_UNDEFINED)
+LIBkmid_LTVERSION=-version-info 0:95
+libkmid_la_LDFLAGS = $(KDE_MT_LDFLAGS) $(LIBkmid_LTVERSION)  -no-undefined $(KDE_NO_UNDEFINED)
+ libkmid_la_LIBADD = $(LIBASOUND) ../kdecore/libkdecore.la
+ DOXYGEN_REFERENCES = kdecore
+ #>- all: all-am
--- a/x11/kde/libs3/patches/patch-libkscreensaver_Makefile_in
+++ b/x11/kde/libs3/patches/patch-libkscreensaver_Makefile_in
@ -0,0 +1,13 @@
+$OpenBSD: patch-libkscreensaver_Makefile_in,v 1.1 2006/01/03 09:10:56 espie Exp $
+--- libkscreensaver/Makefile.in.orig	Mon Jan  2 14:04:28 2006
+++ libkscreensaver/Makefile.in	Mon Jan  2 14:05:43 2006
+@@ -513,7 +513,8 @@ lib_LTLIBRARIES = libkscreensaver.la
+ libkscreensaver_la_SOURCES = main.cpp kscreensaver.cpp
+ libkscreensaver_la_LIBADD = $(LIB_KIO)
+ @undefined_symbols_allowed_FALSE@libkscreensaver_la_LDFLAGS = $(all_libraries) -static
+-@undefined_symbols_allowed_TRUE@libkscreensaver_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 6:0:2
+LIBkscreensaver_LTVERSION=-version-info 6:0:2
+@undefined_symbols_allowed_TRUE@libkscreensaver_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBkscreensaver_LTVERSION)
+ include_HEADERS = kscreensaver.h kscreensaver_vroot.h
+ INCLUDES = $(all_includes)
+ #>- METASOURCES = AUTO
--- a/x11/kde/libs3/pkg/PLIST
+++ b/x11/kde/libs3/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.35 2005/11/29 14:00:12 espie Exp $
+@comment $OpenBSD: PLIST,v 1.36 2006/01/03 09:10:57 espie Exp $
@conflict kdebase-<3.5
@conflict kdeartwork-<3.4
@conflict kdeaddons-<3.4
@ -930,28 +930,28 @@ ${KDE}/plugins/styles/light.so
 ${KDE}/plugins/styles/plastik.la
 ${KDE}/plugins/styles/plastik.so
 lib/libDCOP.la
-@lib lib/libDCOP.so.6.0
+@lib lib/libDCOP.so.${LIBDCOP_VERSION}
 lib/libartskde.la
-@lib lib/libartskde.so.3.0
+@lib lib/libartskde.so.${LIBartskde_VERSION}
 lib/libkabc.la
-@lib lib/libkabc.so.3.0
+@lib lib/libkabc.so.${LIBkabc_VERSION}
 lib/libkabc_dir.la
-@lib lib/libkabc_dir.so.1.0
+@lib lib/libkabc_dir.so.${LIBkabc_dir_VERSION}
 lib/libkabc_file.la
-@lib lib/libkabc_file.so.1.0
+@lib lib/libkabc_file.so.${LIBkabc_file_VERSION}
 lib/libkabc_ldapkio.la
-@lib lib/libkabc_ldapkio.so.1.0
+@lib lib/libkabc_ldapkio.so.${LIBkabc_ldapkio_VERSION}
 lib/libkabc_net.la
-@lib lib/libkabc_net.so.1.0
+@lib lib/libkabc_net.so.${LIBkabc_net_VERSION}
 lib/libkatepartinterfaces.la
-@lib lib/libkatepartinterfaces.so.0.0
+@lib lib/libkatepartinterfaces.so.${LIBkatepartinterfaces_VERSION}
 lib/libkdecore.la
-@lib lib/libkdecore.so.6.0
+@lib lib/libkdecore.so.${LIBkdecore_VERSION}
 lib/libkdefakes.la
-@lib lib/libkdefakes.so.6.0
+@lib lib/libkdefakes.so.${LIBkdefakes_VERSION}
 lib/libkdefakes_nonpic.a
 lib/libkdefx.la
-@lib lib/libkdefx.so.6.0
+@lib lib/libkdefx.so.${LIBkdefx_VERSION}
 lib/libkdeinit_dcopserver.la
 lib/libkdeinit_dcopserver.so
 lib/libkdeinit_kaddprinterwizard.la
@ -973,63 +973,63 @@ lib/libkdeinit_kio_uiserver.so
 lib/libkdeinit_klauncher.la
 lib/libkdeinit_klauncher.so
 lib/libkdeprint.la
-@lib lib/libkdeprint.so.6.0
+@lib lib/libkdeprint.so.${LIBkdeprint_VERSION}
 lib/libkdeprint_management.la
-@lib lib/libkdeprint_management.so.6.0
+@lib lib/libkdeprint_management.so.${LIBkdeprint_management_VERSION}
 lib/libkdesasl.la
-@lib lib/libkdesasl.so.3.0
+@lib lib/libkdesasl.so.${LIBkdesasl_VERSION}
 lib/libkdesu.la
-@lib lib/libkdesu.so.6.0
+@lib lib/libkdesu.so.${LIBkdesu_VERSION}
 lib/libkdeui.la
-@lib lib/libkdeui.so.6.0
+@lib lib/libkdeui.so.${LIBkdeui_VERSION}
 lib/libkdnssd.la
-@lib lib/libkdnssd.so.1.0
+@lib lib/libkdnssd.so.${LIBkdnssd_VERSION}
 lib/libkhtml.la
-@lib lib/libkhtml.so.6.0
+@lib lib/libkhtml.so.${LIBkhtml_VERSION}
 lib/libkimproxy.la
-@lib lib/libkimproxy.so.0.0
+@lib lib/libkimproxy.so.${LIBkimproxy_VERSION}
 lib/libkio.la
-@lib lib/libkio.so.6.0
+@lib lib/libkio.so.${LIBkio_VERSION}
 lib/libkjava.la
-@lib lib/libkjava.so.1.0
+@lib lib/libkjava.so.${LIBkjava_VERSION}
 lib/libkjs.la
-@lib lib/libkjs.so.3.0
+@lib lib/libkjs.so.${LIBkjs_VERSION}
 lib/libkmdi.la
-@lib lib/libkmdi.so.1.0
+@lib lib/libkmdi.so.${LIBkmdi_VERSION}
 lib/libkmdi2.la
-@lib lib/libkmdi2.so.1.0
+@lib lib/libkmdi2.so.${LIBkmdi2_VERSION}
 lib/libkmediaplayer.la
-@lib lib/libkmediaplayer.so.0.0
+@lib lib/libkmediaplayer.so.${LIBkmediaplayer_VERSION}
 lib/libkmid.la
-@lib lib/libkmid.so.0.95
+@lib lib/libkmid.so.${LIBkmid_VERSION}
 lib/libknewstuff.la
-@lib lib/libknewstuff.so.1.0
+@lib lib/libknewstuff.so.${LIBknewstuff_VERSION}
 lib/libkntlm.la
-@lib lib/libkntlm.so.0.0
+@lib lib/libkntlm.so.${LIBkntlm_VERSION}
 lib/libkparts.la
-@lib lib/libkparts.so.3.0
+@lib lib/libkparts.so.${LIBkparts_VERSION}
 lib/libkresources.la
-@lib lib/libkresources.so.3.0
+@lib lib/libkresources.so.${LIBkresources_VERSION}
 lib/libkscreensaver.la
-@lib lib/libkscreensaver.so.6.0
+@lib lib/libkscreensaver.so.${LIBkscreensaver_VERSION}
 lib/libkscript.la
-@lib lib/libkscript.so.0.0
+@lib lib/libkscript.so.${LIBkscript_VERSION}
 lib/libkspell.la
-@lib lib/libkspell.so.6.0
+@lib lib/libkspell.so.${LIBkspell_VERSION}
 lib/libkspell2.la
-@lib lib/libkspell2.so.1.0
+@lib lib/libkspell2.so.${LIBkspell2_VERSION}
 lib/libktexteditor.la
-@lib lib/libktexteditor.so.0.0
+@lib lib/libktexteditor.so.${LIBktexteditor_VERSION}
 lib/libkunittest.la
-@lib lib/libkunittest.so.1.0
+@lib lib/libkunittest.so.${LIBkunittest_VERSION}
 lib/libkutils.la
-@lib lib/libkutils.so.3.0
+@lib lib/libkutils.so.${LIBkutils_VERSION}
 lib/libkwalletbackend.la
-@lib lib/libkwalletbackend.so.1.0
+@lib lib/libkwalletbackend.so.${LIBkwalletbackend_VERSION}
 lib/libkwalletclient.la
-@lib lib/libkwalletclient.so.1.1
+@lib lib/libkwalletclient.so.${LIBkwalletclient_VERSION}
 lib/libvcard.la
-@lib lib/libvcard.so.0.0
+@lib lib/libvcard.so.${LIBvcard_VERSION}
@man man/man1/artsmessage.1
@man man/man1/cupsdconf.1
@man man/man1/dcop.1