[103092] trunk/dports/graphics

ryandesign at macports.org ryandesign at macports.org
Wed Feb 13 20:57:49 PST 2013 

Revision: 103092
          https://trac.macports.org/changeset/103092
Author:   ryandesign at macports.org
Date:     2013-02-13 20:57:49 -0800 (Wed, 13 Feb 2013)
Log Message:
-----------
graphviz, graphviz-devel: fix build failure with +glitz variant

Modified Paths:
--------------
    trunk/dports/graphics/graphviz/Portfile
    trunk/dports/graphics/graphviz-devel/Portfile

Added Paths:
-----------
    trunk/dports/graphics/graphviz/files/patch-cgraph.diff
    trunk/dports/graphics/graphviz-devel/files/patch-cgraph.diff

Removed Paths:
-------------
    trunk/dports/graphics/graphviz/files/patch-plugin-ming-Makefile.in.diff
    trunk/dports/graphics/graphviz-devel/files/patch-plugin-ming-Makefile.in.diff

Modified: trunk/dports/graphics/graphviz/Portfile
===================================================================
--- trunk/dports/graphics/graphviz/Portfile	2013-02-14 01:18:12 UTC (rev 103091)
+++ trunk/dports/graphics/graphviz/Portfile	2013-02-14 04:57:49 UTC (rev 103092)
@@ -59,7 +59,7 @@
 
 depends_run                     port:urw-fonts
 
-patchfiles                      patch-plugin-ming-Makefile.in.diff
+patchfiles                      patch-cgraph.diff
 
 # nawk: illegal jump type 339
 conflicts_build                 nawk

Copied: trunk/dports/graphics/graphviz/files/patch-cgraph.diff (from rev 103077, trunk/dports/graphics/graphviz/files/patch-plugin-ming-Makefile.in.diff)
===================================================================
--- trunk/dports/graphics/graphviz/files/patch-cgraph.diff	                        (rev 0)
+++ trunk/dports/graphics/graphviz/files/patch-cgraph.diff	2013-02-14 04:57:49 UTC (rev 103092)
@@ -0,0 +1,57 @@
+http://www.graphviz.org/mantisbt/view.php?id=2257
+http://hg.research.att.com/graphviz/rev/59b90d6b66e4
+--- plugin/gdiplus/Makefile.in.orig	2013-01-13 21:23:26.000000000 -0600
++++ plugin/gdiplus/Makefile.in	2013-02-13 22:21:48.000000000 -0600
+@@ -532,12 +532,14 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
++ at WITH_CGRAPH_FALSE@GRAPH = graph
++ at WITH_CGRAPH_TRUE@GRAPH = cgraph
+ AM_CPPFLAGS = \
+ 	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/lib/common \
+ 	-I$(top_srcdir)/lib/pathplan \
+ 	-I$(top_srcdir)/lib/gvc \
+-	-I$(top_srcdir)/lib/graph \
++	-I$(top_srcdir)/lib/$(GRAPH) \
+ 	-I$(top_srcdir)/lib/cdt
+ 
+ PATCHES = GdiPlusEnums.h.patch GdiPlusHeaders.h.patch GdiPlusimageAttributes.h.patch GdiPlusImaging.h.patch
+--- plugin/glitz/Makefile.in.orig	2013-01-13 21:23:27.000000000 -0600
++++ plugin/glitz/Makefile.in	2013-02-13 22:21:48.000000000 -0600
+@@ -502,12 +502,14 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
++ at WITH_CGRAPH_FALSE@GRAPH = graph
++ at WITH_CGRAPH_TRUE@GRAPH = cgraph
+ AM_CPPFLAGS = \
+ 	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/lib/common \
+ 	-I$(top_srcdir)/lib/pathplan \
+ 	-I$(top_srcdir)/lib/gvc \
+-	-I$(top_srcdir)/lib/graph \
++	-I$(top_srcdir)/lib/$(GRAPH) \
+ 	-I$(top_srcdir)/lib/cdt \
+ 	$(PANGOCAIRO_CFLAGS) $(GLITZ_CFLAGS)
+ 
+--- plugin/ming/Makefile.in.orig	2013-01-13 21:23:27.000000000 -0600
++++ plugin/ming/Makefile.in	2013-02-13 22:21:48.000000000 -0600
+@@ -504,13 +504,15 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
++ at WITH_CGRAPH_FALSE@GRAPH = graph
++ at WITH_CGRAPH_TRUE@GRAPH = cgraph
+ pkgfontdir = ${pkgdatadir}/font
+ AM_CPPFLAGS = \
+ 	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/lib/common \
+ 	-I$(top_srcdir)/lib/pathplan \
+ 	-I$(top_srcdir)/lib/gvc \
+-	-I$(top_srcdir)/lib/graph \
++	-I$(top_srcdir)/lib/$(GRAPH) \
+ 	-I$(top_srcdir)/lib/cdt \
+ 	$(MING_CFLAGS)
+ 

Deleted: trunk/dports/graphics/graphviz/files/patch-plugin-ming-Makefile.in.diff
===================================================================
--- trunk/dports/graphics/graphviz/files/patch-plugin-ming-Makefile.in.diff	2013-02-14 01:18:12 UTC (rev 103091)
+++ trunk/dports/graphics/graphviz/files/patch-plugin-ming-Makefile.in.diff	2013-02-14 04:57:49 UTC (rev 103092)
@@ -1,12 +0,0 @@
-http://www.graphviz.org/mantisbt/view.php?id=2257
---- plugin/ming/Makefile.in.orig	2013-02-10 23:46:19.000000000 -0600
-+++ plugin/ming/Makefile.in	2013-02-12 23:44:36.000000000 -0600
-@@ -510,7 +510,7 @@
- 	-I$(top_srcdir)/lib/common \
- 	-I$(top_srcdir)/lib/pathplan \
- 	-I$(top_srcdir)/lib/gvc \
--	-I$(top_srcdir)/lib/graph \
-+	-I$(top_srcdir)/lib/cgraph \
- 	-I$(top_srcdir)/lib/cdt \
- 	$(MING_CFLAGS)
- 

Modified: trunk/dports/graphics/graphviz-devel/Portfile
===================================================================
--- trunk/dports/graphics/graphviz-devel/Portfile	2013-02-14 01:18:12 UTC (rev 103091)
+++ trunk/dports/graphics/graphviz-devel/Portfile	2013-02-14 04:57:49 UTC (rev 103092)
@@ -58,7 +58,7 @@
 
 depends_run                     port:urw-fonts
 
-patchfiles                      patch-plugin-ming-Makefile.in.diff
+patchfiles                      patch-cgraph.diff
 
 # nawk: illegal jump type 339
 conflicts_build                 nawk

Copied: trunk/dports/graphics/graphviz-devel/files/patch-cgraph.diff (from rev 103077, trunk/dports/graphics/graphviz-devel/files/patch-plugin-ming-Makefile.in.diff)
===================================================================
--- trunk/dports/graphics/graphviz-devel/files/patch-cgraph.diff	                        (rev 0)
+++ trunk/dports/graphics/graphviz-devel/files/patch-cgraph.diff	2013-02-14 04:57:49 UTC (rev 103092)
@@ -0,0 +1,57 @@
+http://www.graphviz.org/mantisbt/view.php?id=2257
+http://hg.research.att.com/graphviz/rev/59b90d6b66e4
+--- plugin/gdiplus/Makefile.in.orig	2013-01-13 21:23:26.000000000 -0600
++++ plugin/gdiplus/Makefile.in	2013-02-13 22:21:48.000000000 -0600
+@@ -532,12 +532,14 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
++ at WITH_CGRAPH_FALSE@GRAPH = graph
++ at WITH_CGRAPH_TRUE@GRAPH = cgraph
+ AM_CPPFLAGS = \
+ 	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/lib/common \
+ 	-I$(top_srcdir)/lib/pathplan \
+ 	-I$(top_srcdir)/lib/gvc \
+-	-I$(top_srcdir)/lib/graph \
++	-I$(top_srcdir)/lib/$(GRAPH) \
+ 	-I$(top_srcdir)/lib/cdt
+ 
+ PATCHES = GdiPlusEnums.h.patch GdiPlusHeaders.h.patch GdiPlusimageAttributes.h.patch GdiPlusImaging.h.patch
+--- plugin/glitz/Makefile.in.orig	2013-01-13 21:23:27.000000000 -0600
++++ plugin/glitz/Makefile.in	2013-02-13 22:21:48.000000000 -0600
+@@ -502,12 +502,14 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
++ at WITH_CGRAPH_FALSE@GRAPH = graph
++ at WITH_CGRAPH_TRUE@GRAPH = cgraph
+ AM_CPPFLAGS = \
+ 	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/lib/common \
+ 	-I$(top_srcdir)/lib/pathplan \
+ 	-I$(top_srcdir)/lib/gvc \
+-	-I$(top_srcdir)/lib/graph \
++	-I$(top_srcdir)/lib/$(GRAPH) \
+ 	-I$(top_srcdir)/lib/cdt \
+ 	$(PANGOCAIRO_CFLAGS) $(GLITZ_CFLAGS)
+ 
+--- plugin/ming/Makefile.in.orig	2013-01-13 21:23:27.000000000 -0600
++++ plugin/ming/Makefile.in	2013-02-13 22:21:48.000000000 -0600
+@@ -504,13 +504,15 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
++ at WITH_CGRAPH_FALSE@GRAPH = graph
++ at WITH_CGRAPH_TRUE@GRAPH = cgraph
+ pkgfontdir = ${pkgdatadir}/font
+ AM_CPPFLAGS = \
+ 	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/lib/common \
+ 	-I$(top_srcdir)/lib/pathplan \
+ 	-I$(top_srcdir)/lib/gvc \
+-	-I$(top_srcdir)/lib/graph \
++	-I$(top_srcdir)/lib/$(GRAPH) \
+ 	-I$(top_srcdir)/lib/cdt \
+ 	$(MING_CFLAGS)
+ 

Deleted: trunk/dports/graphics/graphviz-devel/files/patch-plugin-ming-Makefile.in.diff
===================================================================
--- trunk/dports/graphics/graphviz-devel/files/patch-plugin-ming-Makefile.in.diff	2013-02-14 01:18:12 UTC (rev 103091)
+++ trunk/dports/graphics/graphviz-devel/files/patch-plugin-ming-Makefile.in.diff	2013-02-14 04:57:49 UTC (rev 103092)
@@ -1,12 +0,0 @@
-http://www.graphviz.org/mantisbt/view.php?id=2257
---- plugin/ming/Makefile.in.orig	2013-02-10 23:46:19.000000000 -0600
-+++ plugin/ming/Makefile.in	2013-02-12 23:44:36.000000000 -0600
-@@ -510,7 +510,7 @@
- 	-I$(top_srcdir)/lib/common \
- 	-I$(top_srcdir)/lib/pathplan \
- 	-I$(top_srcdir)/lib/gvc \
--	-I$(top_srcdir)/lib/graph \
-+	-I$(top_srcdir)/lib/cgraph \
- 	-I$(top_srcdir)/lib/cdt \
- 	$(MING_CFLAGS)
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130213/e2c04301/attachment-0001.html>

More information about the macports-changes mailing list