Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9584/10.7/stable/main/finkinfo/sci
Modified Files:
matplotlib-py.info matplotlib-py.patch
Log Message:
Fix bad flag-ordering and add diagnostics.
Index: matplotlib-py.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/matplotlib-py.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- matplotlib-py.patch 19 Jan 2013 15:41:48 -0000 1.4
+++ matplotlib-py.patch 7 Jun 2013 15:22:37 -0000 1.5
@@ -34,8 +34,8 @@
# execptions to the ['/usr/local', '/usr'] defaults
'win32' : ['win32_static',],
- 'darwin' : ['/usr/local/', '/usr', '/usr/X11', '/opt/local'],
-+ 'darwin' : ['/usr', '/usr/X11',
-+ '/opt/X11', '@PREFIX@/lib/freetype219', '@PREFIX@',],
++ 'darwin' : ['@PREFIX@/lib/freetype219', '@PREFIX@',
++ '/usr', '/usr/X11', '/opt/X11',],
'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',],
'gnu0' : ['/usr'],
'aix5' : ['/usr/local'],
Index: matplotlib-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/matplotlib-py.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- matplotlib-py.info 31 Mar 2013 22:51:00 -0000 1.10
+++ matplotlib-py.info 7 Jun 2013 15:22:37 -0000 1.11
@@ -40,6 +40,7 @@
atk1 (>= 1.20.0-1),
cairo (>= 1.6-1),
expat1,
+ fink-package-precedence,
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.5-1),
gettext-bin,
@@ -64,12 +65,13 @@
GCC: 4.0
NoSetCPPFLAGS: True
-SetCPPFLAGS: -I%p/include/pygtk-2.0 -I%p/lib/freetype219/include/freetype2
-I%p/lib/fontconfig2/include -DNSIG=32
+SetCPPFLAGS: -I%p/include/pygtk-2.0 -I%p/lib/freetype219/include/freetype2
-I%p/lib/fontconfig2/include -DNSIG=32 -MD
NoSetLDFLAGS: True
SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib
+SetCXXFLAGS: -MD
PatchFile: %{ni}.patch
-PatchFile-MD5: b311a9e244d77d61df791dcdd26a4db2
+PatchFile-MD5: e56656ac339f6594b7301c5f421bc075
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
CompileScript: <<
@@ -77,6 +79,7 @@
export PATH=%p/lib/freetype219:$PATH
export
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
%p/bin/python%type_raw[python] setup.py build
+ fink-package-precedence --depfile-ext='\.d' build
<<
# --compiler=%p/bin/g++-fsf-4.6
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
