Improved shared linking.

6 files changed, 36 insertions, 12 deletions

diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile
index 6818c14f829a..3249f6b2aa3e 100644
--- a/lang/tcl83/Makefile
+++ b/lang/tcl83/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tcl
 PORTVERSION=	8.3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang tcl83
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
diff --git a/lang/tcl83/files/patch-configure b/lang/tcl83/files/patch-configure
index 6e9818bd397c..45a42b80823d 100644
--- a/lang/tcl83/files/patch-configure
+++ b/lang/tcl83/files/patch-configure
@@ -1,6 +1,6 @@
 --- configure.orig	Sat Oct 20 02:24:15 2001
-+++ configure	Sat Oct 20 10:45:39 2001
-@@ -4648,7 +4648,7 @@
++++ configure	Sat Nov 10 20:17:05 2001
+@@ -4779,7 +4779,7 @@
      EXTRA_CFLAGS=""
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
@@ -9,7 +9,13 @@
      ECHO_VERSION='`echo ${VERSION}`'
      TCL_LIB_VERSIONS_OK=ok
      CFLAGS_DEBUG=-g
-@@ -5391,11 +5391,11 @@
+@@ -5386,16 +5386,16 @@
+ 	FreeBSD-*)
+ 	    # FreeBSD 3.* and greater have ELF.
+ 	    SHLIB_CFLAGS="-fPIC"
+-	    SHLIB_LD="ld -Bshareable -x"
++	    SHLIB_LD="ld -shared -x -soname \$@"
+ 	    SHLIB_LD_LIBS=""
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
diff --git a/lang/tcl83/files/patch-tcl.m4 b/lang/tcl83/files/patch-tcl.m4
index d546861e60d5..7341faab013e 100644
--- a/lang/tcl83/files/patch-tcl.m4
+++ b/lang/tcl83/files/patch-tcl.m4
@@ -1,6 +1,12 @@
 --- tcl.m4.orig	Sat Oct 20 02:24:15 2001
-+++ tcl.m4	Sat Oct 20 10:47:49 2001
-@@ -957,11 +957,11 @@
++++ tcl.m4	Sat Nov 10 20:17:34 2001
+@@ -952,16 +952,16 @@
+ 	FreeBSD-*)
+ 	    # FreeBSD 3.* and greater have ELF.
+ 	    SHLIB_CFLAGS="-fPIC"
+-	    SHLIB_LD="ld -Bshareable -x"
++	    SHLIB_LD="ld -shared -x -soname \$@"
+ 	    SHLIB_LD_LIBS=""
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index 6818c14f829a..3249f6b2aa3e 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tcl
 PORTVERSION=	8.3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang tcl83
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
diff --git a/lang/tcl84/files/patch-configure b/lang/tcl84/files/patch-configure
index 6e9818bd397c..45a42b80823d 100644
--- a/lang/tcl84/files/patch-configure
+++ b/lang/tcl84/files/patch-configure
@@ -1,6 +1,6 @@
 --- configure.orig	Sat Oct 20 02:24:15 2001
-+++ configure	Sat Oct 20 10:45:39 2001
-@@ -4648,7 +4648,7 @@
++++ configure	Sat Nov 10 20:17:05 2001
+@@ -4779,7 +4779,7 @@
      EXTRA_CFLAGS=""
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
@@ -9,7 +9,13 @@
      ECHO_VERSION='`echo ${VERSION}`'
      TCL_LIB_VERSIONS_OK=ok
      CFLAGS_DEBUG=-g
-@@ -5391,11 +5391,11 @@
+@@ -5386,16 +5386,16 @@
+ 	FreeBSD-*)
+ 	    # FreeBSD 3.* and greater have ELF.
+ 	    SHLIB_CFLAGS="-fPIC"
+-	    SHLIB_LD="ld -Bshareable -x"
++	    SHLIB_LD="ld -shared -x -soname \$@"
+ 	    SHLIB_LD_LIBS=""
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
diff --git a/lang/tcl84/files/patch-tcl.m4 b/lang/tcl84/files/patch-tcl.m4
index d546861e60d5..7341faab013e 100644
--- a/lang/tcl84/files/patch-tcl.m4
+++ b/lang/tcl84/files/patch-tcl.m4
@@ -1,6 +1,12 @@
 --- tcl.m4.orig	Sat Oct 20 02:24:15 2001
-+++ tcl.m4	Sat Oct 20 10:47:49 2001
-@@ -957,11 +957,11 @@
++++ tcl.m4	Sat Nov 10 20:17:34 2001
+@@ -952,16 +952,16 @@
+ 	FreeBSD-*)
+ 	    # FreeBSD 3.* and greater have ELF.
+ 	    SHLIB_CFLAGS="-fPIC"
+-	    SHLIB_LD="ld -Bshareable -x"
++	    SHLIB_LD="ld -shared -x -soname \$@"
+ 	    SHLIB_LD_LIBS=""
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""