Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci In directory vz-cvs-3.sog:/tmp/cvs-serv6101
Modified Files: qgis16-mac.info qgis-mac.info qgis-plugin-manager.info Added Files: qgis-plugin-installer.info qgis-plugin-mapserver.info qgis-plugin-osm.info Log Message: New package Index: qgis-plugin-manager.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qgis-plugin-manager.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- qgis-plugin-manager.info 26 Apr 2011 12:26:43 -0000 1.3 +++ qgis-plugin-manager.info 25 May 2011 11:11:00 -0000 1.4 @@ -1,8 +1,8 @@ Info2: << -Package: qgis%type_pkg[version]-plugin-manager +Package: qgis-plugin-manager Type: version (. 1.6) Version: 1.0 -Revision: 2 +Revision: 3 Description: GNU R plugin to QGIS Homepage: http://www.ftools.ca/manageR/ License: GPL @@ -11,7 +11,6 @@ Source-MD5: a6be403c3c10765a81a6510f6c2cff4c SourceDirectory: manageR Depends: << - qgis%type_pkg[version]-mac | qgis%type_pkg[version]-mac-pgsql | qgis%type_pkg[version]-mac-grass | qgis%type_pkg[version]-mac-pgsql-grass, r-base (>=2.8.0-1), rpy2-py26 (>=2.1.0) | rpy2-py27 (>=2.1.0) << CompileScript: << @@ -21,15 +20,8 @@ InstallScript: << #!/bin/sh -ev pushd .. - case %n in - qgis16-plugin-manager) - mkdir -p %i/Applications/QGIS.app/Contents/Resources/python/plugins - cp -R manageR %i/Applications/QGIS.app/Contents/Resources/python/plugins/ - ;; - qgis-plugin-manager) - mkdir -p %i/Applications/qgis1.5.0.app/Contents/MacOS/share/qgis/python/plugins - cp -R manageR %i/Applications/qgis1.5.0.app/Contents/MacOS/share/qgis/python/plugins/ - ;; - esac + mkdir -p %i/share/qgis/python/plugins + cp -R manageR %i/share/qgis/python/plugins/ + << << \ No newline at end of file --- NEW FILE: qgis-plugin-installer.info --- Package: qgis-plugin-installer Architecture: powerpc, i386, x86_64 Distribution: 10.4, 10.5, 10.6 Version: 1.1.0 Revision: 1 Description: MapServer plugin for QGIS License: GPL Homepage: http://qgis.org Maintainer: BABA Yoshihiko <babayoshih...@mac.com> Depends: BuildDepends: # Unpack Phase. Source: http://qgis.org/downloads/qgis-1.6.0.tar.bz2 Source-MD5: 9ea8a784d970f5009b0e6271820248f6 SourceDirectory: qgis-1.6.0 SetCFLAGS: -fno-common SetLDFLAGS: -liconv CompileScript: << #!/bin/bash -ev # 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 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="-DCMAKE_PREFIX_PATH=%p -DEXECUTABLE_OUTPUT_PATH=%b/build/src/mac/Contents/MacOS -DCMAKE_INSTALL_PREFIX=%b/Applications -DCMAKE_BUILD_TYPE=Release -DGDAL_INCLUDE_DIR=%p/include/gdal1 -DGEOS_CONFIG=%p/opt/libgeos3.2.2/bin/geos-config -DQT_BINARY_DIR=%p/lib/qt4-mac/bin -DQT_INCLUDE_DIR=%p/lib/qt4-mac/include -DQT_QMAKE_EXECUTABLE=%p/lib/qt4-mac/bin/qmake -DPYTHON_DEBUG_LIBRARY=%p/lib/python$PY_VER/config/libpython$PY_VER.dylib -DPYTHON_INCLUDE_PATH=%p/include/python$PY_VER -DPYTHON_LIBRARY=%p/lib/python$PY_VER/config/libpython$PY_VER.dylib -DPYTHON_EXECUTABLE=%p/bin/python$PY_VER -DPYUIC4_PROGRAM=%p/lib/qt4-mac/lib/python$PY_VER/bin/pyuic4 -DSIP_INCLUDE_DIR=%p/include/python$PY_VER -DSIP_BINARY_PATH=%p/bin -DPOSTGRESQL_PREFIX=%p -DPOSTGRES_CONFIG=%p/bin/pg_config -DSQLITE3_INCLUDE_DIR= -DSQLITE3_LIBRARY= -DQWT_LIBRARY=%p/lib/qt4-mac/lib/libqwt.5.2.0.dylib -DQWT_INCLUDE_DIR=%p/lib/qt4-mac/include/qwt/" QGIS_DIR=Applications/QGIS.app/Contents mkdir build pushd build cmake $QGIS_OPTIONS .. make pluginstaller # make mapserverexport # make osmplugin pushd python/plugins make install CMAKE_INSTALL_PREFIX=%b SIP_MAC_PATH=%p/bin popd << InstallScript: << mkdir -p %i/share/qgis/python/plugins cp -R Applications/QGIS.app/Contents/Resources/python/plugins/plugin_installer %i/share/qgis/python/plugins/ << --- NEW FILE: qgis-plugin-osm.info --- Package: qgis-plugin-osm Architecture: powerpc, i386, x86_64 Distribution: 10.4, 10.5, 10.6 Version: 0.5.0 Revision: 1 Description: MapServer plugin for QGIS License: GPL Homepage: http://qgis.org Maintainer: BABA Yoshihiko <babayoshih...@mac.com> Depends: BuildDepends: # Unpack Phase. Source: http://qgis.org/downloads/qgis-1.6.0.tar.bz2 Source-MD5: 9ea8a784d970f5009b0e6271820248f6 SourceDirectory: qgis-1.6.0 SetCFLAGS: -fno-common SetLDFLAGS: -liconv CompileScript: << #!/bin/bash -ev # 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 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="-DCMAKE_PREFIX_PATH=%p -DEXECUTABLE_OUTPUT_PATH=%b/build/src/mac/Contents/MacOS -DCMAKE_INSTALL_PREFIX=%b/Applications -DCMAKE_BUILD_TYPE=Release -DGDAL_INCLUDE_DIR=%p/include/gdal1 -DGEOS_CONFIG=%p/opt/libgeos3.2.2/bin/geos-config -DQT_BINARY_DIR=%p/lib/qt4-mac/bin -DQT_INCLUDE_DIR=%p/lib/qt4-mac/include -DQT_QMAKE_EXECUTABLE=%p/lib/qt4-mac/bin/qmake -DPYTHON_DEBUG_LIBRARY=%p/lib/python$PY_VER/config/libpython$PY_VER.dylib -DPYTHON_INCLUDE_PATH=%p/include/python$PY_VER -DPYTHON_LIBRARY=%p/lib/python$PY_VER/config/libpython$PY_VER.dylib -DPYTHON_EXECUTABLE=%p/bin/python$PY_VER -DPYUIC4_PROGRAM=%p/lib/qt4-mac/lib/python$PY_VER/bin/pyuic4 -DSIP_INCLUDE_DIR=%p/include/python$PY_VER -DSIP_BINARY_PATH=%p/bin -DPOSTGRESQL_PREFIX=%p -DPOSTGRES_CONFIG=%p/bin/pg_config -DSQLITE3_INCLUDE_DIR= -DSQLITE3_LIBRARY= -DQWT_LIBRARY=%p/lib/qt4-mac/lib/libqwt.5.2.0.dylib -DQWT_INCLUDE_DIR=%p/lib/qt4-mac/include/qwt/" QGIS_DIR=Applications/QGIS.app/Contents mkdir build pushd build cmake $QGIS_OPTIONS .. # make pluginstaller # make mapserverexport make osmplugin pushd python/plugins make install CMAKE_INSTALL_PREFIX=%b SIP_MAC_PATH=%p/bin popd << InstallScript: << mkdir -p %i/share/qgis/python/plugins cp -R Applications/QGIS.app/Contents/Resources/python/plugins/osm %i/share/qgis/python/plugins/ << --- NEW FILE: qgis-plugin-mapserver.info --- Package: qgis-plugin-mapserver Architecture: powerpc, i386, x86_64 Distribution: 10.4, 10.5, 10.6 Version: 0.4.3 Revision: 1 Description: MapServer plugin for QGIS License: GPL Homepage: http://qgis.org Maintainer: BABA Yoshihiko <babayoshih...@mac.com> Depends: BuildDepends: # Unpack Phase. Source: http://qgis.org/downloads/qgis-1.6.0.tar.bz2 Source-MD5: 9ea8a784d970f5009b0e6271820248f6 SourceDirectory: qgis-1.6.0 SetCFLAGS: -fno-common SetLDFLAGS: -liconv CompileScript: << #!/bin/bash -ev # 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 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="-DCMAKE_PREFIX_PATH=%p -DEXECUTABLE_OUTPUT_PATH=%b/build/src/mac/Contents/MacOS -DCMAKE_INSTALL_PREFIX=%b/Applications -DCMAKE_BUILD_TYPE=Release -DGDAL_INCLUDE_DIR=%p/include/gdal1 -DGEOS_CONFIG=%p/opt/libgeos3.2.2/bin/geos-config -DQT_BINARY_DIR=%p/lib/qt4-mac/bin -DQT_INCLUDE_DIR=%p/lib/qt4-mac/include -DQT_QMAKE_EXECUTABLE=%p/lib/qt4-mac/bin/qmake -DPYTHON_DEBUG_LIBRARY=%p/lib/python$PY_VER/config/libpython$PY_VER.dylib -DPYTHON_INCLUDE_PATH=%p/include/python$PY_VER -DPYTHON_LIBRARY=%p/lib/python$PY_VER/config/libpython$PY_VER.dylib -DPYTHON_EXECUTABLE=%p/bin/python$PY_VER -DPYUIC4_PROGRAM=%p/lib/qt4-mac/lib/python$PY_VER/bin/pyuic4 -DSIP_INCLUDE_DIR=%p/include/python$PY_VER -DSIP_BINARY_PATH=%p/bin -DPOSTGRESQL_PREFIX=%p -DPOSTGRES_CONFIG=%p/bin/pg_config -DSQLITE3_INCLUDE_DIR= -DSQLITE3_LIBRARY= -DQWT_LIBRARY=%p/lib/qt4-mac/lib/libqwt.5.2.0.dylib -DQWT_INCLUDE_DIR=%p/lib/qt4-mac/include/qwt/" QGIS_DIR=Applications/QGIS.app/Contents mkdir build pushd build cmake $QGIS_OPTIONS .. # make pluginstaller make mapserverexport # make osmplugin pushd python/plugins make install CMAKE_INSTALL_PREFIX=%b SIP_MAC_PATH=%p/bin popd << InstallScript: << mkdir -p %i/share/qgis/python/plugins cp -R Applications/QGIS.app/Contents/Resources/python/plugins/mapserver_export %i/share/qgis/python/plugins/ << Index: qgis-mac.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qgis-mac.info,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- qgis-mac.info 15 Nov 2010 10:19:24 -0000 1.16 +++ qgis-mac.info 25 May 2011 11:11:00 -0000 1.17 @@ -4,13 +4,11 @@ Type: pgsql (. -pgsql), grass (. -grass) Architecture: powerpc, i386, x86_64 Distribution: 10.4, 10.5, 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 -Suggests: r-base (>=2.8.0-1), rpy2-py26 +Suggests: r-base (>=2.8.0-1), rpy2-py27 Version: 1.5.0 -Revision: 5 +Revision: 6 Description: User friendly Open Source GIS License: GPL Homepage: http://qgis.org @@ -35,7 +33,10 @@ To use optional features, choose packages like qgis-pgsql and qgis-grass. << -DescUsage: Just double click 'qgis%v.app' in %p/Application. +DescUsage: << + Just double click 'qgis%type_pkg[pgsql]%type_pkg[grass]-%v.app' +in %p/Application. +<< # Dependencies. Depends: << @@ -46,10 +47,10 @@ cmake, bison (>= 2.3), gsl, qt4-mac (>=4.5.2), - pyqt4-mac-py26 (>=4.7.4-1), - sip-py26-bin (>=4.10.5-1), + pyqt4-mac-py27 (>=4.7.4-1), + sip-py27-bin (>=4.10.5-1), unixodbc2-nox (>= 2.2.11-1010) | unixodbc2 (>= 2.2.11-1010), - libiconv-dev, giflib, libtiff, libjpeg, libogdi3 (>= 3.1.5-1002), libpng3, netcdf (>= 3.6.0-1002), cfitsio, + libiconv-dev, giflib, libtiff, libjpeg, libogdi3 (>= 3.1.5-1002), libpng14 | libpng3, netcdf (>= 3.6.0-1002), cfitsio, libgeos3.2.2, gdal-dev | gdal-pgsql-dev | gdal-mysql-dev| gdal-pgsql-mysql-dev, (%type_raw[pgsql] = -pgsql) postgresql83-dev, @@ -72,131 +73,100 @@ SetLDFLAGS: -liconv CompileScript: << #!/bin/bash -ev - # Find Fink's PyQt4 - perl -pi -e 's|sys.path = \[\\\"\"|sys.path = \[\\\"%p/lib/qt4-mac/lib/python2.6/site-packages\\\", \\\"\"|' src/python/qgspythonutilsimpl.cpp - - export QTDIR=%p/lib/qt4-mac - export PYTHONPATH=%p/lib/qt4-mac/lib/python2.6/site-packages:$PYTHONPATH - export PATH=%p/lib/qt4-mac/lib/python2.6/bin:$PATH - - mkdir build - cd build - - QGIS_OPTIONS='-DCMAKE_PREFIX_PATH=%p - -DEXECUTABLE_OUTPUT_PATH=%b/build/src/mac/Contents/MacOS - -DCMAKE_INSTALL_PREFIX=%i/Applications - -DCMAKE_BUILD_TYPE=Release - -DGDAL_INCLUDE_DIR=%p/include/gdal1 - -DGEOS_CONFIG=%p/opt/libgeos3.2.2/bin/geos-config - -DQT_BINARY_DIR=%p/lib/qt4-mac/bin - -DQT_INCLUDE_DIR=%p/lib/qt4-mac/include - -DQT_QMAKE_EXECUTABLE=%p/lib/qt4-mac/bin/qmake - -DPYTHON_DEBUG_LIBRARY=%p/lib/python2.6/config/libpython2.6.dylib - -DPYTHON_INCLUDE_PATH=%p/include/python2.6 - -DPYTHON_LIBRARY=%p/lib/python2.6/config/libpython2.6.dylib - -DPYTHON_EXECUTABLE=%p/bin/python2.6 - -DPYUIC4_PROGRAM=%p/lib/qt4-mac/lib/python2.6/bin/pyuic4 - -DSIP_INCLUDE_DIR=%p/include/python2.6 - -DSIP_BINARY_PATH=%p/bin - -DSQLITE3_INCLUDE_DIR= - -DSQLITE3_LIBRARY=' + # 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 + + 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 + -DCMAKE_PREFIX_PATH=%p + -DEXECUTABLE_OUTPUT_PATH=%b/build/src/mac/Contents/MacOS + -DCMAKE_INSTALL_PREFIX=%b/Applications + -DCMAKE_BUILD_TYPE=Release + -DGDAL_INCLUDE_DIR=%p/include/gdal1 + -DGEOS_CONFIG=%p/opt/libgeos3.2.2/bin/geos-config + -DQT_BINARY_DIR=%p/lib/qt4-mac/bin + -DQT_INCLUDE_DIR=%p/lib/qt4-mac/include + -DQT_QMAKE_EXECUTABLE=%p/lib/qt4-mac/bin/qmake + -DPYTHON_DEBUG_LIBRARY=%p/lib/python$PY_VER/config/libpython$PY_VER.dylib + -DPYTHON_INCLUDE_PATH=%p/include/python$PY_VER + -DPYTHON_LIBRARY=%p/lib/python$PY_VER/config/libpython$PY_VER.dylib + -DPYTHON_EXECUTABLE=%p/bin/python$PY_VER + -DPYUIC4_PROGRAM=%p/lib/qt4-mac/lib/python$PY_VER/bin/pyuic4 + -DSIP_INCLUDE_DIR=%p/include/python$PY_VER + -DSIP_BINARY_PATH=%p/bin + -DPOSTGRESQL_PREFIX=%p + -DPOSTGRES_CONFIG=%p/bin/pg_config + -DSQLITE3_INCLUDE_DIR= + -DSQLITE3_LIBRARY=" + QGIS_DIR=Applications/qgis%type_pkg[pgsql]%type_pkg[grass]-%v.app/Contents + + mkdir build + pushd build + case %n in + qgis-mac) + cmake $QGIS_OPTIONS \ + -DGRASS_INCLUDE_DIR= \ + -DGRASS_PREFIX= .. + ;; - case %n in - qgis-mac) - cmake $QGIS_OPTIONS \ - -DPOSTGRESQL_PREFIX= \ - -DPOSTGRES_CONFIG= \ - -DGRASS_INCLUDE_DIR= \ - -DGRASS_PREFIX= .. - ;; - qgis-mac-pgsql) - cmake $QGIS_OPTIONS \ - -DPOSTGRESQL_PREFIX=%p \ - -DPOSTGRES_CONFIG=%p/bin/pg_config \ - -DGRASS_INCLUDE_DIR= \ - -DGRASS_PREFIX= .. - ;; - qgis-mac-grass) - cmake $QGIS_OPTIONS \ - -DPOSTGRESQL_PREFIX= \ - -DPOSTGRES_CONFIG= \ - -DGRASS_PREFIX=%p/Applications/GRASS-6.4.app/Contents/MacOS \ - .. - ;; - qgis-mac-pgsql-grass) - cmake $QGIS_OPTIONS \ - -DPOSTGRESQL_PREFIX=%p \ - -DPOSTGRES_CONFIG=%p/bin/pg_config \ - -DGRASS_PREFIX=%p/Applications/GRASS-6.4.app/Contents/MacOS \ - .. - ;; - esac - - touch ../src/mac/Contents/SVN_MARKER-NOTFOUND + qgis-mac-grass) + cmake $QGIS_OPTIONS \ + -DGRASS_PREFIX=%p/Applications/GRASS-6.4.app/Contents/MacOS \ + .. + ;; + esac + + # Workaround for Makefile bug (1.5.0 only) + touch ../src/mac/Contents/SVN_MARKER-NOTFOUND + + make VERSBOSE=0 + make install CMAKE_INSTALL_PREFIX=%b SIP_MAC_PATH=%p/bin + popd + + # Fix install names + pushd %b/$QGIS_DIR/MacOS/lib + install_name_tool -id "%p/$QGIS_DIR/MacOS/lib/libqgis_core.%v.dylib" libqgis_core.%v.dylib + install_name_tool -id "%p/$QGIS_DIR/MacOS/lib/libqgis_analysis.%v.dylib" libqgis_analysis.%v.dylib + install_name_tool -id "%p/$QGIS_DIR/MacOS/lib/libqgis_gui.%v.dylib" libqgis_gui.%v.dylib + install_name_tool -id "%p/$QGIS_DIR/MacOS/lib/libqgispython.%v.dylib" libqgispython.%v.dylib + if [ "%type_raw[grass]" == "-grass" ]; then + install_name_tool -id "%p/$QGIS_DIR/MacOS/lib/libqgisgrass.%v.dylib" libqgisgrass.%v.dylib + fi + popd + + # Tell qgis to read Fink's environmental variables + pushd %b/$QGIS_DIR/MacOS + mv QGIS QGIS.exe + echo '#!/bin/sh' >QGIS + echo ". %p/bin/init.sh && %p/$QGIS_DIR/MacOS/QGIS.exe" >>QGIS + chmod 555 QGIS + popd + + # Plugins are now managed by their own package (e.g. qgis-plugin-ftools) + rm -rf %b/$QGIS_DIR/Resources/python/plugins - make VERBOSE=1 - cd .. + # Workaround to SJIS problem + 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 + + # End of CompileScript << # Install Phase. InstallScript: << -#!/bin/bash -ev - mkdir -p %i/Applications/qgis%v.app/Contents/MacOS - pushd build - make install CMAKE_INSTALL_PREFIX=%i SIP_MAC_PATH=%p/bin - popd - - # Tell qgis to read environmental variables - pushd %i/Applications/qgis%v.app/Contents/MacOS - mv qgis qgis.exe - echo '#!/bin/sh' >qgis - echo '. %p/bin/init.sh && %p/Applications/qgis%v.app/Contents/MacOS/qgis.exe' >>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 - 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 - 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/qgis%v.app/Contents/PlugIns - - - - -SplitOff: << - Package: %N-dev - BuildDependsOnly: True - Conflicts: qgis-mac-dev, qgis-mac-pgsql-dev, qgis-mac-grass-dev, qgis-mac-pgsql-grass-dev - Replaces: qgis-mac-dev, qgis-mac-pgsql-dev, qgis-mac-grass-dev, qgis-mac-pgsql-grass-dev - Description: QGIS Header Files - Depends: %N-shlibs (=%v-%r) - 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 - << + 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 << - - - +AppBundles: Applications/qgis%type_raw[pgsql]%type_raw[grass]-%v.app SplitOff2: << @@ -206,8 +176,8 @@ Description: QGIS Shared Libraries Depends: << qt4-mac-core-shlibs (>=4.5.2), qt4-mac-gui-shlibs, - python26, sip-py26, - pyqt4-mac-py26 (>=4.7.4-1), + python27, sip-py27, + pyqt4-mac-py27 (>=4.7.4-1), gsl-shlibs, libgeos3.2.2-shlibs, gdal-shlibs | gdal-pgsql-shlibs | gdal-mysql-shlibs| gdal-pgsql-mysql-shlibs, @@ -218,8 +188,8 @@ proj-shlibs (>=4) << Files: << - Applications/qgis%v.app/Contents/MacOS/lib/libqgis*.%v.dylib - Applications/qgis%v.app/Contents/MacOS/lib/qgis/plugins/*.so + 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 << Shlibs: << %p/Applications/qgis%v.app/Contents/MacOS/lib/libqgispython.%v.dylib 1.5.0 %n (>= 1.5.0-1) 32 Index: qgis16-mac.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qgis16-mac.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- qgis16-mac.info 3 Apr 2011 08:20:40 -0000 1.4 +++ qgis16-mac.info 25 May 2011 11:11:00 -0000 1.5 @@ -4,12 +4,11 @@ Type: grass (. -grass) Architecture: powerpc, i386, x86_64 Distribution: 10.4, 10.5, 10.6 -Conflicts: qgis16-mac, qgis16-mac-grass -Replaces: qgis16-mac, qgis16-mac-grass + Version: 1.6.0 -Revision: 3 +Revision: 4 Description: User friendly Open Source GIS License: GPL Homepage: http://qgis.org @@ -32,7 +31,7 @@ 8 Feature labeling << -DescUsage: Just double click 'QGIS.app' in /Applications/Fink. +DescUsage: Just double click 'QGIS-%v.app' in /Applications/Fink. # Dependencies. Depends: %n-shlibs (=%v-%r) @@ -42,11 +41,11 @@ qt4-mac (>=4.5.2), sip-py27-bin, pyqt4-mac-py27 (=4.7.4-1), unixodbc2-nox (>= 2.2.11-1010) | unixodbc2 (>= 2.2.11-1010), - libiconv-dev, giflib, libtiff, libjpeg, libogdi3 (>= 3.1.5-1002), libpng3, netcdf (>= 3.6.0-1002), cfitsio, + libiconv-dev, giflib, libtiff, libjpeg, libogdi3 (>= 3.1.5-1002), libpng14 | libpng3, netcdf (>= 3.6.0-1002), cfitsio, libgeos3.2.2, gdal-dev | gdal-pgsql-dev | gdal-mysql-dev| gdal-pgsql-mysql-dev, postgresql84-dev, - (%type_raw[grass] = -grass) grass64-mac-dev | (%type_raw[grass] = -grass) grass64-x11-dev, + (%type_pkg[grass] = -grass) grass64-mac-dev | (%type_pkg[grass] = -grass) grass64-x11-dev, proj (>=4), qwt-qt4-mac << @@ -69,13 +68,15 @@ # 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[grass]-%v.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="-DCMAKE_PREFIX_PATH=%p + QGIS_OPTIONS="-DQGIS_APP_NAME=QGIS%type_pkg[grass]-%v + -DCMAKE_PREFIX_PATH=%p -DEXECUTABLE_OUTPUT_PATH=%b/build/src/mac/Contents/MacOS -DCMAKE_INSTALL_PREFIX=%b/Applications -DCMAKE_BUILD_TYPE=Release @@ -97,7 +98,7 @@ -DSQLITE3_LIBRARY= -DQWT_LIBRARY=%p/lib/qt4-mac/lib/libqwt.5.2.0.dylib -DQWT_INCLUDE_DIR=%p/lib/qt4-mac/include/qwt/" - QGIS_DIR=Applications/QGIS.app/Contents + QGIS_DIR=Applications/QGIS%type_pkg[grass]-%v.app/Contents mkdir build pushd build @@ -119,16 +120,13 @@ make install CMAKE_INSTALL_PREFIX=%b SIP_MAC_PATH=%p/bin popd - # Add version to .app - # mv Applications/QGIS.app Applications/QGIS-%v.app - # Fix install names pushd %b/$QGIS_DIR/MacOS/lib install_name_tool -id "%p/$QGIS_DIR/MacOS/lib/libqgis_core.%v.dylib" libqgis_core.%v.dylib install_name_tool -id "%p/$QGIS_DIR/MacOS/lib/libqgis_analysis.%v.dylib" libqgis_analysis.%v.dylib install_name_tool -id "%p/$QGIS_DIR/MacOS/lib/libqgis_gui.%v.dylib" libqgis_gui.%v.dylib install_name_tool -id "%p/$QGIS_DIR/MacOS/lib/libqgispython.%v.dylib" libqgispython.%v.dylib - if [ "%type_raw[grass]" == "-grass" ]; then + if [ "%type_pkg[grass]" = "-grass" ]; then install_name_tool -id "%p/$QGIS_DIR/MacOS/lib/libqgisgrass.%v.dylib" libqgisgrass.%v.dylib fi popd @@ -141,6 +139,9 @@ chmod 555 QGIS popd + # Plugins are now managed by their own package (e.g. qgis-plugin-ftools) + rm -rf %b/$QGIS_DIR/Resources/python/plugins + # Workaround to SJIS problem mkdir -p %b/$QGIS_DIR/PlugIns ln -s %p/lib/qt4-mac/plugins/codecs %b/$QGIS_DIR/PlugIns/codecs @@ -149,17 +150,15 @@ %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 << - InstallScript: << - echo "Nothing" + mkdir -p %i/share/qgis/python + ln -s %p/share/qgis/python/plugins %b/Applications/QGIS%type_raw[grass]-%v.app/Contents/Resources/python/plugins << -AppBundles: Applications/QGIS.app +AppBundles: Applications/QGIS%type_raw[grass]-%v.app SplitOff: << Package: %N-shlibs - Conflicts: qgis16-mac-shlibs, qgis16-mac-grass-shlibs - Replaces: qgi16s-mac-shlibs, qgis16-mac-grass-shlibs Description: QGIS Shared Libraries Depends: << qt4-mac-core-shlibs (>=4.5.2), qt4-mac-gui-shlibs, @@ -169,28 +168,25 @@ gdal-shlibs | gdal-pgsql-shlibs | gdal-mysql-shlibs| gdal-pgsql-mysql-shlibs, libspatialite1-shlibs | libspatialite1-64bit-shlibs, postgresql84-shlibs, - (%type_raw[grass] = -grass) grass64-mac-shlibs | (%type_raw[grass] = -grass) grass64-x11-shlibs, - (%type_raw[grass] = -grass) grass64-mac | (%type_raw[grass] = -grass) grass64-x11, + (%type_pkg[grass] != .) grass64-mac-shlibs | (%type_pkg[grass] != .) grass64-x11-shlibs, + (%type_pkg[grass] != .) grass64-mac | (%type_pkg[grass] != .) grass64-x11, proj-shlibs (>=4), qwt-qt4-mac-shlibs << Files: << - Applications/QGIS.app/Contents/MacOS/lib/libqgis*.%v.dylib + Applications/QGIS%type_raw[grass]-%v.app/Contents/MacOS/lib/libqgis*.%v.dylib << Shlibs: << - %p/Applications/QGIS.app/Contents/MacOS/lib/libqgispython.%v.dylib 1.6.0 %n (>= 1.6.0-1) - %p/Applications/QGIS.app/Contents/MacOS/lib/libqgis_analysis.%v.dylib 1.6.0 %n (>= 1.6.0-1) - %p/Applications/QGIS.app/Contents/MacOS/lib/libqgis_core.%v.dylib 1.6.0 %n (>= 1.6.0-1) - %p/Applications/QGIS.app/Contents/MacOS/lib/libqgis_gui.%v.dylib 1.6.0 %n (>= 1.6.0-1) - (%type_raw[grass] = -grass) %p/Applications/QGIS.app/Contents/MacOS/lib/libqgisgrass.%v.dylib 1.6.0 %n (>= 1.6.0-0.1) - (%type_raw[grass] = -grass) !%p/Applications/QGIS.app/Contents/MacOS/lib/libqgisgrass.dylib + %p/Applications/QGIS%type_pkg[grass]-%v.app/Contents/MacOS/lib/libqgispython.%v.dylib 1.6.0 %n (>= 1.6.0-1) + %p/Applications/QGIS%type_pkg[grass]-%v.app/Contents/MacOS/lib/libqgis_analysis.%v.dylib 1.6.0 %n (>= 1.6.0-1) + %p/Applications/QGIS%type_pkg[grass]-%v.app/Contents/MacOS/lib/libqgis_core.%v.dylib 1.6.0 %n (>= 1.6.0-1) + %p/Applications/QGIS%type_pkg[grass]-%v.app/Contents/MacOS/lib/libqgis_gui.%v.dylib 1.6.0 %n (>= 1.6.0-1) + (%type_pkg[grass] = -grass) %p/Applications/QGIS%type_pkg[grass]-%v.app/Contents/MacOS/lib/libqgisgrass.%v.dylib 1.6.0 %n (>= 1.6.0-1) + (%type_pkg[grass] = -grass) !%p/Applications/QGIS%type_pkg[grass]-%v.app/Contents/MacOS/lib/libqgisgrass.dylib << #End of SplitOff << - - - DescPackaging: << A separate package to the existing qgis-mac. Users can install two different versions of qgis. ------------------------------------------------------------------------------ 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 Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs