Fix installing on OSX

3 files changed, 39 insertions, 24 deletions

diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index 9908accc27e..e20268b3dde 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.48 2012/08/22 22:03:17 marino Exp $
+$NetBSD: distinfo,v 1.49 2012/08/23 16:14:43 adam Exp $
 
 SHA1 (tcl8.5.12-src.tar.gz) = 0ea293d27b1368cb5865e552ece348d02ff55adc
 RMD160 (tcl8.5.12-src.tar.gz) = ada42e22f7b12413c88d9ec7dbd3789926f362d2
@@ -8,8 +8,8 @@ SHA1 (patch-generic_tclPort.h) = cd44f24c79048a70e2c4929aa1499ee336602ba5
 SHA1 (patch-generic_tclPosixStr.c) = 8c252a4f3d8898fb48544d15123d6a8ddc3172f0
 SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb
 SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2
-SHA1 (patch-unix_Makefile.in) = 2b949d4290b3539916654381e5fdea6f26d0765e
-SHA1 (patch-unix_configure) = 15e41b0117773f815a334ba3332a5ebcd17f531c
+SHA1 (patch-unix_Makefile.in) = 5ccd853f45b66a0638a8625f4b8066955787c20a
+SHA1 (patch-unix_configure) = 2e1e6d2020e68b91b94c0b05cb1d349126989adc
 SHA1 (patch-unix_tclConfig.sh.in) = 5a32d8e97240d14f3a03e205637fe3bf8307d868
 SHA1 (patch-unix_tclUnixFCmd.c) = a56a12b8a0068e914d10336076347ca2b0ba9ac7
 SHA1 (patch-unix_tclUnixInit.c) = cceb75bc67a3b67620889cd92e5978ec8290af09
diff --git a/lang/tcl/patches/patch-unix_Makefile.in b/lang/tcl/patches/patch-unix_Makefile.in
index 8d8cb71f969..6d989ea7caf 100644
--- a/lang/tcl/patches/patch-unix_Makefile.in
+++ b/lang/tcl/patches/patch-unix_Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-unix_Makefile.in,v 1.1 2012/08/21 21:31:47 marino Exp $
+$NetBSD: patch-unix_Makefile.in,v 1.2 2012/08/23 16:14:43 adam Exp $
 
 --- unix/Makefile.in.orig	2012-07-25 16:45:05.000000000 +0000
 +++ unix/Makefile.in
@@ -6,7 +6,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.1 2012/08/21 21:31:47 marino Exp $
  MAJOR_VERSION		= @TCL_MAJOR_VERSION@
  MINOR_VERSION		= @TCL_MINOR_VERSION@
  PATCH_LEVEL		= @TCL_PATCH_LEVEL@
-+SHLIB_VERSION		= .@SHLIB_VERSION@
++SHLIB_VERSION		= @SHLIB_VERSION@
  
  #--------------------------------------------------------------------------
  # Things you can change to personalize the Makefile for your own site (you can
@@ -57,13 +57,16 @@ $NetBSD: patch-unix_Makefile.in,v 1.1 2012/08/21 21:31:47 marino Exp $
  # Make target which outputs the list of the .o contained in the Tcl lib useful
  # to build a single big shared library containing Tcl and other extensions.
  # Used for the Tcl Plugin.  -- dl
-@@ -722,9 +731,13 @@ install-binaries: binaries
+@@ -722,9 +731,16 @@ install-binaries: binaries
  	    fi
  	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
  	@@INSTALL_LIB@
 -	@chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE)
-+	@chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE)$(SHLIB_VERSION)
-+	@cd "$(DLL_INSTALL_DIR)" && ln -sf $(LIB_FILE)$(SHLIB_VERSION) $(LIB_FILE)
++	@cd "$(DLL_INSTALL_DIR)" && if test "$(SHLIB_SUFFIX)" = ".dylib"; then \
++		ln -sf libtcl$(MAJOR_VERSION)$(MINOR_VERSION).$(SHLIB_VERSION)$(SHLIB_SUFFIX) $(LIB_FILE) ; \
++	else \
++		ln -sf libtcl$(MAJOR_VERSION)$(MINOR_VERSION)$(SHLIB_SUFFIX).$(SHLIB_VERSION) $(LIB_FILE) ; \
++	fi
 +	@echo "Installing ${TCL_LIB_A_FILE} to $(DLL_INSTALL_DIR)/"
 +	@$(INSTALL_DATA) ${TCL_LIB_A_FILE} $(DLL_INSTALL_DIR)/${TCL_LIB_A_FILE}
  	@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@"
@@ -72,7 +75,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.1 2012/08/21 21:31:47 marino Exp $
  	@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
  	@$(INSTALL_DATA) tclConfig.sh "$(CONFIG_INSTALL_DIR)"/tclConfig.sh
  	@if test "$(STUB_LIB_FILE)" != "" ; then \
-@@ -734,7 +747,8 @@ install-binaries: binaries
+@@ -734,7 +750,8 @@ install-binaries: binaries
  	@EXTRA_INSTALL_BINARIES@
  
  install-libraries: libraries $(INSTALL_TZDATA) install-msgs
@@ -82,7 +85,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.1 2012/08/21 21:31:47 marino Exp $
  	    do \
  	    if [ ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
-@@ -743,7 +757,7 @@ install-libraries: libraries $(INSTALL_T
+@@ -743,7 +760,7 @@ install-libraries: libraries $(INSTALL_T
  		else true; \
  		fi; \
  	    done;
@@ -91,7 +94,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.1 2012/08/21 21:31:47 marino Exp $
  	    do \
  	    if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
  		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
-@@ -756,12 +770,17 @@ install-libraries: libraries $(INSTALL_T
+@@ -756,12 +773,17 @@ install-libraries: libraries $(INSTALL_T
  	    chmod +x $(SRC_DIR)/../unix/install-sh; \
  	    fi
  	@echo "Installing header files";
@@ -114,7 +117,7 @@ $NetBSD: patch-unix_Makefile.in,v 1.1 2012/08/21 21:31:47 marino Exp $
  	    done;
  	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
  	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
-@@ -774,22 +793,24 @@ install-libraries: libraries $(INSTALL_T
+@@ -774,22 +796,24 @@ install-libraries: libraries $(INSTALL_T
  	    do \
  	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
  	    done;
diff --git a/lang/tcl/patches/patch-unix_configure b/lang/tcl/patches/patch-unix_configure
index 047ae44b840..d925b598a3c 100644
--- a/lang/tcl/patches/patch-unix_configure
+++ b/lang/tcl/patches/patch-unix_configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-unix_configure,v 1.2 2012/08/22 22:03:17 marino Exp $
+$NetBSD: patch-unix_configure,v 1.3 2012/08/23 16:14:43 adam Exp $
 
 --- unix/configure.orig	2012-07-25 16:45:05.000000000 +0000
 +++ unix/configure
@@ -24,7 +24,15 @@ $NetBSD: patch-unix_configure,v 1.2 2012/08/22 22:03:17 marino Exp $
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
-@@ -8953,7 +8952,7 @@ fi
+@@ -7779,7 +7778,6 @@ fi
+ 	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	Darwin-*)
+-	    CFLAGS_OPTIMIZE="-Os"
+ 	    SHLIB_CFLAGS="-fno-common"
+ 	    # To avoid discrepancies between what headers configure sees during
+ 	    # preprocessing tests and compiling tests, move any -isysroot and
+@@ -8953,7 +8951,7 @@ fi
  	    BSD/OS*) ;;
  	    CYGWIN_*|MINGW32_*) ;;
  	    IRIX*) ;;
@@ -33,16 +41,20 @@ $NetBSD: patch-unix_configure,v 1.2 2012/08/22 22:03:17 marino Exp $
  	    Darwin-*) ;;
  	    SCO_SV-3.2*) ;;
  	    *) SHLIB_CFLAGS="-fPIC" ;;
-@@ -8984,7 +8983,7 @@ fi
+@@ -8984,7 +8982,11 @@ fi
  
  else
  
 -            INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"'
-+            INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)$(SHLIB_VERSION)"'
++        if test "${SHLIB_SUFFIX}" = ".dylib" ; then
++            INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/libtcl$(MAJOR_VERSION)$(MINOR_VERSION).$(SHLIB_VERSION)$(SHLIB_SUFFIX)"'
++        else
++            INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE).$(SHLIB_VERSION)"'
++        fi
  
  fi
  
-@@ -9018,7 +9017,7 @@ fi
+@@ -9018,7 +9020,7 @@ fi
  else
  
          MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
@@ -51,7 +63,7 @@ $NetBSD: patch-unix_configure,v 1.2 2012/08/22 22:03:17 marino Exp $
  
  fi
  
-@@ -18893,9 +18892,9 @@ fi
+@@ -18893,9 +18895,9 @@ fi
  #	building libtcl as a shared library instead of a static library.
  #--------------------------------------------------------------------
  
@@ -59,12 +71,12 @@ $NetBSD: patch-unix_configure,v 1.2 2012/08/22 22:03:17 marino Exp $
 -TCL_SHARED_LIB_SUFFIX=${SHARED_LIB_SUFFIX}
 -eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
 +TCL_UNSHARED_LIB_SUFFIX=${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}.a
-+TCL_SHARED_LIB_SUFFIX=${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}.so
++TCL_SHARED_LIB_SUFFIX=${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${SHLIB_SUFFIX}
 +eval "TCL_LIB_FILE=libtcl${TCL_SHARED_LIB_SUFFIX}"
  
  # tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
  # since on some platforms TCL_LIB_FILE contains shell escapes.
-@@ -19000,13 +18999,10 @@ _ACEOF
+@@ -19000,13 +19002,10 @@ _ACEOF
  else
      # libdir must be a fully qualified path and not ${exec_prefix}/lib
      eval libdir="$libdir"
@@ -81,7 +93,7 @@ $NetBSD: patch-unix_configure,v 1.2 2012/08/22 22:03:17 marino Exp $
  fi
  VERSION='${VERSION}'
  eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}"
-@@ -19025,12 +19021,11 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
+@@ -19025,12 +19024,11 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
  	TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /System/Library/Frameworks"
      test -z "$TCL_MODULE_PATH"  && \
  	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
@@ -96,7 +108,7 @@ $NetBSD: patch-unix_configure,v 1.2 2012/08/22 22:03:17 marino Exp $
  #--------------------------------------------------------------------
  #       The statements below define various symbols relating to Tcl
  #       stub support.
-@@ -19043,12 +19038,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
+@@ -19043,12 +19041,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
  eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
  eval "TCL_STUB_LIB_DIR=${libdir}"
  
@@ -110,7 +122,7 @@ $NetBSD: patch-unix_configure,v 1.2 2012/08/22 22:03:17 marino Exp $
  TCL_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}"
  TCL_STUB_LIB_SPEC="-L${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}"
  TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
-@@ -19200,34 +19190,15 @@ fi
+@@ -19200,34 +19193,15 @@ fi
  # Transform confdefs.h into DEFS.
  # Protect against shell expansion while executing Makefile rules.
  # Protect against Makefile macro expansion.
@@ -154,7 +166,7 @@ $NetBSD: patch-unix_configure,v 1.2 2012/08/22 22:03:17 marino Exp $
  
  
  
-@@ -19848,6 +19819,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,;
+@@ -19848,6 +19822,7 @@ s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,;
  s,@EXTRA_TCLSH_LIBS@,$EXTRA_TCLSH_LIBS,;t t
  s,@DLTEST_LD@,$DLTEST_LD,;t t
  s,@DLTEST_SUFFIX@,$DLTEST_SUFFIX,;t t