Bump shlib numbers. Add ".1" to end of PKGNAME to distinguish it from

the previous version.

Submitted by:	Will Andrews <andrews@TECHNOLOGIST.COM>

18 files changed, 328 insertions, 128 deletions

diff --git a/x11/kdelibs11/Makefile b/x11/kdelibs11/Makefile
index 12bf5efa1f31..9d0be8995471 100644
--- a/x11/kdelibs11/Makefile
+++ b/x11/kdelibs11/Makefile
@@ -7,6 +7,7 @@
 #
 
 DISTNAME=	kdelibs-1.1.2
+PKGNAME=	kdelibs-1.1.2.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
 MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
@@ -23,26 +24,30 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 		"--with-extra-includes=${PREFIX}/include" \
 		"--x-inc=$(X11BASE)/include" \
-		"--x-lib=$(X11BASE)/lib"
+		"--x-lib=$(X11BASE)/lib" \
+		--enable-shared
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
 
 .include <bsd.port.pre.mk>
 
+LIBMAJOR=	3
+LIBMINOR=	0
+.if ${PORTOBJFORMAT} == "aout"
+LIBVER=		${LIBMAJOR}.${LIBMINOR}
+.else
+LIBVER=		${LIBMAJOR}
+.endif
+PLIST_SUB=	LIBVER=${LIBVER}
+MAKE_ENV=	SOMAJOR=${LIBMAJOR} SOMINOR=${LIBMINOR}
+
 post-install:
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+.for LIB in jscript kab kdecore kdeui kfile kfm khtmlw kimgio kspell mediatool
+	@${LN} -sf ${PREFIX}/lib/lib${LIB}.so.${LIBVER} ${PREFIX}/lib/lib${LIB}.so
 .if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libjscript.so.2.0   ${PREFIX}/lib/libjscript.so
-	${LN} -sf libkab.so.2.0       ${PREFIX}/lib/libkab.so
-	${LN} -sf libkdecore.so.2.0   ${PREFIX}/lib/libkdecore.so
-	${LN} -sf libkdeui.so.2.0     ${PREFIX}/lib/libkdeui.so
-	${LN} -sf libkfile.so.2.0     ${PREFIX}/lib/libkfile.so
-	${LN} -sf libkfm.so.2.0       ${PREFIX}/lib/libkfm.so
-	${LN} -sf libkhtmlw.so.2.0    ${PREFIX}/lib/libkhtmlw.so
-	${LN} -sf libkimgio.so.2.0    ${PREFIX}/lib/libkimgio.so
-	${LN} -sf libkspell.so.2.0    ${PREFIX}/lib/libkspell.so
-	${LN} -sf libmediatool.so.2.0 ${PREFIX}/lib/libmediatool.so
+	@${RM} -f ${PREFIX}/lib/lib${LIB}.so.${LIBMAJOR}
 .endif
+.endfor
 
 .include <bsd.port.post.mk>
diff --git a/x11/kdelibs11/files/patch-aa b/x11/kdelibs11/files/patch-aa
new file mode 100644
index 000000000000..bb3731f3702c
--- /dev/null
+++ b/x11/kdelibs11/files/patch-aa
@@ -0,0 +1,13 @@
+--- jscript/Makefile.in	Tue Sep  7 11:23:08 1999
++++ jscript/Makefile.in.new	Sun Jan  2 08:54:50 2000
+@@ -183,8 +183,8 @@
+ YACC = bison -y
+ LEX = flex
+ YFLAGS = -d -p yyjscript
+-SOMAJOR = 2
+-SOMINOR = 0
++SOMAJOR ?= 2
++SOMINOR ?= 0
+ 
+ ####### Files
+ 
diff --git a/x11/kdelibs11/files/patch-ab b/x11/kdelibs11/files/patch-ab
new file mode 100644
index 000000000000..c10abb55345c
--- /dev/null
+++ b/x11/kdelibs11/files/patch-ab
@@ -0,0 +1,20 @@
+--- kab/Makefile.in	Tue Sep  7 11:23:12 1999
++++ kab/Makefile.in.new	Sun Jan  2 09:00:20 2000
+@@ -137,6 +137,8 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
++SOMAJOR ?= 2
++SOMINOR ?= 0
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ install_root = @install_root@
+@@ -180,7 +182,7 @@
+ include_HEADERS =  	stl_headers.h 	kabapi.h 	kab.h 	addressbook.h 	configDB.h 	keyvaluemap.h 	sections.h
+ 
+ 
+-libkab_la_LDFLAGS = -version-info 2:0 $(X_LDFLAGS) $(QT_LDFLAGS)
++libkab_la_LDFLAGS = -version-info ${SOMAJOR}:${SOMINOR} $(X_LDFLAGS) $(QT_LDFLAGS)
+ libkab_la_LIBADD = -lXext $(LIB_QT)
+ 
+ # just to make sure, automake makes them 
diff --git a/x11/kdelibs11/files/patch-ac b/x11/kdelibs11/files/patch-ac
new file mode 100644
index 000000000000..0e46c4a1a707
--- /dev/null
+++ b/x11/kdelibs11/files/patch-ac
@@ -0,0 +1,18 @@
+--- kdecore/Makefile.in	Tue Sep  7 11:23:13 1999
++++ kdecore/Makefile.in.new	Sun Jan  2 09:02:31 2000
+@@ -151,6 +151,8 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
++SOMAJOR ?= 2
++SOMINOR ?= 0
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ install_root = @install_root@
+@@ -190,5 +192,5 @@
+ 
+ 
+-libkdecore_la_LDFLAGS = -version-info 2:0
++libkdecore_la_LDFLAGS = -version-info $(SOMAJOR):$(SOMINOR)
+ # libkdecore_la_LIBADD = 
+ 
diff --git a/x11/kdelibs11/files/patch-ad b/x11/kdelibs11/files/patch-ad
new file mode 100644
index 000000000000..71469f91c2cd
--- /dev/null
+++ b/x11/kdelibs11/files/patch-ad
@@ -0,0 +1,18 @@
+--- kdeui/Makefile.in	Tue Sep  7 11:23:16 1999
++++ kdeui/Makefile.in.new	Sun Jan  2 09:30:39 2000
+@@ -150,6 +150,8 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
++SOMAJOR ?= 2
++SOMINOR ?= 0
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ install_root = @install_root@
+@@ -179,5 +181,5 @@
+ EXTRA_DIST = $(data_DATA) CHANGES.kdatepicker USERS.kdatepicker
+ 
+ lib_LTLIBRARIES = libkdeui.la
+-libkdeui_la_LDFLAGS = -version-info 2:0  
++libkdeui_la_LDFLAGS = -version-info ${SOMAJOR}:${SOMINOR}
+ 
diff --git a/x11/kdelibs11/files/patch-ae b/x11/kdelibs11/files/patch-ae
new file mode 100644
index 000000000000..3447e98beefe
--- /dev/null
+++ b/x11/kdelibs11/files/patch-ae
@@ -0,0 +1,11 @@
+--- kfile/Makefile.in	Tue Sep  7 11:23:17 1999
++++ kfile/Makefile.in.new	Sun Jan  2 09:31:54 2000
+@@ -199,7 +199,7 @@
+ toolbardir = $(kde_toolbardir)
+ 
+ LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS)
+-libkfile_la_LDFLAGS = -version-info 2:0 $(LDFLAGS)
++libkfile_la_LDFLAGS = -version-info ${SOMAJOR}:${SOMINOR} $(LDFLAGS)
+ libkfile_la_LIBADD = -lXext  $(LIB_QT)
+ 
+ check_PROGRAMS = kfstest
diff --git a/x11/kdelibs11/files/patch-af b/x11/kdelibs11/files/patch-af
new file mode 100644
index 000000000000..5431af2bff42
--- /dev/null
+++ b/x11/kdelibs11/files/patch-af
@@ -0,0 +1,20 @@
+--- kfmlib/Makefile.in	Tue Sep  7 11:23:17 1999
++++ kfmlib/Makefile.in.new	Sun Jan  2 09:35:10 2000
+@@ -150,6 +150,8 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
++SOMAJOR ?= 2
++SOMINOR ?= 0
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ install_root = @install_root@
+@@ -180,7 +182,7 @@
+ libkfm_la_METASOURCES = kfm.moc kfmclient_ipc.moc
+ 
+ lib_LTLIBRARIES = libkfm.la
+-libkfm_la_LDFLAGS = -version-info 2:0
++libkfm_la_LDFLAGS = -version-info $(SOMAJOR):$(SOMINOR)
+ 
+ libkfm_la_SOURCES = kfm.cpp kfmclient_ipc.cpp kfmclient_ipc2.cpp kfmipc.cpp
+ include_HEADERS = kfm.h kfmclient_ipc.h kfmipc.h
diff --git a/x11/kdelibs11/files/patch-ag b/x11/kdelibs11/files/patch-ag
new file mode 100644
index 000000000000..5a0774d44098
--- /dev/null
+++ b/x11/kdelibs11/files/patch-ag
@@ -0,0 +1,20 @@
+--- khtmlw/Makefile.in	Tue Sep  7 11:23:17 1999
++++ khtmlw/Makefile.in.new	Sun Jan  2 09:36:48 2000
+@@ -150,6 +150,8 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
++SOMAJOR ?= 2
++SOMINOR ?= 0
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ install_root = @install_root@
+@@ -185,7 +187,7 @@
+ 
+ 
+ noinst_HEADERS = htmlchain.h
+-libkhtmlw_la_LDFLAGS = -version-info 2:0
++libkhtmlw_la_LDFLAGS = -version-info $(SOMAJOR):$(SOMINOR)
+ 
+ data_DATA = khtmlw_dnd.xpm
+ datadir = $(kde_datadir)/khtmlw/pics
diff --git a/x11/kdelibs11/files/patch-ah b/x11/kdelibs11/files/patch-ah
new file mode 100644
index 000000000000..8e1d0fd0edbf
--- /dev/null
+++ b/x11/kdelibs11/files/patch-ah
@@ -0,0 +1,20 @@
+--- kimgio/Makefile.in	Tue Sep  7 11:23:07 1999
++++ kimgio/Makefile.in.new	Sun Jan  2 09:37:34 2000
+@@ -132,6 +132,8 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
++SOMAJOR ?= 2
++SOMINOR ?= 0
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ install_root = @install_root@
+@@ -159,7 +161,7 @@
+ 
+ lib_LTLIBRARIES = libkimgio.la
+ 
+-libkimgio_la_LDFLAGS = -version-info 2:0
++libkimgio_la_LDFLAGS = -version-info $(SOMAJOR):$(SOMINOR)
+ 
+ libkimgio_la_SOURCES = jpeg.cpp xview.cpp kimgio.cpp kimgio.h eps.cpp 		tiffr.cpp pngr.cpp
+ 
diff --git a/x11/kdelibs11/files/patch-ai b/x11/kdelibs11/files/patch-ai
new file mode 100644
index 000000000000..ca97b6bfd679
--- /dev/null
+++ b/x11/kdelibs11/files/patch-ai
@@ -0,0 +1,20 @@
+--- kspell/Makefile.in	Tue Sep  7 11:23:18 1999
++++ kspell/Makefile.in.new	Sun Jan  2 09:38:32 2000
+@@ -153,6 +153,8 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
++SOMAJOR ?= 2
++SOMINOR ?= 0
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ install_root = @install_root@
+@@ -181,7 +183,7 @@
+ INCLUDES = -I$(top_srcdir)/kdecore -I$(top_srcdir)/kdeui $(QT_INCLUDES) $(X_INCLUDES)
+ 
+ lib_LTLIBRARIES = libkspell.la
+-libkspell_la_LDFLAGS = -version-info 2:0
++libkspell_la_LDFLAGS = -version-info $(SOMAJOR):$(SOMINOR)
+ 
+ include_HEADERS = kspell.h ksconfig.h kprocio.h kspelldlg.h
+ noinst_HEADERS = version.h
diff --git a/x11/kdelibs11/files/patch-aj b/x11/kdelibs11/files/patch-aj
new file mode 100644
index 000000000000..23ee285fbd2f
--- /dev/null
+++ b/x11/kdelibs11/files/patch-aj
@@ -0,0 +1,20 @@
+--- mediatool/Makefile.in	Tue Sep  7 11:23:18 1999
++++ mediatool/Makefile.in.new	Sun Jan  2 09:40:22 2000
+@@ -150,6 +150,8 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
++SOMAJOR ?= 2
++SOMINOR ?= 0
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ install_root = @install_root@
+@@ -188,7 +190,7 @@
+ include_HEADERS = mediatool.h kaudio.h
+ noinst_HEADERS = chunk.h playlist.h
+ 
+-libmediatool_la_LDFLAGS = -version-info 2:0 
++libmediatool_la_LDFLAGS = -version-info $(SOMAJOR):$(SOMINOR) 
+ libmediatool_la_LIBADD = $(LIBCOMPAT)
+ 
+ libmediatool_la_METASOURCES = kaudio.moc
diff --git a/x11/kdelibs11/pkg-plist b/x11/kdelibs11/pkg-plist
index e93d073d873f..d9a735da00d3 100644
--- a/x11/kdelibs11/pkg-plist
+++ b/x11/kdelibs11/pkg-plist
@@ -124,25 +124,25 @@ include/sections.h
 include/stl_headers.h
 include/xview.h
 lib/libjscript.la
-lib/libjscript.so.2
+lib/libjscript.so.%%LIBVER%%
 lib/libkab.la
-lib/libkab.so.2
+lib/libkab.so.%%LIBVER%%
 lib/libkdecore.la
-lib/libkdecore.so.2
+lib/libkdecore.so.%%LIBVER%%
 lib/libkdeui.la
-lib/libkdeui.so.2
+lib/libkdeui.so.%%LIBVER%%
 lib/libkfile.la
-lib/libkfile.so.2
+lib/libkfile.so.%%LIBVER%%
 lib/libkfm.la
-lib/libkfm.so.2
+lib/libkfm.so.%%LIBVER%%
 lib/libkhtmlw.la
-lib/libkhtmlw.so.2
+lib/libkhtmlw.so.%%LIBVER%%
 lib/libkimgio.la
-lib/libkimgio.so.2
+lib/libkimgio.so.%%LIBVER%%
 lib/libkspell.la
-lib/libkspell.so.2
+lib/libkspell.so.%%LIBVER%%
 lib/libmediatool.la
-lib/libmediatool.so.2
+lib/libmediatool.so.%%LIBVER%%
 share/apps/kab/pics/background_1.jpg
 share/apps/kab/pics/dialog_background.jpg
 share/apps/kde/pics/arrow_down.xbm
@@ -302,16 +302,16 @@ share/toolbar/viewmag-.xpm
 share/toolbar/viewmag.xpm
 share/toolbar/viewzoom.xpm
 @exec ln -sf en %D/share/doc/HTML/default
-@exec ln -sf libjscript.so.2 %D/lib/libjscript.so
-@exec ln -sf libkab.so.2 %D/lib/libkab.so
-@exec ln -sf libkdecore.so.2 %D/lib/libkdecore.so
-@exec ln -sf libkdeui.so.2 %D/lib/libkdeui.so
-@exec ln -sf libkfile.so.2 %D/lib/libkfile.so
-@exec ln -sf libkfm.so.2 %D/lib/libkfm.so
-@exec ln -sf libkhtmlw.so.2 %D/lib/libkhtmlw.so
-@exec ln -sf libkimgio.so.2 %D/lib/libkimgio.so
-@exec ln -sf libkspell.so.2 %D/lib/libkspell.so
-@exec ln -sf libmediatool.so.2 %D/lib/libmediatool.so
+@exec ln -sf libjscript.so.%%LIBVER%% %D/lib/libjscript.so
+@exec ln -sf libkab.so.%%LIBVER%% %D/lib/libkab.so
+@exec ln -sf libkdecore.so.%%LIBVER%% %D/lib/libkdecore.so
+@exec ln -sf libkdeui.so.%%LIBVER%% %D/lib/libkdeui.so
+@exec ln -sf libkfile.so.%%LIBVER%% %D/lib/libkfile.so
+@exec ln -sf libkfm.so.%%LIBVER%% %D/lib/libkfm.so
+@exec ln -sf libkhtmlw.so.%%LIBVER%% %D/lib/libkhtmlw.so
+@exec ln -sf libkimgio.so.%%LIBVER%% %D/lib/libkimgio.so
+@exec ln -sf libkspell.so.%%LIBVER%% %D/lib/libkspell.so
+@exec ln -sf libmediatool.so.%%LIBVER%% %D/lib/libmediatool.so
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @dirrm share/toolbar
 @dirrm share/locale/zh_TW.Big5/LC_MESSAGES
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 12bf5efa1f31..9d0be8995471 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -7,6 +7,7 @@
 #
 
 DISTNAME=	kdelibs-1.1.2
+PKGNAME=	kdelibs-1.1.2.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
 MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
@@ -23,26 +24,30 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 		"--with-extra-includes=${PREFIX}/include" \
 		"--x-inc=$(X11BASE)/include" \
-		"--x-lib=$(X11BASE)/lib"
+		"--x-lib=$(X11BASE)/lib" \
+		--enable-shared
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
 
 .include <bsd.port.pre.mk>
 
+LIBMAJOR=	3
+LIBMINOR=	0
+.if ${PORTOBJFORMAT} == "aout"
+LIBVER=		${LIBMAJOR}.${LIBMINOR}
+.else
+LIBVER=		${LIBMAJOR}
+.endif
+PLIST_SUB=	LIBVER=${LIBVER}
+MAKE_ENV=	SOMAJOR=${LIBMAJOR} SOMINOR=${LIBMINOR}
+
 post-install:
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+.for LIB in jscript kab kdecore kdeui kfile kfm khtmlw kimgio kspell mediatool
+	@${LN} -sf ${PREFIX}/lib/lib${LIB}.so.${LIBVER} ${PREFIX}/lib/lib${LIB}.so
 .if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libjscript.so.2.0   ${PREFIX}/lib/libjscript.so
-	${LN} -sf libkab.so.2.0       ${PREFIX}/lib/libkab.so
-	${LN} -sf libkdecore.so.2.0   ${PREFIX}/lib/libkdecore.so
-	${LN} -sf libkdeui.so.2.0     ${PREFIX}/lib/libkdeui.so
-	${LN} -sf libkfile.so.2.0     ${PREFIX}/lib/libkfile.so
-	${LN} -sf libkfm.so.2.0       ${PREFIX}/lib/libkfm.so
-	${LN} -sf libkhtmlw.so.2.0    ${PREFIX}/lib/libkhtmlw.so
-	${LN} -sf libkimgio.so.2.0    ${PREFIX}/lib/libkimgio.so
-	${LN} -sf libkspell.so.2.0    ${PREFIX}/lib/libkspell.so
-	${LN} -sf libmediatool.so.2.0 ${PREFIX}/lib/libmediatool.so
+	@${RM} -f ${PREFIX}/lib/lib${LIB}.so.${LIBMAJOR}
 .endif
+.endfor
 
 .include <bsd.port.post.mk>
diff --git a/x11/kdelibs2/pkg-plist b/x11/kdelibs2/pkg-plist
index e93d073d873f..d9a735da00d3 100644
--- a/x11/kdelibs2/pkg-plist
+++ b/x11/kdelibs2/pkg-plist
@@ -124,25 +124,25 @@ include/sections.h
 include/stl_headers.h
 include/xview.h
 lib/libjscript.la
-lib/libjscript.so.2
+lib/libjscript.so.%%LIBVER%%
 lib/libkab.la
-lib/libkab.so.2
+lib/libkab.so.%%LIBVER%%
 lib/libkdecore.la
-lib/libkdecore.so.2
+lib/libkdecore.so.%%LIBVER%%
 lib/libkdeui.la
-lib/libkdeui.so.2
+lib/libkdeui.so.%%LIBVER%%
 lib/libkfile.la
-lib/libkfile.so.2
+lib/libkfile.so.%%LIBVER%%
 lib/libkfm.la
-lib/libkfm.so.2
+lib/libkfm.so.%%LIBVER%%
 lib/libkhtmlw.la
-lib/libkhtmlw.so.2
+lib/libkhtmlw.so.%%LIBVER%%
 lib/libkimgio.la
-lib/libkimgio.so.2
+lib/libkimgio.so.%%LIBVER%%
 lib/libkspell.la
-lib/libkspell.so.2
+lib/libkspell.so.%%LIBVER%%
 lib/libmediatool.la
-lib/libmediatool.so.2
+lib/libmediatool.so.%%LIBVER%%
 share/apps/kab/pics/background_1.jpg
 share/apps/kab/pics/dialog_background.jpg
 share/apps/kde/pics/arrow_down.xbm
@@ -302,16 +302,16 @@ share/toolbar/viewmag-.xpm
 share/toolbar/viewmag.xpm
 share/toolbar/viewzoom.xpm
 @exec ln -sf en %D/share/doc/HTML/default
-@exec ln -sf libjscript.so.2 %D/lib/libjscript.so
-@exec ln -sf libkab.so.2 %D/lib/libkab.so
-@exec ln -sf libkdecore.so.2 %D/lib/libkdecore.so
-@exec ln -sf libkdeui.so.2 %D/lib/libkdeui.so
-@exec ln -sf libkfile.so.2 %D/lib/libkfile.so
-@exec ln -sf libkfm.so.2 %D/lib/libkfm.so
-@exec ln -sf libkhtmlw.so.2 %D/lib/libkhtmlw.so
-@exec ln -sf libkimgio.so.2 %D/lib/libkimgio.so
-@exec ln -sf libkspell.so.2 %D/lib/libkspell.so
-@exec ln -sf libmediatool.so.2 %D/lib/libmediatool.so
+@exec ln -sf libjscript.so.%%LIBVER%% %D/lib/libjscript.so
+@exec ln -sf libkab.so.%%LIBVER%% %D/lib/libkab.so
+@exec ln -sf libkdecore.so.%%LIBVER%% %D/lib/libkdecore.so
+@exec ln -sf libkdeui.so.%%LIBVER%% %D/lib/libkdeui.so
+@exec ln -sf libkfile.so.%%LIBVER%% %D/lib/libkfile.so
+@exec ln -sf libkfm.so.%%LIBVER%% %D/lib/libkfm.so
+@exec ln -sf libkhtmlw.so.%%LIBVER%% %D/lib/libkhtmlw.so
+@exec ln -sf libkimgio.so.%%LIBVER%% %D/lib/libkimgio.so
+@exec ln -sf libkspell.so.%%LIBVER%% %D/lib/libkspell.so
+@exec ln -sf libmediatool.so.%%LIBVER%% %D/lib/libmediatool.so
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @dirrm share/toolbar
 @dirrm share/locale/zh_TW.Big5/LC_MESSAGES
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 12bf5efa1f31..9d0be8995471 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -7,6 +7,7 @@
 #
 
 DISTNAME=	kdelibs-1.1.2
+PKGNAME=	kdelibs-1.1.2.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
 MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
@@ -23,26 +24,30 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 		"--with-extra-includes=${PREFIX}/include" \
 		"--x-inc=$(X11BASE)/include" \
-		"--x-lib=$(X11BASE)/lib"
+		"--x-lib=$(X11BASE)/lib" \
+		--enable-shared
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
 
 .include <bsd.port.pre.mk>
 
+LIBMAJOR=	3
+LIBMINOR=	0
+.if ${PORTOBJFORMAT} == "aout"
+LIBVER=		${LIBMAJOR}.${LIBMINOR}
+.else
+LIBVER=		${LIBMAJOR}
+.endif
+PLIST_SUB=	LIBVER=${LIBVER}
+MAKE_ENV=	SOMAJOR=${LIBMAJOR} SOMINOR=${LIBMINOR}
+
 post-install:
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+.for LIB in jscript kab kdecore kdeui kfile kfm khtmlw kimgio kspell mediatool
+	@${LN} -sf ${PREFIX}/lib/lib${LIB}.so.${LIBVER} ${PREFIX}/lib/lib${LIB}.so
 .if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libjscript.so.2.0   ${PREFIX}/lib/libjscript.so
-	${LN} -sf libkab.so.2.0       ${PREFIX}/lib/libkab.so
-	${LN} -sf libkdecore.so.2.0   ${PREFIX}/lib/libkdecore.so
-	${LN} -sf libkdeui.so.2.0     ${PREFIX}/lib/libkdeui.so
-	${LN} -sf libkfile.so.2.0     ${PREFIX}/lib/libkfile.so
-	${LN} -sf libkfm.so.2.0       ${PREFIX}/lib/libkfm.so
-	${LN} -sf libkhtmlw.so.2.0    ${PREFIX}/lib/libkhtmlw.so
-	${LN} -sf libkimgio.so.2.0    ${PREFIX}/lib/libkimgio.so
-	${LN} -sf libkspell.so.2.0    ${PREFIX}/lib/libkspell.so
-	${LN} -sf libmediatool.so.2.0 ${PREFIX}/lib/libmediatool.so
+	@${RM} -f ${PREFIX}/lib/lib${LIB}.so.${LIBMAJOR}
 .endif
+.endfor
 
 .include <bsd.port.post.mk>
diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist
index e93d073d873f..d9a735da00d3 100644
--- a/x11/kdelibs3/pkg-plist
+++ b/x11/kdelibs3/pkg-plist
@@ -124,25 +124,25 @@ include/sections.h
 include/stl_headers.h
 include/xview.h
 lib/libjscript.la
-lib/libjscript.so.2
+lib/libjscript.so.%%LIBVER%%
 lib/libkab.la
-lib/libkab.so.2
+lib/libkab.so.%%LIBVER%%
 lib/libkdecore.la
-lib/libkdecore.so.2
+lib/libkdecore.so.%%LIBVER%%
 lib/libkdeui.la
-lib/libkdeui.so.2
+lib/libkdeui.so.%%LIBVER%%
 lib/libkfile.la
-lib/libkfile.so.2
+lib/libkfile.so.%%LIBVER%%
 lib/libkfm.la
-lib/libkfm.so.2
+lib/libkfm.so.%%LIBVER%%
 lib/libkhtmlw.la
-lib/libkhtmlw.so.2
+lib/libkhtmlw.so.%%LIBVER%%
 lib/libkimgio.la
-lib/libkimgio.so.2
+lib/libkimgio.so.%%LIBVER%%
 lib/libkspell.la
-lib/libkspell.so.2
+lib/libkspell.so.%%LIBVER%%
 lib/libmediatool.la
-lib/libmediatool.so.2
+lib/libmediatool.so.%%LIBVER%%
 share/apps/kab/pics/background_1.jpg
 share/apps/kab/pics/dialog_background.jpg
 share/apps/kde/pics/arrow_down.xbm
@@ -302,16 +302,16 @@ share/toolbar/viewmag-.xpm
 share/toolbar/viewmag.xpm
 share/toolbar/viewzoom.xpm
 @exec ln -sf en %D/share/doc/HTML/default
-@exec ln -sf libjscript.so.2 %D/lib/libjscript.so
-@exec ln -sf libkab.so.2 %D/lib/libkab.so
-@exec ln -sf libkdecore.so.2 %D/lib/libkdecore.so
-@exec ln -sf libkdeui.so.2 %D/lib/libkdeui.so
-@exec ln -sf libkfile.so.2 %D/lib/libkfile.so
-@exec ln -sf libkfm.so.2 %D/lib/libkfm.so
-@exec ln -sf libkhtmlw.so.2 %D/lib/libkhtmlw.so
-@exec ln -sf libkimgio.so.2 %D/lib/libkimgio.so
-@exec ln -sf libkspell.so.2 %D/lib/libkspell.so
-@exec ln -sf libmediatool.so.2 %D/lib/libmediatool.so
+@exec ln -sf libjscript.so.%%LIBVER%% %D/lib/libjscript.so
+@exec ln -sf libkab.so.%%LIBVER%% %D/lib/libkab.so
+@exec ln -sf libkdecore.so.%%LIBVER%% %D/lib/libkdecore.so
+@exec ln -sf libkdeui.so.%%LIBVER%% %D/lib/libkdeui.so
+@exec ln -sf libkfile.so.%%LIBVER%% %D/lib/libkfile.so
+@exec ln -sf libkfm.so.%%LIBVER%% %D/lib/libkfm.so
+@exec ln -sf libkhtmlw.so.%%LIBVER%% %D/lib/libkhtmlw.so
+@exec ln -sf libkimgio.so.%%LIBVER%% %D/lib/libkimgio.so
+@exec ln -sf libkspell.so.%%LIBVER%% %D/lib/libkspell.so
+@exec ln -sf libmediatool.so.%%LIBVER%% %D/lib/libmediatool.so
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @dirrm share/toolbar
 @dirrm share/locale/zh_TW.Big5/LC_MESSAGES
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 12bf5efa1f31..9d0be8995471 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -7,6 +7,7 @@
 #
 
 DISTNAME=	kdelibs-1.1.2
+PKGNAME=	kdelibs-1.1.2.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
 MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
@@ -23,26 +24,30 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 		"--with-extra-includes=${PREFIX}/include" \
 		"--x-inc=$(X11BASE)/include" \
-		"--x-lib=$(X11BASE)/lib"
+		"--x-lib=$(X11BASE)/lib" \
+		--enable-shared
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
 
 .include <bsd.port.pre.mk>
 
+LIBMAJOR=	3
+LIBMINOR=	0
+.if ${PORTOBJFORMAT} == "aout"
+LIBVER=		${LIBMAJOR}.${LIBMINOR}
+.else
+LIBVER=		${LIBMAJOR}
+.endif
+PLIST_SUB=	LIBVER=${LIBVER}
+MAKE_ENV=	SOMAJOR=${LIBMAJOR} SOMINOR=${LIBMINOR}
+
 post-install:
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+.for LIB in jscript kab kdecore kdeui kfile kfm khtmlw kimgio kspell mediatool
+	@${LN} -sf ${PREFIX}/lib/lib${LIB}.so.${LIBVER} ${PREFIX}/lib/lib${LIB}.so
 .if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libjscript.so.2.0   ${PREFIX}/lib/libjscript.so
-	${LN} -sf libkab.so.2.0       ${PREFIX}/lib/libkab.so
-	${LN} -sf libkdecore.so.2.0   ${PREFIX}/lib/libkdecore.so
-	${LN} -sf libkdeui.so.2.0     ${PREFIX}/lib/libkdeui.so
-	${LN} -sf libkfile.so.2.0     ${PREFIX}/lib/libkfile.so
-	${LN} -sf libkfm.so.2.0       ${PREFIX}/lib/libkfm.so
-	${LN} -sf libkhtmlw.so.2.0    ${PREFIX}/lib/libkhtmlw.so
-	${LN} -sf libkimgio.so.2.0    ${PREFIX}/lib/libkimgio.so
-	${LN} -sf libkspell.so.2.0    ${PREFIX}/lib/libkspell.so
-	${LN} -sf libmediatool.so.2.0 ${PREFIX}/lib/libmediatool.so
+	@${RM} -f ${PREFIX}/lib/lib${LIB}.so.${LIBMAJOR}
 .endif
+.endfor
 
 .include <bsd.port.post.mk>
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index e93d073d873f..d9a735da00d3 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -124,25 +124,25 @@ include/sections.h
 include/stl_headers.h
 include/xview.h
 lib/libjscript.la
-lib/libjscript.so.2
+lib/libjscript.so.%%LIBVER%%
 lib/libkab.la
-lib/libkab.so.2
+lib/libkab.so.%%LIBVER%%
 lib/libkdecore.la
-lib/libkdecore.so.2
+lib/libkdecore.so.%%LIBVER%%
 lib/libkdeui.la
-lib/libkdeui.so.2
+lib/libkdeui.so.%%LIBVER%%
 lib/libkfile.la
-lib/libkfile.so.2
+lib/libkfile.so.%%LIBVER%%
 lib/libkfm.la
-lib/libkfm.so.2
+lib/libkfm.so.%%LIBVER%%
 lib/libkhtmlw.la
-lib/libkhtmlw.so.2
+lib/libkhtmlw.so.%%LIBVER%%
 lib/libkimgio.la
-lib/libkimgio.so.2
+lib/libkimgio.so.%%LIBVER%%
 lib/libkspell.la
-lib/libkspell.so.2
+lib/libkspell.so.%%LIBVER%%
 lib/libmediatool.la
-lib/libmediatool.so.2
+lib/libmediatool.so.%%LIBVER%%
 share/apps/kab/pics/background_1.jpg
 share/apps/kab/pics/dialog_background.jpg
 share/apps/kde/pics/arrow_down.xbm
@@ -302,16 +302,16 @@ share/toolbar/viewmag-.xpm
 share/toolbar/viewmag.xpm
 share/toolbar/viewzoom.xpm
 @exec ln -sf en %D/share/doc/HTML/default
-@exec ln -sf libjscript.so.2 %D/lib/libjscript.so
-@exec ln -sf libkab.so.2 %D/lib/libkab.so
-@exec ln -sf libkdecore.so.2 %D/lib/libkdecore.so
-@exec ln -sf libkdeui.so.2 %D/lib/libkdeui.so
-@exec ln -sf libkfile.so.2 %D/lib/libkfile.so
-@exec ln -sf libkfm.so.2 %D/lib/libkfm.so
-@exec ln -sf libkhtmlw.so.2 %D/lib/libkhtmlw.so
-@exec ln -sf libkimgio.so.2 %D/lib/libkimgio.so
-@exec ln -sf libkspell.so.2 %D/lib/libkspell.so
-@exec ln -sf libmediatool.so.2 %D/lib/libmediatool.so
+@exec ln -sf libjscript.so.%%LIBVER%% %D/lib/libjscript.so
+@exec ln -sf libkab.so.%%LIBVER%% %D/lib/libkab.so
+@exec ln -sf libkdecore.so.%%LIBVER%% %D/lib/libkdecore.so
+@exec ln -sf libkdeui.so.%%LIBVER%% %D/lib/libkdeui.so
+@exec ln -sf libkfile.so.%%LIBVER%% %D/lib/libkfile.so
+@exec ln -sf libkfm.so.%%LIBVER%% %D/lib/libkfm.so
+@exec ln -sf libkhtmlw.so.%%LIBVER%% %D/lib/libkhtmlw.so
+@exec ln -sf libkimgio.so.%%LIBVER%% %D/lib/libkimgio.so
+@exec ln -sf libkspell.so.%%LIBVER%% %D/lib/libkspell.so
+@exec ln -sf libmediatool.so.%%LIBVER%% %D/lib/libmediatool.so
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @dirrm share/toolbar
 @dirrm share/locale/zh_TW.Big5/LC_MESSAGES