diff --git a/srcpkgs/graphviz/patches/cross.patch b/srcpkgs/graphviz/patches/cross.patch index 5af9971549..a98fd68779 100644 --- a/srcpkgs/graphviz/patches/cross.patch +++ b/srcpkgs/graphviz/patches/cross.patch @@ -1,12 +1,12 @@ ---- lib/gvpr/Makefile.in.orig 2014-02-08 10:35:01.782106087 +0100 -+++ lib/gvpr/Makefile.in 2014-02-08 10:35:20.629222313 +0100 -@@ -1063,8 +1063,7 @@ $(libgvpr_C_la_OBJECTS): gdefs.h - gvpr.3.pdf: $(srcdir)/gvpr.3 - - @GROFF@ -Tps -man $(srcdir)/gvpr.3 | @PS2PDF@ - - >gvpr.3.pdf +--- lib/gvpr/Makefile.am.orig 2014-10-12 12:30:00.897952089 +0200 ++++ lib/gvpr/Makefile.am 2014-10-12 12:30:12.929055089 +0200 +@@ -52,8 +52,7 @@ libgvpr_la_DEPENDENCIES = $(libgvpr_C_la + + mkdefs_SOURCES = mkdefs.c -gdefs.h: $(top_srcdir)/lib/gvpr/gprdata mkdefs - ./mkdefs gdefs.h < $(top_srcdir)/lib/gvpr/gprdata +gdefs.h: - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. + EXTRA_DIST = $(man_MANS) $(pdf_DATA) gprdata mkdefs.c gdefs.h trie.c gvprlib.vcproj + diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template index 30216c26f2..80f87ce777 100644 --- a/srcpkgs/graphviz/template +++ b/srcpkgs/graphviz/template @@ -1,9 +1,9 @@ # Template file for 'graphviz' pkgname=graphviz version=2.38.0 -revision=1 +revision=2 build_style=gnu-configure -hostmakedepends="libtool flex pkg-config libltdl-devel" +hostmakedepends="automake libtool flex pkg-config libltdl-devel" makedepends="libpng-devel>=1.6 gd-devel>=2.1 gtk+-devel librsvg-devel libltdl-devel" short_desc="Graph Visualization Software" configure_args="--disable-rpath --enable-ltdl --disable-ltdl-install @@ -18,12 +18,10 @@ distfiles="http://www.graphviz.org/pub/graphviz/stable/SOURCES/$pkgname-$version checksum=81aa238d9d4a010afa73a9d2a704fc3221c731e1e06577c2ab3496bdef67859e pre_configure() { - libtoolize -f + autoreconf -fi } - post_install() { - # intall license. - vinstall ${FILESDIR}/LICENSE 644 usr/share/licenses/$pkgname + vlicense ${FILESDIR}/LICENSE } graphviz-libs_package() { @@ -34,7 +32,6 @@ graphviz-libs_package() { vmove usr/lib/graphviz } } - graphviz-devel_package() { depends="graphviz-libs>=${version}_${revision}" short_desc+=" - development files"