diff options
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/blt/Makefile | 17 | ||||
| -rw-r--r-- | x11/blt/PLIST | 4 | ||||
| -rw-r--r-- | x11/blt/distinfo | 8 | ||||
| -rw-r--r-- | x11/blt/patches/patch-ad | 15 | ||||
| -rw-r--r-- | x11/blt/patches/patch-src_tkButton.c | 24 |
5 files changed, 52 insertions, 16 deletions
diff --git a/x11/blt/Makefile b/x11/blt/Makefile index 5c68f4b389b..7545474439f 100644 --- a/x11/blt/Makefile +++ b/x11/blt/Makefile @@ -1,12 +1,15 @@ -# $NetBSD: Makefile,v 1.28 2014/01/11 14:42:01 adam Exp $ -# +# $NetBSD: Makefile,v 1.29 2014/02/01 18:12:13 adam Exp $ DISTNAME= BLT2.4z PKGNAME= blt-2.4z -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=blt/} +PATCHFILES= blt2.4z-patch-2 +PATCH_SITES= ${MASTER_SITES} +PATCH_DIST_STRIP=-p1 + MAINTAINER= brook@nmsu.edu HOMEPAGE= http://blt.sourceforge.net/ COMMENT= Extension to Tcl/Tk @@ -16,11 +19,12 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews MAKE_JOBS_SAFE= no WRKSRC= ${WRKDIR}/blt2.4z -GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --exec-prefix=${PREFIX:Q} +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --exec-prefix=${PREFIX} CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}/lib -CONFIGURE_ENV+= X11BASE=${X11BASE:Q} +CONFIGURE_ENV+= X11BASE=${X11BASE} +CFLAGS+= -DUSE_INTERP_RESULT MAKE_ENV+= CP=${CP:Q} CHECK_INTERPRETER_SKIP+= lib/*/demos/*.tcl @@ -37,5 +41,4 @@ INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR} .include "../../lang/tcl/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/blt/PLIST b/x11/blt/PLIST index 9785250d22f..2e5493ad38a 100644 --- a/x11/blt/PLIST +++ b/x11/blt/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:24:44 joerg Exp $ +@comment $NetBSD: PLIST,v 1.4 2014/02/01 18:12:13 adam Exp $ bin/bltsh bin/bltsh24 bin/bltwish @@ -184,8 +184,8 @@ man/mann/barchart.n man/mann/beep.n man/mann/bgexec.n man/mann/bltbitmap.n +man/mann/bltbusy.n man/mann/bltdebug.n -man/mann/busy.n man/mann/container.n man/mann/cutbuffer.n man/mann/dragdrop.n diff --git a/x11/blt/distinfo b/x11/blt/distinfo index a957b5c4ac4..e296b911414 100644 --- a/x11/blt/distinfo +++ b/x11/blt/distinfo @@ -1,12 +1,16 @@ -$NetBSD: distinfo,v 1.12 2012/08/21 22:00:24 marino Exp $ +$NetBSD: distinfo,v 1.13 2014/02/01 18:12:13 adam Exp $ SHA1 (BLT2.4z.tar.gz) = 29f719aa762f1762dbf4a3b0e60dc5356118ba2f RMD160 (BLT2.4z.tar.gz) = d54d9fdb6c61391c191afab4701716d18a3d928b Size (BLT2.4z.tar.gz) = 2200973 bytes +SHA1 (blt2.4z-patch-2) = abc287e23e4c08d3a771332499aee03ad3a56266 +RMD160 (blt2.4z-patch-2) = a9120e301e0a906b414e978cf3d5a3062d668cf0 +Size (blt2.4z-patch-2) = 28594 bytes SHA1 (patch-aa) = 6a28cc2405adcc6037865f174bb48d81909c83d6 SHA1 (patch-ab) = da9479d5de1053c45753eef611eae2764909f0ec SHA1 (patch-ac) = 696f90010831522f46d67052abc0c6068197cfd9 -SHA1 (patch-ad) = be6bd157a084f5ad38ff3787f53e7aa4fcf80234 +SHA1 (patch-ad) = cc2579223a5a8a764d797fa16a146999cd4a796d SHA1 (patch-ae) = f2689eb585f19d05e9dfe6164f96d6fc9dbc77ad SHA1 (patch-af) = b82641d4aad426fbe9a6781fa828d8aa81f71253 SHA1 (patch-src_bltNsUtil.h) = 949647e6ca4a4890a51917c268289384da98b7ca +SHA1 (patch-src_tkButton.c) = 39132933914ee8d52389f5be72cbc02b21e7216e diff --git a/x11/blt/patches/patch-ad b/x11/blt/patches/patch-ad index 87a5c48a961..32288d74bef 100644 --- a/x11/blt/patches/patch-ad +++ b/x11/blt/patches/patch-ad @@ -1,19 +1,24 @@ -$NetBSD: patch-ad,v 1.4 2004/03/06 06:26:21 minskim Exp $ +$NetBSD: patch-ad,v 1.5 2014/02/01 18:12:13 adam Exp $ ---- man/Makefile.in.orig 2002-02-18 18:11:46.000000000 -0600 +--- man/Makefile.in.orig 2002-02-19 00:11:46.000000000 +0000 +++ man/Makefile.in -@@ -10,7 +10,7 @@ version = @BLT_VERSION@ +@@ -10,8 +10,8 @@ version = @BLT_VERSION@ instdirs = $(mandir) $(mandir)/mann $(mandir)/man3 -MAN_N = BLT.n barchart.n beep.n bgexec.n bitmap.n \ +- bltdebug.n busy.n container.n cutbuffer.n \ +MAN_N = BLT.n barchart.n beep.n bgexec.n bltbitmap.n \ - bltdebug.n busy.n container.n cutbuffer.n \ ++ bltdebug.n bltbusy.n container.n cutbuffer.n \ dragdrop.n eps.n graph.n hierbox.n \ hiertable.n htext.n spline.n stripchart.n \ -@@ -72,3 +72,5 @@ clean: + table.n tabset.n tile.n tree.n treeview.n vector.n \ +@@ -72,3 +72,8 @@ clean: distclean: clean $(RM) $(srcdir)/*.bak $(srcdir)/*\~ $(srcdir)/"#"* Makefile +bltbitmap.mann: bitmap.mann + ${CP} bitmap.mann bltbitmap.mann ++ ++bltbusy.mann: busy.mann ++ ${CP} busy.mann bltbusy.mann diff --git a/x11/blt/patches/patch-src_tkButton.c b/x11/blt/patches/patch-src_tkButton.c new file mode 100644 index 00000000000..f07c8144631 --- /dev/null +++ b/x11/blt/patches/patch-src_tkButton.c @@ -0,0 +1,24 @@ +$NetBSD: patch-src_tkButton.c,v 1.1 2014/02/01 18:12:13 adam Exp $ + +Fix building with Tcl 8.6. + +--- src/tkButton.c.orig 2014-02-01 17:46:04.000000000 +0000 ++++ src/tkButton.c +@@ -526,7 +526,7 @@ static int InvokeButton _ANSI_ARGS_((But + static Blt_TileChangedProc TileChangedProc; + static Tcl_CmdProc ButtonCmd, LabelCmd, CheckbuttonCmd, RadiobuttonCmd; + +-EXTERN int TkCopyAndGlobalEval _ANSI_ARGS_((Tcl_Interp *interp, char *script)); ++EXTERN int Tcl_EvalEx _ANSI_ARGS_((Tcl_Interp *interp, const char *script, int numBytes, int flags)); + + #if (TK_MAJOR_VERSION > 4) + EXTERN void TkComputeAnchor _ANSI_ARGS_((Tk_Anchor anchor, Tk_Window tkwin, +@@ -1890,7 +1890,7 @@ InvokeButton(butPtr) + } + } + if ((butPtr->type != TYPE_LABEL) && (butPtr->command != NULL)) { +- return TkCopyAndGlobalEval(butPtr->interp, butPtr->command); ++ return Tcl_EvalEx(butPtr->interp, butPtr->command, -1, TCL_EVAL_GLOBAL); + } + return TCL_OK; + } |