[csw-devel] SF.net SVN: gar:[21600] csw/mgar/pkg/graphviz/trunk
lblume at users.sourceforge.net
lblume at users.sourceforge.net
Thu Aug 1 03:33:00 CEST 2013
Revision: 21600
http://gar.svn.sourceforge.net/gar/?rev=21600&view=rev
Author: lblume
Date: 2013-08-01 01:32:54 +0000 (Thu, 01 Aug 2013)
Log Message:
-----------
graphviz/trunk: Bump to 2.30.1; build 64 bit w/ isaexec; dependencies overhaul; use python 2.7
Modified Paths:
--------------
csw/mgar/pkg/graphviz/trunk/Makefile
csw/mgar/pkg/graphviz/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/graphviz/trunk/files/0001_configure_tcl_bin_path_not_good_for_64bit.patch
csw/mgar/pkg/graphviz/trunk/files/0002_configure_guile_version_detection_needs_gsed.patch
Modified: csw/mgar/pkg/graphviz/trunk/Makefile
===================================================================
--- csw/mgar/pkg/graphviz/trunk/Makefile 2013-08-01 00:09:00 UTC (rev 21599)
+++ csw/mgar/pkg/graphviz/trunk/Makefile 2013-08-01 01:32:54 UTC (rev 21600)
@@ -4,7 +4,7 @@
# investigated.
NAME = graphviz
-VERSION = 2.28.0
+VERSION = 2.30.1
GARTYPE = v2
DESCRIPTION = Graph visualization tools
@@ -20,21 +20,30 @@
GARCOMPILER = GCC4
-PATCHFILES += configure.patch
-PATCHFILES += Makefile.am.patch
-PATCHFILES += trapezoid.c.patch
-PATCHFILES += post_process.c.patch
-PATCHFILES += gvpr_Makefile.am.patch
-PATCHFILES += gv_Makefile.am.patch
+PATCHFILES += 0001_configure_tcl_bin_path_not_good_for_64bit.patch
+PATCHFILES += 0002_configure_guile_version_detection_needs_gsed.patch
+#PATCHFILES += configure.patch
+#PATCHFILES += Makefile.am.patch
+#PATCHFILES += trapezoid.c.patch
+#PATCHFILES += post_process.c.patch
+#PATCHFILES += gvpr_Makefile.am.patch
+#PATCHFILES += gv_Makefile.am.patch
INCOMPATIBLE_PKGS = CSWgraphvis
# defer for some time to allow CSWgraphviz2 upgrades
# INCOMPATIBLE_PKGS = CSWgraphviz2
-# Waiting for liblasi, gts, gd, ghostscript and tcl/tk
-#BUILD64 = 1
+BUILD64 = 1
+ISAEXEC = 1
-BUILD_DEP_PKGS =
+BUILD_DEP_PKGS += CSWliblasi-dev
+BUILD_DEP_PKGS += CSWlibgd-dev
+BUILD_DEP_PKGS += CSWgts-dev
+BUILD_DEP_PKGS += CSWghostscript-dev
+BUILD_DEP_PKGS += CSWtcl-dev
+BUILD_DEP_PKGS += CSWtk-dev
+BUILD_DEP_PKGS += CSWswig
+BUILD_DEP_PKGS += CSWlibgc-dev
# This is a compatibility package which should go away after some time.
# It only contains a link to CSWgraphviz.
@@ -45,62 +54,55 @@
PACKAGES += CSWgraphviz
SPKG_DESC_CSWgraphviz = Graph Visualization Tools
-RUNTIME_DEP_PKGS_CSWgraphviz = CSWexpat
RUNTIME_DEP_PKGS_CSWgraphviz += CSWpango
-RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibcairo
-RUNTIME_DEP_PKGS_CSWgraphviz += CSWgts
-RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibxrender
-RUNTIME_DEP_PKGS_CSWgraphviz += CSWgs
-RUNTIME_DEP_PKGS_CSWgraphviz += CSWfconfig
-RUNTIME_DEP_PKGS_CSWgraphviz += CSWftype2
-RUNTIME_DEP_PKGS_CSWgraphviz += CSWglib2
-RUNTIME_DEP_PKGS_CSWgraphviz += CSWgtk2
-RUNTIME_DEP_PKGS_CSWgraphviz += CSWiconv
-RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibatk
-RUNTIME_DEP_PKGS_CSWgraphviz += CSWliblasi
-RUNTIME_DEP_PKGS_CSWgraphviz += CSWzlib
-RUNTIME_DEP_PKGS_CSWgraphviz += CSWxpm
-RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibrsvg
-RUNTIME_DEP_PKGS_CSWgraphviz += CSWgcc4corert
-RUNTIME_DEP_PKGS_CSWgraphviz += CSWgcc4g++rt
-RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibintl8
RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibcdt5
RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibcgraph6
-RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibgraph5
RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibgvc6
-RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibgvpr2
RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibpathplan4
-RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibxdot4
-PKGFILES_CSWgraphviz = $(bindir)/(?!(diffimg|dot_static)).*
-PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_core\.so\..*
-PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_gdk_pixbuf\.so\..*
-PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_gs\.so\..*
-PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_gtk\.so\..*
-PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_lasi\.so\..*
-PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_pango\.so\..*
-PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_rsvg\.so\..*
-PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_xlib\.so\..*
-PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_.*layout\.so\..*
+RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibrsvg2-2
+RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibgdk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibgts0-7-5
+RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibgtk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibgs9
+RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibatk1-0-0
+RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWgraphviz += CSWlibgvpr2
+PKGFILES_CSWgraphviz += $(call baseisadirs,$(bindir),(?:(?!diffimg|dot_static).)*)
+PKGFILES_CSWgraphviz += $(call baseisadirs,$(libdir),graphviz/libgvplugin_core\.so\..*)
+PKGFILES_CSWgraphviz += $(call baseisadirs,$(libdir),graphviz/libgvplugin_gdk_pixbuf\.so\..*)
+PKGFILES_CSWgraphviz += $(call baseisadirs,$(libdir),graphviz/libgvplugin_gs\.so\..*)
+PKGFILES_CSWgraphviz += $(call baseisadirs,$(libdir),graphviz/libgvplugin_gtk\.so\..*)
+PKGFILES_CSWgraphviz += $(call baseisadirs,$(libdir),graphviz/libgvplugin_lasi\.so\..*)
+PKGFILES_CSWgraphviz += $(call baseisadirs,$(libdir),graphviz/libgvplugin_neato_layout\.so\..*)
+PKGFILES_CSWgraphviz += $(call baseisadirs,$(libdir),graphviz/libgvplugin_pango\.so\..*)
+PKGFILES_CSWgraphviz += $(call baseisadirs,$(libdir),graphviz/libgvplugin_rsvg\.so\..*)
+PKGFILES_CSWgraphviz += $(call baseisadirs,$(libdir),graphviz/libgvplugin_xlib\.so\..*)
+PKGFILES_CSWgraphviz += $(call baseisadirs,$(libdir),graphviz/libgvplugin_.*layout\.so\..*)
PKGFILES_CSWgraphviz += $(sharedstatedir)/graphviz/lefty/.*
PKGFILES_CSWgraphviz += $(mandir)/man1/.*\.1
PKGFILES_CSWgraphviz += $(mandir)/man7/.*\.7
-PACKAGES += CSWgraphvizdevel
-SPKG_DESC_CSWgraphvizdevel = Graphviz Headers etc. for development
+PACKAGES += CSWgraphviz-dev
+SPKG_DESC_CSWgraphviz-dev = Graphviz Headers etc. for development
-RUNTIME_DEP_PKGS_CSWgraphvizdevel = CSWgraphviz
-RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibpathplan4
-RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibxdot4
-RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibgraph5
-RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibcdt5
-RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibgvc6
-RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibcgraph6
-RUNTIME_DEP_PKGS_CSWgraphvizdevel += CSWlibgvpr2
-PKGFILES_CSWgraphvizdevel = $(libdir)/pkgconfig/.*\.pc
-PKGFILES_CSWgraphvizdevel += $(libdir)/lib.*\.so
-PKGFILES_CSWgraphvizdevel += $(includedir)/.*\.h
-PKGFILES_CSWgraphvizdevel += $(mandir)/man3/.*\.3
+RUNTIME_DEP_PKGS_CSWgraphviz-dev += CSWgraphviz
+RUNTIME_DEP_PKGS_CSWgraphviz-dev += CSWlibpathplan4
+RUNTIME_DEP_PKGS_CSWgraphviz-dev += CSWlibxdot4
+RUNTIME_DEP_PKGS_CSWgraphviz-dev += CSWlibcdt5
+RUNTIME_DEP_PKGS_CSWgraphviz-dev += CSWlibgvc6
+RUNTIME_DEP_PKGS_CSWgraphviz-dev += CSWlibcgraph6
+RUNTIME_DEP_PKGS_CSWgraphviz-dev += CSWlibgvpr2
+PKGFILES_CSWgraphviz-dev += $(call baseisadirs,$(libdir),pkgconfig/.*\.pc)
+PKGFILES_CSWgraphviz-dev += $(call baseisadirs,$(libdir),lib.*\.so)
+PKGFILES_CSWgraphviz-dev += $(includedir)/.*\.h
+PKGFILES_CSWgraphviz-dev += $(mandir)/man3/.*\.3
+OBSOLETED_BY_CSWgraphviz-dev = CSWgraphvizdevel
PACKAGES += CSWgraphvizdoc
SPKG_DESC_CSWgraphvizdoc = Graphviz documentation
@@ -116,38 +118,26 @@
PACKAGES += CSWgraphvizgd
SPKG_DESC_CSWgraphvizgd = Graphviz renderers using gd
-# FIXME - graphviz seems to be using internal copy of libgd
-RUNTIME_DEP_PKGS_CSWgraphvizgd = CSWlibgd2
-RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWjpeg
-RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWglib2
-RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWxpm
-RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWftype2
-RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWiconv
-RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWgts
+RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibgd3
RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWpango
-RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWpng
-RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWfconfig
-RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibcairo
-RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWexpat
-RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWzlib
-RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWgcc4corert
RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWgraphviz
-RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibcdt5
+RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibz1
+RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibgts0-7-5
+RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibgcc-s1
RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibpathplan4
-RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibxdot4
-RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibgraph5
+RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibcgraph6
RUNTIME_DEP_PKGS_CSWgraphvizgd += CSWlibgvc6
-PKGFILES_CSWgraphvizgd = $(libdir)/graphviz/libgvplugin_gd\.so\..*
-PKGFILES_CSWgraphvizgd += $(bindir)/diffimg
-PKGFILES_CSWgraphvizgd += $(bindir)/dot_static
+PKGFILES_CSWgraphvizgd += $(call baseisadirs,$(libdir),graphviz/libgvplugin_gd\.so.*)
+PKGFILES_CSWgraphvizgd += $(call baseisadirs,$(bindir),diffimg)
+PKGFILES_CSWgraphvizgd += $(call baseisadirs,$(bindir),dot_static)
#PACKAGES += CSWgraphvizdevil
SPKG_DESC_CSWgraphvizdevil = Graphviz renderers using DevIL
-RUNTIME_DEP_PKGS_CSWgraphvizdevil = CSWdevil
-RUNTIME_DEP_PKGS_CSWgraphvizdevil += CSWexpat
-RUNTIME_DEP_PKGS_CSWgraphvizdevil += CSWzlib
+RUNTIME_DEP_PKGS_CSWgraphvizdevil += CSWdevil
RUNTIME_DEP_PKGS_CSWgraphvizdevil += CSWgcc4corert
RUNTIME_DEP_PKGS_CSWgraphvizdevil += CSWgcc4g++rt
RUNTIME_DEP_PKGS_CSWgraphvizdevil += CSWlibltdl7
@@ -155,42 +145,31 @@
PKGFILES_CSWgraphvizdevil = $(libdir)/graphviz/libgvplugin_devil\.so\..*
PACKAGES += CSWgraphvizsharp
-SPKG_DESC_CSWgraphvizsharp = Graphviz language binding for C#
-RUNTIME_DEP_PKGS_CSWgraphvizsharp = CSWexpat
-RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWzlib
-RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWgcc4corert
-RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWgcc4g++rt
-RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWlibpathplan4
-RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWlibxdot4
-RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWlibcdt5
+SPKG_DESC_CSWgraphvizsharp = Graphviz language binding for C\#
RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWlibgvc6
-RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWlibgraph5
+RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWgraphvizsharp += CSWlibcgraph6
PKGFILES_CSWgraphvizsharp = $(libdir)/graphviz/sharp/.*
PKGFILES_CSWgraphvizsharp += $(mandir)/man3/.*\.3sharp
PKGFILES_CSWgraphvizsharp += $(sharedstatedir)/graphviz/demo/.*\.cs
+# Nothing 64 bit there?
+CHECKPKG_OVERRIDES_CSWgraphvizsharp += 64-bit-binaries-missing
PACKAGES += CSWgraphvizguile
SPKG_DESC_CSWgraphvizguile = Graphviz language binding for guile
-RUNTIME_DEP_PKGS_CSWgraphvizguile = CSWexpat
-RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWzlib
-RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWgcc4corert
-RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWgcc4g++rt
-RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibpathplan4
-RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibxdot4
-RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibcdt5
RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibgvc6
-RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibgraph5
+RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibguile2-0-22
+RUNTIME_DEP_PKGS_CSWgraphvizguile += CSWlibcgraph6
PKGFILES_CSWgraphvizguile = $(libdir)/graphviz/guile/.*
PKGFILES_CSWgraphvizguile += $(mandir)/man3/.*\.3guile
PKGFILES_CSWgraphvizguile += $(sharedstatedir)/graphviz/demo/.*\.guile
+# No 64 bit guile
+CHECKPKG_OVERRIDES_CSWgraphvizguile += 64-bit-binaries-missing
#PACKAGES += CSWgraphvizjava
SPKG_DESC_CSWgraphvizjava = Graphviz language binding for java
-RUNTIME_DEP_PKGS_CSWgraphvizjava = CSWjava
-RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWexpat
-RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWzlib
+RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWjava
RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWgcc4corert
RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWgcc4g++rt
RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWlibltdl7
@@ -198,16 +177,13 @@
RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWlibxdot4
RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWlibcdt5
RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWlibgvc6
-RUNTIME_DEP_PKGS_CSWgraphvizjava += CSWlibgraph5
PKGFILES_CSWgraphvizjava = $(libdir)/graphviz/java/.*
PKGFILES_CSWgraphvizjava += $(mandir)/man3/.*\.3java
PKGFILES_CSWgraphvizjava += $(sharedstatedir)/graphviz/demo/.*\.java
#PACKAGES += CSWgraphvizlua
SPKG_DESC_CSWgraphvizlua = Graphviz language binding for lua
-RUNTIME_DEP_PKGS_CSWgraphvizlua = CSWlua
-RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWexpat
-RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWzlib
+RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWlua
RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWgcc4corert
RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWgcc4g++rt
RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWlibltdl7
@@ -215,16 +191,13 @@
RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWlibxdot4
RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWlibcdt5
RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWlibgvc6
-RUNTIME_DEP_PKGS_CSWgraphvizlua += CSWlibgraph5
PKGFILES_CSWgraphvizlua = $(libdir)/graphviz/lua/.*
PKGFILES_CSWgraphvizlua += $(mandir)/man3/.*\.3lua
PKGFILES_CSWgraphvizlua += $(sharedstatedir)/graphviz/demo/.*\.lua
#PACKAGES += CSWgraphvizocaml
SPKG_DESC_CSWgraphvizocaml = Graphviz language binding for ocaml
-RUNTIME_DEP_PKGS_CSWgraphvizocaml = CSWocaml
-RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWexpat
-RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWzlib
+RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWocaml
RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWgcc4corert
RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWgcc4g++rt
RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWlibltdl7
@@ -232,33 +205,26 @@
RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWlibxdot4
RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWlibcdt5
RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWlibgvc6
-RUNTIME_DEP_PKGS_CSWgraphvizocaml += CSWlibgraph5
PKGFILES_CSWgraphvizocaml = $(libdir)/graphviz/ocaml/.*
PKGFILES_CSWgraphvizocaml += $(mandir)/man3/.*\.3ocaml
PKGFILES_CSWgraphvizocaml += $(sharedstatedir)/graphviz/demo/.*\.ml
PACKAGES += CSWgraphvizperl
SPKG_DESC_CSWgraphvizperl = Graphviz language binding for perl
-RUNTIME_DEP_PKGS_CSWgraphvizperl = CSWperl
-RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWexpat
-RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWzlib
-RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWgcc4corert
-RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWgcc4g++rt
-RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibpathplan4
-RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibxdot4
-RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibcdt5
+RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWperl
RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibgvc6
-RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibgraph5
+RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWgraphvizperl += CSWlibcgraph6
PKGFILES_CSWgraphvizperl = $(libdir)/graphviz/perl/.*
PKGFILES_CSWgraphvizperl += $(mandir)/man3/.*\.3perl
PKGFILES_CSWgraphvizperl += $(sharedstatedir)/graphviz/demo/.*\.pl
+# No 64 bit perl
+CHECKPKG_OVERRIDES_CSWgraphvizperl += 64-bit-binaries-missing
#PACKAGES += CSWgraphvizphp
SPKG_DESC_CSWgraphvizphp = Graphviz language binding for php
-RUNTIME_DEP_PKGS_CSWgraphvizphp = CSWphp5
-RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWexpat
-RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWzlib
+RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWphp5
RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWgcc4corert
RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWgcc4g++rt
RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWlibltdl7
@@ -266,34 +232,32 @@
RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWlibxdot4
RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWlibcdt5
RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWlibgvc6
-RUNTIME_DEP_PKGS_CSWgraphvizphp += CSWlibgraph5
PKGFILES_CSWgraphvizphp = $(libdir)/graphviz/php/.*
PKGFILES_CSWgraphvizphp += $(mandir)/man3/.*\.3php
PKGFILES_CSWgraphvizphp += $(sharedstatedir)/graphviz/demo/.*\.php
PACKAGES += CSWgraphvizpython
SPKG_DESC_CSWgraphvizpython = Graphviz language binding for python
-RUNTIME_DEP_PKGS_CSWgraphvizpython = CSWpython
-RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWexpat
-RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWzlib
-RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWgcc4corert
-RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWgcc4g++rt
-RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibpython2-6-1-0
-RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibpathplan4
-RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibxdot4
-RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibcdt5
+RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWpython27
RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibgvc6
-RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibgraph5
-PKGFILES_CSWgraphvizpython = $(libdir)/graphviz/python/.*
+RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibcgraph6
+RUNTIME_DEP_PKGS_CSWgraphvizpython += CSWlibgcc-s1
+PKGFILES_CSWgraphvizpython += $(call baseisadirs,$(libdir),graphviz/python.*)
+PKGFILES_CSWgraphvizpython += $(call baseisadirs,$(libdir),python.*)
PKGFILES_CSWgraphvizpython += $(mandir)/man3/.*\.3python
PKGFILES_CSWgraphvizpython += $(sharedstatedir)/graphviz/demo/.*\.py
+# Keep the right Python as a dependency
+CHECKPKG_OVERRIDES_CSWgraphvizpython += surplus-dependency|CSWpython27
+# No 64 bit python
+CHECKPKG_OVERRIDES_CSWgraphvizpython += 64-bit-binaries-missing
+# Those ones should be considered
+CHECKPKG_OVERRIDES_CSWgraphvizpython += pkgname-does-not-start-with-CSWpy-
+CHECKPKG_OVERRIDES_CSWgraphvizpython += catalogname-does-not-start-with-py_
#PACKAGES += CSWgraphvizr
SPKG_DESC_CSWgraphvizr = Graphviz language binding for R
-RUNTIME_DEP_PKGS_CSWgraphvizr = CSWr
-RUNTIME_DEP_PKGS_CSWgraphvizr += CSWexpat
-RUNTIME_DEP_PKGS_CSWgraphvizr += CSWzlib
+RUNTIME_DEP_PKGS_CSWgraphvizr += CSWr
RUNTIME_DEP_PKGS_CSWgraphvizr += CSWgcc4corert
RUNTIME_DEP_PKGS_CSWgraphvizr += CSWgcc4g++rt
RUNTIME_DEP_PKGS_CSWgraphvizr += CSWlibltdl7
@@ -301,55 +265,41 @@
RUNTIME_DEP_PKGS_CSWgraphvizr += CSWlibxdot4
RUNTIME_DEP_PKGS_CSWgraphvizr += CSWlibcdt5
RUNTIME_DEP_PKGS_CSWgraphvizr += CSWlibgvc6
-RUNTIME_DEP_PKGS_CSWgraphvizr += CSWlibgraph5
PKGFILES_CSWgraphvizr = $(libdir)/graphviz/R/.*
PKGFILES_CSWgraphvizr += $(mandir)/man3/.*\.3r
PKGFILES_CSWgraphvizr += $(sharedstatedir)/graphviz/demo/.*\.r
PACKAGES += CSWgraphvizruby
SPKG_DESC_CSWgraphvizruby = Graphviz language binding for ruby
-RUNTIME_DEP_PKGS_CSWgraphvizruby = CSWruby
+RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWruby
RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWlibruby18-1
-RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWexpat
-RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWzlib
-RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWgcc4corert
-RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWgcc4g++rt
-RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWlibpathplan4
-RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWlibxdot4
-RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWlibcdt5
RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWlibgvc6
-RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWlibgraph5
+RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWgraphvizruby += CSWlibcgraph6
PKGFILES_CSWgraphvizruby = $(libdir)/graphviz/ruby/.*
PKGFILES_CSWgraphvizruby += $(mandir)/man3/.*\.3ruby
PKGFILES_CSWgraphvizruby += $(sharedstatedir)/graphviz/demo/.*\.rb
+# No 64 bit ruby
+CHECKPKG_OVERRIDES_CSWgraphvizruby += 64-bit-binaries-missing
PACKAGES += CSWgraphviztcl
SPKG_DESC_CSWgraphviztcl = Graphviz language binding for tcl
-RUNTIME_DEP_PKGS_CSWgraphviztcl = CSWtk
-RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibcairo
-RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWfconfig
-RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWpango
-RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWftype2
-RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWgts
-RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWglib2
-RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWexpat
-RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWzlib
-RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWpng
-RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWjpeg
-RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibgd2
-RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWiconv
-RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWxpm
-RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWgcc4corert
-RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWgcc4g++rt
RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibcdt5
+RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWpango
+RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibgd3
RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibpathplan4
-RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibxdot4
-RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibgraph5
RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibgvc6
-PKGFILES_CSWgraphviztcl = $(libdir)/graphviz/tcl/.*
+RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibz1
+RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibgts0-7-5
+RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibcgraph6
+RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWgraphviztcl += CSWlibcairo2
+PKGFILES_CSWgraphviztcl += $(call baseisadirs,$(libdir),graphviz/tcl/.*)
PKGFILES_CSWgraphviztcl += $(mandir)/man3/.*\.3tcl
PKGFILES_CSWgraphviztcl += $(mandir)/man3/.*\.3tk
PKGFILES_CSWgraphviztcl += $(sharedstatedir)/graphviz/demo/.*\.tcl
@@ -362,27 +312,16 @@
PKGFILES_CSWlibcdt5 += $(call baseisadirs,$(libdir),libcdt\.so\.5\.0\.0)
PKGFILES_CSWlibcdt5 += $(call baseisadirs,$(libdir),libcdt\.so\.5(\.\d+)*)
SPKG_DESC_CSWlibcdt5 += Graph Visualization Tools, libcdt.so.5
-RUNTIME_DEP_PKGS_CSWlibcdt5 += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWlibcdt5 += CSWgcc4corert
+RUNTIME_DEP_PKGS_CSWlibcdt5 += CSWlibgcc-s1
PACKAGES += CSWlibcgraph6
CATALOGNAME_CSWlibcgraph6 = libcgraph6
PKGFILES_CSWlibcgraph6 += $(call baseisadirs,$(libdir),libcgraph\.so\.6\.0\.0)
PKGFILES_CSWlibcgraph6 += $(call baseisadirs,$(libdir),libcgraph\.so\.6(\.\d+)*)
SPKG_DESC_CSWlibcgraph6 += Graph Visualization Tools, libcgraph.so.6
-RUNTIME_DEP_PKGS_CSWlibcgraph6 += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWlibcgraph6 += CSWgcc4corert
RUNTIME_DEP_PKGS_CSWlibcgraph6 += CSWlibcdt5
+RUNTIME_DEP_PKGS_CSWlibcgraph6 += CSWlibgcc-s1
-PACKAGES += CSWlibgraph5
-CATALOGNAME_CSWlibgraph5 = libgraph5
-PKGFILES_CSWlibgraph5 += $(call baseisadirs,$(libdir),libgraph\.so\.5\.0\.0)
-PKGFILES_CSWlibgraph5 += $(call baseisadirs,$(libdir),libgraph\.so\.5(\.\d+)*)
-SPKG_DESC_CSWlibgraph5 += Graph Visualization Tools, libgraph.so.5
-RUNTIME_DEP_PKGS_CSWlibgraph5 += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWlibgraph5 += CSWgcc4corert
-RUNTIME_DEP_PKGS_CSWlibgraph5 += CSWlibcdt5
-
PACKAGES += CSWlibgvc6
CATALOGNAME_CSWlibgvc6 = libgvc6
PKGFILES_CSWlibgvc6 += $(call baseisadirs,$(libdir),libgvc\.so\.6\.0\.0)
@@ -390,39 +329,34 @@
SPKG_DESC_CSWlibgvc6 += Graph Visualization Tools, libgvc.so.6
RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWlibltdl7
RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWlibpathplan4
-RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWlibxdot4
RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWlibcdt5
-RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWzlib
-RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWexpat
-RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWgcc4corert
-RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWlibgraph5
+RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWlibcgraph6
+RUNTIME_DEP_PKGS_CSWlibgvc6 += CSWlibz1
PACKAGES += CSWlibgvpr2
CATALOGNAME_CSWlibgvpr2 = libgvpr2
PKGFILES_CSWlibgvpr2 += $(call baseisadirs,$(libdir),libgvpr\.so\.2\.0\.0)
PKGFILES_CSWlibgvpr2 += $(call baseisadirs,$(libdir),libgvpr\.so\.2(\.\d+)*)
SPKG_DESC_CSWlibgvpr2 += Graph Visualization Tools, libgvpr.so.2
-RUNTIME_DEP_PKGS_CSWlibgvpr2 += CSWlibltdl7
RUNTIME_DEP_PKGS_CSWlibgvpr2 += CSWlibcdt5
-RUNTIME_DEP_PKGS_CSWlibgvpr2 += CSWgcc4corert
RUNTIME_DEP_PKGS_CSWlibgvpr2 += CSWlibcgraph6
+RUNTIME_DEP_PKGS_CSWlibgvpr2 += CSWlibgcc-s1
-
PACKAGES += CSWlibpathplan4
CATALOGNAME_CSWlibpathplan4 = libpathplan4
PKGFILES_CSWlibpathplan4 += $(call baseisadirs,$(libdir),libpathplan\.so\.4\.0\.0)
PKGFILES_CSWlibpathplan4 += $(call baseisadirs,$(libdir),libpathplan\.so\.4(\.\d+)*)
SPKG_DESC_CSWlibpathplan4 += Graph Visualization Tools, libpathplan.so.4
-RUNTIME_DEP_PKGS_CSWlibpathplan4 += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWlibpathplan4 += CSWgcc4corert
+RUNTIME_DEP_PKGS_CSWlibpathplan4 += CSWlibgcc-s1
PACKAGES += CSWlibxdot4
CATALOGNAME_CSWlibxdot4 = libxdot4
PKGFILES_CSWlibxdot4 += $(call baseisadirs,$(libdir),libxdot\.so\.4\.0\.0)
PKGFILES_CSWlibxdot4 += $(call baseisadirs,$(libdir),libxdot\.so\.4(\.\d+)*)
SPKG_DESC_CSWlibxdot4 += Graph Visualization Tools, libxdot.so.4
-RUNTIME_DEP_PKGS_CSWlibxdot4 += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWlibxdot4 += CSWgcc4corert
+RUNTIME_DEP_PKGS_CSWlibxdot4 += CSWlibgcc-s1
DISTFILES = $(NAME)-$(VERSION).tar.gz
DISTFILES += CSWgraphviz.postinstall
@@ -433,11 +367,14 @@
CONFIGURE_ARGS += --with-sfdp
CONFIGURE_ARGS += --without-smyrna
CONFIGURE_ARGS += --with-gtk
+CONFIGURE_ARGS += --with-qt=no
CONFIGURE_ARGS += --with-gdk-pixbuf
CONFIGURE_ARGS += --with-ghostscript
CONFIGURE_ARGS += --with-lasi
CONFIGURE_ARGS += --without-ipsepcola
CONFIGURE_ARGS += --with-rsvg
+CONFIGURE_ARGS += --enable-python=no
+CONFIGURE_ARGS += --enable-python27=yes
CONFIGURE_ARGS += --disable-devil
CONFIGURE_ARGS += --disable-java
CONFIGURE_ARGS += --disable-lua
@@ -448,27 +385,37 @@
CONFIGURE_ARGS += --disable-silent-rules
CONFIGURE_ARGS += "PANGOCAIRO_CFLAGS=`pkg-config --cflags pangocairo`"
+# Yes, configure is making silly assumption of what the CPU type can be on
+# Solaris, and that's one of the things needed to properly detect tclConfig.sh
+CONFIGURE_ARGS-isa-amd64 += --build=x86_64-solaris2.10
+CONFIGURE_ARGS-isa-sparcv9 += --build=sparc64-sun-solaris2.10
+# Also, no 64 bit perl
+CONFIGURE_ARGS-isa-amd64 += --enable-perl=no
+CONFIGURE_ARGS-isa-sparcv9 += --enable-perl=no
+# No 64 bit guile
+CONFIGURE_ARGS-isa-amd64 += --enable-guile=no
+CONFIGURE_ARGS-isa-sparcv9 += --enable-guile=no
+# No 64 bit Ruby
+CONFIGURE_ARGS-isa-amd64 += --enable-ruby=no
+CONFIGURE_ARGS-isa-sparcv9 += --enable-ruby=no
+CONFIGURE_ARGS += $(CONFIGURE_ARGS-isa-$(ISA))
+
EXTRA_LD_FLAGS = -lm
+
+# Ugly, but without it, there are tons of errors with Guile
+EXTRA_CXXFLAGS = -fpermissive
+
STRIP_LIBTOOL=1
TEST_SCRIPTS =
-# It's a known problem with the tcl library.
-CHECKPKG_OVERRIDES_CSWgraphviztcl += file-with-bad-content
-
-# /usr/local references from the docs are allright
-CHECKPKG_OVERRIDES_CSWgraphvizdoc += file-with-bad-content
-
-#FIXME - sometime - demo code
-CHECKPKG_OVERRIDES_CSWgraphvizgraphs += file-with-bad-content|/usr/share|root/opt/csw/share/graphviz/graphs/directed/pmpipe.gv
-CHECKPKG_OVERRIDES_CSWgraphvizperl += file-with-bad-content|/usr/local|root/opt/csw/share/graphviz/demo/modgraph.pl
-
#FIXME - maybe - poss false alarm? - can't find any "/usr/local" in sources
CHECKPKG_OVERRIDES_CSWlibgvpr2 += file-with-bad-content|/usr/local|root/opt/csw/lib/libgvpr.so.2.0.0
-CHECKPKG_OVERRIDES_CSWgraphviz += file-with-bad-content|/usr/local|root/opt/csw/bin/gvpr_static
+CHECKPKG_OVERRIDES_CSWlibgvpr2 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libgvpr.so.2.0.0
+CHECKPKG_OVERRIDES_CSWlibgvpr2 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libgvpr.so.2.0.0
+CHECKPKG_OVERRIDES_CSWgraphviz += file-with-bad-content|/usr/local|root/opt/csw/bin/pentium_pro/gvpr_static
+CHECKPKG_OVERRIDES_CSWgraphviz += file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/gvpr_static
+CHECKPKG_OVERRIDES_CSWgraphviz += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv9/gvpr_static
+CHECKPKG_OVERRIDES_CSWgraphviz += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv8plus/gvpr_static
include gar/category.mk
-
-post-merge:
- gln -s . $(PKGROOT)$(prefix)/graphviz2
- @$(MAKECOOKIE)
Modified: csw/mgar/pkg/graphviz/trunk/checksums
===================================================================
--- csw/mgar/pkg/graphviz/trunk/checksums 2013-08-01 00:09:00 UTC (rev 21599)
+++ csw/mgar/pkg/graphviz/trunk/checksums 2013-08-01 01:32:54 UTC (rev 21600)
@@ -1,12 +1 @@
-b66d09e11339fc981ab7c62518b3f92e CSWgraphviz.postinstall
-b66d09e11339fc981ab7c62518b3f92e CSWgraphvizdevil.postinstall
-b66d09e11339fc981ab7c62518b3f92e CSWgraphvizdevil.postuninstall
-b66d09e11339fc981ab7c62518b3f92e CSWgraphvizgd.postinstall
-b66d09e11339fc981ab7c62518b3f92e CSWgraphvizgd.postuninstall
-d039829d638e26ea600f4db3e213959f configure.patch
-f2c5f062fb643dbb0db352a25bf09e6c Makefile.am.patch
-5ced04f48ec6c223d6a6e51c2f6219d0 trapezoid.c.patch
-31f8a6e9e31075ad537fc2b9d2e6ab09 post_process.c.patch
-a9e6a8d6711f217155272c1e17e7d106 gvpr_Makefile.am.patch
-53b4189304d377812b47c885a4f97342 gv_Makefile.am.patch
-8d26c1171f30ca3b1dc1b429f7937e58 graphviz-2.28.0.tar.gz
+8130785a8f1fb8a57f6b839b617e85fa graphviz-2.30.1.tar.gz
Added: csw/mgar/pkg/graphviz/trunk/files/0001_configure_tcl_bin_path_not_good_for_64bit.patch
===================================================================
--- csw/mgar/pkg/graphviz/trunk/files/0001_configure_tcl_bin_path_not_good_for_64bit.patch (rev 0)
+++ csw/mgar/pkg/graphviz/trunk/files/0001_configure_tcl_bin_path_not_good_for_64bit.patch 2013-08-01 01:32:54 UTC (rev 21600)
@@ -0,0 +1,20 @@
+--- a/configure jeu. févr 14 14:30:22 2013
++++ b/configure mar. juil 30 22:09:59 2013
+@@ -23637,7 +23637,7 @@
+ # can't assume ksh on all architectures
+ # TCLSH_EXEC_PREFIX=${TCLSH%%/bin/tclsh.*}
+ # so use sed instead
+- TCLSH_EXEC_PREFIX=`echo $TCLSH|sed -e 's%/bin/tclsh.*$%%'`
++ TCLSH_EXEC_PREFIX=`echo $TCLSH|sed -e 's%/bin/.*tclsh.*$%%'`
+
+ if test -f ${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND}/tcl.h; then
+ TCL_INCLUDES="-I${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND} -I${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND}/generic"
+@@ -23853,7 +23853,7 @@
+ # can't assume ksh on all architectures
+ # WISH_EXEC_PREFIX=${WISH%%/bin/tclsh.*}
+ # so use sed instead
+- WISH_EXEC_PREFIX=`echo $WISH|sed -e 's%/bin/wish.*$%%'`
++ WISH_EXEC_PREFIX=`echo $WISH|sed -e 's%/bin/.*wish.*$%%'`
+
+ if test -f ${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/tk.h; then
+ TK_INCLUDES="-I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND} -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/generic -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/unix"
Added: csw/mgar/pkg/graphviz/trunk/files/0002_configure_guile_version_detection_needs_gsed.patch
===================================================================
--- csw/mgar/pkg/graphviz/trunk/files/0002_configure_guile_version_detection_needs_gsed.patch (rev 0)
+++ csw/mgar/pkg/graphviz/trunk/files/0002_configure_guile_version_detection_needs_gsed.patch 2013-08-01 01:32:54 UTC (rev 21600)
@@ -0,0 +1,55 @@
+--- a/configure Tue Jul 30 23:30:11 2013
++++ b/configure Tue Jul 30 23:39:30 2013
+@@ -20960,7 +20960,7 @@
+ if test "x$GUILE" == "x"; then
+ use_guile="No (guile not available)"
+ else
+- GUILE_VERSION=`$GUILE --version | sed -n '1 s/^.* \+\([0-9\.]\+\)$/\1/ p'`
++ GUILE_VERSION=`$GUILE --version | gsed -n '1 s/^.* \+\([0-9\.]\+\)$/\1/ p'`
+ GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1`
+ GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2`
+ if test 0$GUILE_VERSION_MAJOR -lt 2; then
+@@ -20987,12 +20987,12 @@
+ pkg_cv_GUILE_CFLAGS="$GUILE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile >= \"\$GUILE_VERSION_MAJOR.\$GUILE_VERSION_MINOR\"\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "guile >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.0 >= \"\$GUILE_VERSION_MAJOR.\$GUILE_VERSION_MINOR\"\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "guile-2.0 >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"" 2>/dev/null`
++ pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-2.0 >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -21003,12 +21003,12 @@
+ pkg_cv_GUILE_LIBS="$GUILE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile >= \"\$GUILE_VERSION_MAJOR.\$GUILE_VERSION_MINOR\"\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "guile >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.0 >= \"\$GUILE_VERSION_MAJOR.\$GUILE_VERSION_MINOR\"\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "guile-2.0 >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"" 2>/dev/null`
++ pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-2.0 >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -21028,9 +21028,9 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "guile >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"" 2>&1`
++ GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "guile-2.0 >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"" 2>&1`
+ else
+- GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors "guile >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"" 2>&1`
++ GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors "guile-2.0 >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GUILE_PKG_ERRORS" >&5
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list