[csw-devel] SF.net SVN: gar:[21887] csw/mgar/pkg/graphviz/trunk
lblume at users.sourceforge.net
lblume at users.sourceforge.net
Sat Sep 7 12:34:56 CEST 2013
Revision: 21887
http://gar.svn.sourceforge.net/gar/?rev=21887&view=rev
Author: lblume
Date: 2013-09-07 10:34:55 +0000 (Sat, 07 Sep 2013)
Log Message:
-----------
graphviz/trunk: Bump version to 2.34.0; remove old patch files
Modified Paths:
--------------
csw/mgar/pkg/graphviz/trunk/Makefile
csw/mgar/pkg/graphviz/trunk/checksums
Removed 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
csw/mgar/pkg/graphviz/trunk/files/Makefile.am.patch
csw/mgar/pkg/graphviz/trunk/files/configure.patch
csw/mgar/pkg/graphviz/trunk/files/gv_Makefile.am.patch
csw/mgar/pkg/graphviz/trunk/files/gvpr_Makefile.am.patch
csw/mgar/pkg/graphviz/trunk/files/post_process.c.patch
csw/mgar/pkg/graphviz/trunk/files/trapezoid.c.patch
Modified: csw/mgar/pkg/graphviz/trunk/Makefile
===================================================================
--- csw/mgar/pkg/graphviz/trunk/Makefile 2013-09-06 20:35:01 UTC (rev 21886)
+++ csw/mgar/pkg/graphviz/trunk/Makefile 2013-09-07 10:34:55 UTC (rev 21887)
@@ -4,7 +4,7 @@
# investigated.
NAME = graphviz
-VERSION = 2.32.0
+VERSION = 2.34.0
GARTYPE = v2
DESCRIPTION = Graph visualization tools
@@ -20,8 +20,6 @@
GARCOMPILER = GCC4
-PATCHFILES += 0001_configure_tcl_bin_path_not_good_for_64bit.patch
-
INCOMPATIBLE_PKGS = CSWgraphvis
BUILD64 = 1
Modified: csw/mgar/pkg/graphviz/trunk/checksums
===================================================================
--- csw/mgar/pkg/graphviz/trunk/checksums 2013-09-06 20:35:01 UTC (rev 21886)
+++ csw/mgar/pkg/graphviz/trunk/checksums 2013-09-07 10:34:55 UTC (rev 21887)
@@ -1 +1 @@
-deda3933da701e2cc9ad968249a0b096 graphviz-2.32.0.tar.gz
+a8a54f8abac5bcdafd9a568e85a086d6 graphviz-2.34.0.tar.gz
Deleted: 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 2013-09-06 20:35:01 UTC (rev 21886)
+++ csw/mgar/pkg/graphviz/trunk/files/0001_configure_tcl_bin_path_not_good_for_64bit.patch 2013-09-07 10:34:55 UTC (rev 21887)
@@ -1,20 +0,0 @@
---- 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"
Deleted: 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 2013-09-06 20:35:01 UTC (rev 21886)
+++ csw/mgar/pkg/graphviz/trunk/files/0002_configure_guile_version_detection_needs_gsed.patch 2013-09-07 10:34:55 UTC (rev 21887)
@@ -1,55 +0,0 @@
---- 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
Deleted: csw/mgar/pkg/graphviz/trunk/files/Makefile.am.patch
===================================================================
--- csw/mgar/pkg/graphviz/trunk/files/Makefile.am.patch 2013-09-06 20:35:01 UTC (rev 21886)
+++ csw/mgar/pkg/graphviz/trunk/files/Makefile.am.patch 2013-09-07 10:34:55 UTC (rev 21887)
@@ -1,25 +0,0 @@
---- graphviz2/Makefile.am.orig 2011-05-19 16:37:11.967464147 -0400
-+++ graphviz2/Makefile.am 2011-05-19 16:16:07.582870659 -0400
-@@ -12,7 +12,7 @@
- txt_DATA = $(txt)
- html_DATA = $(html)
-
--pkginclude_HEADERS = graphviz_version.h
-+pkginclude_HEADERS = $(top_builddir)/graphviz_version.h
-
- man_MANS = graphviz.7
-
-@@ -28,10 +28,10 @@
- # rm -f ToPAS
- # find $(distdir) -type f -exec md5sum {} >>ToPAS \;
-
--BUILT_SOURCES = graphviz_version.h
-+BUILT_SOURCES = $(top_builddir)/graphviz_version.h
-
--graphviz_version.h: config.h
-- $(GREP) 'PACKAGE\|VERSION\|GVPLUGIN' config.h > graphviz_version.h
-+$(top_builddir)/graphviz_version.h: config.h
-+ ggrep 'PACKAGE\|VERSION\|GVPLUGIN' config.h > $(top_builddir)/graphviz_version.h
-
- EXTRA_DIST = $(txt) $(html) graphviz.spec.in graphviz.spec \
- autogen.sh config/depcomp config/config.rpath \
Deleted: csw/mgar/pkg/graphviz/trunk/files/configure.patch
===================================================================
--- csw/mgar/pkg/graphviz/trunk/files/configure.patch 2013-09-06 20:35:01 UTC (rev 21886)
+++ csw/mgar/pkg/graphviz/trunk/files/configure.patch 2013-09-07 10:34:55 UTC (rev 21887)
@@ -1,39 +0,0 @@
---- graphviz-2.28.0/configure.orig 2011-05-07 05:27:36.000000000 +0200
-+++ graphviz-2.28.0/configure 2011-05-31 14:13:54.695706826 +0200
-@@ -4056,7 +4056,7 @@
- if test "x${prefix}" != "x/usr"; then
- CPPFLAGS="$CPPFLAGS -I${prefix}/include"
- LDFLAGS="$LDFLAGS -L${prefix}/lib"
-- PKG_CONFIG_PATH="$prefix/lib/pkgconfig$PATHSEPARATOR$PKG_CONFIG_PATH"
-+ PKG_CONFIG_PATH="$PKG_CONFIG_PATH$PATHSEPARATOR$prefix/lib/pkgconfig"
- export PKG_CONFIG_PATH
- fi
-
-@@ -25115,7 +25115,7 @@
-
- if test -n "$GDLIB_CONFIG"; then
- GD_INCLUDES=`$GDLIB_CONFIG --includes`
-- GD_LDFLAGS=`$GDLIB_CONFIG --ldflags | sed 's/-xarch=386 //'`
-+ GD_LDFLAGS=`$GDLIB_CONFIG --ldflags | sed 's/-xarch=[^ ]* //'`
- GD_LIBS=`$GDLIB_CONFIG --libs`
- GD_MAJORVERSION=`$GDLIB_CONFIG --majorversion`
- GD_MINORVERSION=`$GDLIB_CONFIG --minorversion`
-@@ -25270,7 +25270,8 @@
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgd $GD_LIBS $LIBS"
-+GD_LIBS="$GD_LDFLAGS -lgd $GD_LIBS"
-+LIBS="$GD_LIBS $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-@@ -25296,8 +25297,6 @@
- $as_echo "$ac_cv_lib_gd_main" >&6; }
- if test "x$ac_cv_lib_gd_main" = x""yes; then :
-
-- GD_LIBS="$GD_LDFLAGS -lgd $GD_LIBS"
--
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBGD 1
- _ACEOF
Deleted: csw/mgar/pkg/graphviz/trunk/files/gv_Makefile.am.patch
===================================================================
--- csw/mgar/pkg/graphviz/trunk/files/gv_Makefile.am.patch 2013-09-06 20:35:01 UTC (rev 21886)
+++ csw/mgar/pkg/graphviz/trunk/files/gv_Makefile.am.patch 2013-09-07 10:34:55 UTC (rev 21887)
@@ -1,15 +0,0 @@
---- graphviz-2.28.0/tclpkg/gv/Makefile.am.orig 2011-03-28 20:15:56.000000000 +0200
-+++ graphviz-2.28.0/tclpkg/gv/Makefile.am 2011-05-29 16:38:29.887586723 +0200
-@@ -133,9 +133,9 @@
-
- pkgperldir = $(pkglibdir)/perl
- PERL ?= perl
--PERL_CC = $(shell $(PERL) -MExtUtils::Embed -e ccopts)
--PERL_LD = $(shell $(PERL) -MExtUtils::Embed -e ldopts)
--VENDOR_ARCH = $(shell $(PERL) -MConfig -e 'print $$Config{installvendorarch};')
-+PERL_CC = `$(PERL) -MExtUtils::Embed -e ccopts | $(PERL) -pe 's/-x.*? //g'`
-+PERL_LD = `$(PERL) -MExtUtils::Embed -e ldopts`
-+VENDOR_ARCH = `$(PERL) -MConfig -e 'print $$Config{installvendorarch};'`
- PERL_data = gv.pm
- nodist_libgv_perl_la_SOURCES = gv_perl.cpp $(PERL_data)
- libgv_perl_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
Deleted: csw/mgar/pkg/graphviz/trunk/files/gvpr_Makefile.am.patch
===================================================================
--- csw/mgar/pkg/graphviz/trunk/files/gvpr_Makefile.am.patch 2013-09-06 20:35:01 UTC (rev 21886)
+++ csw/mgar/pkg/graphviz/trunk/files/gvpr_Makefile.am.patch 2013-09-07 10:34:55 UTC (rev 21887)
@@ -1,11 +0,0 @@
---- graphviz-2.28.0/lib/gvpr/Makefile.am.orig 2011-05-29 14:42:32.102324093 +0200
-+++ graphviz-2.28.0/lib/gvpr/Makefile.am 2011-05-29 14:42:51.192032898 +0200
-@@ -3,6 +3,8 @@
-
- pkgconfigdir = $(libdir)/pkgconfig
-
-+LIBS=
-+
- GVPR_VERSION="2:0:0"
-
- AM_CPPFLAGS = \
Deleted: csw/mgar/pkg/graphviz/trunk/files/post_process.c.patch
===================================================================
--- csw/mgar/pkg/graphviz/trunk/files/post_process.c.patch 2013-09-06 20:35:01 UTC (rev 21886)
+++ csw/mgar/pkg/graphviz/trunk/files/post_process.c.patch 2013-09-07 10:34:55 UTC (rev 21887)
@@ -1,9 +0,0 @@
---- graphviz2/lib/sfdpgen/post_process.c.orig 2011-05-20 11:08:31.253933170 -0400
-+++ graphviz2/lib/sfdpgen/post_process.c 2011-05-20 11:06:43.000000000 -0400
-@@ -412,7 +412,7 @@
-
-
- void SparseStressMajorizationSmoother_delete(SparseStressMajorizationSmoother sm){
-- return StressMajorizationSmoother_delete(sm);
-+ StressMajorizationSmoother_delete(sm);
- }
Deleted: csw/mgar/pkg/graphviz/trunk/files/trapezoid.c.patch
===================================================================
--- csw/mgar/pkg/graphviz/trunk/files/trapezoid.c.patch 2013-09-06 20:35:01 UTC (rev 21886)
+++ csw/mgar/pkg/graphviz/trunk/files/trapezoid.c.patch 2013-09-07 10:34:55 UTC (rev 21887)
@@ -1,13 +0,0 @@
---- graphviz2/lib/ortho/trapezoid.c.orig 2011-05-20 10:21:30.053193399 -0400
-+++ graphviz2/lib/ortho/trapezoid.c 2011-05-20 10:15:18.261136653 -0400
-@@ -28,6 +28,10 @@
-
- #ifdef WIN32
- #define log2(x) (log(x)/log(2))
-+#else
-+#ifndef HAVE_LOG2
-+#define log2(x) (log(x)/log(2))
-+#endif
- #endif
-
- /* Node types */
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