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

[hson at users.sourceforge.net]

Revision: 8396
          http://gar.svn.sourceforge.net/gar/?rev=8396&view=rev
Author:   hson
Date:     2010-02-08 02:28:16 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
graphviz: Link to CSW X11, prepare for 64-bit build

Modified Paths:
--------------
    csw/mgar/pkg/graphviz/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/graphviz/trunk/files/configure.patch

Modified: csw/mgar/pkg/graphviz/trunk/Makefile
===================================================================
--- csw/mgar/pkg/graphviz/trunk/Makefile	2010-02-08 02:19:21 UTC (rev 8395)
+++ csw/mgar/pkg/graphviz/trunk/Makefile	2010-02-08 02:28:16 UTC (rev 8396)
@@ -14,7 +14,8 @@
 # disable dependency checks because plugins depend on libs from base package
 ENABLE_CHECK = 0
 
-PATCHFILES =  Draw.c.diff
+PATCHFILES += configure.patch
+PATCHFILES +=  Draw.c.diff
 
 PACKAGES = CSWgraphviz \
 	CSWgraphvizdevel \
@@ -49,7 +50,7 @@
 ARCHALL_CSWgraphvizgraphs = 1
 ARCHALL_CSWgraphviz2 = 1
 
-# Sun's CC is broken on 64bit architectures!
+# Waiting for liblasi, gts, gd, ghostscript and tcl/tk
 #BUILD64 = 1
 
 BUILD_DEP_PKGS = 
@@ -216,8 +217,14 @@
 CONFIGURE_ARGS += --disable-php
 CONFIGURE_ARGS += --disable-r
 CONFIGURE_ARGS += --enable-static --enable-shared
-CONFIGURE_ARGS += PKG_CONFIG_PATH=/opt/csw/lib/pkgconfig:/opt/csw/X11/lib/pkgconfig
 
+
+EXTRA_INC = $(prefix)/X11/include
+EXTRA_LIB = $(prefix)/X11/lib
+EXTRA_LD_FLAGS = -lm
+EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+
 STRIP_LIBTOOL=1
 
 TEST_SCRIPTS = custom

Added: csw/mgar/pkg/graphviz/trunk/files/configure.patch
===================================================================
--- csw/mgar/pkg/graphviz/trunk/files/configure.patch	                        (rev 0)
+++ csw/mgar/pkg/graphviz/trunk/files/configure.patch	2010-02-08 02:28:16 UTC (rev 8396)
@@ -0,0 +1,11 @@
+--- 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 @@
+ 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
+ 


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