PKG_DESTDIR_SUPPORT

8 files changed, 89 insertions, 89 deletions

diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile
index 230f6da0e5c..74aac80ec1b 100644
--- a/lang/tcl83/Makefile
+++ b/lang/tcl83/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.18 2009/08/20 15:24:59 jwise Exp $
+# $NetBSD: Makefile,v 1.19 2009/12/17 18:35:26 abs Exp $
 #
 
 DISTNAME=		tcl8.3.4
 PKGNAME=		tcl-8.3.4
 PKGREVISION=		2
 CATEGORIES=		lang
-MASTER_SITES=	ftp://ftp.funet.fi/pub/languages/tcl/tcl/tcl8_3/ 
+MASTER_SITES=		ftp://ftp.funet.fi/pub/languages/tcl/tcl/tcl8_3/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.tcltk.com/
@@ -28,6 +28,9 @@ INSTALL_TARGET=		install
 # Add ${VIEWBASE}/lib/tcl to the list of locations for Tcl packages.
 CONFIGURE_ENV+=		TCL_PACKAGE_PATH="${VIEWBASE}/lib/tcl"
 
+PKG_DESTDIR_SUPPORT=  user-destdir
+INSTALLATION_DIRS+= include/tcl/unix include/tcl/generic
+
 .include "../../mk/bsd.prefs.mk"
 
 # NetBSD-1.5.x-m68k platforms apparently have a compiler optimization bug
@@ -45,7 +48,7 @@ CONFIGURE_ARGS+=	--enable-64bit
 # linked to a longer filename.
 #
 post-patch:
-	@cd ${WRKSRC}/unix;						\
+	cd ${WRKSRC}/unix;						\
 	${MV} -f mkLinks mkLinks.tmp;					\
 	${GREP} -v "^exit 0" mkLinks.tmp > mkLinks;			\
 	${CAT} mkLinks.tmp						\
@@ -70,22 +73,19 @@ post-build:
 		${MV} ${WRKSRC}/tclConfig.sh.tmp ${WRKSRC}/unix/tclConfig.sh
 
 post-install:
-	cd ${PREFIX}/bin && ${LN} -s tclsh8.3 tclsh
-	${INSTALL_DATA_DIR} ${PREFIX}/include/tcl
-	${INSTALL_DATA_DIR} ${PREFIX}/include/tcl/unix
-	${INSTALL_DATA_DIR} ${PREFIX}/include/tcl/generic
-	${INSTALL_DATA} ${WRKSRC}/unix/tclUnixPort.h ${PREFIX}/include/tcl/unix
-	${INSTALL_DATA} ${WRKSRC}/generic/tcl.h ${PREFIX}/include/tcl/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tclCompile.h ${PREFIX}/include/tcl/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tclDecls.h ${PREFIX}/include/tcl/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tclIO.h ${PREFIX}/include/tcl/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tclInitScript.h ${PREFIX}/include/tcl/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tclInt.h ${PREFIX}/include/tcl/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tclIntDecls.h ${PREFIX}/include/tcl/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tclIntPlatDecls.h ${PREFIX}/include/tcl/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tclMath.h ${PREFIX}/include/tcl/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tclPlatDecls.h ${PREFIX}/include/tcl/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tclPort.h ${PREFIX}/include/tcl/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tclRegexp.h ${PREFIX}/include/tcl/generic
+	cd ${DESTDIR}${PREFIX}/bin && ${LN} -s tclsh8.3 tclsh
+	${INSTALL_DATA} ${WRKSRC}/unix/tclUnixPort.h ${DESTDIR}${PREFIX}/include/tcl/unix
+	${INSTALL_DATA} ${WRKSRC}/generic/tcl.h ${DESTDIR}${PREFIX}/include/tcl/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tclCompile.h ${DESTDIR}${PREFIX}/include/tcl/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tclDecls.h ${DESTDIR}${PREFIX}/include/tcl/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tclIO.h ${DESTDIR}${PREFIX}/include/tcl/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tclInitScript.h ${DESTDIR}${PREFIX}/include/tcl/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tclInt.h ${DESTDIR}${PREFIX}/include/tcl/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tclIntDecls.h ${DESTDIR}${PREFIX}/include/tcl/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tclIntPlatDecls.h ${DESTDIR}${PREFIX}/include/tcl/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tclMath.h ${DESTDIR}${PREFIX}/include/tcl/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tclPlatDecls.h ${DESTDIR}${PREFIX}/include/tcl/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tclPort.h ${DESTDIR}${PREFIX}/include/tcl/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tclRegexp.h ${DESTDIR}${PREFIX}/include/tcl/generic
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/tcl83/distinfo b/lang/tcl83/distinfo
index e2cb8354e6c..d9690aeb8a6 100644
--- a/lang/tcl83/distinfo
+++ b/lang/tcl83/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.6 2007/10/27 15:16:52 hubertf Exp $
+$NetBSD: distinfo,v 1.7 2009/12/17 18:35:26 abs Exp $
 
 SHA1 (tcl8.3.4.tar.gz) = b179f1f51b322b7045cf152b73df4f3d01da82ec
 RMD160 (tcl8.3.4.tar.gz) = 1840927939f9bbc4c48a53f256212f26c164e517
 Size (tcl8.3.4.tar.gz) = 2654756 bytes
-SHA1 (patch-aa) = 36e3e635b5f70b658c7151254cf02529611a3120
-SHA1 (patch-ab) = 1f717fcab6ddce1023ad889fabc049b4a950912e
-SHA1 (patch-ac) = b01dc7dbe9b9bd92de4792b74a25b01e33ad4bb9
-SHA1 (patch-ae) = a2d8477c6b2f80700876128e14e39afdb4e5504b
-SHA1 (patch-af) = 96f10a1cf1340362ede4eee6327fe44f6b9f9bb3
-SHA1 (patch-ag) = a4bc4fe104890a874463df5b2795499f871dd1ba
+SHA1 (patch-aa) = 7d6a122753bb277dfb9614ea57436c317cd3d412
+SHA1 (patch-ab) = b98391bfc0642eb2562383482d028826824444c6
+SHA1 (patch-ac) = 35ec24f9cc18bdea9c596bb58bccaddd807d47c2
+SHA1 (patch-ae) = b1f2fea3397c8377290a1e74de5b86ca5ce526b0
+SHA1 (patch-af) = 8e701b8f30974037d1147cd25fd6478d35f9d78b
+SHA1 (patch-ag) = ecab865e47fd46a778b37346d009a01bdcc54dc5
diff --git a/lang/tcl83/patches/patch-aa b/lang/tcl83/patches/patch-aa
index b01698b5718..96fe1cbc910 100644
--- a/lang/tcl83/patches/patch-aa
+++ b/lang/tcl83/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.3 2005/11/04 09:56:09 rillig Exp $
+$NetBSD: patch-aa,v 1.4 2009/12/17 18:35:26 abs Exp $
 
---- unix/Makefile.in.orig	2001-10-20 10:24:15.000000000 +1000
+--- unix/Makefile.in.orig	2001-10-20 00:24:15.000000000 +0000
 +++ unix/Makefile.in
+@@ -35,7 +35,7 @@ mandir			= @mandir@
+ # to be different than those used for actually reference files at
+ # run-time.  INSTALL_ROOT is prepended to $prefix and $exec_prefix
+ # when installing files.
+-INSTALL_ROOT		=
++INSTALL_ROOT		= $(DESTDIR)
+ 
+ # Path for the platform independent Tcl scripting libraries:
+ TCL_LIBRARY		= $(prefix)/lib/tcl$(VERSION)
 @@ -87,7 +87,7 @@ CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
diff --git a/lang/tcl83/patches/patch-ab b/lang/tcl83/patches/patch-ab
index c4e9be830ea..0c40e163357 100644
--- a/lang/tcl83/patches/patch-ab
+++ b/lang/tcl83/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2007/10/27 15:16:52 hubertf Exp $
+$NetBSD: patch-ab,v 1.6 2009/12/17 18:35:27 abs Exp $
 
---- unix/configure.orig	2001-10-20 02:24:15.000000000 +0200
-+++ unix/configure	2007-10-27 16:52:15.000000000 +0200
-@@ -4719,7 +4719,7 @@
+--- unix/configure.orig	2001-10-20 00:24:15.000000000 +0000
++++ unix/configure
+@@ -4719,7 +4719,7 @@ echo "configure:4710: checking system ve
  	    # results, and the version is kept in special file).
  	
  	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.5 2007/10/27 15:16:52 hubertf Exp $
  	    fi
  	    if test "`uname -s`" = "AIX" ; then
  		system=AIX-`uname -v`.`uname -r`
-@@ -4776,6 +4776,7 @@
+@@ -4776,6 +4776,7 @@ fi
      # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
@@ -19,7 +19,7 @@ $NetBSD: patch-ab,v 1.5 2007/10/27 15:16:52 hubertf Exp $
      EXTRA_CFLAGS=""
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
-@@ -5114,6 +5115,9 @@
+@@ -5114,6 +5115,9 @@ fi
  	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  	    EXTRA_CFLAGS=""
  	    LDFLAGS=""
@@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.5 2007/10/27 15:16:52 hubertf Exp $
  	    ;;
  	IRIX-6.*|IRIX64-6.5*)
  	    SHLIB_CFLAGS=""
-@@ -5138,6 +5142,9 @@
+@@ -5138,6 +5142,9 @@ fi
  		esac
  		LDFLAGS="-n32"
  	    fi
@@ -39,7 +39,7 @@ $NetBSD: patch-ab,v 1.5 2007/10/27 15:16:52 hubertf Exp $
  	    ;;
  	IRIX64-6.*)
  	    SHLIB_CFLAGS=""
-@@ -5148,6 +5155,9 @@
+@@ -5148,6 +5155,9 @@ fi
  	    DL_LIBS=""
  	    LDFLAGS=""
  	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
@@ -49,7 +49,7 @@ $NetBSD: patch-ab,v 1.5 2007/10/27 15:16:52 hubertf Exp $
  	    ;;
  	Linux*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -5221,6 +5231,9 @@
+@@ -5221,6 +5231,9 @@ fi
                  EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline"
              fi
  
@@ -59,7 +59,7 @@ $NetBSD: patch-ab,v 1.5 2007/10/27 15:16:52 hubertf Exp $
  	    ;;
  	GNU*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -5298,6 +5311,9 @@
+@@ -5298,6 +5311,9 @@ fi
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*)
@@ -69,7 +69,7 @@ $NetBSD: patch-ab,v 1.5 2007/10/27 15:16:52 hubertf 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
-@@ -5330,17 +5346,15 @@
+@@ -5330,17 +5346,15 @@ if eval "test \"`echo '$ac_cv_header_'$a
    
  		# NetBSD/SPARC needs -fPIC, -fpic will not do.
  		SHLIB_CFLAGS="-fPIC"
@@ -89,7 +89,7 @@ $NetBSD: patch-ab,v 1.5 2007/10/27 15:16:52 hubertf Exp $
  #include "confdefs.h"
  
  #ifdef __ELF__
-@@ -5351,11 +5365,20 @@
+@@ -5351,11 +5365,20 @@ EOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    egrep "yes" >/dev/null 2>&1; then
    rm -rf conftest*
@@ -112,7 +112,7 @@ $NetBSD: patch-ab,v 1.5 2007/10/27 15:16:52 hubertf Exp $
  		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
  		
  fi
-@@ -5383,7 +5406,7 @@
+@@ -5383,7 +5406,7 @@ fi
  	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
  	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
@@ -121,7 +121,7 @@ $NetBSD: patch-ab,v 1.5 2007/10/27 15:16:52 hubertf Exp $
  	    # FreeBSD 3.* and greater have ELF.
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD="ld -Bshareable -x"
-@@ -5401,7 +5424,7 @@
+@@ -5401,7 +5424,7 @@ fi
  	Rhapsody-*|Darwin-*)
  	    SHLIB_CFLAGS="-fno-common"
  	    SHLIB_LD="cc -dynamiclib \${LDFLAGS}"
@@ -130,7 +130,7 @@ $NetBSD: patch-ab,v 1.5 2007/10/27 15:16:52 hubertf Exp $
  	    SHLIB_LD_LIBS="${LIBS}"
  	    SHLIB_SUFFIX=".dylib"
  	    DL_OBJS="tclLoadDyld.o"
-@@ -5410,6 +5433,9 @@
+@@ -5410,6 +5433,9 @@ fi
  	    LD_SEARCH_FLAGS=""
  	    CFLAGS_OPTIMIZE="-O3"
  	    EXTRA_CFLAGS="-arch ppc -pipe"
@@ -140,7 +140,7 @@ $NetBSD: patch-ab,v 1.5 2007/10/27 15:16:52 hubertf Exp $
  	    ;;
  	NEXTSTEP-*)
  	    SHLIB_CFLAGS=""
-@@ -5569,6 +5595,9 @@
+@@ -5569,6 +5595,9 @@ EOF
  	    DL_LIBS="-ldl"
  	    LDFLAGS=""
  	    LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
@@ -150,7 +150,7 @@ $NetBSD: patch-ab,v 1.5 2007/10/27 15:16:52 hubertf Exp $
  	    ;;
  	SunOS-5*)
  
-@@ -5616,6 +5645,9 @@
+@@ -5616,6 +5645,9 @@ EOF
  	    else
  		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
  	    fi
@@ -160,7 +160,7 @@ $NetBSD: patch-ab,v 1.5 2007/10/27 15:16:52 hubertf Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
-@@ -5858,7 +5890,7 @@
+@@ -5858,7 +5890,7 @@ fi
  		    ;;
  		IRIX*)
  		    ;;
@@ -169,7 +169,7 @@ $NetBSD: patch-ab,v 1.5 2007/10/27 15:16:52 hubertf Exp $
  		    ;;
  		Rhapsody-*|Darwin-*)
  		    ;;
-@@ -6016,7 +6048,7 @@
+@@ -6016,7 +6048,7 @@ echo "configure:6008: checking FIONBIO v
  	    # results, and the version is kept in special file).
  	
  	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
@@ -178,7 +178,7 @@ $NetBSD: patch-ab,v 1.5 2007/10/27 15:16:52 hubertf Exp $
  	    fi
  	    if test "`uname -s`" = "AIX" ; then
  		system=AIX-`uname -v`.`uname -r`
-@@ -6103,7 +6135,7 @@
+@@ -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
@@ -187,7 +187,7 @@ $NetBSD: patch-ab,v 1.5 2007/10/27 15:16:52 hubertf Exp $
      fi
  else
      case $system in
-@@ -6141,7 +6173,7 @@
+@@ -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}"
@@ -196,7 +196,7 @@ $NetBSD: patch-ab,v 1.5 2007/10/27 15:16:52 hubertf Exp $
  else
      TCL_BUILD_EXP_FILE="lib.exp"
      eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -6171,10 +6203,17 @@
+@@ -6171,10 +6203,17 @@ VERSION=${TCL_VERSION}
  #--------------------------------------------------------------------
  
  if test "$prefix" != "$exec_prefix"; then
@@ -216,7 +216,7 @@ $NetBSD: patch-ab,v 1.5 2007/10/27 15:16:52 hubertf Exp $
  
  #--------------------------------------------------------------------
  #       The statements below define various symbols relating to Tcl
-@@ -6262,6 +6301,8 @@
+@@ -6262,6 +6301,8 @@ TCL_SHARED_BUILD=${SHARED_BUILD}
  
  
  
@@ -225,16 +225,7 @@ $NetBSD: patch-ab,v 1.5 2007/10/27 15:16:52 hubertf Exp $
  trap '' 1 2 15
  cat > confcache <<\EOF
  # This file is a shell script that caches the results of configure
-@@ -6361,6 +6402,8 @@
- do
-   case "\$ac_option" in
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+	: Avoid regenerating within pkgsrc
-+	exit 0
-     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-@@ -6437,12 +6480,12 @@
+@@ -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
diff --git a/lang/tcl83/patches/patch-ac b/lang/tcl83/patches/patch-ac
index dbc82c60840..05e6664620c 100644
--- a/lang/tcl83/patches/patch-ac
+++ b/lang/tcl83/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.3 2005/11/04 09:56:09 rillig Exp $
+$NetBSD: patch-ac,v 1.4 2009/12/17 18:35:27 abs Exp $
 
---- unix/tclUnixInit.c.orig	Fri Aug 24 19:13:22 2001
+--- unix/tclUnixInit.c.orig	2001-08-24 17:13:22.000000000 +0000
 +++ unix/tclUnixInit.c
 @@ -13,7 +13,7 @@
  #include "tclInt.h"
diff --git a/lang/tcl83/patches/patch-ae b/lang/tcl83/patches/patch-ae
index f9b81a8ff2d..eabdbd59460 100644
--- a/lang/tcl83/patches/patch-ae
+++ b/lang/tcl83/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2005/11/04 09:56:09 rillig Exp $
+$NetBSD: patch-ae,v 1.3 2009/12/17 18:35:27 abs Exp $
 
---- unix/configure.in.orig	Fri Oct 19 17:24:15 2001
-+++ unix/configure.in	Tue Nov 25 05:16:06 2003
-@@ -386,7 +386,7 @@
+--- unix/configure.in.orig	2001-10-20 00:24:15.000000000 +0000
++++ unix/configure.in
+@@ -386,7 +386,7 @@ if test "${SHARED_BUILD}" = "1" -a "${SH
      if test "x$DL_OBJS" = "xtclLoadAout.o"; then
  	MAKE_LIB="\${STLIB_LD} \[$]@ \${OBJS}"
      else
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.2 2005/11/04 09:56:09 rillig Exp $
      fi
  else
      case $system in
-@@ -424,7 +424,7 @@
+@@ -424,7 +424,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}"
@@ -20,7 +20,7 @@ $NetBSD: patch-ae,v 1.2 2005/11/04 09:56:09 rillig Exp $
  else
      TCL_BUILD_EXP_FILE="lib.exp"
      eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -454,10 +454,17 @@
+@@ -454,10 +454,17 @@ VERSION=${TCL_VERSION}
  #--------------------------------------------------------------------
  
  if test "$prefix" != "$exec_prefix"; then
@@ -40,7 +40,7 @@ $NetBSD: patch-ae,v 1.2 2005/11/04 09:56:09 rillig Exp $
  
  #--------------------------------------------------------------------
  #       The statements below define various symbols relating to Tcl
-@@ -469,7 +476,7 @@
+@@ -469,7 +476,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
  # Replace DBGX with TCL_DBGX
  eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
  
@@ -49,7 +49,7 @@ $NetBSD: patch-ae,v 1.2 2005/11/04 09:56:09 rillig Exp $
  
  if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
      TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}"
-@@ -511,6 +518,8 @@
+@@ -511,6 +518,8 @@ AC_SUBST(CFG_TCL_UNSHARED_LIB_SUFFIX)
  AC_SUBST(CFG_TCL_EXPORT_FILE_SUFFIX)
  
  AC_SUBST(CFLAGS)
diff --git a/lang/tcl83/patches/patch-af b/lang/tcl83/patches/patch-af
index 80af0eff32b..360e9d9f709 100644
--- a/lang/tcl83/patches/patch-af
+++ b/lang/tcl83/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.4 2007/10/27 15:16:52 hubertf Exp $
+$NetBSD: patch-af,v 1.5 2009/12/17 18:35:27 abs Exp $
 
---- unix/tcl.m4.orig	2001-10-20 02:24:15.000000000 +0200
-+++ unix/tcl.m4	2007-10-27 16:53:32.000000000 +0200
-@@ -584,7 +584,7 @@
+--- unix/tcl.m4.orig	2001-10-20 00:24:15.000000000 +0000
++++ unix/tcl.m4
+@@ -584,7 +584,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
  	    # results, and the version is kept in special file).
  	
  	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.4 2007/10/27 15:16:52 hubertf Exp $
  	    fi
  	    if test "`uname -s`" = "AIX" ; then
  		system=AIX-`uname -v`.`uname -r`
-@@ -601,6 +601,7 @@
+@@ -601,6 +601,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
      # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
@@ -19,7 +19,7 @@ $NetBSD: patch-af,v 1.4 2007/10/27 15:16:52 hubertf Exp $
      EXTRA_CFLAGS=""
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
-@@ -790,6 +791,9 @@
+@@ -790,6 +791,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
  	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  	    EXTRA_CFLAGS=""
  	    LDFLAGS=""
@@ -29,7 +29,7 @@ $NetBSD: patch-af,v 1.4 2007/10/27 15:16:52 hubertf Exp $
  	    ;;
  	IRIX-6.*|IRIX64-6.5*)
  	    SHLIB_CFLAGS=""
-@@ -814,6 +818,9 @@
+@@ -814,6 +818,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
  		esac
  		LDFLAGS="-n32"
  	    fi
@@ -39,7 +39,7 @@ $NetBSD: patch-af,v 1.4 2007/10/27 15:16:52 hubertf Exp $
  	    ;;
  	IRIX64-6.*)
  	    SHLIB_CFLAGS=""
-@@ -824,6 +831,9 @@
+@@ -824,6 +831,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
  	    DL_LIBS=""
  	    LDFLAGS=""
  	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
@@ -49,7 +49,7 @@ $NetBSD: patch-af,v 1.4 2007/10/27 15:16:52 hubertf Exp $
  	    ;;
  	Linux*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -865,6 +875,9 @@
+@@ -865,6 +875,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
                  EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline"
              fi
  
@@ -59,7 +59,7 @@ $NetBSD: patch-af,v 1.4 2007/10/27 15:16:52 hubertf Exp $
  	    ;;
  	GNU*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -910,28 +923,36 @@
+@@ -910,28 +923,36 @@ dnl AC_CHECK_TOOL(AR, ar, :)
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	NetBSD-*|FreeBSD-[[1-2]].*|OpenBSD-*)
@@ -101,7 +101,7 @@ $NetBSD: patch-af,v 1.4 2007/10/27 15:16:52 hubertf Exp $
  	    ], [
  		SHLIB_CFLAGS=""
  		SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
-@@ -949,7 +970,7 @@
+@@ -949,7 +970,7 @@ dnl AC_CHECK_TOOL(AR, ar, :)
  	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
  	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
@@ -110,7 +110,7 @@ $NetBSD: patch-af,v 1.4 2007/10/27 15:16:52 hubertf Exp $
  	    # FreeBSD 3.* and greater have ELF.
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD="ld -Bshareable -x"
-@@ -1129,6 +1150,9 @@
+@@ -1129,6 +1150,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
  	    DL_LIBS="-ldl"
  	    LDFLAGS=""
  	    LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
@@ -120,7 +120,7 @@ $NetBSD: patch-af,v 1.4 2007/10/27 15:16:52 hubertf Exp $
  	    ;;
  	SunOS-5*)
  
-@@ -1173,6 +1197,9 @@
+@@ -1173,6 +1197,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
  	    else
  		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
  	    fi
@@ -130,7 +130,7 @@ $NetBSD: patch-af,v 1.4 2007/10/27 15:16:52 hubertf Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
-@@ -1328,7 +1355,7 @@
+@@ -1328,7 +1355,7 @@ dnl AC_CHECK_TOOL(AR, ar, :)
  		    ;;
  		IRIX*)
  		    ;;
@@ -139,7 +139,7 @@ $NetBSD: patch-af,v 1.4 2007/10/27 15:16:52 hubertf Exp $
  		    ;;
  		Rhapsody-*|Darwin-*)
  		    ;;
-@@ -1707,7 +1734,7 @@
+@@ -1707,7 +1734,7 @@ AC_DEFUN(SC_BLOCKING_STYLE, [
  	    # results, and the version is kept in special file).
  	
  	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
diff --git a/lang/tcl83/patches/patch-ag b/lang/tcl83/patches/patch-ag
index 2b0991f8d02..60ace9bd8d5 100644
--- a/lang/tcl83/patches/patch-ag
+++ b/lang/tcl83/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.2 2005/11/04 09:56:09 rillig Exp $
+$NetBSD: patch-ag,v 1.3 2009/12/17 18:35:27 abs Exp $
 
---- unix/tclUnixPort.h.orig	2005-07-30 20:55:41.000000000 +0000
+--- unix/tclUnixPort.h.orig	2001-09-04 22:26:49.000000000 +0000
 +++ unix/tclUnixPort.h
 @@ -417,7 +417,9 @@ EXTERN int		gettimeofday _ANSI_ARGS_((st
   * isn't generally declared in a header file anywhere.