extra/graphviz to 2.40.1-7

extra/graphviz/PKGBUILD

@@ -8,15 +8,15 @@
 
 pkgname=graphviz
 pkgver=2.40.1
-pkgrel=6
+pkgrel=7
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('CPL')
 arch=('i686' 'x86_64')
 depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts' 'gsfonts')
-makedepends=('swig' 'guile' 'lua51' 'ocaml' 'perl' 'python2' 'r' 'tk' 'qt4' 'gtk2')
+makedepends=('swig' 'guile' 'lua' 'ocaml' 'perl' 'python2' 'r' 'tk' 'qt4' 'gtk2')
 optdepends=('guile: guile bindings'
-            'lua51: lua bindings'
+            'lua: lua bindings'
             'ocaml: ocaml bindings'
             'perl: perl bindings'
             'python2: python bindings'
@@ -41,10 +41,8 @@ prepare() {
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	export CXXFLAGS+=' -Dint64=int64_t' # for ocaml
-	export LIBPOSTFIX=/
 	export PYTHON=python2
-	export LUA=lua5.1
+	export LIBPOSTFIX=/
 
 	./configure --prefix=/usr
 	make
@@ -54,13 +52,8 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
 
-	cd "${pkgdir}/usr/lib"
-	install -d lua/5.1
-	mv lua/gv.so lua/5.1
-
-	# Workaround symlink upgrade bug (fixed in pacman trunk)
-	# Also deduplicates the tcl libraries (upstream bug?)
-	# Might have been this commit: https://github.com/ellson/graphviz/commit/f11aead
-	rm -r tcl8.6/graphviz
-	ln -s ../graphviz/tcl tcl8.6/graphviz
+	# Deduplicates TCL libraries
+	cd "${pkgdir}/usr/lib/tcl8.6"
+	rm -fr graphviz
+	ln -s ../graphviz/tcl graphviz
 }