Don't compile/install useless statically linked versions of shared modules.

4 files changed, 40 insertions, 13 deletions

diff --git a/devel/bonobo/files/patch-ltmain.sh b/devel/bonobo/files/patch-ltmain.sh
index 98cb05e4ddb3..91c341790451 100644
--- a/devel/bonobo/files/patch-ltmain.sh
+++ b/devel/bonobo/files/patch-ltmain.sh
@@ -1,19 +1,27 @@
 
 $FreeBSD$
 
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
+--- ltmain.sh.orig	Sun Jan 20 16:11:07 2002
++++ ltmain.sh	Tue Jan 22 13:34:20 2002
+@@ -1060,6 +1060,7 @@
+ 
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -2442,6 +2443,9 @@
+ 	  *-*-openbsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
  	    ;;
 +	  *-*-freebsd*)
 +	    # FreeBSD doesn't need this...
 +	    ;;
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
+ 	    if test $build_libtool_need_lc = "yes"; then
+@@ -4208,10 +4212,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/devel/bonobo/files/patch-monikers::Makefile.in b/devel/bonobo/files/patch-monikers::Makefile.in
index 3e83154faa2d..86b054c5fc37 100644
--- a/devel/bonobo/files/patch-monikers::Makefile.in
+++ b/devel/bonobo/files/patch-monikers::Makefile.in
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- monikers/Makefile.in	2001/10/30 11:02:02	1.1
-+++ monikers/Makefile.in	2001/10/30 11:03:04
+--- monikers/Makefile.in.orig	Tue Jan 22 14:02:06 2002
++++ monikers/Makefile.in	Tue Jan 22 14:07:14 2002
 @@ -72,7 +72,7 @@
  BONOBO_LIBDIR = @BONOBO_LIBDIR@
  BONOBO_LIBS = @BONOBO_LIBS@
@@ -12,3 +12,12 @@ $FreeBSD$
  BONOBO_TEST_LIBS = @BONOBO_TEST_LIBS@
  BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
  CATALOGS = @CATALOGS@
+@@ -212,7 +212,7 @@
+ 	bonobo-moniker-std.c			
+ 
+ 
+-libmoniker_std_la_LDFLAGS = -module
++libmoniker_std_la_LDFLAGS = -module -avoid-version
+ 
+ bonobo_moniker_gunzip_SOURCES = \
+ 	bonobo-moniker-gunzip.c		\
diff --git a/devel/bonobo/files/patch-storage-modules::Makefile.in b/devel/bonobo/files/patch-storage-modules::Makefile.in
new file mode 100644
index 000000000000..5faf5c7fce74
--- /dev/null
+++ b/devel/bonobo/files/patch-storage-modules::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- storage-modules/Makefile.in	2002/01/22 11:54:43	1.1
++++ storage-modules/Makefile.in	2002/01/22 11:55:39
+@@ -169,7 +169,7 @@
+         $(GNOME_INCLUDEDIR)
+ 
+ 
+-common_ldflags = -avoid-version
++common_ldflags = -avoid-version -module
+ 
+ bonobo_plugindir = $(PLUGIN_DIR)
+ bonobo_plugin_LTLIBRARIES = libstorage_efs.la libstorage_fs.la 
diff --git a/devel/bonobo/pkg-plist b/devel/bonobo/pkg-plist
index 267b61adf9a7..0391d58d77d1 100644
--- a/devel/bonobo/pkg-plist
+++ b/devel/bonobo/pkg-plist
@@ -89,12 +89,8 @@ include/gnome-1.0/bonobo/bonobo-wrapper.h
 include/gnome-1.0/bonobo/bonobo-xobject.h
 include/gnome-1.0/bonobo/bonobo-zoomable-frame.h
 include/gnome-1.0/bonobo/bonobo-zoomable.h
-lib/bonobo/monikers/libmoniker_std.a
 lib/bonobo/monikers/libmoniker_std.so
-lib/bonobo/monikers/libmoniker_std.so.0
-lib/bonobo/plugin/libstorage_efs.a
 lib/bonobo/plugin/libstorage_efs.so
-lib/bonobo/plugin/libstorage_fs.a
 lib/bonobo/plugin/libstorage_fs.so
 lib/libbonobo-print.a
 lib/libbonobo-print.so