Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv32311
Modified Files:
qgis-mac.info
Log Message:
Fixed errors
Index: qgis-mac.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qgis-mac.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- qgis-mac.info 25 May 2011 11:11:00 -0000 1.17
+++ qgis-mac.info 26 May 2011 10:50:53 -0000 1.18
@@ -8,7 +8,7 @@
Version: 1.5.0
-Revision: 6
+Revision: 7
Description: User friendly Open Source GIS
License: GPL
Homepage: http://qgis.org
@@ -34,8 +34,8 @@
<<
DescUsage: <<
- Just double click 'qgis%type_pkg[pgsql]%type_pkg[grass]-%v.app'
-in %p/Application.
+ Just double click 'qgis%v%type_pkg[pgsql]%type_pkg[grass]-%v.app'
+in %p/Applications.
<<
# Dependencies.
@@ -76,12 +76,12 @@
# Find Fink's PyQt4
PY_VER=2.7
perl -pi -e 's|sys.path = \[\\\"\"|sys.path =
\[\\\"%p/lib/qt4-mac/lib/python'${PY_VER}'/site-packages\\", \\"\"|'
src/python/qgspythonutilsimpl.cpp
- perl -pi -e 's|\.app|%type_pkg[pgsql]%type_pkg[grass]-%v.app|' CMakeLists.txt
+ perl -pi -e 's|\.app|%type_pkg[pgsql]%type_pkg[grass].app|' CMakeLists.txt
export QTDIR=%p/lib/qt4-mac
export PYTHONPATH=%p/lib/qt4-mac/lib/python$PY_VER/site-packages:$PYTHONPATH
export PATH=%p/lib/qt4-mac/lib/python$PY_VER/bin:$PATH
- QGIS_OPTIONS="-DQGIS_APP_NAME=qgis%type_pkg[pgsql]%type_pkg[grass]-%v
+ QGIS_OPTIONS="-DQGIS_APP_NAME=qgis%type_pkg[pgsql]%type_pkg[grass]
-DCMAKE_PREFIX_PATH=%p
-DEXECUTABLE_OUTPUT_PATH=%b/build/src/mac/Contents/MacOS
-DCMAKE_INSTALL_PREFIX=%b/Applications
@@ -102,7 +102,7 @@
-DPOSTGRES_CONFIG=%p/bin/pg_config
-DSQLITE3_INCLUDE_DIR=
-DSQLITE3_LIBRARY="
- QGIS_DIR=Applications/qgis%type_pkg[pgsql]%type_pkg[grass]-%v.app/Contents
+ QGIS_DIR=Applications/qgis%v%type_pkg[pgsql]%type_pkg[grass].app/Contents
mkdir build
pushd build
@@ -153,26 +153,22 @@
mkdir -p %b/$QGIS_DIR/PlugIns
ln -s %p/lib/qt4-mac/plugins/codecs %b/$QGIS_DIR/PlugIns/codecs
- # Recompile python scripts to fix path (added to 1.6.0)
- %p/bin/python$PY_VER %p/lib/python$PY_VER/compileall.py -f -d
%p/$QGIS_DIR/Resources/python/qgis %b/$QGIS_DIR/Resources/python/qgis
- %p/bin/python$PY_VER -O %p/lib/python$PY_VER/compileall.py -f -d
%p/$QGIS_DIR/Resources/python/qgis %b/$QGIS_DIR/Resources/python/qgis
-
-
+ # Recompile python scripts to fix path (added to 1.5.0)
+ %p/bin/python$PY_VER %p/lib/python$PY_VER/compileall.py -f -d
%p/$QGIS_DIR/Resources/python/qgis %b/$QGIS_DIR/MacOS/share/qgis/python/qgis
+ %p/bin/python$PY_VER -O %p/lib/python$PY_VER/compileall.py -f -d
%p/$QGIS_DIR/Resources/python/qgis %b/$QGIS_DIR/MacOS/share/qgis/python/qgis
# End of CompileScript
<<
# Install Phase.
InstallScript: <<
- mkdir -p %i/share/qgis/python
- ln -s %p/share/qgis/python/plugins
%b/Applications/qgis%type_pkg[pgsql]%type_pkg[grass]-%v.app/Contents/Resources/python/plugins
+ mkdir -p
%b/Applications/qgis%v%type_pkg[pgsql]%type_pkg[grass].app/Contents/Resources/python
+ ln -s %p/share/qgis/python/plugins
%b/Applications/qgis%v%type_pkg[pgsql]%type_pkg[grass].app/Contents/Resources/python/plugins
<<
-AppBundles: Applications/qgis%type_raw[pgsql]%type_raw[grass]-%v.app
+AppBundles: Applications/qgis%v%type_pkg[pgsql]%type_pkg[grass].app
SplitOff2: <<
Package: %N-shlibs
- Conflicts: qgis-mac-shlibs, qgis-mac-pgsql-shlibs, qgis-mac-grass-shlibs,
qgis-mac-pgsql-grass-shlibs
- Replaces: qgis-mac-shlibs, qgis-mac-pgsql-shlibs, qgis-mac-grass-shlibs,
qgis-mac-pgsql-grass-shlibs
Description: QGIS Shared Libraries
Depends: <<
qt4-mac-core-shlibs (>=4.5.2), qt4-mac-gui-shlibs,
@@ -188,15 +184,15 @@
proj-shlibs (>=4)
<<
Files: <<
-
Applications/qgis%type_raw[pgsql]%type_raw[grass]%v.app/Contents/MacOS/lib/libqgis*.%v.dylib
-
Applications/qgis%type_raw[pgsql]%type_raw[grass]%v.app/Contents/MacOS/lib/qgis/plugins/*.so
+
Applications/qgis%v%type_pkg[pgsql]%type_pkg[grass].app/Contents/MacOS/lib/libqgis*.%v.dylib
+
Applications/qgis%v%type_pkg[pgsql]%type_pkg[grass].app/Contents/MacOS/lib/qgis/plugins/*.so
<<
Shlibs: <<
- %p/Applications/qgis%v.app/Contents/MacOS/lib/libqgispython.%v.dylib
1.5.0 %n (>= 1.5.0-1) 32
- %p/Applications/qgis%v.app/Contents/MacOS/lib/libqgis_analysis.%v.dylib
1.5.0 %n (>= 1.5.0-1) 32
- %p/Applications/qgis%v.app/Contents/MacOS/lib/libqgis_core.%v.dylib
1.5.0 %n (>= 1.5.0-1) 32
- %p/Applications/qgis%v.app/Contents/MacOS/lib/libqgis_gui.%v.dylib
1.5.0 %n (>= 1.5.0-1) 32
- (%type_raw[grass] = -grass)
%p/Applications/qgis%v.app/Contents/MacOS/lib/libqgisgrass.%v.dylib 1.5.0 %n
(>= 1.5.0-1) 32
+
%p/Applications/qgis%v%type_pkg[pgsql]%type_pkg[grass].app/Contents/MacOS/lib/libqgispython.%v.dylib
1.5.0 %n (>= 1.5.0-1) 32
+
%p/Applications/qgis%v%type_pkg[pgsql]%type_pkg[grass].app/Contents/MacOS/lib/libqgis_analysis.%v.dylib
1.5.0 %n (>= 1.5.0-1) 32
+
%p/Applications/qgis%v%type_pkg[pgsql]%type_pkg[grass].app/Contents/MacOS/lib/libqgis_core.%v.dylib
1.5.0 %n (>= 1.5.0-1) 32
+
%p/Applications/qgis%v%type_pkg[pgsql]%type_pkg[grass].app/Contents/MacOS/lib/libqgis_gui.%v.dylib
1.5.0 %n (>= 1.5.0-1) 32
+ (%type_pkg[grass] = -grass)
%p/Applications/qgis%v%type_pkg[pgsql]%type_pkg[grass].app/Contents/MacOS/lib/libqgisgrass.%v.dylib
1.5.0 %n (>= 1.5.0-1) 32
<<
#End of SplitOff2
<<
------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery,
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now.
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
