Update of /cvsroot/fink/experimental/babayoshihiko/finkinfo
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5469
Modified Files:
qgis-mac.info grass64.info
Log Message:
fixed many issues; qgis+grass64 now works
Index: qgis-mac.info
===================================================================
RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/qgis-mac.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- qgis-mac.info 27 Jul 2010 06:06:40 -0000 1.4
+++ qgis-mac.info 26 Aug 2010 02:18:02 -0000 1.5
@@ -3,7 +3,7 @@
Package: qgis-mac%type_pkg[pgsql]%type_pkg[grass]
Type: pgsql (. -pgsql), grass (. -grass)
Architecture: powerpc, i386, x86_64
-Distribution: 10.4, 10.5, 10.6
+Distribution: (%type_raw[grass] = .) 10.4, (%type_raw[grass] = .) 10.5,
(%type_raw[grass] = -grass) 10.5, (%type_raw[grass] = .) 10.6,
(%type_raw[grass] = -grass) 10.6
Conflicts: qgis-mac, qgis-mac-pgsql, qgis-mac-grass, qgis-mac-pgsql-grass
Replaces: qgis-mac, qgis-mac-pgsql, qgis-mac-grass, qgis-mac-pgsql-grass
@@ -51,9 +51,9 @@
libiconv-dev, giflib, libtiff, libjpeg, libogdi3 (>= 3.1.5-1002),
libpng3, netcdf (>= 3.6.0-1002), cfitsio,
libgeos3, libgeosc1,
gdal-dev | gdal-pgsql-dev | gdal-mysql-dev| gdal-pgsql-mysql-dev,
- (type_pkg[64bit] = .) libspatialite1 | (type_pkg[64bit] = -64bit)
libspatialite1-64bit,
+ libspatialite1 | libspatialite1-64bit,
(%type_raw[pgsql] = -pgsql) postgresql83-dev,
- (%type_raw[grass] = -grass) grass64-dev | (%type_raw[grass] = -grass)
grass64-pgsql-dev,
+ (%type_raw[grass] = -grass) grass64-mac-dev | (%type_raw[grass] =
-grass) grass64-x11-dev,
proj (>=4)
<<
@@ -130,9 +130,9 @@
;;
esac
- # touch ../src/mac/Contents/SVN_MARKER-NOTFOUND
+ touch ../src/mac/Contents/SVN_MARKER-NOTFOUND
- make
+ make VERBOSE=1
cd ..
# End of CompileScript
<<
@@ -149,6 +149,9 @@
install_name_tool -id
"%p/Applications/qgis%v.app/Contents/MacOS/lib/libqgis_analysis.%v.dylib"
libqgis_analysis.%v.dylib
install_name_tool -id
"%p/Applications/qgis%v.app/Contents/MacOS/lib/libqgis_gui.%v.dylib"
libqgis_gui.%v.dylib
install_name_tool -id
"%p/Applications/qgis%v.app/Contents/MacOS/lib/libqgispython.%v.dylib"
libqgispython.%v.dylib
+ if [ "%type_raw[grass]" == "-grass" ]; then
+ install_name_tool -id
"%p/Applications/qgis%v.app/Contents/MacOS/lib/libqgisgrass.%v.dylib"
libqgisgrass.%v.dylib
+ fi
popd
# Workaround to SJIS problem
@@ -196,9 +199,9 @@
gsl-shlibs,
libgeos3-shlibs, libgeosc1-shlibs,
gdal-shlibs | gdal-pgsql-shlibs | gdal-mysql-shlibs|
gdal-pgsql-mysql-shlibs,
- (type_pkg[64bit] = .) libspatialite1-shlibs | (type_pkg[64bit] =
-64bit) libspatialite1-64bit-shlibs,
+ libspatialite1-shlibs | libspatialite1-64bit-shlibs,
(%type_raw[pgsql] = -pgsql) postgresql83-shlibs, (%type_raw[pgsql] =
-pgsql) postgis83,
- (%type_raw[grass] = -grass) grass64-shlibs | (%type_raw[grass] =
-grass) grass64-pgsql-shlibs,
+ (%type_raw[grass] = -grass) grass64-mac-shlibs | (%type_raw[grass] =
-grass) grass64-x11-shlibs,
proj-shlibs (>=4)
<<
Files: <<
Index: grass64.info
===================================================================
RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/grass64.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- grass64.info 7 Aug 2010 22:54:41 -0000 1.6
+++ grass64.info 26 Aug 2010 02:18:02 -0000 1.7
@@ -1,12 +1,11 @@
Info2: <<
Package: grass64%type_pkg[gui]
Type: gui (-mac -x11)
-Distribution: (%type_raw[gui] = -x11) 10.4, (%type_raw[gui] = -x11) 10.5,
(%type_raw[gui] = -x11) 10.6, (%type_raw[gui] = -aqua) 10.6
+Distribution: (%type_raw[gui] = -x11) 10.4, (%type_raw[gui] = -x11) 10.5,
(%type_raw[gui] = -mac) 10.6
Version: 6.4.0
-Revision: 6.2
-Provides: grass64
-Conflicts: grass64, grass64-aqua, grass64-pgsql-aqua, grass64-x11,
grass64-pgsql-x11
-Replaces: grass64, grass64-aqua, grass64-pgsql-aqua, grass64-x11,
grass64-pgsql-x11
+Revision: 5
+Conflicts: grass64, grass64-mac, grass64-x11
+Replaces: grass64, grass64-mac, grass64-x11
Description: Powerful GIS software
License: GPL
@@ -108,8 +107,8 @@
Package: %N-dev
Description: GRASS Development Headers
Depends: %N-shlibs (= %v-%r)
- Conflicts: grass64-dev, grass64-aqua-dev, grass64-x11-dev
- Replaces: grass64-dev, grass64-aqua-dev, grass64-x11-dev
+ Conflicts: grass64-dev, grass64-mac-dev, grass64-x11-dev
+ Replaces: grass64-dev, grass64-mac-dev, grass64-x11-dev
BuildDependsOnly: true
Files: Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_*.a
DocFiles:
@@ -123,8 +122,8 @@
SplitOff2: <<
Package: %N-shlibs
Description: GRASS Shared Libraries
- Conflicts: grass64-aqua-shlibs, grass64-x11-shlibs
- Replaces: grass64-aqua-shlibs, grass64-x11-shlibs
+ Conflicts: grass64-shlibs, grass64-mac-shlibs, grass64-x11-shlibs
+ Replaces: grass64-shlibs, grass64-mac-shlibs, grass64-x11-shlibs
Depends: <<
ncurses-shlibs,
fftw3-shlibs,
@@ -241,16 +240,7 @@
<<
-DescPort: <<
-Based on standard configure options. Non-standard configured variants are
-also avaiable, e.g. grass64-pgsql for PostgreSQL support.
-
-Added -lcurses to LDFALGS.
-
-Uses MacOSX's TclTk because visualization/nviz uses OS's tcltk.
-
-Will start adding additional configure features back into the package down the
road.
-<<
+DescPort:
# End of Info2
<<
------------------------------------------------------------------------------
Sell apps to millions through the Intel(R) Atom(Tm) Developer Program
Be part of this innovative community and reach millions of netbook users
worldwide. Take advantage of special opportunities to increase revenue and
speed time-to-market. Join now, and jumpstart your future.
http://p.sf.net/sfu/intel-atom-d2d
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
