Fix for lua-5.2. Bump PKGREVISION for PLIST change.

4 files changed, 17 insertions, 7 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 900735fd874..0cbc0e62e50 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.121 2013/07/04 21:27:57 adam Exp $
+# $NetBSD: Makefile,v 1.122 2013/07/06 23:14:07 wiz Exp $
 
 DISTNAME=	graphviz-2.26.3
-PKGREVISION=	28
+PKGREVISION=	29
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/stable/SOURCES/
 
diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST
index e48ffb6f91a..c4f6d63ff66 100644
--- a/graphics/graphviz/PLIST
+++ b/graphics/graphviz/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.40 2012/08/21 21:44:00 marino Exp $
+@comment $NetBSD: PLIST,v 1.41 2013/07/06 23:14:07 wiz Exp $
 bin/acyclic
 bin/bcomps
 bin/ccomps
@@ -97,6 +97,7 @@ lib/libgvc.la
 lib/libgvpr.la
 lib/libpathplan.la
 lib/libxdot.la
+${PLIST.lua}lib/lua/gv.so
 ${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/gv.pm
 ${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/gv.so
 lib/pkgconfig/libcdt.pc
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 0a0b994f12f..76f66ddfa50 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.41 2012/09/08 14:48:45 tron Exp $
+$NetBSD: distinfo,v 1.42 2013/07/06 23:14:07 wiz Exp $
 
 SHA1 (graphviz-2.26.3.tar.gz) = 04503ac5a9eaa579859f0d017811fa245717edec
 RMD160 (graphviz-2.26.3.tar.gz) = b2fbaf03b2006b43ed70e2a710363d7efbcfda77
 Size (graphviz-2.26.3.tar.gz) = 17092429 bytes
 SHA1 (patch-aa) = 301ce5e8bfe68bab47ffdf513e2decbb52aff2c9
-SHA1 (patch-ab) = 00472c4299983e64f79e483ebcd705138401fc5d
+SHA1 (patch-ab) = fcea85f1dea4de107f1d4dd5c2f489321b4b4a6f
 SHA1 (patch-ag) = 1eb3aab33f132b019a3faaa80bb68d44daa58f61
 SHA1 (patch-aj) = af8c688a0beeabfc391dde7acc9c33afe9ac3546
 SHA1 (patch-ak) = d8b06e60be1014387f07ae5f00dce33a2096b855
diff --git a/graphics/graphviz/patches/patch-ab b/graphics/graphviz/patches/patch-ab
index 80ff78eb400..ec66359d7db 100644
--- a/graphics/graphviz/patches/patch-ab
+++ b/graphics/graphviz/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.20 2011/10/18 22:34:06 sbd Exp $
+$NetBSD: patch-ab,v 1.21 2013/07/06 23:14:07 wiz Exp $
 
 --- configure.orig	2010-01-26 16:01:10.000000000 +0000
 +++ configure
@@ -61,6 +61,15 @@ $NetBSD: patch-ab,v 1.20 2011/10/18 22:34:06 sbd Exp $
              fi
          fi
  
+@@ -25403,7 +25413,7 @@ fi
+ 
+         { $as_echo "$as_me:$LINENO: checking for Lua compiling and linking" >&5
+ $as_echo_n "checking for Lua compiling and linking... " >&6; }
+-        LUA_TEST=`LT=luatest.c ; echo "#include <lua.h>" > $LT;  echo "#include <lualib.h>" >> $LT; echo "int main() { luaopen_base((lua_State *)lua_open()); return 0; }" >> $LT ; $CC -Wall $LT -o $LT.out $LUA_INCLUDES $LUA_LIBS $CFLAGS $LDFLAGS 1>/dev/null 2>&1 ; echo $?; rm -f $LT $LT.out 1>/dev/null 2>&1`
++        LUA_TEST=`LT=luatest.c ; echo "#include <lua.h>" > $LT;  echo "#include <lualib.h>" >> $LT; echo "int main() { luaopen_base((lua_State *)luaL_newstate()); return 0; }" >> $LT ; $CC -Wall $LT -o $LT.out $LUA_INCLUDES $LUA_LIBS $CFLAGS $LDFLAGS 1>/dev/null 2>&1 ; echo $?; rm -f $LT $LT.out 1>/dev/null 2>&1`
+         if test "x$LUA_TEST" != "x0" ; then
+           { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
 @@ -25535,8 +25545,8 @@ $as_echo "no" >&6; }
  fi
  
@@ -113,7 +122,7 @@ $NetBSD: patch-ab,v 1.20 2011/10/18 22:34:06 sbd Exp $
  		sincos(PI/2.0,&sinx,&cosx);
  		assert(sinx>0.9999999);
  		assert(sinx<1.0000001);
-@@ -38777,7 +38789,7 @@ else
+@@ -38777,7 +38791,7 @@ else
      use_gv_tcl="Yes"
    fi
    if test "x$use_gd" != "xYes"; then