[61341] trunk/dports/x11/blt

[macsforever2000 at macports.org]

Revision: 61341
          http://trac.macports.org/changeset/61341
Author:   macsforever2000 at macports.org
Date:     2009-12-08 21:22:27 -0800 (Tue, 08 Dec 2009)
Log Message:
-----------
Fix build with tcl/tk 8.5. (#22536)

Modified Paths:
--------------
    trunk/dports/x11/blt/Portfile

Added Paths:
-----------
    trunk/dports/x11/blt/files/blt-2.4z-tcl8.5-fix.patch
    trunk/dports/x11/blt/files/blt-x86_64.patch
    trunk/dports/x11/blt/files/blt2.4z-noexactversion.patch

Modified: trunk/dports/x11/blt/Portfile
===================================================================
--- trunk/dports/x11/blt/Portfile	2009-12-09 04:54:11 UTC (rev 61340)
+++ trunk/dports/x11/blt/Portfile	2009-12-09 05:22:27 UTC (rev 61341)
@@ -3,7 +3,7 @@
 
 name                    blt
 version                 2.4z
-revision		2
+revision		3
 categories              x11
 maintainers             markd
 description             BLT is an extension to the Tk toolkit, adding new widgets, \
@@ -41,7 +41,10 @@
 			patch-src-Makefile.in \
 			patch-src-shared-Makefile.in \
 			patch-library-pkgIndex.tcl.in \
-			patch-demos-Makefile.in
+			patch-demos-Makefile.in \
+			blt-2.4z-tcl8.5-fix.patch \
+			blt2.4z-noexactversion.patch \
+			blt-x86_64.patch
 
 post-patch {
         reinplace "s|__DESTROOT__|${destroot}|g" \

Added: trunk/dports/x11/blt/files/blt-2.4z-tcl8.5-fix.patch
===================================================================
--- trunk/dports/x11/blt/files/blt-2.4z-tcl8.5-fix.patch	                        (rev 0)
+++ trunk/dports/x11/blt/files/blt-2.4z-tcl8.5-fix.patch	2009-12-09 05:22:27 UTC (rev 61341)
@@ -0,0 +1,37 @@
+--- src/bltNsUtil.h.org	2007-05-10 04:38:52.000000000 +0200
++++ src/bltNsUtil.h	2007-05-10 04:41:50.000000000 +0200
+@@ -46,10 +46,10 @@
+ #define TCL_NAMESPACE_ONLY TCL_GLOBAL_ONLY
+ #endif
+ 
+-
++/*
+ EXTERN Tcl_Command Tcl_FindCommand _ANSI_ARGS_((Tcl_Interp *interp,
+ 	char *name, Tcl_Namespace *nsPtr, int flags));
+-
++*/
+ #define NS_SEARCH_NONE		(0)
+ #define NS_SEARCH_CURRENT	(1<<0)
+ #define NS_SEARCH_GLOBAL	(1<<1)
+@@ -64,17 +64,18 @@
+ EXTERN Tcl_Namespace *Tcl_GetGlobalNamespace _ANSI_ARGS_((Tcl_Interp *interp));
+ 
+ #if (TCL_MAJOR_VERSION >= 8)
++/*
+ EXTERN Tcl_Namespace *Tcl_CreateNamespace _ANSI_ARGS_((Tcl_Interp *interp,
+ 	char *name, ClientData clientData, Tcl_NamespaceDeleteProc *nsDelProc));
+-
++*/
+ EXTERN void Tcl_DeleteNamespace _ANSI_ARGS_((Tcl_Namespace *nsPtr));
+-
++/*
+ EXTERN Tcl_Namespace *Tcl_FindNamespace _ANSI_ARGS_((Tcl_Interp *interp,
+ 	char *name, Tcl_Namespace *context, int flags));
+ 
+ EXTERN int Tcl_Export _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Namespace *nsPtr,
+ 	char *name, int resetFlag));
+-
++*/
+ EXTERN Tcl_Var Tcl_FindNamespaceVar _ANSI_ARGS_((Tcl_Interp *interp, char *name,
+ 	Tcl_Namespace *contextNsPtr, int flags));
+ 

Added: trunk/dports/x11/blt/files/blt-x86_64.patch
===================================================================
--- trunk/dports/x11/blt/files/blt-x86_64.patch	                        (rev 0)
+++ trunk/dports/x11/blt/files/blt-x86_64.patch	2009-12-09 05:22:27 UTC (rev 61341)
@@ -0,0 +1,25 @@
+--- src/bltTree.c.orig	2002-09-29 07:44:12.000000000 +0200
++++ src/bltTree.c	2004-11-05 12:27:45.797366712 +0100
+@@ -95,17 +95,16 @@
+  */
+ 
+ #define REBUILD_MULTIPLIER	3
++#define START_LOGSIZE		5 /* Initial hash table size is 32. */
++#define MAX_LIST_VALUES		20 /* Convert to hash table when node
++				    * value list gets bigger than this
++				    * many values. */
+ 
+ #if (SIZEOF_VOID_P == 8)
+ #define RANDOM_INDEX(i)		HashOneWord(mask, downshift, i)
+ #define BITSPERWORD		64
+ #else 
+ 
+-#define START_LOGSIZE		5 /* Initial hash table size is 32. */
+-#define MAX_LIST_VALUES		20 /* Convert to hash table when node
+-				    * value list gets bigger than this
+-				    * many values. */
+-
+ /*
+  * The following macro takes a preliminary integer hash value and
+  * produces an index into a hash tables bucket list.  The idea is
+ 

Added: trunk/dports/x11/blt/files/blt2.4z-noexactversion.patch
===================================================================
--- trunk/dports/x11/blt/files/blt2.4z-noexactversion.patch	                        (rev 0)
+++ trunk/dports/x11/blt/files/blt2.4z-noexactversion.patch	2009-12-09 05:22:27 UTC (rev 61341)
@@ -0,0 +1,11 @@
+--- src/bltInit.c.orig	2008-03-17 18:42:09.000000000 -0700
++++ src/bltInit.c	2008-03-17 18:43:05.000000000 -0700
+@@ -415,7 +415,7 @@
+ 	 * Check that the versions of Tcl that have been loaded are
+ 	 * the same ones that BLT was compiled against.
+ 	 */
+-	if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, EXACT) == NULL) {
++	if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 0) == NULL) {
+ 	    return TCL_ERROR;
+ 	}
+ 	/* Set the "blt_version", "blt_patchLevel", and "blt_libPath" Tcl
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091208/27fff3f9/attachment.html>