Update of /cvsroot/fink/experimental/babayoshihiko/finkinfo
In directory vz-cvs-3.sog:/tmp/cvs-serv10203
Modified Files:
grass64.info grass64.patch
Log Message:
xerces
Index: grass64.info
===================================================================
RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/grass64.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- grass64.info 17 Oct 2011 01:15:34 -0000 1.11
+++ grass64.info 5 Dec 2011 03:19:54 -0000 1.12
@@ -1,9 +1,9 @@
Info2: <<
Package: grass64%type_pkg[gui]
-Type: gui (-mac -x11)
-Distribution: (%type_raw[gui] = -mac) 10.7, (%type_raw[gui] = -x11) 10.7,
(%type_raw[gui] = -x11) 10.6, (%type_raw[gui] = -mac) 10.6, (%type_raw[gui] =
-x11) 10.5, (%type_raw[gui] = -x11) 10.4
+Type: gui (-x11)
+Distribution: (%type_raw[gui] = -x11) 10.4, (%type_raw[gui] = -x11) 10.5,
(%type_raw[gui] = -x11) 10.6, (%type_raw[gui] = -x11) 10.7
Version: 6.4.1
-Revision: 1001.2
+Revision: 1002
Conflicts: grass64, grass64-mac, grass64-x11
Replaces: grass64, grass64-mac, grass64-x11
@@ -14,11 +14,11 @@
DescDetail: <<
Very Powerful Geographical Information System with CLI and GUI.
-PostgreSQL: 9.0
+PostgreSQL: 8.4
Python: 2.7
SQLite: 3
-Mac version (10.7 and 10.6 only) uses Mac's TclTk.
+Mac version (10.6 only) uses Mac's TclTk.
X11 version uses Fink's TclTk and lacks OpenGL/NVIZ support.
<<
@@ -29,60 +29,47 @@
# Dependencies.
Depends: <<
- %n-shlibs (=%v-%r)
+ %n-shlibs (=%v-%r)
<<
BuildDepends: <<
- fink (>= 0.28),
- libncurses5-dev,
- libiconv-dev, readline5, libgettext8-dev,
- fftw3,
- unixodbc2 | unixodbc2-nox,
- hdf5.7-bin,
- gdal-dev,
- libjpeg8, libpng14, libtiff,
- szip, xerces-c31-dev, libogdi3,
- postgresql90-dev,
- python27,
- sqlite3-dev
+ fink (>= 0.28),
+ libncurses5-dev,
+ libiconv-dev, readline5, libgettext8-dev, gettext-tools,
+ fftw3,
+ gdal-dev,
+ libjpeg, libpng14 | libpng3, libtiff,
+ unixodbc2 | unixodbc2-nox,
+ szip, xerces-c31-dev, libogdi3,
+ postgresql84-dev,
+ python27,
+ sqlite3-dev
<<
-# (%type_raw[gui] = -mac) wxmac28,
+# hdf5-18-bin | hdf5-bin,
+# (%type_raw[gui] = -mac) wxmac28
Source: http://grass.osgeo.org/grass64/source/grass-%v.tar.gz
Source-MD5: d8ca83d416b5b0cf2aa9d36c81a77b23
# Patch Phase.
PatchFile: grass64.patch
-PatchFile-MD5: 1287d269b2b47355bf3a9443d8541347
+PatchFile-MD5: e3bf9a0a35baea73d3eca03af93321b7
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
# Compile Phase.
SetCFLAGS: -I%p/include
SetLDFLAGS: -L%p/lib -lcurses
-ConfigureParams: <<
- --with-curses --with-freetype
--with-freetype-includes=%p/lib/freetype219/include/freetype2
--with-freetype-libs=%p/lib/freetype219/lib \
- --with-cxx --without-motif --without-glw --without-readline \
- --with-gdal=%p/bin/gdal-config \
- --with-proj --with-proj-includes=%p/include --with-proj-libs=%p/lib
--with-proj-share=%p/share/proj \
- --with-jpeg-includes=%p/include --with-jpeg-libs=%p/lib
--with-png-includes=%p/include --with-png-libs=%p/lib
--with-tiff-includes=%p/include --with-tiff-libs=%p/lib \
- --without-mysql --without-odbc --with-sqlite --with-sqlite-libs=%p/lib
--with-sqlite-includes=%p/include \
- --with-fftw-includes=%p/include --with-fftw-libs=%p/lib \
- --with-python=%p/bin/python2.7-config -\
- -prefix=%p/Applications --enable-macosx-app
-<<
+ConfigureParams: --with-curses --with-freetype
--with-freetype-includes=%p/lib/freetype219/include/freetype2
--with-freetype-libs=%p/lib/freetype219/lib --with-gdal=%p/bin/gdal-config
--with-proj --with-proj-includes=%p/include --with-proj-libs=%p/lib
--with-proj-share=%p/share/proj --with-jpeg-includes=%p/include
--with-jpeg-libs=%p/lib --with-png-includes=%p/include --with-png-libs=%p/lib
--with-tiff-includes=%p/include --with-tiff-libs=%p/lib --without-mysql
--with-odbc --with-sqlite --with-sqlite-libs=%p/lib
--with-sqlite-includes=%p/include --with-fftw-includes=%p/include
--with-fftw-libs=%p/lib --with-cxx --without-motif --without-glw
--without-readline --with-python=%p/bin/python2.7-config
--prefix=%p/Applications --enable-macosx-app
+
+
CompileScript: <<
#!/bin/bash -xe
- darwin_vers=`uname -r | cut -d. -f1`
- if test "$darwin_vers" = 11 ; then
- export CC=gcc-fsf-4.6
- export CXX=g++-fsf-4.6
- fi
- PGSQLPARAM=" --with-postgres
--with-postgres-includes=%p/opt/postgresql-9.0/include
--with-postgres-libs=%p/opt/postgresql-9.0/lib "
+ PGSQLPARAM=" --with-postgres
--with-postgres-includes=%p/opt/postgresql-8.4/include
--with-postgres-libs=%p/opt/postgresql-8.4/lib "
if [ "%type_raw[gui]" == "-mac" ]; then
- ./configure %c $PGSQLPARAM --without-x --without-wxwidgets
--with-opengl=aqua
'--with-opengl-includes=/System/Library/Frameworks/OpenGL.framework/Headers
/System/Library/Frameworks/GLUT.framework/Headers
/System/Library/Frameworks/AGL.framework/Headers'
+ ./configure %c $PGSQLPARAM --without-x
'--with-tcltk-includes=/System/Library/Frameworks/Tcl.framework/Headers
/System/Library/Frameworks/Tk.framework/Headers
/System/Library/Frameworks/Tk.framework/PrivateHeaders'
--with-tcltk-libs=/usr/lib --with-opengl=aqua
'--with-opengl-includes=/System/Library/Frameworks/OpenGL.framework/Headers
/System/Library/Frameworks/GLUT.framework/Headers
/System/Library/Frameworks/AGL.framework/Headers'
# --with-wxwidgets=%p/lib/wx/config/mac-ansi-release-2.8
perl -pi -e "s|^TCLINCDIR|TCLINCDIR =
-I/System/Library/Frameworks/Tcl.framework/Headers
-I/System/Library/Frameworks/Tk.framework/Headers
-I/System/Library/Frameworks/Tk.framework/PrivateHeaders #|"
include/Make/Platform.make
perl -pi -e "s|^TKINCDIR|TKINCDIR =
-I/System/Library/Frameworks/Tcl.framework/Headers
-I/System/Library/Frameworks/Tk.framework/Headers
-I/System/Library/Frameworks/Tk.framework/PrivateHeaders #|"
include/Make/Platform.make
@@ -107,6 +94,8 @@
fi
<<
+
+
# Install Phase.
InstallScript: <<
#!/bin/sh -xe
@@ -116,6 +105,13 @@
DocFiles:
+
+
+
+
+
+
+
# Additional Phase.
SplitOff: <<
Package: %N-dev
@@ -128,22 +124,28 @@
DocFiles:
<<
+
+
+
+
+
SplitOff2: <<
Package: %N-shlibs
Description: GRASS Shared Libraries
Conflicts: grass64-shlibs, grass64-mac-shlibs, grass64-x11-shlibs
Replaces: grass64-shlibs, grass64-mac-shlibs, grass64-x11-shlibs
Depends: <<
- libncurses5-shlibs, libgettext8-shlibs,
+ libncurses5-shlibs,
fftw3-shlibs,
- unixodbc2-shlibs | unixodbc2-nox-shlibs,
gdal-shlibs,
- libjpeg8-shlibs, libpng14-shlibs, libtiff-shlibs,
- postgresql90-shlibs,
+ libgettext8-shlibs, libjpeg-shlibs, libpng14-shlibs | libpng3-shlibs,
libtiff-shlibs,
+ xerces-c31-shlibs,
+ postgresql84-shlibs,
python27-shlibs,
- sqlite3-shlibs
+ sqlite3-shlibs,
+ unixodbc2-shlibs | unixodbc2-nox-shlibs
<<
-# (%type_raw[gui] = -mac) wxmac28-shlibs,
+ # (%type_raw[gui] = -mac) wxmac28-shlibs
Files: Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_*.dylib
Shlibs: <<
@@ -196,7 +198,7 @@
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vask.%v.dylib
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vect.%v.dylib
!%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_vedit.%v.dylib
- %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_I.dylib 6.4.0 %n
(>= 6.4.0-1) 32
+ %p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_I.dylib 6.4.0 %n
(>= 6.4.0-1)
(%type_raw[gui] = -x11)
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_Iortho.dylib 6.4.0 %n
(>= 6.4.0-1)
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_arraystats.dylib
6.4.0 %n (>= 6.4.0-1)
%p/Applications/GRASS-6.4.app/Contents/MacOS/lib/libgrass_bitmap.dylib
6.4.0 %n (>= 6.4.0-1)
Index: grass64.patch
===================================================================
RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/grass64.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- grass64.patch 24 Sep 2011 15:23:49 -0000 1.5
+++ grass64.patch 5 Dec 2011 03:19:54 -0000 1.6
@@ -1,106 +1,6 @@
-Binary files grass-6.4.1-orig/include/.DS_Store and
grass-6.4.1/include/.DS_Store differ
-diff -ruN grass-6.4.1-orig/include/iostream/ami_stream.h
grass-6.4.1/include/iostream/ami_stream.h
---- grass-6.4.1-orig/include/iostream/ami_stream.h 2011-09-24
11:17:17.000000000 +0900
-+++ grass-6.4.1/include/iostream/ami_stream.h 2011-09-24 11:40:29.000000000
+0900
-@@ -139,7 +139,7 @@
- AMI_STREAM();
-
- // An AMI stream based on a specific path name.
-- AMI_STREAM(const char *path_name, AMI_stream_type st);
-+ AMI_STREAM(const char *path_name, AMI_stream_type st =
AMI_READ_WRITE_STREAM);
-
- // convenience function with split path_name
- //AMI_STREAM(const char *dir_name, const char *file_name, AMI_stream_type
st);
-@@ -155,7 +155,7 @@
- // Read and write elements.
- AMI_err read_item(T **elt);
- AMI_err write_item(const T &elt);
-- AMI_err read_array(T *data, off_t len, off_t *lenp);
-+ AMI_err read_array(T *data, off_t len, off_t *lenp=NULL);
- AMI_err write_array(const T *data, off_t len);
-
- // Return the number of items in the stream.
-@@ -171,7 +171,7 @@
- // Query memory usage
- static AMI_err main_memory_usage(size_t *usage,
- //MM_stream_usage usage_type=
MM_STREAM_USAGE_OVERHEAD);
-- MM_stream_usage usage_type);
-+ MM_stream_usage usage_type =
MM_STREAM_USAGE_OVERHEAD);
-
- void persist(persistence p);
-
-@@ -247,7 +247,7 @@
- // An AMI stream based on a specific path name.
- template<class T>
- AMI_STREAM<T>::AMI_STREAM(const char *path_name,
-- AMI_stream_type st = AMI_READ_WRITE_STREAM) {
-+ AMI_stream_type st) {
-
- access_mode = st;
-
-@@ -465,7 +465,7 @@
- template<class T>
- AMI_err
- AMI_STREAM<T>::main_memory_usage(size_t *usage,
--
MM_stream_usage usage_type= MM_STREAM_USAGE_OVERHEAD) {
-+
MM_stream_usage usage_type) {
-
- switch (usage_type) {
- case MM_STREAM_USAGE_OVERHEAD:
-@@ -544,7 +544,7 @@
-
- /**********************************************************************/
- template<class T>
--AMI_err AMI_STREAM<T>::read_array(T *data, off_t len, off_t *lenp=NULL) {
-+AMI_err AMI_STREAM<T>::read_array(T *data, off_t len, off_t *lenp) {
- size_t nobj;
- assert(fp);
-
-diff -ruN grass-6.4.1-orig/include/iostream/embuffer.h
grass-6.4.1/include/iostream/embuffer.h
---- grass-6.4.1-orig/include/iostream/embuffer.h 2011-09-24
11:17:17.000000000 +0900
-+++ grass-6.4.1/include/iostream/embuffer.h 2011-09-24 12:34:15.000000000
+0900
-@@ -364,7 +364,7 @@
- // return the number of items actually inserted
- long insert(AMI_STREAM<T>* str,
- //long bos=0);
-- long bos);
-+ long bos=0);
-
- //print range of elements in buffer
- void print_range();
-@@ -1120,7 +1120,7 @@
-
- return the number of items actually inserted */
- template<class T, class Key>
--long em_buffer<T,Key>::insert(AMI_STREAM<T>* str, long bos=0) {
-+long em_buffer<T,Key>::insert(AMI_STREAM<T>* str, long bos) {
-
- assert(str);
-
-diff -ruN grass-6.4.1-orig/include/iostream/minmaxheap.h
grass-6.4.1/include/iostream/minmaxheap.h
---- grass-6.4.1-orig/include/iostream/minmaxheap.h 2011-09-24
11:17:17.000000000 +0900
-+++ grass-6.4.1/include/iostream/minmaxheap.h 2011-09-24 15:51:50.000000000
+0900
-@@ -491,7 +491,7 @@
- T a, b;
- min(a);
- max(b);
-- if (size) {
-+ if (size()) {
- cout << a.getPriority() << ".."
- << b.getPriority();
- }
-@@ -744,7 +744,7 @@
- //heap must be empty
- assert(this->size()==0);
- for (i = 0; !full() && i<n; i++) {
-- insert(arr[i]);
-+ this->insert(arr[i]);
- }
- if (i < n) {
- assert(i == this->maxsize);
diff -ruN grass-6.4.1-orig/lib/init/init.sh grass-6.4.1/lib/init/init.sh
---- grass-6.4.1-orig/lib/init/init.sh 2011-09-24 11:17:18.000000000 +0900
-+++ grass-6.4.1/lib/init/init.sh 2011-09-24 11:22:08.000000000 +0900
+--- grass-6.4.1-orig/lib/init/init.sh 2011-05-23 20:38:02.000000000 +0900
++++ grass-6.4.1/lib/init/init.sh 2011-05-23 21:34:33.000000000 +0900
@@ -25,7 +25,8 @@
trap "echo 'User break!' ; exit" 2 3 15
@@ -176,8 +76,8 @@
"$ETC/clean_temp" > /dev/null
diff -ruN grass-6.4.1-orig/macosx/Makefile grass-6.4.1/macosx/Makefile
---- grass-6.4.1-orig/macosx/Makefile 2011-09-24 11:17:18.000000000 +0900
-+++ grass-6.4.1/macosx/Makefile 2011-09-24 11:22:08.000000000 +0900
+--- grass-6.4.1-orig/macosx/Makefile 2011-05-23 20:38:04.000000000 +0900
++++ grass-6.4.1/macosx/Makefile 2011-05-23 21:35:02.000000000 +0900
@@ -4,8 +4,8 @@
MACOSX_APP_NAME = GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app
@@ -228,8 +128,8 @@
macosx-support-dir:
${MAKE_DIR_CMD} ${MACOSX_SUPPDIR}
diff -ruN grass-6.4.1-orig/macosx/app/build_gui_user_menu.sh
grass-6.4.1/macosx/app/build_gui_user_menu.sh
---- grass-6.4.1-orig/macosx/app/build_gui_user_menu.sh 2011-09-24
11:17:18.000000000 +0900
-+++ grass-6.4.1/macosx/app/build_gui_user_menu.sh 2011-09-24
11:22:08.000000000 +0900
+--- grass-6.4.1-orig/macosx/app/build_gui_user_menu.sh 2011-05-23
20:38:04.000000000 +0900
++++ grass-6.4.1/macosx/app/build_gui_user_menu.sh 2011-05-24
07:27:20.000000000 +0900
@@ -13,7 +13,7 @@
GRASS_MMVER=`cut -d . -f 1-2 "$GISBASE/etc/VERSIONNUMBER"`
@@ -240,8 +140,8 @@
echo "Rebuilding Addon menu..."
diff -ruN grass-6.4.1-orig/macosx/app/build_html_user_index.sh
grass-6.4.1/macosx/app/build_html_user_index.sh
---- grass-6.4.1-orig/macosx/app/build_html_user_index.sh 2011-09-24
11:17:18.000000000 +0900
-+++ grass-6.4.1/macosx/app/build_html_user_index.sh 2011-09-24
11:22:08.000000000 +0900
+--- grass-6.4.1-orig/macosx/app/build_html_user_index.sh 2011-05-23
20:38:04.000000000 +0900
++++ grass-6.4.1/macosx/app/build_html_user_index.sh 2011-05-24
07:31:21.000000000 +0900
@@ -19,13 +19,13 @@
GRASS_MMVER=`cut -d . -f 1-2 "$GISBASE/etc/VERSIONNUMBER"`
GRASSVERSION=`cat "$GISBASE/etc/VERSIONNUMBER"`
@@ -265,8 +165,8 @@
+mkdir -p $HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER
ln -sfh ../../GRASS/$GRASS_MMVER/Modules/docs/html
$HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER
diff -ruN grass-6.4.1-orig/macosx/app/grass.sh.in
grass-6.4.1/macosx/app/grass.sh.in
---- grass-6.4.1-orig/macosx/app/grass.sh.in 2011-09-24 11:17:18.000000000
+0900
-+++ grass-6.4.1/macosx/app/grass.sh.in 2011-09-24 11:22:08.000000000 +0900
+--- grass-6.4.1-orig/macosx/app/grass.sh.in 2011-05-23 20:38:04.000000000
+0900
++++ grass-6.4.1/macosx/app/grass.sh.in 2011-05-24 07:28:43.000000000 +0900
@@ -32,7 +32,7 @@
grass_ver=`cut -d . -f 1-2 "$GISBASE/etc/VERSIONNUMBER"`
@@ -410,8 +310,8 @@
fi
if [ "$GRASS_GUI" = "text" ] && [ "$x11" = "tig" ] ; then
diff -ruN grass-6.4.1-orig/macosx/app/python_wrapper
grass-6.4.1/macosx/app/python_wrapper
---- grass-6.4.1-orig/macosx/app/python_wrapper 2011-09-24 11:17:18.000000000
+0900
-+++ grass-6.4.1/macosx/app/python_wrapper 2011-09-24 11:22:08.000000000
+0900
+--- grass-6.4.1-orig/macosx/app/python_wrapper 2011-05-23 20:38:04.000000000
+0900
++++ grass-6.4.1/macosx/app/python_wrapper 2011-05-23 21:37:19.000000000
+0900
@@ -29,9 +29,7 @@
SYSARCH=`uname -p`
SYSVER=`uname -r | cut -d . -f 1`
@@ -424,8 +324,8 @@
if [ $(($SYSVER)) -gt 5 ] && [ "$GRASS_WX64BIT" = "0" ] ; then
case $SYSARCH in
diff -ruN grass-6.4.1-orig/macosx/modbuild/Makefile
grass-6.4.1/macosx/modbuild/Makefile
---- grass-6.4.1-orig/macosx/modbuild/Makefile 2011-09-24 11:17:18.000000000
+0900
-+++ grass-6.4.1/macosx/modbuild/Makefile 2011-09-24 11:22:08.000000000
+0900
+--- grass-6.4.1-orig/macosx/modbuild/Makefile 2011-05-23 20:38:04.000000000
+0900
++++ grass-6.4.1/macosx/modbuild/Makefile 2011-05-24 07:29:31.000000000
+0900
@@ -9,7 +9,7 @@
MACOSX_APP_NAME =
GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app
endif
------------------------------------------------------------------------------
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. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
