head	1.6;
access;
symbols
	RELEASE_8_3_0:1.6
	RELEASE_9_0_0:1.6
	RELEASE_7_4_0:1.5
	RELEASE_8_2_0:1.5
	RELEASE_6_EOL:1.4
	RELEASE_8_1_0:1.4
	RELEASE_7_3_0:1.4
	RELEASE_8_0_0:1.4
	RELEASE_7_2_0:1.4
	RELEASE_7_1_0:1.4
	RELEASE_6_4_0:1.4
	RELEASE_5_EOL:1.4
	RELEASE_7_0_0:1.3
	RELEASE_6_3_0:1.3
	PRE_XORG_7:1.1;
locks; strict;
comment	@# @;


1.6
date	2011.06.26.09.17.43;	author mm;	state Exp;
branches;
next	1.5;

1.5
date	2010.12.09.08.48.49;	author mm;	state Exp;
branches;
next	1.4;

1.4
date	2007.12.29.21.38.48;	author mm;	state Exp;
branches;
next	1.3;

1.3
date	2007.09.28.05.14.15;	author mm;	state Exp;
branches;
next	1.2;

1.2
date	2007.06.05.13.32.05;	author mm;	state Exp;
branches;
next	1.1;

1.1
date	2007.01.29.03.06.56;	author clsung;	state Exp;
branches;
next	;


desc
@@


1.6
log
@Update to 8.5.10
@
text
@--- configure.orig	2011-06-23 15:18:36.000000000 +0200
+++ configure	2011-06-25 21:30:44.310215849 +0200
@@@@ -6638,7 +6638,7 @@@@
     # is disabled by the user. [Bug 1016796]
     LDFLAGS_ARCH=""
     UNSHARED_LIB_SUFFIX=""
-    TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
+    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
     ECHO_VERSION='`echo ${VERSION}`'
     TCL_LIB_VERSIONS_OK=ok
     CFLAGS_DEBUG=-g
@@@@ -7648,7 +7648,7 @@@@
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
-	    LDFLAGS="$LDFLAGS -export-dynamic"
+	    LDFLAGS=""
 	    if test $doRpath = yes; then
 
 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
@@@@ -7659,16 +7659,16 @@@@
 
 		# The -pthread needs to go in the CFLAGS, not LIBS
 		LIBS=`echo $LIBS | sed s/-pthread//`
-		CFLAGS="$CFLAGS -pthread"
-	    	LDFLAGS="$LDFLAGS -pthread"
+		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+	    	LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
 
 fi
 
 	    case $system in
-	    FreeBSD-3.*)
+	    FreeBSD-*)
 	    	# FreeBSD-3 doesn't handle version numbers with dots.
 	    	UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-	    	SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
+	    	SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
 	    	TCL_LIB_VERSIONS_OK=nodots
 		;;
 	    esac
@@@@ -7677,7 +7677,7 @@@@
 	    # This configuration from FreeBSD Ports.
 	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_LD="${CC} -shared"
-	    TCL_SHLIB_LD_EXTRAS="-soname \$@@"
+	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@@"
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
@


1.5
log
@- Unbreak build with clang

PR:		ports/152842
Submitted by:	Koop Mast <kwm@@FreeBSD.org>
@
text
@d1 3
a3 3
--- configure.orig	2010-09-08 19:40:48.000000000 +0200
+++ configure	2010-12-09 09:21:58.223421249 +0100
@@@@ -6636,7 +6636,7 @@@@
d12 1
a12 1
@@@@ -7609,7 +7609,7 @@@@
d21 1
a21 1
@@@@ -7620,16 +7620,16 @@@@
d42 1
a42 1
@@@@ -7638,7 +7638,7 @@@@
a47 1
 	    SHLIB_LD_LIBS='${LIBS}'
d50 1
@


1.4
log
@- Update to 8.5.0
@
text
@d1 4
a4 3
--- configure.orig	2007-12-19 22:50:13.000000000 +0100
+++ configure	2007-12-26 11:49:03.000000000 +0100
@@@@ -6633,7 +6633,7 @@@@
a5 1
     TCL_EXPORT_FILE_SUFFIX=""
d12 1
a12 1
@@@@ -7624,7 +7624,7 @@@@
d21 1
a21 1
@@@@ -7635,16 +7635,16 @@@@
d42 9
@


1.3
log
@- Update to 8.5.b.1
@
text
@d1 3
a3 3
--- configure.orig	2007-09-24 17:46:44.000000000 +0200
+++ configure	2007-09-27 20:24:15.000000000 +0200
@@@@ -6615,7 +6615,7 @@@@
d12 1
a12 1
@@@@ -7490,20 +7490,20 @@@@
d18 5
a22 3
 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 	    if test "${TCL_THREADS}" = "1" ; then
d29 3
a31 1
 	    fi
@


1.2
log
@- fix shared build on -CURRENT
- change tr to ${TR}

Suggested by:	stas
Approved by:	garga (mentor)
@
text
@d1 3
a3 3
--- configure.orig	Wed Jan 17 13:10:49 2007
+++ configure	Wed Jan 17 13:00:27 2007
@@@@ -6467,7 +6467,7 @@@@
d12 1
a12 8
@@@@ -7275,25 +7275,26 @@@@
 	FreeBSD-*)
 	    # FreeBSD 3.* and greater have ELF.
 	    SHLIB_CFLAGS="-fPIC"
-	    SHLIB_LD="ld -Bshareable -x"
+	    SHLIB_LD="${CC} -shared"
+	    TCL_SHLIB_LD_EXTRAS="-soname \$@@"
 	    SHLIB_LD_LIBS='${LIBS}'
d19 1
a19 1
 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
d21 1
a21 2
-		# The -pthread needs to go in the CFLAGS, not LIBS
+		# The -pthread needs to go in the LDFLAGS, not LIBS
@


1.1
log
@Add tcl85 8.5.a.5, tool Command Language (development version).

PR:		ports/108041
Submitted by:	martin at matuska.org
@
text
@d17 1
a17 1
+	    SHLIB_LD="ld -shared -x"
@

