fix build on Darwin:

- libtool needs -dynamiclib on Darwin to create shared libraries
- don't use libtool to create the static libtclstub.a, do it the same
  way that tcl 8.4 does
- name library libtcl83 (as opposed to libtcl8.3) like other platforms
- remove PLIST unnecessary hack for Darwin shlib name

5 files changed, 46 insertions, 44 deletions

diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile
index fdccd9991e0..ddfe7bdd2ce 100644
--- a/lang/tcl83/Makefile
+++ b/lang/tcl83/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/09 15:29:41 tv Exp $
+# $NetBSD: Makefile,v 1.3 2004/10/10 11:58:29 grant Exp $
 #
 
 DISTNAME=		tcl8.3.4
@@ -28,8 +28,6 @@ USE_LIBTOOL=		yes
 
 INSTALL_TARGET=		install
 
-PLIST_SUBST+=		SHLIB_SUFX="${SHLIB_SUFX}"
-
 # Initially install the man pages into ${WRKDIR}/man, as we need a staged
 # install to avoid overwriting existing manpages in ${PREFIX}/man.
 #
@@ -40,12 +38,6 @@ CONFIGURE_ENV+=		TCL_PACKAGE_PATH="${VIEWBASE}/lib/tcl"
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Darwin"
-SHLIB_SUFX=		dylib
-.else
-SHLIB_SUFX=		la
-.endif
-
 # NetBSD-1.5.x-m68k platforms apparently have a compiler optimization bug
 # tickled by the Tcl code that manifests in code generation problems.
 #
diff --git a/lang/tcl83/PLIST b/lang/tcl83/PLIST
index ff404098667..c5c3c373de0 100644
--- a/lang/tcl83/PLIST
+++ b/lang/tcl83/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/10/09 15:29:41 tv Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/10/10 11:58:29 grant Exp $
 bin/tclsh
 bin/tclsh8.3
 include/tcl.h
@@ -17,7 +17,7 @@ include/tcl/generic/tclRegexp.h
 include/tcl/unix/tclUnixPort.h
 include/tclDecls.h
 include/tclPlatDecls.h
-lib/libtcl83.${SHLIB_SUFX}
+lib/libtcl83.la
 lib/libtclstub83.a
 lib/tcl8.3/auto.tcl
 lib/tcl8.3/encoding/ascii.enc
diff --git a/lang/tcl83/distinfo b/lang/tcl83/distinfo
index a079db85397..5c0cf8f50e3 100644
--- a/lang/tcl83/distinfo
+++ b/lang/tcl83/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/03/08 19:22:26 minskim Exp $
+$NetBSD: distinfo,v 1.2 2004/10/10 11:58:29 grant Exp $
 
 SHA1 (tcl8.3.4.tar.gz) = b179f1f51b322b7045cf152b73df4f3d01da82ec
 Size (tcl8.3.4.tar.gz) = 2654756 bytes
-SHA1 (patch-aa) = 3e9fa9427f40a4c6b1f97bcda58fefe9d5cf20ce
-SHA1 (patch-ab) = 0e5a89fdf9623f78f4165c025412428aef5146df
+SHA1 (patch-aa) = 2a6069a0ddb7961bb3c120c753bc9f99dce73ff7
+SHA1 (patch-ab) = 3db75db8162cb7e72446dd608fd3fd02ff4aef9c
 SHA1 (patch-ac) = d1e1b6ed334ff424140a678ed098504cc14614e8
 SHA1 (patch-ae) = 5eee14adec88cf0cac5715fe0cfe7420b9b83774
 SHA1 (patch-af) = 6d2b97ea8ad9de7e22ed6c2c81aa91aeadad3241
diff --git a/lang/tcl83/patches/patch-aa b/lang/tcl83/patches/patch-aa
index 9c34e5e13b7..d924024aef0 100644
--- a/lang/tcl83/patches/patch-aa
+++ b/lang/tcl83/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/03/08 19:22:27 minskim Exp $
+$NetBSD: patch-aa,v 1.2 2004/10/10 11:58:29 grant Exp $
 
---- Makefile.in.orig	Fri Oct 19 20:24:15 2001
-+++ Makefile.in	Tue Oct  7 21:57:52 2003
-@@ -87,7 +87,7 @@
+--- Makefile.in.orig	2001-10-20 10:24:15.000000000 +1000
++++ Makefile.in
+@@ -87,7 +87,7 @@ CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
  #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/03/08 19:22:27 minskim Exp $
  
  # Flags to pass to the linker
  LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -169,8 +169,8 @@
+@@ -169,8 +169,8 @@ SHELL			= /bin/sh
  INSTALL_STRIP_PROGRAM   = -s
  INSTALL_STRIP_LIBRARY  = -S -S
  
@@ -22,18 +22,18 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/03/08 19:22:27 minskim Exp $
  INSTALL_LIBRARY		= ${INSTALL}
  INSTALL_DATA		= ${INSTALL} -m 644
  
-@@ -187,8 +187,8 @@
+@@ -187,8 +187,8 @@ TCL_EXE			= tclsh
  # configure script.  You shouldn't normally need to modify any of
  # these definitions by hand.
  
 -STLIB_LD		= @STLIB_LD@
 -SHLIB_LD		= @SHLIB_LD@
-+STLIB_LD		= ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
++STLIB_LD		= ${AR} cr
 +SHLIB_LD		= ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
  SHLIB_CFLAGS		= @SHLIB_CFLAGS@
  
  SHLIB_SUFFIX		= @SHLIB_SUFFIX@
-@@ -235,8 +235,9 @@
+@@ -235,8 +235,9 @@ DLTEST_DIR		= @TCL_SRC_DIR@/unix/dltest
  # Must be absolute to so the corresponding tcltest's tcl_library is absolute.
  TCL_BUILDTIME_LIBRARY	= @TCL_SRC_DIR@/library
  
@@ -44,7 +44,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/03/08 19:22:27 minskim Exp $
  
  #----------------------------------------------------------------
  # The information below should be usable as is.  The configure
-@@ -420,6 +421,7 @@
+@@ -420,6 +421,7 @@ ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE
  	@MAKE_LIB@
  	if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
  		$(RANLIB) ${TCL_LIB_FILE}; \
@@ -52,7 +52,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/03/08 19:22:27 minskim Exp $
  	fi
  
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
-@@ -440,11 +442,11 @@
+@@ -440,11 +442,11 @@ objs: ${OBJS}
  
  
  tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
@@ -66,7 +66,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/03/08 19:22:27 minskim Exp $
  		@TCL_LD_SEARCH_FLAGS@ -o tcltest
  
  # Note, in the target below TCL_LIBRARY needs to be set or else
-@@ -538,7 +540,7 @@
+@@ -538,7 +540,7 @@ install-binaries: binaries
  	    chmod +x $(SRC_DIR)/install-sh; \
  	    fi
  	@echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/"
@@ -75,7 +75,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/03/08 19:22:27 minskim Exp $
  	@if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
  	    (cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE)); \
  	    fi
-@@ -989,7 +991,7 @@
+@@ -989,7 +991,7 @@ tclUnixInit.o: $(UNIX_DIR)/tclUnixInit.c
  
  xttest:  ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
  	@DL_OBJS@ ${BUILD_DLTEST}
diff --git a/lang/tcl83/patches/patch-ab b/lang/tcl83/patches/patch-ab
index d60d8ae007d..3e115fb4069 100644
--- a/lang/tcl83/patches/patch-ab
+++ b/lang/tcl83/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/03/08 19:22:27 minskim Exp $
+$NetBSD: patch-ab,v 1.2 2004/10/10 11:58:29 grant Exp $
 
---- configure.orig	Fri Oct 19 19:24:15 2001
+--- configure.orig	2001-10-20 10:24:15.000000000 +1000
 +++ configure
 @@ -4776,6 +4776,7 @@ fi
      # Step 3: set configuration options based on system name and version.
@@ -103,7 +103,26 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 19:22:27 minskim Exp $
  		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
  		
  fi
-@@ -5569,6 +5592,9 @@ EOF
+@@ -5401,7 +5424,7 @@ fi
+ 	Rhapsody-*|Darwin-*)
+ 	    SHLIB_CFLAGS="-fno-common"
+ 	    SHLIB_LD="cc -dynamiclib \${LDFLAGS}"
+-	    TCL_SHLIB_LD_EXTRAS="-compatibility_version ${TCL_MAJOR_VERSION} -current_version \${VERSION} -install_name \${LIB_RUNTIME_DIR}/\${TCL_LIB_FILE} -prebind -seg1addr a000000"
++	    TCL_SHLIB_LD_EXTRAS="-dynamiclib -compatibility_version ${TCL_MAJOR_VERSION} -current_version \${VERSION} -install_name \${LIB_RUNTIME_DIR}/\${TCL_LIB_FILE} -prebind -seg1addr a000000"
+ 	    SHLIB_LD_LIBS="${LIBS}"
+ 	    SHLIB_SUFFIX=".dylib"
+ 	    DL_OBJS="tclLoadDyld.o"
+@@ -5410,6 +5433,9 @@ fi
+ 	    LD_SEARCH_FLAGS=""
+ 	    CFLAGS_OPTIMIZE="-O3"
+ 	    EXTRA_CFLAGS="-arch ppc -pipe"
++	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.dylib'
++	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	NEXTSTEP-*)
+ 	    SHLIB_CFLAGS=""
+@@ -5569,6 +5595,9 @@ EOF
  	    DL_LIBS="-ldl"
  	    LDFLAGS=""
  	    LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
@@ -113,7 +132,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 19:22:27 minskim Exp $
  	    ;;
  	SunOS-5*)
  
-@@ -5616,6 +5642,9 @@ EOF
+@@ -5616,6 +5645,9 @@ EOF
  	    else
  		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
  	    fi
@@ -123,7 +142,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 19:22:27 minskim Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
-@@ -6103,7 +6132,7 @@ if test "${SHARED_BUILD}" = "1" -a "${SH
+@@ -6103,7 +6135,7 @@ if test "${SHARED_BUILD}" = "1" -a "${SH
      if test "x$DL_OBJS" = "xtclLoadAout.o"; then
  	MAKE_LIB="\${STLIB_LD} \$@ \${OBJS}"
      else
@@ -132,7 +151,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 19:22:27 minskim Exp $
      fi
  else
      case $system in
-@@ -6141,7 +6170,7 @@ if test "$SHARED_BUILD" = "0" -o $TCL_NE
+@@ -6141,7 +6173,7 @@ if test "$SHARED_BUILD" = "0" -o $TCL_NE
          TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
      fi
      TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
@@ -141,7 +160,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 19:22:27 minskim Exp $
  else
      TCL_BUILD_EXP_FILE="lib.exp"
      eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -6171,10 +6200,17 @@ VERSION=${TCL_VERSION}
+@@ -6171,10 +6203,17 @@ VERSION=${TCL_VERSION}
  #--------------------------------------------------------------------
  
  if test "$prefix" != "$exec_prefix"; then
@@ -161,16 +180,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 19:22:27 minskim Exp $
  
  #--------------------------------------------------------------------
  #       The statements below define various symbols relating to Tcl
-@@ -6186,7 +6222,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
- # Replace DBGX with TCL_DBGX
- eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
- 
--MAKE_STUB_LIB="\${STLIB_LD} \$@ \${STUB_LIB_OBJS}"
-+MAKE_STUB_LIB="\${STLIB_LD} -o \$@ \${STUB_LIB_OBJS}"
- 
- if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-     TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}"
-@@ -6262,6 +6298,8 @@ TCL_SHARED_BUILD=${SHARED_BUILD}
+@@ -6262,6 +6301,8 @@ TCL_SHARED_BUILD=${SHARED_BUILD}
  
  
  
@@ -179,7 +189,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 19:22:27 minskim Exp $
  trap '' 1 2 15
  cat > confcache <<\EOF
  # This file is a shell script that caches the results of configure
-@@ -6437,12 +6475,12 @@ s%@TCL_DBGX@%$TCL_DBGX%g
+@@ -6437,12 +6478,12 @@ s%@TCL_DBGX@%$TCL_DBGX%g
  s%@CFG_TCL_SHARED_LIB_SUFFIX@%$CFG_TCL_SHARED_LIB_SUFFIX%g
  s%@CFG_TCL_UNSHARED_LIB_SUFFIX@%$CFG_TCL_UNSHARED_LIB_SUFFIX%g
  s%@CFG_TCL_EXPORT_FILE_SUFFIX@%$CFG_TCL_EXPORT_FILE_SUFFIX%g