Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8549
Modified Files:
graphviz.info
Log Message:
sync with 10.7
Index: graphviz.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/graphviz.info,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- graphviz.info 19 Apr 2013 20:10:16 -0000 1.20
+++ graphviz.info 29 Jul 2013 16:23:04 -0000 1.21
@@ -2,7 +2,7 @@
Package: graphviz%type_pkg[var]
Type: var (. -nox)
Version: 2.26.3
-Revision: 7
+Revision: 8
License: OSI-Approved
# License: Common Public License 1.0
Maintainer: David Fang <fang...@users.sourceforge.net>
@@ -17,10 +17,10 @@
SourceDirectory: graphviz-%v
Source-MD5: 6f45946fa622770c45609778c0a982ee
PatchFile: graphviz.patch
-PatchFile-MD5: be11768d92be0bf3ec3c014ee244e4aa
+PatchFile-MD5: 5d35b2df78217fd312da61ed591ed1de
PatchScript: <<
#!/bin/sh -ev
- %{default_script}
+ sed 's|@FINKPREFIX@|%p|g' < %{PatchFile} | patch -p1
sed -i.orig -e '/OCAML/s|/usr|%p|g' \
-e '/framework/s|-\(framework\) |-Wl,-\1,|g' \
configure
@@ -44,14 +44,14 @@
(%type_raw[var] = .) freeglut,
freetype219 (>= 2.3.5-1),
giflib,
- gmp,
+ gmp5,
(%type_raw[var] = .) glib2-dev (>= 2.14.0-1),
(%type_raw[var] = .) glitz,
(%type_raw[var] = .) gtkglext1 (>= 1.0.6-1007),
(%type_raw[var] = .) gts75,
guile18,
guile18-dev,
- libjpeg8,
+ libjpeg9 (>= 9-3),
(%type_raw[var] = .) librsvg2 (>= 2.20.0-1),
(%type_raw[var] = .) libiconv-dev,
(%type_raw[var] = .) libgettext8-dev (>= 0.14.5-1),
@@ -120,11 +120,8 @@
--disable-python \
GUILE=%p/bin/guile-1.8 \
(%type_raw[var] = .)
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH" \
- RUBY=/usr/bin/ruby \
-
CPPFLAGS="-I/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Headers
-I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers
-I%p/lib/ocaml -idirafter $system_ruby_include" \
- -C
+ RUBY=/usr/bin/ruby
<<
-SetLDFLAGS: -Wl,-framework,JavaVM -Wl,-framework,ApplicationServices
-Wl,-framework,CoreServices
# (%type_raw[var] = -nox) --with-mylibgd \
# other possible configure params:
#
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
@@ -149,7 +146,18 @@
then { echo "No X11 found."; exit 1; }
# else, don't care if X11 is not found for -nox
fi
- ./configure %c
+ # handle java
+ JAVA_VERSION=`javac -version 2>&1 >/dev/null | cut -d ' ' -f 2`
+ JAVA_RELEASE=`javac -version 2>&1 >/dev/null | cut -d ' ' -f 2 | cut
-d. -f1-2`
+ case "$JAVA_RELEASE" in
+ "1.6") export LDFLAGS="-Wl,-framework,JavaVM
-Wl,-framework,ApplicationServices -Wl,-framework,CoreServices"
+ ./configure %c
CPPFLAGS="-I/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Headers
-I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers
-I%p/lib/ocaml -idirafter $system_ruby_include" -C
+ ;;
+ "1.7" ) export
LDFLAGS="-L/Library/Java/JavaVirtualMachines/jdk$JAVA_VERSION.jdk/Contents/Home/lib
-Wl,-framework,ApplicationServices -Wl,-framework,CoreServices"
+ ./configure %c
CPPFLAGS="-I/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Headers
-I/Library/Java/JavaVirtualMachines/jdk$JAVA_VERSION.jdk/Contents/Home/include
-I%p/lib/ocaml -idirafter $system_ruby_include" -C
+ ;;
+ *) ;;
+ esac
# TK_XINCLUDES needed for 10.8
sed -i.orig -e '/framework/s|-\(framework\) |-Wl,-\1,|g' \
-e "/TK_XINCLUDES/s|\"\"|\"-I$X11_ROOT/include\"|" config.status
@@ -199,7 +207,7 @@
giflib-shlibs,
(%type_raw[var] = .) glitz-shlibs,
(%type_raw[var] = .) gts75-shlibs,
- libjpeg8-shlibs,
+ libjpeg9-shlibs (>= 9-3),
(%type_raw[var] = .) libiconv,
(%type_raw[var] = .) librsvg2-shlibs (>= 2.20.0-1),
(%type_raw[var] = .) libgettext8-shlibs,
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
