[csw-devel] SF.net SVN: gar:[14682] csw/mgar/pkg/graphviz/trunk

[ellson at users.sourceforge.net]

Revision: 14682
          http://gar.svn.sourceforge.net/gar/?rev=14682&view=rev
Author:   ellson
Date:     2011-05-31 12:22:52 +0000 (Tue, 31 May 2011)

Log Message:
-----------
graphviz: get rid of -x switch that gcc doesn't like

Modified Paths:
--------------
    csw/mgar/pkg/graphviz/trunk/Makefile
    csw/mgar/pkg/graphviz/trunk/checksums
    csw/mgar/pkg/graphviz/trunk/files/configure.patch

Removed Paths:
-------------
    csw/mgar/pkg/graphviz/trunk/files/configure_gd.patch

Modified: csw/mgar/pkg/graphviz/trunk/Makefile
===================================================================
--- csw/mgar/pkg/graphviz/trunk/Makefile	2011-05-31 12:08:06 UTC (rev 14681)
+++ csw/mgar/pkg/graphviz/trunk/Makefile	2011-05-31 12:22:52 UTC (rev 14682)
@@ -21,7 +21,6 @@
 GARCOMPILER = GCC4
 
 PATCHFILES += configure.patch
-PATCHFILES += configure_gd.patch
 PATCHFILES += Makefile.am.patch
 PATCHFILES += trapezoid.c.patch
 PATCHFILES += post_process.c.patch

Modified: csw/mgar/pkg/graphviz/trunk/checksums
===================================================================
--- csw/mgar/pkg/graphviz/trunk/checksums	2011-05-31 12:08:06 UTC (rev 14681)
+++ csw/mgar/pkg/graphviz/trunk/checksums	2011-05-31 12:22:52 UTC (rev 14682)
@@ -3,8 +3,7 @@
 b66d09e11339fc981ab7c62518b3f92e  CSWgraphvizdevil.postuninstall
 b66d09e11339fc981ab7c62518b3f92e  CSWgraphvizgd.postinstall
 b66d09e11339fc981ab7c62518b3f92e  CSWgraphvizgd.postuninstall
-bb58d5086e1aaa2519a7184b9ef1748f  configure.patch
-601adb487b4698e0a955206a2190725b  configure_gd.patch
+d039829d638e26ea600f4db3e213959f  configure.patch
 85ebea4df5ba1af93d04f52dbf7b94b6  Makefile.am.patch
 5ced04f48ec6c223d6a6e51c2f6219d0  trapezoid.c.patch
 31f8a6e9e31075ad537fc2b9d2e6ab09  post_process.c.patch

Modified: csw/mgar/pkg/graphviz/trunk/files/configure.patch
===================================================================
--- csw/mgar/pkg/graphviz/trunk/files/configure.patch	2011-05-31 12:08:06 UTC (rev 14681)
+++ csw/mgar/pkg/graphviz/trunk/files/configure.patch	2011-05-31 12:22:52 UTC (rev 14682)
@@ -1,6 +1,6 @@
---- graphviz-2.24.0/configure.orig	2009-06-17 01:24:55.000000000 +0200
-+++ graphviz-2.24.0/configure	2010-01-28 02:57:28.658585976 +0100
-@@ -3425,7 +3425,7 @@
+--- 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"
@@ -9,3 +9,31 @@
  	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/configure_gd.patch
===================================================================
--- csw/mgar/pkg/graphviz/trunk/files/configure_gd.patch	2011-05-31 12:08:06 UTC (rev 14681)
+++ csw/mgar/pkg/graphviz/trunk/files/configure_gd.patch	2011-05-31 12:22:52 UTC (rev 14682)
@@ -1,21 +0,0 @@
---- graphviz-2.28.0/configure.old	2011-05-31 13:58:42.522392950 +0200
-+++ graphviz-2.28.0/configure	2011-05-31 14:02:05.736756763 +0200
-@@ -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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.