Reinstate the NetBSD tweak to install $MACHINE_ARCH in

tcl_platform(machine), instead of using $MACHINE there.

This is in preparation for reverting the recent change
to the net/tcl-scotty PLIST.

Bump PKGREVISION.

3 files changed, 20 insertions, 16 deletions

diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index 86eec49b59f..5a9cd0aecea 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.69 2012/10/02 20:11:55 asau Exp $
+# $NetBSD: Makefile,v 1.70 2012/11/07 14:30:48 he Exp $
 
 DISTNAME=	tcl${TCL_VERSION}-src
 PKGNAME=	tcl-${TCL_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index e20268b3dde..d1388623eaa 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.49 2012/08/23 16:14:43 adam Exp $
+$NetBSD: distinfo,v 1.50 2012/11/07 14:30:48 he Exp $
 
 SHA1 (tcl8.5.12-src.tar.gz) = 0ea293d27b1368cb5865e552ece348d02ff55adc
 RMD160 (tcl8.5.12-src.tar.gz) = ada42e22f7b12413c88d9ec7dbd3789926f362d2
@@ -8,9 +8,11 @@ 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) = 5ccd853f45b66a0638a8625f4b8066955787c20a
-SHA1 (patch-unix_configure) = 2e1e6d2020e68b91b94c0b05cb1d349126989adc
+SHA1 (patch-unix_Makefile.in) = 2b949d4290b3539916654381e5fdea6f26d0765e
+SHA1 (patch-unix_configure) = 4a2823d212cf9027080a6e05e81dd69a9e6c1c52
+SHA1 (patch-unix_configure.in) = 15813d14f8cd1ea351f484d2290905ac68b00551
+SHA1 (patch-unix_tcl.m4) = 5570abf0b24887aacf16dc1291f5bf98e92012f3
 SHA1 (patch-unix_tclConfig.sh.in) = 5a32d8e97240d14f3a03e205637fe3bf8307d868
 SHA1 (patch-unix_tclUnixFCmd.c) = a56a12b8a0068e914d10336076347ca2b0ba9ac7
-SHA1 (patch-unix_tclUnixInit.c) = cceb75bc67a3b67620889cd92e5978ec8290af09
+SHA1 (patch-unix_tclUnixInit.c) = 4cbddb3e1a9ed4bbbf2d8de0df1a9032fc5b2629
 SHA1 (patch-unix_tclUnixPort.h) = 2965dd6ef6560e0a6385c6cb286754f63c98c827
diff --git a/lang/tcl/patches/patch-unix_tclUnixInit.c b/lang/tcl/patches/patch-unix_tclUnixInit.c
index a3082231122..ef90e0be0e8 100644
--- a/lang/tcl/patches/patch-unix_tclUnixInit.c
+++ b/lang/tcl/patches/patch-unix_tclUnixInit.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-unix_tclUnixInit.c,v 1.1 2012/08/21 21:31:47 marino Exp $
+$NetBSD: patch-unix_tclUnixInit.c,v 1.2 2012/11/07 14:30:48 he Exp $
 
 Carried over from TCL 8.4
 
@@ -47,17 +47,19 @@ Carried over from TCL 8.4
  
  #ifdef HAVE_COREFOUNDATION
      char tclLibPath[MAXPATHLEN + 1];
-@@ -915,7 +926,12 @@ TclpSetVariables(
- 	Tcl_SetVar(interp, "tcl_pkgPath", pkgPath, TCL_GLOBAL_ONLY);
-     }
+@@ -986,8 +997,15 @@ TclpSetVariables(
  
--#ifdef DJGPP
+ #endif /* DJGPP */
+ 	}
 +#if defined(__NetBSD__)
 +	if (sysctl(mib, sizeof(mib) / sizeof(int), machine_arch, &len, NULL, 0) < 0)
 +	    unameOK = 0;
 +	else
-+            Tcl_SetVar2(interp, "tcl_platform", "platform", "unix", TCL_GLOBAL_ONLY);
-+#elif defined(DJGPP)
-     Tcl_SetVar2(interp, "tcl_platform", "platform", "dos", TCL_GLOBAL_ONLY);
- #else
-     Tcl_SetVar2(interp, "tcl_platform", "platform", "unix", TCL_GLOBAL_ONLY);
++            Tcl_SetVar2(interp, "tcl_platform", "machine", machine_arch, TCL_GLOBAL_ONLY);
++#else
+ 	Tcl_SetVar2(interp, "tcl_platform", "machine", name.machine,
+ 		TCL_GLOBAL_ONLY);
++#endif /* __NetBSD__ */
+     }
+ #endif /* !NO_UNAME */
+     if (!unameOK) {