Tue Aug 21 22:00:24 2012 UTC ()
x11/blt: Add tcl/tk 8.5 support

Mask some EXTERN functions that are already present in tcl 8.5 headers.


(marino)
diff -r1.22 -r1.23 pkgsrc/x11/blt/Makefile
diff -r1.11 -r1.12 pkgsrc/x11/blt/distinfo
diff -r0 -r1.1 pkgsrc/x11/blt/patches/patch-src_bltNsUtil.h
cvs diff -r1.22 -r1.23 pkgsrc/x11/blt/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/blt/Makefile 2012/06/15 23:06:02 1.22
+++ pkgsrc/x11/blt/Makefile 2012/08/21 22:00:24 1.23
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.22 2012/06/15 23:06:02 dholland Exp $ 1# $NetBSD: Makefile,v 1.23 2012/08/21 22:00:24 marino Exp $
2# 2#
3 3
4DISTNAME= BLT2.4z 4DISTNAME= BLT2.4z
5PKGNAME= blt-2.4z 5PKGNAME= blt-2.4z
6PKGREVISION= 2 6PKGREVISION= 3
7CATEGORIES= x11 7CATEGORIES= x11
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=blt/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=blt/}
9 9
10MAINTAINER= brook@nmsu.edu 10MAINTAINER= brook@nmsu.edu
11HOMEPAGE= http://blt.sourceforge.net/ 11HOMEPAGE= http://blt.sourceforge.net/
12COMMENT= Extension to Tcl/Tk 12COMMENT= Extension to Tcl/Tk
13 13
14PKG_INSTALLATION_TYPES= overwrite pkgviews 14PKG_INSTALLATION_TYPES= overwrite pkgviews
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17MAKE_JOBS_SAFE= no 17MAKE_JOBS_SAFE= no
18 18
19WRKSRC= ${WRKDIR}/blt2.4z 19WRKSRC= ${WRKDIR}/blt2.4z
cvs diff -r1.11 -r1.12 pkgsrc/x11/blt/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/blt/distinfo 2009/02/16 20:22:18 1.11
+++ pkgsrc/x11/blt/distinfo 2012/08/21 22:00:24 1.12
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.11 2009/02/16 20:22:18 joerg Exp $ 1$NetBSD: distinfo,v 1.12 2012/08/21 22:00:24 marino Exp $
2 2
3SHA1 (BLT2.4z.tar.gz) = 29f719aa762f1762dbf4a3b0e60dc5356118ba2f 3SHA1 (BLT2.4z.tar.gz) = 29f719aa762f1762dbf4a3b0e60dc5356118ba2f
4RMD160 (BLT2.4z.tar.gz) = d54d9fdb6c61391c191afab4701716d18a3d928b 4RMD160 (BLT2.4z.tar.gz) = d54d9fdb6c61391c191afab4701716d18a3d928b
5Size (BLT2.4z.tar.gz) = 2200973 bytes 5Size (BLT2.4z.tar.gz) = 2200973 bytes
6SHA1 (patch-aa) = 6a28cc2405adcc6037865f174bb48d81909c83d6 6SHA1 (patch-aa) = 6a28cc2405adcc6037865f174bb48d81909c83d6
7SHA1 (patch-ab) = da9479d5de1053c45753eef611eae2764909f0ec 7SHA1 (patch-ab) = da9479d5de1053c45753eef611eae2764909f0ec
8SHA1 (patch-ac) = 696f90010831522f46d67052abc0c6068197cfd9 8SHA1 (patch-ac) = 696f90010831522f46d67052abc0c6068197cfd9
9SHA1 (patch-ad) = be6bd157a084f5ad38ff3787f53e7aa4fcf80234 9SHA1 (patch-ad) = be6bd157a084f5ad38ff3787f53e7aa4fcf80234
10SHA1 (patch-ae) = f2689eb585f19d05e9dfe6164f96d6fc9dbc77ad 10SHA1 (patch-ae) = f2689eb585f19d05e9dfe6164f96d6fc9dbc77ad
11SHA1 (patch-af) = b82641d4aad426fbe9a6781fa828d8aa81f71253 11SHA1 (patch-af) = b82641d4aad426fbe9a6781fa828d8aa81f71253
 12SHA1 (patch-src_bltNsUtil.h) = 949647e6ca4a4890a51917c268289384da98b7ca
File Added: pkgsrc/x11/blt/patches/patch-src_bltNsUtil.h
$NetBSD: patch-src_bltNsUtil.h,v 1.1 2012/08/21 22:00:24 marino Exp $

--- src/bltNsUtil.h.orig	2002-07-18 06:35:32.000000000 +0000
+++ src/bltNsUtil.h
@@ -47,8 +47,10 @@ typedef struct Tcl_CallFrameStruct *Tcl_
 #endif
 
 
+#if (TCL_MAJOR_VERSION <= 8) && (TCL_MINOR_VERSION < 5)
 EXTERN Tcl_Command Tcl_FindCommand _ANSI_ARGS_((Tcl_Interp *interp,
 	char *name, Tcl_Namespace *nsPtr, int flags));
+#endif
 
 #define NS_SEARCH_NONE		(0)
 #define NS_SEARCH_CURRENT	(1<<0)
@@ -63,7 +65,7 @@ EXTERN Tcl_Namespace *Tcl_GetCurrentName
 
 EXTERN Tcl_Namespace *Tcl_GetGlobalNamespace _ANSI_ARGS_((Tcl_Interp *interp));
 
-#if (TCL_MAJOR_VERSION >= 8)
+#if (TCL_MAJOR_VERSION >= 8) && (TCL_MINOR_VERSION <= 4)
 EXTERN Tcl_Namespace *Tcl_CreateNamespace _ANSI_ARGS_((Tcl_Interp *interp,
 	char *name, ClientData clientData, Tcl_NamespaceDeleteProc *nsDelProc));