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

the previous version.

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

2 files changed, 37 insertions, 32 deletions

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