First stab at Interix support.

3 files changed, 65 insertions, 21 deletions

diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index a5b9d5d1282..df5190e7bcf 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.28 2005/01/05 09:15:29 adam Exp $
+$NetBSD: distinfo,v 1.29 2005/01/24 22:10:44 tv Exp $
 
 SHA1 (tcl8.4.9-src.tar.gz) = 77370577ded22315fb8f60e20500920352412e58
 Size (tcl8.4.9-src.tar.gz) = 3496364 bytes
 SHA1 (patch-aa) = b9a40bcc2873065714f802e8605709da8532eeee
-SHA1 (patch-ab) = adbc7e77190469e49712d25d3683288d8de9be0d
+SHA1 (patch-ab) = 248f281b084af50aa980521b3ff3d72a40e97efd
 SHA1 (patch-ac) = ca2409270eee18ca2c8ddf9a002d9fff95053e4d
 SHA1 (patch-ae) = f086af46134e7698e71a9cf1b5668f32ae722d46
-SHA1 (patch-af) = bd59ac1331b2e314ed245d7bd60fbf05643fcb29
+SHA1 (patch-af) = b149cb12b04d2b379dfe6acbc6438c294224f65b
 SHA1 (patch-ag) = 0a11bfc878d43b15f6444923fac18b4876b62398
 SHA1 (patch-ah) = 0aaa349fcf9ce736e1f7d3dad377ee355f549ecb
diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab
index d4a04901d7f..cdf8e094199 100644
--- a/lang/tcl/patches/patch-ab
+++ b/lang/tcl/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.28 2005/01/05 09:15:29 adam Exp $
+$NetBSD: patch-ab,v 1.29 2005/01/24 22:10:44 tv Exp $
 
---- configure.orig	2004-12-07 00:23:45.000000000 +0000
+--- configure.orig	2004-12-06 19:23:45.000000000 -0500
 +++ configure
 @@ -2192,12 +2192,13 @@ fi
      # Step 3: set configuration options based on system name and version.
@@ -17,7 +17,29 @@ $NetBSD: patch-ab,v 1.28 2005/01/05 09:15:29 adam Exp $
      CFLAGS_DEBUG=-g
      CFLAGS_OPTIMIZE=-O
      if test "$GCC" = "yes" ; then
-@@ -2867,6 +2868,9 @@ fi
+@@ -2639,6 +2640,21 @@ fi
+ 		LD_LIBRARY_PATH_VAR="SHLIB_PATH"
+ 	    fi
+ 	    ;;
++	Interix-3.*)
++	    SHLIB_CFLAGS=""
++	    SHLIB_LD='${TCL_CC} -shared'
++	    SHLIB_LD_LIBS=""
++	    SHLIB_SUFFIX=".so"
++	    DL_OBJS="tclLoadDl.o"
++	    DL_LIBS="-ldl"
++	    LDFLAGS="$LDFLAGS -Wl,-E"
++	    CC_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}'
++	    LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}'
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so',
++	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++	    TCL_LIB_SPEC_RPATH="-Wl,-R${exec_prefix}/lib"
++	    TCL_LIB_VERSIONS_OK=nodots
++	    ;;
+ 	IRIX-4.*)
+ 	    SHLIB_CFLAGS="-G 0"
+ 	    SHLIB_SUFFIX=".a"
+@@ -2867,6 +2883,9 @@ fi
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	NetBSD-*|FreeBSD-[1-2].*)
@@ -27,7 +49,7 @@ $NetBSD: patch-ab,v 1.28 2005/01/05 09:15:29 adam Exp $
  	    # 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
-@@ -2899,13 +2903,11 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -2899,13 +2918,11 @@ if eval "test \"`echo '$ac_cv_header_'$a
    
  		# NetBSD/SPARC needs -fPIC, -fpic will not do.
  		SHLIB_CFLAGS="-fPIC"
@@ -41,7 +63,7 @@ $NetBSD: patch-ab,v 1.28 2005/01/05 09:15:29 adam Exp $
  		echo $ac_n "checking for ELF""... $ac_c" 1>&6
  echo "configure:2911: checking for ELF" >&5
  		cat > conftest.$ac_ext <<EOF
-@@ -2920,11 +2922,20 @@ EOF
+@@ -2920,11 +2937,20 @@ EOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    egrep "yes" >/dev/null 2>&1; then
    rm -rf conftest*
@@ -64,7 +86,7 @@ $NetBSD: patch-ab,v 1.28 2005/01/05 09:15:29 adam Exp $
  		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
  		
  fi
-@@ -3540,16 +3551,16 @@ fi
+@@ -3540,16 +3566,16 @@ fi
      fi
  
      if test "$SHARED_LIB_SUFFIX" = "" ; then
@@ -85,7 +107,7 @@ $NetBSD: patch-ab,v 1.28 2005/01/05 09:15:29 adam Exp $
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -7430,7 +7441,7 @@ elif test "$SHARED_BUILD" = "0" || test 
+@@ -7430,7 +7456,7 @@ elif test "$SHARED_BUILD" = "0" || test 
          TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
      fi
      TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
@@ -94,7 +116,7 @@ $NetBSD: patch-ab,v 1.28 2005/01/05 09:15:29 adam Exp $
  else
      TCL_BUILD_EXP_FILE="lib.exp"
      eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -7460,13 +7471,19 @@ VERSION=${TCL_VERSION}
+@@ -7460,13 +7486,19 @@ VERSION=${TCL_VERSION}
  #--------------------------------------------------------------------
  
  if test "$FRAMEWORK_BUILD" = "1" ; then
diff --git a/lang/tcl/patches/patch-af b/lang/tcl/patches/patch-af
index fbdc7ab8e3c..1c48b67273e 100644
--- a/lang/tcl/patches/patch-af
+++ b/lang/tcl/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.14 2005/01/05 09:15:29 adam Exp $
+$NetBSD: patch-af,v 1.15 2005/01/24 22:10:44 tv Exp $
 
---- tcl.m4.orig	2004-12-07 00:23:45.000000000 +0000
+--- tcl.m4.orig	2004-12-06 19:23:45.000000000 -0500
 +++ tcl.m4
 @@ -865,6 +865,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
      # Step 3: set configuration options based on system name and version.
@@ -10,7 +10,29 @@ $NetBSD: patch-af,v 1.14 2005/01/05 09:15:29 adam Exp $
      LDFLAGS_ORIG="$LDFLAGS"
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
-@@ -1139,6 +1140,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1118,6 +1119,21 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 		LD_LIBRARY_PATH_VAR="SHLIB_PATH"
+ 	    fi
+ 	    ;;
++	Interix-3.*)
++	    SHLIB_CFLAGS=""
++	    SHLIB_LD='${TCL_CC} -shared'
++	    SHLIB_LD_LIBS=""
++	    SHLIB_SUFFIX=".so"
++	    DL_OBJS="tclLoadDl.o"
++	    DL_LIBS="-ldl"
++	    LDFLAGS="$LDFLAGS -Wl,-E"
++	    CC_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}'
++	    LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}'
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so',
++	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++	    TCL_LIB_SPEC_RPATH="-Wl,-R${exec_prefix}/lib"
++	    TCL_LIB_VERSIONS_OK=nodots
++	    ;;
+ 	IRIX-4.*)
+ 	    SHLIB_CFLAGS="-G 0"
+ 	    SHLIB_SUFFIX=".a"
+@@ -1139,6 +1155,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    DL_LIBS=""
  	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
@@ -20,7 +42,7 @@ $NetBSD: patch-af,v 1.14 2005/01/05 09:15:29 adam Exp $
  	    ;;
  	IRIX-6.*)
  	    SHLIB_CFLAGS=""
-@@ -1164,6 +1168,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1164,6 +1183,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  		esac
  		LDFLAGS="$LDFLAGS -n32"
  	    fi
@@ -30,7 +52,7 @@ $NetBSD: patch-af,v 1.14 2005/01/05 09:15:29 adam Exp $
  	    ;;
  	IRIX64-6.*)
  	    SHLIB_CFLAGS=""
-@@ -1187,6 +1194,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1187,6 +1209,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  	            LDFLAGS="$LDFLAGS -64"
  	        fi
  	    fi
@@ -40,7 +62,7 @@ $NetBSD: patch-af,v 1.14 2005/01/05 09:15:29 adam Exp $
  	    ;;
  	Linux*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -1232,6 +1242,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1232,6 +1257,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    # XIM peeking works under XFree86.
  	    AC_DEFINE(PEEK_XCLOSEIM)
  
@@ -50,7 +72,7 @@ $NetBSD: patch-af,v 1.14 2005/01/05 09:15:29 adam Exp $
  	    ;;
  	GNU*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -1279,28 +1292,36 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1279,28 +1307,36 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	NetBSD-*|FreeBSD-[[1-2]].*)
@@ -91,7 +113,7 @@ $NetBSD: patch-af,v 1.14 2005/01/05 09:15:29 adam Exp $
  	    ], [
  		SHLIB_CFLAGS=""
  		SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
-@@ -1609,6 +1630,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1609,6 +1645,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
  		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
  	    fi
@@ -101,7 +123,7 @@ $NetBSD: patch-af,v 1.14 2005/01/05 09:15:29 adam Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
-@@ -1788,8 +1812,8 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1788,8 +1827,8 @@ dnl AC_CHECK_TOOL(AR, ar)
  
      if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
          LIB_SUFFIX=${SHARED_LIB_SUFFIX}
@@ -112,7 +134,7 @@ $NetBSD: patch-af,v 1.14 2005/01/05 09:15:29 adam Exp $
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -1819,10 +1843,10 @@ dnl        esac
+@@ -1819,10 +1858,10 @@ dnl        esac
  
      # Stub lib does not depend on shared/static configuration
      if test "$RANLIB" = "" ; then