head	1.12;
access;
symbols
	RELEASE_8_3_0:1.11
	RELEASE_9_0_0:1.11
	RELEASE_7_4_0:1.11
	RELEASE_8_2_0:1.11
	RELEASE_6_EOL:1.11
	RELEASE_8_1_0:1.11
	RELEASE_7_3_0:1.11
	RELEASE_8_0_0:1.10
	RELEASE_7_2_0:1.10
	RELEASE_7_1_0:1.10
	RELEASE_6_4_0:1.10
	RELEASE_5_EOL:1.10
	RELEASE_7_0_0:1.10
	RELEASE_6_3_0:1.10
	PRE_XORG_7:1.10
	RELEASE_4_EOL:1.9
	RELEASE_6_2_0:1.9
	RELEASE_6_1_0:1.9
	RELEASE_5_5_0:1.9
	RELEASE_6_0_0:1.9
	RELEASE_5_4_0:1.9
	RELEASE_4_11_0:1.9
	RELEASE_5_3_0:1.9
	RELEASE_4_10_0:1.9
	RELEASE_5_2_1:1.9
	RELEASE_5_2_0:1.9
	RELEASE_4_9_0:1.9
	RELEASE_5_1_0:1.9
	RELEASE_4_8_0:1.9
	RELEASE_5_0_0:1.9
	RELEASE_4_7_0:1.8
	RELEASE_4_6_2:1.8
	RELEASE_4_6_1:1.8
	RELEASE_4_6_0:1.8
	RELEASE_5_0_DP1:1.8
	RELEASE_4_5_0:1.7
	RELEASE_4_4_0:1.7
	RELEASE_4_3_0:1.7
	RELEASE_4_2_0:1.7
	RELEASE_4_1_1:1.7
	RELEASE_4_1_0:1.7
	RELEASE_3_5_0:1.7
	RELEASE_4_0_0:1.7
	RELEASE_3_4_0:1.6
	RELEASE_3_3_0:1.5
	RELEASE_3_2_0:1.3
	RELEASE_3_1_0:1.3
	RELEASE_2_2_8:1.2
	RELEASE_3_0_0:1.2;
locks; strict;
comment	@# @;


1.12
date	2012.12.03.16.52.03;	author svnexp;	state dead;
branches;
next	1.11;

1.11
date	2009.10.26.15.24.15;	author dinoex;	state Exp;
branches;
next	1.10;

1.10
date	2007.01.30.10.25.30;	author pav;	state Exp;
branches;
next	1.9;

1.9
date	2002.12.16.20.08.07;	author dinoex;	state Exp;
branches;
next	1.8;

1.8
date	2002.01.27.14.24.20;	author dinoex;	state Exp;
branches;
next	1.7;

1.7
date	2000.01.05.07.11.52;	author jseger;	state Exp;
branches;
next	1.6;

1.6
date	99.11.21.20.54.58;	author jseger;	state Exp;
branches;
next	1.5;

1.5
date	99.09.05.16.32.09;	author jseger;	state Exp;
branches;
next	1.4;

1.4
date	99.06.20.14.05.29;	author jseger;	state Exp;
branches;
next	1.3;

1.3
date	99.01.17.14.07.04;	author ejc;	state Exp;
branches;
next	1.2;

1.2
date	98.10.03.21.35.23;	author steve;	state Exp;
branches;
next	1.1;

1.1
date	98.09.15.02.51.09;	author jseger;	state Exp;
branches;
next	;


desc
@@


1.12
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/308158
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r308158 | gahr | 2012-12-03 16:49:48 +0000 (Mon, 03 Dec 2012) | 5 lines
## SVN ##
## SVN ## - Retire Tcl/Tk 8.2 now that the last consumer (deskutils/abacus) has gone
## SVN ## - Fix typo in previous commit in MOVED
## SVN ##
## SVN ## Feature safe:	yes
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@--- configure.orig	1999-12-15 04:59:18.000000000 +0100
+++ configure	2009-10-26 16:20:22.000000000 +0100
@@@@ -4587,7 +4587,7 @@@@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print }' /etc/.relid'`
+		system=MP-RAS-`awk '{print }' '/etc/.relid'`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`
@@@@ -4648,7 +4648,7 @@@@
     EXTRA_CFLAGS=""
     TCL_EXPORT_FILE_SUFFIX=""
     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
@@@@ -4892,7 +4892,7 @@@@
 	    LDFLAGS="-Wl,-Bexport"
 	    LD_SEARCH_FLAGS=""
 	    ;;
-	NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*)
+	NetBSD-*|FreeBSD-*|OpenBSD-*)
 	    # Not available on all versions:  check for include file.
 	    ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
@@@@ -4922,16 +4922,16 @@@@
 fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  
-		SHLIB_CFLAGS="-fpic"
-		SHLIB_LD="ld -Bshareable -x"
+		SHLIB_CFLAGS="-fPIC"
 		SHLIB_LD_LIBS=""
 		SHLIB_SUFFIX=".so"
 		DL_OBJS="tclLoadDl.o"
 		DL_LIBS=""
 		LDFLAGS=""
 		LD_SEARCH_FLAGS=""
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
+		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
+		TCL_SHLIB_LD_EXTRAS="-soname \$@@"
+		SHLIB_LD="ld -shared -x"
 	    
 else
   echo "$ac_t""no" 1>&6
@@@@ -4954,17 +4954,6 @@@@
 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
 	    TCL_LIB_VERSIONS_OK=nodots
 	    ;;
-	FreeBSD-*)
-	    # FreeBSD 3.* and greater have ELF.
-	    SHLIB_CFLAGS="-fpic"
-	    SHLIB_LD="ld -Bshareable -x"
-	    SHLIB_LD_LIBS=""
-	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS=""
-	    LDFLAGS=""
-	    LD_SEARCH_FLAGS=""
-	    ;;
 	NEXTSTEP-*)
 	    SHLIB_CFLAGS=""
 	    SHLIB_LD="cc -nostdlib -r"
@@@@ -5371,7 +5360,7 @@@@
 	SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}${SHLIB_SUFFIX}'
     fi
     if test "$UNSHARED_LIB_SUFFIX" = "" ; then
-	UNSHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
+	UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
     fi
 
     
@@@@ -5507,7 +5496,7 @@@@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print }' /etc/.relid'`
+		system=MP-RAS-`awk '{print }' '/etc/.relid'`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`
@@@@ -5594,7 +5583,7 @@@@
     if test "x$DL_OBJS" = "xtclLoadAout.o"; then
 	MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}"
     else
-	MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
+	MAKE_LIB="\${SHLIB_LD} \${TCL_SHLIB_LD_EXTRAS} -o \${TCL_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
 	RANLIB=":"
     fi
 else
@@@@ -5628,11 +5617,7 @@@@
 # up the Tcl library.
 
 if test "$SHARED_BUILD" = "0" -o $TCL_NEEDS_EXP_FILE = 0; then
-    if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-        TCL_LIB_FLAG="-ltcl${TCL_VERSION}\${TCL_DBGX}"
-    else
-        TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
-    fi
+    TCL_LIB_FLAG="-ltcl${TCL_TRIM_DOTS}\${TCL_DBGX}"
     TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
     TCL_LIB_SPEC="-L${exec_prefix}/lib ${TCL_LIB_FLAG}"
 else
@@@@ -5678,11 +5663,7 @@@@
 
 TCL_STUB_LIB_FILE=${STUB_LIB_FILE}
 
-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-    TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}"
-else
-    TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
-fi
+TCL_STUB_LIB_FLAG="-ltclstub${TCL_TRIM_DOTS}\${TCL_DBGX}"
 
 TCL_BUILD_STUB_LIB_SPEC="-L`pwd` ${TCL_STUB_LIB_FLAG}"
 TCL_STUB_LIB_SPEC="-L${exec_prefix}/lib ${TCL_STUB_LIB_FLAG}"
@


1.11
log
@- fix build unter FreeBSD 9
Reported by:	Ernst W. Winter
@
text
@@


1.10
log
@- Remove support for a.out format and PORTOBJFORMAT variable from individual
  ports

With hat:	portmgr
@
text
@d1 11
a11 2
--- configure.orig	Tue Dec 14 19:59:18 1999
+++ configure	Mon Dec 16 11:52:34 2002
d51 1
a51 1
@@@@ -4954,17 +4959,6 @@@@
d69 1
a69 1
@@@@ -5371,7 +5365,7 @@@@
d78 10
a87 1
@@@@ -5594,7 +5588,7 @@@@
d96 1
a96 1
@@@@ -5628,11 +5622,7 @@@@
d109 1
a109 1
@@@@ -5678,11 +5668,7 @@@@
@


1.9
log
@- Fix build on Sparc
@
text
@d21 1
a21 1
@@@@ -4922,16 +4922,21 @@@@
a35 1
+	if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf" ; then
a38 4
+	else
+		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
+		SHLIB_LD="ld -Bshareable -x"
+	fi
@


1.8
log
@- strip SHLIB_LD of option "-soname $@@"
- define TCL_SHLIB_LD_EXTRAS
- bump PORTREVISION

PR:		34210
@
text
@d1 2
a2 2
--- configure.orig	Wed Dec 15 04:59:18 1999
+++ configure	Sun Jan 27 14:59:38 2002
d26 1
a26 1
 		SHLIB_CFLAGS="-fpic"
d28 1
@


1.7
log
@Upgrade to tcl 8.2.3
@
text
@d1 2
a2 2
--- configure.orig	Tue Dec 14 22:59:18 1999
+++ configure	Wed Jan  5 00:56:06 2000
d21 1
a21 1
@@@@ -4922,16 +4922,20 @@@@
d37 2
a38 1
+		SHLIB_LD="ld -shared -x -soname \$@@"
d46 1
a46 1
@@@@ -4954,17 +4958,6 @@@@
d64 1
a64 1
@@@@ -5371,7 +5364,7 @@@@
d73 10
a82 1
@@@@ -5628,11 +5621,7 @@@@
d95 1
a95 1
@@@@ -5678,11 +5667,7 @@@@
@


1.6
log
@Upgrade to tcl-8.2.2
@
text
@d1 2
a2 2
--- configure.orig	Wed Nov  3 21:37:24 1999
+++ configure	Sun Nov 21 15:34:05 1999
d8 1
a8 1
+    TCL_TRIM_DOTS=82
d21 1
a21 1
@@@@ -4922,16 +4922,21 @@@@
a35 1
+		echo "SHARED_LIB_SUFFIX JSEGER"
d45 1
a45 1
@@@@ -4954,17 +4959,6 @@@@
d63 1
a63 1
@@@@ -5371,7 +5365,7 @@@@
d72 1
a72 1
@@@@ -5628,11 +5622,7 @@@@
d85 1
a85 1
@@@@ -5678,11 +5668,7 @@@@
@


1.5
log
@Upgrade repository copies to tcl/tk 8.2
@
text
@d1 2
a2 2
--- configure.orig	Fri Aug 13 18:02:47 1999
+++ configure	Sat Sep  4 13:15:50 1999
d16 1
a16 1
-	NetBSD-*|FreeBSD-[12].*|OpenBSD-*)
@


1.4
log
@Upgrade to tcl and tk 8.1.
Move NO_LATEST_LINK from tcl81 and tk81 to tcl80 and tk80.

Submitted by:	YAZAKI Hiroyuki <yazaki@@nn.iij4u.or.jp>
@
text
@d1 19
a19 10
--- configure.orig	Fri Apr 30 08:23:33 1999
+++ configure	Tue May 11 01:25:32 1999
@@@@ -4384,7 +4384,7 @@@@
 	LD_FLAGS="-Wl,-Bexport"
 	LD_SEARCH_FLAGS=""
 	;;
-    NetBSD-*|FreeBSD-12.*|OpenBSD-*)
+    NetBSD-*|FreeBSD-*|OpenBSD-*)
 	# Not available on all versions:  check for include file.
 	ac_safe=`echo "dlfcn.h" | tr './\055' '___'`
d21 3
a23 1
@@@@ -4413,14 +4413,19 @@@@
d25 28
a52 2
   
 	    SHLIB_CFLAGS="-fpic"
d54 31
a84 15
 	    SHLIB_LD_LIBS=""
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
 	    LD_FLAGS=""
 	    LD_SEARCH_FLAGS=""
-	    TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
+        if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf"; then
+            TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
+            SHLIB_LD="ld -shared -x -soname \$@@"
+        else
+            TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
+            SHLIB_LD="ld -Bshareable -x"
+        fi
 	
d86 13
a98 27
   echo "$ac_t""no" 1>&6
@@@@ -4443,17 +4448,6 @@@@
 	TCL_UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
 	TCL_LIB_VERSIONS_OK=nodots
         ;;
-    FreeBSD-*)
-        # FreeBSD 3.* and greater have ELF.
-        SHLIB_CFLAGS="-fpic"
-        SHLIB_LD="ld -Bshareable -x"
-        SHLIB_LD_LIBS=""
-        SHLIB_SUFFIX=".so"
-        DL_OBJS="tclLoadDl.o"
-        DL_LIBS=""
-        LD_FLAGS=""
-        LD_SEARCH_FLAGS=""
-	;;
     NEXTSTEP-*)
 	SHLIB_CFLAGS=""
 	SHLIB_LD="cc -nostdlib -r"
@@@@ -5100,6 +5094,7 @@@@
 #       stub support.
 #--------------------------------------------------------------------
 # Replace ${VERSION} with contents of ${TCL_VERSION}
+${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0
 eval "STUB_LIB_FILE=libtclstub${TCL_UNSHARED_LIB_SUFFIX}"
 # Replace DBGX with TCL_DBGX
 eval "STUB_LIB_FILE=\"${STUB_LIB_FILE}\""
@


1.3
log
@Update tcl81 to beta 1
@
text
@d1 12
a12 3
--- configure.orig	Fri Dec 11 18:36:14 1998
+++ configure	Sat Jan  2 15:04:24 1999
@@@@ -4330,14 +4330,19 @@@@
d25 1
a25 1
+            TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1'
d28 1
a28 1
+            TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.0'
d34 26
@


1.2
log
@Cleanup conversion to ELF.
@
text
@d1 3
a3 3
--- configure.orig	Mon Feb 23 20:02:51 1998
+++ configure	Sat Oct  3 15:46:42 1998
@@@@ -4528,14 +4528,19 @@@@
d14 8
a21 7
+  if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf"; then
+	    TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1'
+	    SHLIB_LD="ld -shared -x -soname \$@@"
+  else
 	    TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.0'
+	    SHLIB_LD="ld -Bshareable -x"
+  fi
@


1.1
log
@Changes for ELF
@
text
@d1 10
a10 3
--- configure.orig	Tue Feb 24 02:02:51 1998
+++ configure	Tue Sep 15 02:45:28 1998
@@@@ -4535,7 +4535,11 @@@@
d16 2
a17 1
+    else
d19 1
@
