[101438] trunk/dports/x11/blt
ryandesign at macports.org
ryandesign at macports.org
Thu Jan 10 17:38:54 PST 2013
Revision: 101438
https://trac.macports.org/changeset/101438
Author: ryandesign at macports.org
Date: 2013-01-10 17:38:53 -0800 (Thu, 10 Jan 2013)
Log Message:
-----------
blt: fix build with tcl / tk 8.6 (#37505); ensure library and manpage files get installed inside destroot, and clean up the files previously installed outside destroot; fix mtree violation by manpages and remove or rename manpages which conflict with those installed by tk
Modified Paths:
--------------
trunk/dports/x11/blt/Portfile
trunk/dports/x11/blt/files/patch-library-Makefile.in
Added Paths:
-----------
trunk/dports/x11/blt/files/patch-man-Makefile.in
trunk/dports/x11/blt/files/patch-tk-8.6
Modified: trunk/dports/x11/blt/Portfile
===================================================================
--- trunk/dports/x11/blt/Portfile 2013-01-11 01:26:36 UTC (rev 101437)
+++ trunk/dports/x11/blt/Portfile 2013-01-11 01:38:53 UTC (rev 101438)
@@ -3,7 +3,7 @@
name blt
version 2.4z
-revision 4
+revision 5
categories x11
license MIT
maintainers markd
@@ -23,12 +23,16 @@
port:tcl \
port:tk
-configure.cflags "-O3 -fno-common"
+use_parallel_build no
+configure.optflags -O3
+configure.cflags-append -fno-common -DUSE_INTERP_RESULT
+
configure.args --exec_prefix=${prefix} \
--bindir=${prefix}/bin \
--includedir=${prefix}/include \
--libdir=${prefix}/lib \
+ --mandir=${prefix}/share/man \
--with-tcllibs=${prefix}/lib \
--with-tklibs=${prefix}/lib \
--with-tclincls=${prefix}/include \
@@ -45,14 +49,18 @@
patch-demos-Makefile.in \
blt-2.4z-tcl8.5-fix.patch \
blt2.4z-noexactversion.patch \
- blt-x86_64.patch
+ blt-x86_64.patch \
+ patch-tk-8.6 \
+ patch-man-Makefile.in
post-patch {
reinplace "s|__DESTROOT__|${destroot}|g" \
${worksrcpath}/Makefile.in \
${worksrcpath}/src/Makefile.in \
${worksrcpath}/src/shared/Makefile.in \
- ${worksrcpath}/demos/Makefile.in
+ ${worksrcpath}/demos/Makefile.in \
+ ${worksrcpath}/library/Makefile.in \
+ ${worksrcpath}/man/Makefile.in
eval reinplace "s|../src/bltwish|${prefix}/bin/bltwish|g" \
[glob ${worksrcpath}/demos/*.tcl] \
@@ -64,4 +72,77 @@
system "cd ${destroot}${prefix}/lib && ln -sf libBLT.2.4.dylib libBLT.dylib"
system "cd ${destroot}${prefix}/lib && ln -sf libBLTlite.2.4.dylib libBLTlite.2.dylib"
system "cd ${destroot}${prefix}/lib && ln -sf libBLTlite.2.4.dylib libBLTlite.dylib"
+
+ # These manpages conflict with those installed by tk.
+ # blt's busy.n and tk's busy.n appear to describe the same function so I don't mind deleting blt's.
+ delete ${destroot}${prefix}/share/man/mann/busy.n
+ # blt's bitmap.n and tk's bitmap.n don't appear to be related at all so I'm keeping and renaming blt's.
+ move ${destroot}${prefix}/share/man/mann/bitmap.n ${destroot}${prefix}/share/man/mann/blt-bitmap.n
}
+
+pre-activate {
+ # blt 2.4z_4 and earlier installed some items directly to ${prefix}; remove them if found.
+ # To be removed after January 2014.
+ foreach file {
+ lib/blt2.4/bltCanvEps.pro
+ lib/blt2.4/bltGraph.pro
+ lib/blt2.4/dnd.tcl
+ lib/blt2.4/dragdrop.tcl
+ lib/blt2.4/graph.tcl
+ lib/blt2.4/hierbox.tcl
+ lib/blt2.4/pkgIndex.tcl
+ lib/blt2.4/tabnotebook.tcl
+ lib/blt2.4/tabset.tcl
+ lib/blt2.4/tclIndex
+ lib/blt2.4/treeview.tcl
+ lib/blt2.4/treeview.xbm
+ lib/blt2.4/treeview_m.xbm
+ lib/blt2.4/dd_protocols/dd-color.tcl
+ lib/blt2.4/dd_protocols/dd-file.tcl
+ lib/blt2.4/dd_protocols/dd-number.tcl
+ lib/blt2.4/dd_protocols/dd-text.tcl
+ lib/blt2.4/dd_protocols/tclIndex
+ man/man3/Blt_Tree.3
+ man/man3/Blt_TreeCreate.3
+ man/man3/Blt_TreeCreateNode.3
+ man/man3/Blt_TreeDeleteNode.3
+ man/man3/Blt_TreeExists.3
+ man/man3/Blt_TreeGetNode.3
+ man/man3/Blt_TreeGetToken.3
+ man/man3/Blt_TreeName.3
+ man/man3/Blt_TreeNodeId.3
+ man/man3/Blt_TreeReleaseToken.3
+ man/mann/BLT.n
+ man/mann/barchart.n
+ man/mann/beep.n
+ man/mann/bgexec.n
+ man/mann/bitmap.n
+ man/mann/bltdebug.n
+ man/mann/busy.n
+ man/mann/container.n
+ man/mann/cutbuffer.n
+ man/mann/dragdrop.n
+ man/mann/eps.n
+ man/mann/graph.n
+ man/mann/hierbox.n
+ man/mann/hiertable.n
+ man/mann/htext.n
+ man/mann/spline.n
+ man/mann/stripchart.n
+ man/mann/table.n
+ man/mann/tabset.n
+ man/mann/tile.n
+ man/mann/tree.n
+ man/mann/treeview.n
+ man/mann/vector.n
+ man/mann/watch.n
+ man/mann/winop.n
+ } {
+ set filepath ${prefix}/${file}
+ if {[file exists ${filepath}] && [registry_file_registered ${filepath}] == "0"} {
+ if {[catch {delete ${filepath}}]} {
+ ui_warn "Cannot delete ${filepath}; please remove it manually"
+ }
+ }
+ }
+}
Modified: trunk/dports/x11/blt/files/patch-library-Makefile.in
===================================================================
--- trunk/dports/x11/blt/files/patch-library-Makefile.in 2013-01-11 01:26:36 UTC (rev 101437)
+++ trunk/dports/x11/blt/files/patch-library-Makefile.in 2013-01-11 01:38:53 UTC (rev 101438)
@@ -1,5 +1,14 @@
---- library/Makefile.in.org 2003-07-09 20:18:32.000000000 +0100
-+++ library/Makefile.in 2003-07-09 20:19:06.000000000 +0100
+--- library/Makefile.in.orig 2013-01-09 18:53:56.000000000 -0500
++++ library/Makefile.in 2013-01-09 18:54:27.000000000 -0500
+@@ -12,7 +12,7 @@
+
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_ROOT =
++INSTALL_ROOT = __DESTROOT__
+ RM = rm -f
+ SHELL = /bin/sh
+
@@ -58,7 +58,7 @@
for i in $(miscFiles) ; do \
$(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(scriptdir) ; \
@@ -9,4 +18,3 @@
mkdirs:
@for i in $(instdirs) ; do \
-
Added: trunk/dports/x11/blt/files/patch-man-Makefile.in
===================================================================
--- trunk/dports/x11/blt/files/patch-man-Makefile.in (rev 0)
+++ trunk/dports/x11/blt/files/patch-man-Makefile.in 2013-01-11 01:38:53 UTC (rev 101438)
@@ -0,0 +1,11 @@
+--- man/Makefile.in.orig 2013-01-09 18:56:21.000000000 -0500
++++ man/Makefile.in 2013-01-09 18:57:29.000000000 -0500
+@@ -27,7 +27,7 @@
+
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_ROOT =
++INSTALL_ROOT = __DESTROOT__
+ SHELL = /bin/sh
+ RM = rm -rf
+ VPATH = $(srcdir)
Property changes on: trunk/dports/x11/blt/files/patch-man-Makefile.in
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/dports/x11/blt/files/patch-tk-8.6
===================================================================
--- trunk/dports/x11/blt/files/patch-tk-8.6 (rev 0)
+++ trunk/dports/x11/blt/files/patch-tk-8.6 2013-01-11 01:38:53 UTC (rev 101438)
@@ -0,0 +1,20 @@
+--- src/tkButton.c.orig 2013-01-04 23:24:45.000000000 -0500
++++ src/tkButton.c 2013-01-04 23:28:29.000000000 -0500
+@@ -526,8 +526,6 @@
+ static Blt_TileChangedProc TileChangedProc;
+ static Tcl_CmdProc ButtonCmd, LabelCmd, CheckbuttonCmd, RadiobuttonCmd;
+
+-EXTERN int TkCopyAndGlobalEval _ANSI_ARGS_((Tcl_Interp *interp, char *script));
+-
+ #if (TK_MAJOR_VERSION > 4)
+ EXTERN void TkComputeAnchor _ANSI_ARGS_((Tk_Anchor anchor, Tk_Window tkwin,
+ int padX, int padY, int innerWidth, int innerHeight, int *xPtr,
+@@ -1890,7 +1888,7 @@
+ }
+ }
+ if ((butPtr->type != TYPE_LABEL) && (butPtr->command != NULL)) {
+- return TkCopyAndGlobalEval(butPtr->interp, butPtr->command);
++ return Tcl_EvalObjEx(butPtr->interp, butPtr->command, TCL_EVAL_GLOBAL);
+ }
+ return TCL_OK;
+ }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130110/bc7ec1d4/attachment.html>
More information about the macports-changes
mailing list