Don't build/install useless statically linked version of the shared module.

12 files changed, 116 insertions, 32 deletions

diff --git a/www/gtkhtml/files/patch-components::http-storage-module::Makefile.in b/www/gtkhtml/files/patch-components::http-storage-module::Makefile.in
new file mode 100644
index 00000000000..6f238102e76
--- /dev/null
+++ b/www/gtkhtml/files/patch-components::http-storage-module::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- components/http-storage-module/Makefile.in	2002/01/22 14:05:48	1.1
++++ components/http-storage-module/Makefile.in	2002/01/22 14:06:05
+@@ -154,7 +154,7 @@
+ INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        	-I$(srcdir) -I$(top_srcdir) 				-I$(top_builddir)					-DPLUGIN_DIR=\""$(PLUGIN_DIR)"\"		        -I$(includedir)                                 	$(EXTRA_GNOME_CFLAGS)
+ 
+ 
+-common_ldflags = -avoid-version
++common_ldflags = -avoid-version -module
+ 
+ bonobo_plugindir = $(PLUGIN_DIR)
+ bonobo_plugin_LTLIBRARIES = libstorage_http.la
diff --git a/www/gtkhtml/files/patch-ltmain.sh b/www/gtkhtml/files/patch-ltmain.sh
index 98cb05e4ddb..91c34179045 100644
--- a/www/gtkhtml/files/patch-ltmain.sh
+++ b/www/gtkhtml/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/www/gtkhtml/pkg-plist b/www/gtkhtml/pkg-plist
index a2c29bfaa41..d7ae99d37ed 100644
--- a/www/gtkhtml/pkg-plist
+++ b/www/gtkhtml/pkg-plist
@@ -90,7 +90,6 @@ include/gtkhtml/htmltypes.h
 include/gtkhtml/htmlundo-action.h
 include/gtkhtml/htmlundo.h
 include/gtkhtml/htmlvspace.h
-lib/bonobo/plugin/libstorage_http.a
 lib/bonobo/plugin/libstorage_http.so
 lib/libgtkhtml.a
 lib/libgtkhtml.so
diff --git a/www/gtkhtml3/files/patch-components::http-storage-module::Makefile.in b/www/gtkhtml3/files/patch-components::http-storage-module::Makefile.in
new file mode 100644
index 00000000000..6f238102e76
--- /dev/null
+++ b/www/gtkhtml3/files/patch-components::http-storage-module::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- components/http-storage-module/Makefile.in	2002/01/22 14:05:48	1.1
++++ components/http-storage-module/Makefile.in	2002/01/22 14:06:05
+@@ -154,7 +154,7 @@
+ INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        	-I$(srcdir) -I$(top_srcdir) 				-I$(top_builddir)					-DPLUGIN_DIR=\""$(PLUGIN_DIR)"\"		        -I$(includedir)                                 	$(EXTRA_GNOME_CFLAGS)
+ 
+ 
+-common_ldflags = -avoid-version
++common_ldflags = -avoid-version -module
+ 
+ bonobo_plugindir = $(PLUGIN_DIR)
+ bonobo_plugin_LTLIBRARIES = libstorage_http.la
diff --git a/www/gtkhtml3/files/patch-ltmain.sh b/www/gtkhtml3/files/patch-ltmain.sh
index 98cb05e4ddb..91c34179045 100644
--- a/www/gtkhtml3/files/patch-ltmain.sh
+++ b/www/gtkhtml3/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/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index a2c29bfaa41..d7ae99d37ed 100644
--- a/www/gtkhtml3/pkg-plist
+++ b/www/gtkhtml3/pkg-plist
@@ -90,7 +90,6 @@ include/gtkhtml/htmltypes.h
 include/gtkhtml/htmlundo-action.h
 include/gtkhtml/htmlundo.h
 include/gtkhtml/htmlvspace.h
-lib/bonobo/plugin/libstorage_http.a
 lib/bonobo/plugin/libstorage_http.so
 lib/libgtkhtml.a
 lib/libgtkhtml.so
diff --git a/www/gtkhtml38/files/patch-components::http-storage-module::Makefile.in b/www/gtkhtml38/files/patch-components::http-storage-module::Makefile.in
new file mode 100644
index 00000000000..6f238102e76
--- /dev/null
+++ b/www/gtkhtml38/files/patch-components::http-storage-module::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- components/http-storage-module/Makefile.in	2002/01/22 14:05:48	1.1
++++ components/http-storage-module/Makefile.in	2002/01/22 14:06:05
+@@ -154,7 +154,7 @@
+ INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        	-I$(srcdir) -I$(top_srcdir) 				-I$(top_builddir)					-DPLUGIN_DIR=\""$(PLUGIN_DIR)"\"		        -I$(includedir)                                 	$(EXTRA_GNOME_CFLAGS)
+ 
+ 
+-common_ldflags = -avoid-version
++common_ldflags = -avoid-version -module
+ 
+ bonobo_plugindir = $(PLUGIN_DIR)
+ bonobo_plugin_LTLIBRARIES = libstorage_http.la
diff --git a/www/gtkhtml38/files/patch-ltmain.sh b/www/gtkhtml38/files/patch-ltmain.sh
index 98cb05e4ddb..91c34179045 100644
--- a/www/gtkhtml38/files/patch-ltmain.sh
+++ b/www/gtkhtml38/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/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist
index a2c29bfaa41..d7ae99d37ed 100644
--- a/www/gtkhtml38/pkg-plist
+++ b/www/gtkhtml38/pkg-plist
@@ -90,7 +90,6 @@ include/gtkhtml/htmltypes.h
 include/gtkhtml/htmlundo-action.h
 include/gtkhtml/htmlundo.h
 include/gtkhtml/htmlvspace.h
-lib/bonobo/plugin/libstorage_http.a
 lib/bonobo/plugin/libstorage_http.so
 lib/libgtkhtml.a
 lib/libgtkhtml.so
diff --git a/www/libgtkhtml/files/patch-components::http-storage-module::Makefile.in b/www/libgtkhtml/files/patch-components::http-storage-module::Makefile.in
new file mode 100644
index 00000000000..6f238102e76
--- /dev/null
+++ b/www/libgtkhtml/files/patch-components::http-storage-module::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- components/http-storage-module/Makefile.in	2002/01/22 14:05:48	1.1
++++ components/http-storage-module/Makefile.in	2002/01/22 14:06:05
+@@ -154,7 +154,7 @@
+ INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        	-I$(srcdir) -I$(top_srcdir) 				-I$(top_builddir)					-DPLUGIN_DIR=\""$(PLUGIN_DIR)"\"		        -I$(includedir)                                 	$(EXTRA_GNOME_CFLAGS)
+ 
+ 
+-common_ldflags = -avoid-version
++common_ldflags = -avoid-version -module
+ 
+ bonobo_plugindir = $(PLUGIN_DIR)
+ bonobo_plugin_LTLIBRARIES = libstorage_http.la
diff --git a/www/libgtkhtml/files/patch-ltmain.sh b/www/libgtkhtml/files/patch-ltmain.sh
index 98cb05e4ddb..91c34179045 100644
--- a/www/libgtkhtml/files/patch-ltmain.sh
+++ b/www/libgtkhtml/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/www/libgtkhtml/pkg-plist b/www/libgtkhtml/pkg-plist
index a2c29bfaa41..d7ae99d37ed 100644
--- a/www/libgtkhtml/pkg-plist
+++ b/www/libgtkhtml/pkg-plist
@@ -90,7 +90,6 @@ include/gtkhtml/htmltypes.h
 include/gtkhtml/htmlundo-action.h
 include/gtkhtml/htmlundo.h
 include/gtkhtml/htmlvspace.h
-lib/bonobo/plugin/libstorage_http.a
 lib/bonobo/plugin/libstorage_http.so
 lib/libgtkhtml.a
 lib/libgtkhtml.so