Modify so that shared lib has same name as static lib.

5 files changed, 42 insertions, 4 deletions

diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index ff171460e30..ed04e4dcdc4 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/07/15 08:00:45 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2000/07/15 08:41:26 jlam Exp $
 
 DISTNAME=		libsigc++-1.0.1
 CATEGORIES=		devel
@@ -14,7 +14,6 @@ USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/scripts/ltconfig
 
 post-install:
-	${RM} -f ${PREFIX}/lib/libsigc.so
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sigc++
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/sigc++
 
diff --git a/devel/libsigc++/files/patch-sum b/devel/libsigc++/files/patch-sum
new file mode 100644
index 00000000000..2aa37a8d13b
--- /dev/null
+++ b/devel/libsigc++/files/patch-sum
@@ -0,0 +1,4 @@
+$NetBSD: patch-sum,v 1.1 2000/07/15 08:41:28 jlam Exp $
+
+MD5 (patch-aa) = 18b020d3c16c54b646c04b3017a5247d
+MD5 (patch-ab) = daf77c01ce4f95409ccc6878c36512e8
diff --git a/devel/libsigc++/patches/patch-aa b/devel/libsigc++/patches/patch-aa
new file mode 100644
index 00000000000..ded87d15075
--- /dev/null
+++ b/devel/libsigc++/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2000/07/15 08:41:28 jlam Exp $
+
+--- sigc++/Makefile.in.orig	Sat May 20 14:47:52 2000
++++ sigc++/Makefile.in	Sat Jul 15 04:31:27 2000
+@@ -90,7 +90,7 @@
+ libsigc_la_SOURCES =     object.cc   scope.cc   marshal.cc   slot.cc    basic_signal.cc adaptor.cc thread.cc
+ 
+ 
+-libsigc_la_LDFLAGS = -version-info $(LIBSIGC_SO_VERSION)                      -release $(SIGC_RELEASE) -no-undefined
++libsigc_la_LDFLAGS = -version-info $(LIBSIGC_SO_VERSION) -no-undefined
+ 
+ libsigcdir = $(prefix)/include/sigc++
+ 
diff --git a/devel/libsigc++/patches/patch-ab b/devel/libsigc++/patches/patch-ab
new file mode 100644
index 00000000000..90a99d7aab6
--- /dev/null
+++ b/devel/libsigc++/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1 2000/07/15 08:41:28 jlam Exp $
+
+--- sigc-config.in.orig	Thu Oct 21 02:28:33 1999
++++ sigc-config.in	Sat Jul 15 04:32:16 2000
+@@ -150,7 +150,7 @@
+     case "$i" in
+     # a library, save it for later, in reverse order
+     -l*) af_rev_libs="$i $af_rev_libs" ;;
+-    -L*|-R*)
++    -L*|-R*|-Wl,-R*)
+         if test "X$af_echo_libs_L" = "Xyes"; then
+             case " $af_lib_L_flags " in
+             *\ $i\ *) ;;                              # already there
+@@ -218,7 +218,7 @@
+   includes="-I@includedir@"
+ fi
+ if test "@libdir@" != /usr/lib ; then
+-  libs="-L@libdir@"
++  libs="-Wl,-R@libdir@ -L@libdir@"
+ fi
+ af_cflags="$af_cflags -I@libdir@/sigc++/include $includes"
+ af_libs="$libs -lsigc @THREAD_LIB@ $af_libs"
diff --git a/devel/libsigc++/pkg/PLIST b/devel/libsigc++/pkg/PLIST
index 998ecb2a267..7bf6e2965a6 100644
--- a/devel/libsigc++/pkg/PLIST
+++ b/devel/libsigc++/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/07/15 08:00:45 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/07/15 08:41:31 jlam Exp $
 bin/sigc-config
 include/sigc++/adaptor.h
 include/sigc++/basic_signal.h
@@ -32,7 +32,7 @@ include/sigc++/type.h
 lib/sigc++/include/sigc++config.h
 lib/libsigc.a
 lib/libsigc.la
-lib/libsigc-1.0.so.0.0
+lib/libsigc.so.0.0
 share/aclocal/sigc++.m4
 share/doc/sigc++/API
 share/doc/sigc++/FAQ