summaryrefslogtreecommitdiff
path: root/lang/tcl/patches
diff options
context:
space:
mode:
authorhe <he@pkgsrc.org>2012-11-07 14:30:48 +0000
committerhe <he@pkgsrc.org>2012-11-07 14:30:48 +0000
commitac2ca6c14c10ba3ac2b49057308d76663ea84b56 (patch)
tree260411432a44b0837285b148459e0312a56a7d00 /lang/tcl/patches
parent0b5fcbf7ec188358eef6770f424716edaa3bb38a (diff)
downloadpkgsrc-ac2ca6c14c10ba3ac2b49057308d76663ea84b56.tar.gz
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.
Diffstat (limited to 'lang/tcl/patches')
-rw-r--r--lang/tcl/patches/patch-unix_tclUnixInit.c22
1 files changed, 12 insertions, 10 deletions
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) {