[cvs] dists/10.7/stable/main/finkinfo/sci grass64.info,1.10,1.11

[Daniel M. <dm...@us...>]

Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1140

Modified Files:
	grass64.info 
Log Message:
ft219 dep cleanups

Index: grass64.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/grass64.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- grass64.info	3 May 2014 15:01:07 -0000	1.10
+++ grass64.info	2 Sep 2014 06:43:27 -0000	1.11
@@ -2,7 +2,7 @@
 Package: grass64%type_pkg[gui]
 Type: gui (-mac -x11)
 Version: 6.4.3
-Revision: 1
+Revision: 2
 Conflicts: grass64, grass64-mac, grass64-x11
 Replaces: grass64, grass64-mac, grass64-x11
 
@@ -33,11 +33,12 @@
 
 # Dependencies.
 Depends: <<
-  %n-shlibs (=%v-%r)
+  %n-shlibs (=%v-%r),
+  (%type_pkg[gui] = -x11) x11-shlibs
 <<
 BuildDepends: <<
   fink (>= 0.28),
-  freetype219,
+  freetype219 (>= 2.4.11-1),
   libncurses5-dev,
   libiconv-dev, readline6, libgettext8-dev, gettext-tools,
   fftw3,
@@ -49,7 +50,8 @@
   proj, proj-bin,
   python27,
   sqlite3-dev,
-  (%type_pkg[gui] = -x11) tcltk-dev
+  (%type_pkg[gui] = -x11) tcltk-dev,
+  (%type_pkg[gui] = -x11) x11-dev
 <<
 # hdf5-18-bin | hdf5-bin,
 # (%type_raw[gui] = -mac) wxmac28
@@ -69,7 +71,7 @@
 SetCFLAGS: -I%p/include
 SetLDFLAGS: -L%p/lib -lcurses
 
-ConfigureParams: --with-curses --with-freetype --with-freetype-includes=%p/lib/freetype219/include/freetype2 --with-freetype-libs=%p/lib/freetype219/lib --with-gdal=%p/bin/gdal-config --with-proj --with-proj-includes=%p/include --with-proj-libs=%p/lib --with-proj-share=%p/share/proj --with-jpeg-includes=%p/include --with-jpeg-libs=%p/lib --with-png-includes=%p/include --with-png-libs=%p/lib --with-tiff-includes=%p/include --with-tiff-libs=%p/lib --without-mysql --with-odbc --with-sqlite --with-sqlite-libs=%p/lib --with-sqlite-includes=%p/include --with-fftw-includes=%p/include --with-fftw-libs=%p/lib --with-cxx --without-motif --without-glw --without-readline --with-python=%p/bin/python2.7-config --prefix=%p/Applications --enable-macosx-app
+ConfigureParams: --with-curses --with-freetype --with-freetype-includes=%p/include/freetype2 --with-freetype-libs=%p/lib --with-gdal=%p/bin/gdal-config --with-proj --with-proj-includes=%p/include --with-proj-libs=%p/lib --with-proj-share=%p/share/proj --with-jpeg-includes=%p/include --with-jpeg-libs=%p/lib --with-png-includes=%p/include --with-png-libs=%p/lib --with-tiff-includes=%p/include --with-tiff-libs=%p/lib --without-mysql --with-odbc --with-sqlite --with-sqlite-libs=%p/lib --with-sqlite-includes=%p/include --with-fftw-includes=%p/include --with-fftw-libs=%p/lib --with-cxx --without-motif --without-glw --without-readline --with-python=%p/bin/python2.7-config --prefix=%p/Applications --enable-macosx-app
 
 
 
@@ -176,7 +178,7 @@
   Conflicts: grass64-shlibs, grass64-mac-shlibs, grass64-x11-shlibs
   Replaces: grass64-shlibs, grass64-mac-shlibs, grass64-x11-shlibs
   Depends: <<
-    freetype219-shlibs,
+    freetype219-shlibs (>= 2.4.11-1),
     libncurses5-shlibs,
     libiconv,
     fftw3-shlibs,