pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/graphviz Does not build with lua51. It isn't ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/265204ed3f82
branches:  trunk
changeset: 626009:265204ed3f82
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Wed Oct 30 06:22:04 2013 +0000

description:
Does not build with lua51. It isn't clear to me if this is a serious
problem or a makefile glitch, as libtool is involved and everything is
very opaque as a result.

Also, use REPLACE_LUA.

diffstat:

 graphics/graphviz/Makefile |  13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diffs (34 lines):

diff -r dbe2e6e59b7d -r 265204ed3f82 graphics/graphviz/Makefile
--- a/graphics/graphviz/Makefile        Wed Oct 30 06:20:45 2013 +0000
+++ b/graphics/graphviz/Makefile        Wed Oct 30 06:22:04 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.130 2013/10/10 14:42:14 ryoon Exp $
+# $NetBSD: Makefile,v 1.131 2013/10/30 06:22:04 dholland Exp $
 
 DISTNAME=      graphviz-2.34.0
 PKGREVISION=   1
@@ -43,10 +43,11 @@
 PKGCONFIG_OVERRIDE+=   lib/xdot/libxdot.pc.in
 XAW_TYPE=              standard
 
-REPLACE_INTERPRETER+=  lua
-REPLACE.lua.old=       .*lua
-REPLACE.lua.new=       ${PREFIX}/bin/lua
-REPLACE_FILES.lua=     tclpkg/gv/demo/modgraph.lua
+# With lua51 there's a PLIST divergence and it isn't obvious whether
+# it's serious or not, or what causes it.
+LUA_VERSIONS_INCOMPATIBLE=     51
+
+REPLACE_LUA+=          tclpkg/gv/demo/modgraph.lua
 
 REPLACE_INTERPRETER+=  tclsh
 REPLACE.tclsh.old=     .*tclsh
@@ -76,6 +77,8 @@
 
 .include "options.mk"
 
+.include "../../lang/lua/application.mk"
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"



Home | Main Index | Thread Index | Old Index