Update of /cvsroot/fink/experimental/babayoshihiko/finkinfo
In directory vz-cvs-3.sog:/tmp/cvs-serv1821
Modified Files:
grass64.info pgrouting.info qgis-mac.info
qgis-plugin-manager.info qgis16-mac.info
Removed Files:
libgaul1.info
Log Message:
--- libgaul1.info DELETED ---
Index: qgis-plugin-manager.info
===================================================================
RCS file:
/cvsroot/fink/experimental/babayoshihiko/finkinfo/qgis-plugin-manager.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qgis-plugin-manager.info 30 Nov 2010 22:46:53 -0000 1.1
+++ qgis-plugin-manager.info 24 Jun 2011 02:27:15 -0000 1.2
@@ -1,7 +1,7 @@
-Package: qgis%type_pkg[version]-plugin-manager
-Type: version (. 1.6)
+Info2: <<
+Package: qgis-plugin-manager
Version: 1.0
-Revision:1
+Revision: 4
Description: GNU R plugin to QGIS
Homepage: http://www.ftools.ca/manageR/
License: GPL
@@ -10,8 +10,8 @@
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)
+ sip-py27 (>=4.10.5-1) | sip-py26 (>=4.10.5-1)
+ r-base (>=2.8.0-1), rpy2-py27 (>=2.1.0) | rpy2-py26 (>=2.1.0)
<<
CompileScript: <<
#!/bin/sh -ev
@@ -20,14 +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
Index: qgis-mac.info
===================================================================
RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/qgis-mac.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- qgis-mac.info 1 Oct 2010 10:51:32 -0000 1.11
+++ qgis-mac.info 24 Jun 2011 02:27:15 -0000 1.12
@@ -3,14 +3,12 @@
Package: qgis-mac%type_pkg[pgsql]%type_pkg[grass]
Type: pgsql (. -pgsql), grass (. -grass)
Architecture: powerpc, i386, x86_64
-Distribution: 10.4
-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
+Distribution: 10.4, 10.5, 10.6
+Suggests: r-base (>=2.8.0-1), rpy2-py27
Version: 1.5.0
-Revision: 4.1
+Revision: 8
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%v%type_pkg[pgsql]%type_pkg[grass]-%v.app'
+in %p/Applications.
+<<
# Dependencies.
Depends: <<
@@ -46,13 +47,13 @@
cmake, bison (>= 2.3),
gsl,
qt4-mac (>=4.5.2),
- pyqt4-mac-py26 (>=4.7.4-1),
- sip-py26-bin (>=4.10.5-1),
- unixodbc2 (>= 2.2.11-1010) | unixodbc2-nox (>= 2.2.11-1010),
- libiconv-dev, giflib, libtiff, libjpeg, libogdi3 (>= 3.1.5-1002),
libpng3, netcdf (>= 3.6.0-1002), cfitsio,
- libgeos3, libgeosc1,
+ 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, libjpeg8, libogdi3 (>= 3.1.5-1002),
libpng14, netcdf (>= 3.6.0-1002), cfitsio,
+ libgeos3.3.0,
gdal-dev | gdal-pgsql-dev | gdal-mysql-dev| gdal-pgsql-mysql-dev,
- (%type_raw[pgsql] = -pgsql) postgresql83-dev,
+ (%type_raw[pgsql] = -pgsql) postgresql84-dev,
(%type_raw[grass] = -grass) grass64-mac-dev | (%type_raw[grass] =
-grass) grass64-x11-dev,
proj (>=4)
<<
@@ -72,158 +73,126 @@
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
- -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].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]
+ -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%v%type_pkg[pgsql]%type_pkg[grass].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.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: <<
-#!/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
%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%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),
- pyqt4-mac-py26 (>=4.7.4-1),
+ qt4-mac-core-shlibs (>=4.5.2), qt4-mac-gui-shlibs,
+ python27, sip-py27,
+ pyqt4-mac-py27 (>=4.7.4-1),
gsl-shlibs,
- libgeos3-shlibs, libgeosc1-shlibs,
+ libgeos3.3.0-shlibs,
gdal-shlibs | gdal-pgsql-shlibs | gdal-mysql-shlibs|
gdal-pgsql-mysql-shlibs,
libspatialite1-shlibs | libspatialite1-64bit-shlibs,
- (%type_raw[pgsql] = -pgsql) postgresql83-shlibs, (%type_raw[pgsql] =
-pgsql) postgis83,
+ (%type_raw[pgsql] = -pgsql) 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,
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%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_raw[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
<<
@@ -238,8 +207,8 @@
Some other GIS programs, e.g. gdal, also depend on them.
The versions should be consistent.
Recommended versions:
- python2.6
- postgresql83 (because Fink's latest version of PostGIS is for postgresql83)
+ python2.7
+ postgresql84 (because Fink's latest version of PostGIS is for postgresql83)
grass64
# End of DescPort
Index: pgrouting.info
===================================================================
RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/pgrouting.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pgrouting.info 4 Jan 2011 11:31:04 -0000 1.3
+++ pgrouting.info 24 Jun 2011 02:27:15 -0000 1.4
@@ -1,9 +1,9 @@
Info4: <<
Package: pgrouting%type_pkg[postgresql]
Version: 1.05
-Revision: 0.3
+Revision: 2
Description: Geospatial routing functionality for PostGIS
-Type: postgresql (8.4 9.0)
+Type: postgresql (9.0 8.4 8.3 8.2 8.1 8.0)
License: BSD
Maintainer: BABA Yoshihiko <[email protected]>
@@ -21,7 +21,12 @@
proj
<<
BuildConflicts: <<
- (%type_pkg[postgresql]=90) postgresql84-dev, (%type_pkg[postgresql]=84)
postgresql90-dev
+ (%type_pkg[postgresql]!=90) postgresql90-dev,
+ (%type_pkg[postgresql]!=84) postgresql84-dev,
+ (%type_pkg[postgresql]!=83) postgresql83-dev,
+ (%type_pkg[postgresql]!=82) postgresql82-dev,
+ (%type_pkg[postgresql]!=81) postgresql81-dev,
+ (%type_pkg[postgresql]!=80) postgresql81-dev
<<
GCC: 4.0
@@ -61,4 +66,4 @@
<<
-<<
\ No newline at end of file
+<<
Index: qgis16-mac.info
===================================================================
RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/qgis16-mac.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- qgis16-mac.info 2 Dec 2010 05:48:49 -0000 1.2
+++ qgis16-mac.info 24 Jun 2011 02:27:15 -0000 1.3
@@ -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: 0.5
+Revision: 5
Description: User friendly Open Source GIS
License: GPL
Homepage: http://qgis.org
@@ -32,32 +31,20 @@
8 Feature labeling
<<
-DescUsage: Just double click 'QGIS.app' in /Applications/Fink.
+DescUsage: Just double click 'QGIS-%v.app' in /Applications/Fink.
# Dependencies.
-Depends: <<
- qt4-mac-core-shlibs (>=4.5.2), qt4-mac-gui-shlibs,
- python26, sip-py26, pyqt4-mac-py26 (>=4.7.4-1),
- gsl-shlibs,
- libgeos3.2.2-shlibs,
- gdal-shlibs | gdal-pgsql-shlibs | gdal-mysql-shlibs|
gdal-pgsql-mysql-shlibs,
- libspatialite1-shlibs | libspatialite1-64bit-shlibs,
- postgresql83-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,
- proj-shlibs (>=4),
- qwt-qt4-mac-shlibs
-<<
+Depends: %n-shlibs (=%v-%r)
BuildDepends: <<
fink (>= 0.28), cmake, bison (>= 2.3),
gsl,
qt4-mac (>=4.5.2),
- sip-py26-bin (>=4.10.5-1), pyqt4-mac-py26 (>=4.7.4-1),
+ 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,
- libgeos3.2.2,
+ libiconv-dev, giflib, libtiff, libjpeg8, libogdi3 (>= 3.1.5-1002), libpng14,
netcdf (>= 3.6.0-1002), cfitsio,
+ libgeos3.3.0,
gdal-dev | gdal-pgsql-dev | gdal-mysql-dev| gdal-pgsql-mysql-dev,
- postgresql83-dev,
+ postgresql84-dev,
(%type_raw[grass] = -grass) grass64-mac-dev | (%type_raw[grass] = -grass)
grass64-x11-dev,
proj (>=4),
qwt-qt4-mac
@@ -79,15 +66,17 @@
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
+ 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
- PY_VER=2.6
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
@@ -109,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
@@ -131,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
@@ -153,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
@@ -161,24 +150,40 @@
%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_pkg[grass]-%v.app/Contents/Resources/python/plugins
<<
-AppBundles: Applications/QGIS.app
+AppBundles: Applications/QGIS%type_pkg[grass]-%v.app
-Shlibs: <<
- %p/Applications/QGIS.app/Contents/MacOS/lib/libqgispython.%v.dylib
1.6.0 %n (>= 1.6.0-0.1)
- %p/Applications/QGIS.app/Contents/MacOS/lib/libqgis_analysis.%v.dylib
1.6.0 %n (>= 1.6.0-0.1)
- %p/Applications/QGIS.app/Contents/MacOS/lib/libqgis_core.%v.dylib
1.6.0 %n (>= 1.6.0-0.1)
- %p/Applications/QGIS.app/Contents/MacOS/lib/libqgis_gui.%v.dylib
1.6.0 %n (>= 1.6.0-0.1)
- !%p/Applications/QGIS.app/Contents/MacOS/lib/libqgispython.dylib
- !%p/Applications/QGIS.app/Contents/MacOS/lib/libqgis_analysis.dylib
- !%p/Applications/QGIS.app/Contents/MacOS/lib/libqgis_core.dylib
- !%p/Applications/QGIS.app/Contents/MacOS/lib/libqgis_gui.dylib
- (%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
+SplitOff: <<
+ Package: %N-shlibs
+ Description: QGIS Shared Libraries
+ Depends: <<
+ qt4-mac-core-shlibs (>=4.5.2), qt4-mac-gui-shlibs,
+ python27, pyqt4-mac-py27 (=4.7.4-1),
+ gsl-shlibs,
+ libgeos3.3.0-shlibs,
+ gdal-shlibs | gdal-pgsql-shlibs | gdal-mysql-shlibs|
gdal-pgsql-mysql-shlibs,
+ libspatialite1-shlibs | libspatialite1-64bit-shlibs,
+ postgresql84-shlibs,
+ (%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%type_pkg[grass]-%v.app/Contents/MacOS/lib/libqgis*.%v.dylib
+ <<
+ Shlibs: <<
+
%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_raw[grass] = -grass)
%p/Applications/QGIS%type_pkg[grass]-%v.app/Contents/MacOS/lib/libqgisgrass.%v.dylib
1.6.0 %n (>= 1.6.0-1)
+ <<
+#End of SplitOff
<<
DescPackaging: <<
@@ -187,8 +192,8 @@
For consistency, qgis and relevant packages are strongly recommended to
depend on
the latest stable versions, e.g.:
- python3.1 or python2.7
- postgresql83
+ python2.7
+ postgresql84
grass64
<<
DescPort: <<
Index: grass64.info
===================================================================
RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/grass64.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- grass64.info 26 Aug 2010 02:18:02 -0000 1.7
+++ grass64.info 24 Jun 2011 02:27:15 -0000 1.8
@@ -3,7 +3,7 @@
Type: gui (-mac -x11)
Distribution: (%type_raw[gui] = -x11) 10.4, (%type_raw[gui] = -x11) 10.5,
(%type_raw[gui] = -mac) 10.6
Version: 6.4.0
-Revision: 5
+Revision: 6
Conflicts: grass64, grass64-mac, grass64-x11
Replaces: grass64, grass64-mac, grass64-x11
@@ -14,8 +14,8 @@
DescDetail: <<
Very Powerful Geographical Information System with CLI and GUI.
-PostgreSQL: 8.3
-Python: 2.6
+PostgreSQL: 8.4
+Python: 2.7
SQLite: 3
Mac version (10.6 only) uses Mac's TclTk.
@@ -34,17 +34,18 @@
<<
BuildDepends: <<
fink (>= 0.28),
- ncurses-dev,
- libiconv-dev, readline5, libgettext3-dev, gettext-tools,
+ libncurses5,
+ libgettext8-dev, gettext-tools,
+ libiconv-dev, readline5,
fftw3,
gdal-dev,
- libjpeg, libpng3, libtiff,
+ libjpeg8, libpng3, libtiff,
unixodbc2 | unixodbc2-nox,
- szip, hdf5-18 | hdf5, xerces-c-dev, libogdi3,
+ szip, hdf5-18, xerces-c-dev, libogdi3,
postgresql83-dev,
- python26,
+ python27,
sqlite3-dev,
- (%type_raw[gui] = -x11) wxgtk2.8-py26-dev
+ (%type_raw[gui] = -x11) wxgtk2.8-py27-dev
<<
Source: http://grass.itc.it/grass64/source/grass-%vRC6.tar.gz
@@ -125,15 +126,17 @@
Conflicts: grass64-shlibs, grass64-mac-shlibs, grass64-x11-shlibs
Replaces: grass64-shlibs, grass64-mac-shlibs, grass64-x11-shlibs
Depends: <<
- ncurses-shlibs,
+ libncurses5-shlibs,
+ libgettext8-shlibs,
fftw3-shlibs,
gdal-shlibs,
- gettext, libjpeg-shlibs, libpng3-shlibs, libtiff-shlibs,
- postgresql83-shlibs,
- python26-shlibs,
+ gettext, libjpeg8-shlibs, libpng3-shlibs, libtiff-shlibs,
+ hdf5-18-shlibs,
+ postgresql84-shlibs,
+ python27-shlibs,
sqlite3-shlibs,
unixodbc2-shlibs | unixodbc2-nox-shlibs,
- (%type_raw[gui] = -x11) wxgtk2.8-py26
+ (%type_raw[gui] = -x11) wxgtk2.8-py27
<<
Files: Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_*.dylib
lib/GRASS
Shlibs: <<
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense..
http://p.sf.net/sfu/splunk-d2d-c1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
