Bump shlib numbers, USE_QT now implies USE_NEWGCC so people using

3-stable will be unable to link with old libraries.

9 files changed, 67 insertions, 24 deletions

diff --git a/converters/kdesupport11/Makefile b/converters/kdesupport11/Makefile
index bee6559..d6c131d 100644
--- a/converters/kdesupport11/Makefile
+++ b/converters/kdesupport11/Makefile
@@ -25,13 +25,7 @@ CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 
-.include <bsd.port.mk>
-
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-.if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libQwSpriteField.so.6.0  ${PREFIX}/lib/libQwSpriteField.so
-	${LN} -sf lib/libjs.so.2.0         ${PREFIX}/lib/libjs.so
-	${LN} -sf lib/libmimelib.so.1.0    ${PREFIX}/lib/libmimelib.so
-	${LN} -sf librdb.so.55.0           ${PREFIX}/lib/librdb.so
-.endif
+
+.include <bsd.port.mk>
diff --git a/converters/kdesupport11/files/patch-ac b/converters/kdesupport11/files/patch-ac
new file mode 100644
index 0000000..ce31dc3
--- /dev/null
+++ b/converters/kdesupport11/files/patch-ac
@@ -0,0 +1,11 @@
+--- ./QwSpriteField/Makefile.in.org	Tue Sep  7 08:24:52 1999
++++ ./QwSpriteField/Makefile.in	Wed Feb 23 18:10:41 2000
+@@ -166,7 +166,7 @@
+ # the difference between the first and the last, is the major number
+ # the last is the minor number
+ # the number in the middle is the minor-minor number
+-libQwSpriteField_la_LDFLAGS = -version-info 6:0:5  -lXext  $(LIB_QT)
++libQwSpriteField_la_LDFLAGS = -version-info 7:0:5  -lXext  $(LIB_QT)
+ 
+ INCLUDES = $(QT_INCLUDES)
+ lib_LTLIBRARIES = libQwSpriteField.la
diff --git a/converters/kdesupport11/files/patch-ad b/converters/kdesupport11/files/patch-ad
new file mode 100644
index 0000000..571330a
--- /dev/null
+++ b/converters/kdesupport11/files/patch-ad
@@ -0,0 +1,11 @@
+--- ./js/Makefile.in.org	Tue Sep  7 08:24:51 1999
++++ ./js/Makefile.in	Wed Feb 23 18:14:54 2000
+@@ -196,7 +196,7 @@
+ libjs_la_SOURCES = bc.c heap.c object.c debug.c compiler.c js.c vm.c 		vmswitch.c vmjumps.c alloc.c utils.c mrgsort.c 		regex.c crc32.c 		b_array.c b_bool.c b_func.c b_core.c b_number.c 		b_object.c b_string.c b_date.c b_file.c b_math.c 		b_regexp.c b_system.c b_vm.c
+ 
+ 
+-libjs_la_LDFLAGS = -version-info 2:0:2 
++libjs_la_LDFLAGS = -version-info 3:0:2 
+ 
+ noinst_HEADERS = c1swt0.h eswt0.h c1switch.h c2switch.h eswitch.h 	c1jumps.h c2jumps.h ejumps.h rentrant.h 	mrgsort.h regex.h md5.h
+ 
diff --git a/converters/kdesupport11/files/patch-ae b/converters/kdesupport11/files/patch-ae
new file mode 100644
index 0000000..aa3724a
--- /dev/null
+++ b/converters/kdesupport11/files/patch-ae
@@ -0,0 +1,11 @@
+--- ./mimelib/Makefile.in.org	Tue Sep  7 08:24:50 1999
++++ ./mimelib/Makefile.in	Wed Feb 23 18:14:27 2000
+@@ -191,7 +191,7 @@
+ 
+ DEFS = -D$(LIBVERSION) @DEFS@
+ 
+-libmimelib_la_LDFLAGS = -version-info 1:0
++libmimelib_la_LDFLAGS = -version-info 2:0
+ mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/converters/kdesupport11/files/patch-af b/converters/kdesupport11/files/patch-af
new file mode 100644
index 0000000..53827f4
--- /dev/null
+++ b/converters/kdesupport11/files/patch-af
@@ -0,0 +1,11 @@
+--- ./rdb/Makefile.in.org	Tue Sep  7 08:24:51 1999
++++ ./rdb/Makefile.in	Wed Feb 23 18:13:12 2000
+@@ -162,7 +162,7 @@
+ x_libraries = @x_libraries@
+ 
+ lib_LTLIBRARIES = librdb.la
+-librdb_la_LDFLAGS = -version-info 55:0:55
++librdb_la_LDFLAGS = -version-info 56:0:55
+ 
+ librdb_la_SOURCES = cdb_hash.c cdb_seek.c  hash.c rdb.c
+ 
diff --git a/converters/kdesupport11/pkg-plist b/converters/kdesupport11/pkg-plist
index a8860a5..50ed634 100644
--- a/converters/kdesupport11/pkg-plist
+++ b/converters/kdesupport11/pkg-plist
@@ -45,13 +45,13 @@ include/rdb/hash.h
 include/rdb/rdb.h
 include/rdb/uint32.h
 lib/libQwSpriteField.a
-lib/libQwSpriteField.so.6
+lib/libQwSpriteField.so.7
 lib/libjs.a
-lib/libjs.so.2
+lib/libjs.so.3
 lib/libmimelib.a
-lib/libmimelib.so.1
+lib/libmimelib.so.2
 lib/librdb.a
-lib/librdb.so.55
+lib/librdb.so.56
 @exec ln -sf libQwSpriteField.so.6 %D/lib/libQwSpriteField.so
 @exec ln -sf libjs.so.2 %D/lib/libjs.so
 @exec ln -sf libmimelib.so.1 %D/lib/libmimelib.so
diff --git a/converters/kdesupport2/Makefile b/converters/kdesupport2/Makefile
index bee6559..d6c131d 100644
--- a/converters/kdesupport2/Makefile
+++ b/converters/kdesupport2/Makefile
@@ -25,13 +25,7 @@ CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 
-.include <bsd.port.mk>
-
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-.if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libQwSpriteField.so.6.0  ${PREFIX}/lib/libQwSpriteField.so
-	${LN} -sf lib/libjs.so.2.0         ${PREFIX}/lib/libjs.so
-	${LN} -sf lib/libmimelib.so.1.0    ${PREFIX}/lib/libmimelib.so
-	${LN} -sf librdb.so.55.0           ${PREFIX}/lib/librdb.so
-.endif
+
+.include <bsd.port.mk>
diff --git a/converters/kdesupport2/files/patch-ae b/converters/kdesupport2/files/patch-ae
new file mode 100644
index 0000000..aa3724a
--- /dev/null
+++ b/converters/kdesupport2/files/patch-ae
@@ -0,0 +1,11 @@
+--- ./mimelib/Makefile.in.org	Tue Sep  7 08:24:50 1999
++++ ./mimelib/Makefile.in	Wed Feb 23 18:14:27 2000
+@@ -191,7 +191,7 @@
+ 
+ DEFS = -D$(LIBVERSION) @DEFS@
+ 
+-libmimelib_la_LDFLAGS = -version-info 1:0
++libmimelib_la_LDFLAGS = -version-info 2:0
+ mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/converters/kdesupport2/pkg-plist b/converters/kdesupport2/pkg-plist
index a8860a5..50ed634 100644
--- a/converters/kdesupport2/pkg-plist
+++ b/converters/kdesupport2/pkg-plist
@@ -45,13 +45,13 @@ include/rdb/hash.h
 include/rdb/rdb.h
 include/rdb/uint32.h
 lib/libQwSpriteField.a
-lib/libQwSpriteField.so.6
+lib/libQwSpriteField.so.7
 lib/libjs.a
-lib/libjs.so.2
+lib/libjs.so.3
 lib/libmimelib.a
-lib/libmimelib.so.1
+lib/libmimelib.so.2
 lib/librdb.a
-lib/librdb.so.55
+lib/librdb.so.56
 @exec ln -sf libQwSpriteField.so.6 %D/lib/libQwSpriteField.so
 @exec ln -sf libjs.so.2 %D/lib/libjs.so
 @exec ln -sf libmimelib.so.1 %D/lib/libmimelib.so