diff options
| author | marino <marino@pkgsrc.org> | 2012-08-21 22:00:24 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2012-08-21 22:00:24 +0000 |
| commit | a00605d5e9b9787f9bb3ee4ec8c5158575fe3158 (patch) | |
| tree | 869e45dcb612ec8b072d2a38a8b4591d0d98419a /x11/blt | |
| parent | a795df978e8a160e7bdcd7d7de3202a6c8484621 (diff) | |
| download | pkgsrc-a00605d5e9b9787f9bb3ee4ec8c5158575fe3158.tar.gz | |
x11/blt: Add tcl/tk 8.5 support
Mask some EXTERN functions that are already present in tcl 8.5 headers.
Diffstat (limited to 'x11/blt')
| -rw-r--r-- | x11/blt/Makefile | 4 | ||||
| -rw-r--r-- | x11/blt/distinfo | 3 | ||||
| -rw-r--r-- | x11/blt/patches/patch-src_bltNsUtil.h | 24 |
3 files changed, 28 insertions, 3 deletions
diff --git a/x11/blt/Makefile b/x11/blt/Makefile index 6d7607e8e75..45e468757b9 100644 --- a/x11/blt/Makefile +++ b/x11/blt/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.22 2012/06/15 23:06:02 dholland Exp $ +# $NetBSD: Makefile,v 1.23 2012/08/21 22:00:24 marino Exp $ # DISTNAME= BLT2.4z PKGNAME= blt-2.4z -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=blt/} diff --git a/x11/blt/distinfo b/x11/blt/distinfo index 1cfe5e5546b..a957b5c4ac4 100644 --- a/x11/blt/distinfo +++ b/x11/blt/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2009/02/16 20:22:18 joerg Exp $ +$NetBSD: distinfo,v 1.12 2012/08/21 22:00:24 marino Exp $ SHA1 (BLT2.4z.tar.gz) = 29f719aa762f1762dbf4a3b0e60dc5356118ba2f RMD160 (BLT2.4z.tar.gz) = d54d9fdb6c61391c191afab4701716d18a3d928b @@ -9,3 +9,4 @@ SHA1 (patch-ac) = 696f90010831522f46d67052abc0c6068197cfd9 SHA1 (patch-ad) = be6bd157a084f5ad38ff3787f53e7aa4fcf80234 SHA1 (patch-ae) = f2689eb585f19d05e9dfe6164f96d6fc9dbc77ad SHA1 (patch-af) = b82641d4aad426fbe9a6781fa828d8aa81f71253 +SHA1 (patch-src_bltNsUtil.h) = 949647e6ca4a4890a51917c268289384da98b7ca diff --git a/x11/blt/patches/patch-src_bltNsUtil.h b/x11/blt/patches/patch-src_bltNsUtil.h new file mode 100644 index 00000000000..7f970f64a2b --- /dev/null +++ b/x11/blt/patches/patch-src_bltNsUtil.h @@ -0,0 +1,24 @@ +$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)); + |