Update of /cvsroot/fink/experimental/babayoshihiko/finkinfo
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30562
Modified Files:
qgis-mac.info
Log Message:
tells python to read env vars
Index: qgis-mac.info
===================================================================
RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/qgis-mac.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- qgis-mac.info 19 Sep 2010 06:35:06 -0000 1.6
+++ qgis-mac.info 20 Sep 2010 02:46:13 -0000 1.7
@@ -9,7 +9,7 @@
Version: 1.5.0
-Revision: 1.1
+Revision: 3.3
Description: User friendly Open Source GIS
License: GPL
Homepage: http://qgis.org
@@ -146,13 +146,13 @@
popd
# Tell qgis to read environmental variables
- pushd %i/Applications/qgis%v.app/Contents
- perl -pi -e "s|<string>qgis</string>|<string>qgis.sh</string>|"
Info.plist
- echo '#!/bin/sh' >MacOS/qgis.sh
- echo '. /sw/bin/init.sh && ./qgis' >>MacOS/qgis.sh
+ pushd %i/Applications/qgis%v.app/Contents/MacOS
+ mv qgis %n
+ echo '#!/bin/sh' >qgis
+ echo '. %p/bin/init.sh && %p/Applications/qgis%v.app/Contents/MacOS/%n'
>>qgis
+ chmod 555 qgis
popd
-
pushd %i/Applications/qgis%v.app/Contents/MacOS/lib
install_name_tool -id
"%p/Applications/qgis%v.app/Contents/MacOS/lib/libqgis_core.%v.dylib"
libqgis_core.%v.dylib
install_name_tool -id
"%p/Applications/qgis%v.app/Contents/MacOS/lib/libqgis_analysis.%v.dylib"
libqgis_analysis.%v.dylib
@@ -164,14 +164,14 @@
popd
# Workaround to SJIS problem
- mkdir -p %i/Applications/qgis1.4.0.app/Contents/PlugIns
- ln -s $p/lib/qt4-mac/plugins/codecs
%i/Applications/qgis1.4.0.app/Contents/PlugIns/codecs
+ mkdir -p %i/Applications/qgis%v.app/Contents/PlugIns
+ ln -s %p/lib/qt4-mac/plugins/codecs
%i/Applications/qgis%v.app/Contents/PlugIns/codecs
# added to 1.5.0
%p/bin/python2.6 %p/lib/python2.6/compileall.py -f -d
%p/Applications/qgis%v.app/Contents/MacOS/share/qgis/python/qgis
%i/Applications/qgis%v.app/Contents/MacOS/share/qgis/python/qgis
%p/bin/python2.6 -O %p/lib/python2.6/compileall.py -f -d
%p/Applications/qgis%v.app/Contents/MacOS/share/qgis/python/qgis
%i/Applications/qgis%v.app/Contents/MacOS/share/qgis/python/qgis
<<
-PreRmScript: rm -rf %p/Applications/qgis1.4.0.app/Contents/PlugIns
+PreRmScript: rm -rf %p/Applications/qgis%v.app/Contents/PlugIns
@@ -228,6 +228,22 @@
<<
+SplitOff3: <<
+ Package: %N-r
+ Description: QGIS with R
+ Depends: %N (=%v-%r), r-base (>=2.8.0-1), numpy-py26, rpy2-py26
+ Files: <<
+ Applications/qgis%v.app/Contents/MacOS/include
+ Applications/qgis%v.app/Contents/MacOS/lib/libqgis_analysis.dylib
+ Applications/qgis%v.app/Contents/MacOS/lib/libqgis_core.dylib
+ Applications/qgis%v.app/Contents/MacOS/lib/libqgis_gui.dylib
+ Applications/qgis%v.app/Contents/MacOS/lib/libqgispython.dylib
+ (%type_raw[grass] = -grass)
Applications/qgis%v.app/Contents/MacOS/lib/libqgisgrass.dylib
+ <<
+# End of SplitOff3
+<<
+
+
DescPort: <<
http://wiki.qgis.org/qgiswiki/BuildingFromSource
@@ -236,37 +252,10 @@
Some other GIS programs, e.g. gdal, also depend on them.
The versions should be consistent.
Recommended versions:
- qt4-4.5.x
python2.6
postgresql83 (because Fink's latest version of PostGIS is for postgresql83)
grass64
-The versions of qt4, pyqt4 and sip should be the latest. In particular, the
API versions
-of SIP and PyQt should match. To test SIP and PyQt, do:
-$ python
->>> import sip
->>> from PyQt4 import QtCore, QtGui
-
-BuildDepends:
-fink (>= 0.28). To use ! in Shlibs.
-bison (>=2.3). 10.4's bison is obsolete.
-
-CompileScript:
-(export QTDIR=%p/lib/qt4-mac). Qt4's descpackage says that QTDIR is no longer
needed,
-but, without it, cmake cannot find qmake. All other parameters are defined in
ConfigureParams.
-
-Configure Parameterss:
-ccmake and build/CMakeCache.txt help you find the arguments to be passed to
cmake.
-http://www.opensubscriber.com/message/fink-de...@lists.sourceforge.net/6883546.html
-
-1.3.0:
- 1.3.0 BuildDepends on pyuic4, a part of pyqt4-mac-py26 package, but
-it calls OS's pythonw. Instead of using it, I modified to call Fink's
-python.
-
- echo 'exec %p/bin/python2.6
%p/lib/python2.6/site-packages/pyqt4-mac/PyQt4/uic/pyuic.py ${1+"$@"}' >./pyuic4
- chmod 0555 ./pyuic4
-
# End of DescPort
<<
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
