Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6373/main/finkinfo/sci
Modified Files:
Tag: pangocairo-branch
ccp4.info gmt.info gmt.patch mathomatic.info mbsystem.info
scilab-atlas.info scilab-atlas.patch scilab.info scilab.patch
vtk-py.info xcircuit-testing.info
Log Message:
merged from HEAD (tagged as pangocairo-root-2)
Index: vtk-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/vtk-py.info,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- vtk-py.info 22 Sep 2006 04:42:19 -0000 1.6
+++ vtk-py.info 20 Dec 2006 18:01:15 -0000 1.6.2.1
@@ -1,8 +1,8 @@
Info2: <<
Package: vtk-py%type_pkg[python]
Version: 5.0.2
-Revision: 1001
-Type: python (2.3 2.4)
+Revision: 1002
+Type: python (2.3 2.4 2.5)
BuildDependsOnly: False
Source: http://www.vtk.org/files/release/5.0/vtk-%v.tar.gz
Source-MD5: c2f439d1a4bc1598a1cb09ee43f794ed
@@ -11,20 +11,19 @@
GCC: 4.0
Depends: x11, x11-shlibs, tcltk, tcltk-shlibs, expat-shlibs, libpng3-shlibs,
libtiff-shlibs, libjpeg-shlibs, python%type_pkg[python]
BuildDepends: cmake (>= 2.4.2-1), x11-dev, tcltk-dev, expat, libpng3, libtiff,
libjpeg
-Conflicts: vtk (<= 4.2.5-2), vtk-py23, vtk-py24
-Replaces: vtk (<=4.2.5-2), vtk-py23, vtk-py24
+Conflicts: vtk (<= 4.2.5-2), vtk-py23, vtk-py24, vtk-py25
+Replaces: vtk (<=4.2.5-2), vtk-py23, vtk-py24, vtk-py25
Recommends: vtkdata
PatchScript: <<
perl -pi.bak -e 's|/usr/local/lib|%p/lib/vtk|g'
Wrapping/Python/vtk/tk/vtkLoadPythonTkWidgets.py
perl -pi.bak -e 's|/usr/local|%p|g' Wrapping/Tcl/vtkbase/vtkbase.tcl
- if [ %m = "powerpc" ]; then perl -pi -e 's|(\-no\-cpp\-precomp)|\-O3
\-mcpu=G3 \-mtune=G4 \-funroll\-loops \-Wno\-long\-double $1|g' CMakeLists.txt;
fi
- if [ %m = "i386" ]; then perl -pi -e 's|(\-no\-cpp\-precomp)|\-O3
\-funroll\-loops \-Wno\-long\-double $1|g' CMakeLists.txt; fi
+ if [ %m = "powerpc" ]; then perl -pi -e 's|(\-no\-cpp\-precomp)|\-Os
\-mcpu=G3 \-mtune=G4 \-funroll\-loops \-Wno\-long\-double $1|g' CMakeLists.txt;
fi
+ if [ %m = "i386" ]; then perl -pi -e 's|(\-no\-cpp\-precomp)|\-Os
\-funroll\-loops \-Wno\-long\-double $1|g' CMakeLists.txt; fi
+ if [ %type_raw[python] = "2.5" ]; then perl -pi -e 's|(char .*tp_doc;)|const
\1|' Common/vtkPythonUtil.cxx; fi
<<
CompileScript: <<
#!/bin/sh -ex
%p/bin/cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
- -DCMAKE_SKIP_BUILD_RPATH:BOOL=ON \
- -DCMAKE_INSTALL_NAME_DIR:PATH=%p/lib/vtk \
-DVTK_INSTALL_LIB_DIR:STRING="/lib/vtk" \
-DBUILD_SHARED_LIBS:BOOL=ON \
-DCMAKE_INSTALL_PREFIX:PATH=%p \
@@ -39,6 +38,7 @@
-DTK_LIBRARY:FILEPATH=%p/lib/libtk.dylib \
-DTK_INCLUDE_PATH:PATH=%p/include \
-DVTK_WRAP_JAVA:BOOL=ON \
+ -DJAVA_HAVE_FRAMEWORK:BOOL=ON \
-DVTK_WRAP_PYTHON:BOOL=ON \
-DPYTHON_EXECUTABLE:FILEPATH=%p/bin/python%type_raw[python] \
-DPYTHON_INCLUDE_PATH:PATH=%p/include/python%type_raw[python] \
@@ -62,7 +62,7 @@
-DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T:BOOL=ON \
.
# ugly hack to fix the -install_name of the dylibs
-# cmake-2.4 has a mechanism for it, but it is unusable
+# cmake-2.4 has a mechanism for it, but it is unusable (still can't make it
work in cmake-2.4.5)
perl -pi -e 's|install_name lib|install_name %p/lib/vtk/lib|g' `find . -name
build.make -or -name link.txt`
#
make
Index: xcircuit-testing.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/xcircuit-testing.info,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -d -r1.19 -r1.19.2.1
--- xcircuit-testing.info 11 Dec 2006 00:24:47 -0000 1.19
+++ xcircuit-testing.info 20 Dec 2006 18:01:15 -0000 1.19.2.1
@@ -1,12 +1,12 @@
Package: xcircuit-testing
-Version: 3.6.72
+Version: 3.6.73
Revision: 1
Depends: x11, ghostscript, tcltk
BuildDepends: m4, tcltk-dev, x11-dev, automake1.9
Conflicts: xcircuit
Replaces: xcircuit
Source: http://opencircuitdesign.com/xcircuit/archive/xcircuit-%v.tgz
-Source-MD5: c40a471bb2c990acd3528d239cbbebb0
+Source-MD5: 465ee663c664377ec13c06cf15a77cf0
Patch: %n.patch
ConfigureParams: --with-gnu-ld --mandir=%p/share/man
SetCFLAGS: -I/usr/X11R6/include -fno-common
Index: gmt.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gmt.info,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- gmt.info 22 May 2006 15:12:02 -0000 1.5
+++ gmt.info 20 Dec 2006 18:01:14 -0000 1.5.2.1
@@ -1,35 +1,32 @@
Package: gmt
-Version: 4.1.1
-Revision: 1001
-Source: ftp://ftp.soest.hawaii.edu/gmt/4/GMT%v_progs.tar.bz2
+Version: 4.1.4
+Revision: 1
+Source: ftp://ftp.soest.hawaii.edu/gmt/4/GMT%v_src.tar.bz2
Source2: ftp://ftp.soest.hawaii.edu/gmt/4/GMT%v_man.tar.bz2
-Source3: ftp://ftp.soest.hawaii.edu/gmt/4/GMT4_share.tar.bz2
+Source3: ftp://ftp.soest.hawaii.edu/gmt/4/GMT%v_share.tar.bz2
Source4: ftp://ftp.soest.hawaii.edu/gmt/4/GMT%v_suppl.tar.bz2
-Source-MD5: d8e189e9388cf415e0aceea3cb8e0348
-Source2-MD5: 2b2e42972f4addd5386e2b8fc116cd59
-Source3-MD5: d3aa6559eca5045e3255b476c1914f02
-Source4-MD5: 191fe95ea7211d2910363b93d95a301e
-#Source3Rename: GMT_share.tar.bz2
+Source5: ftp://ftp.soest.hawaii.edu/gmt/4/GMT4.1_coast.tar.bz2
+Source-MD5: 679bfb7b73a70fa4e77731afc75352b1
+Source2-MD5: 4931a770b95f2f096e689f8e4d0203ab
+Source3-MD5: 27960716546b8d5454a2bf605290f6ec
+Source4-MD5: 9ee5e07db137b2aa99ad29e5fb33fa52
+Source5-MD5: 2ab56bb6dd2baf7299143a6cb46fbea4
SourceDirectory: GMT%v
-Source3ExtractDir: GMT%v
+Source5ExtractDir: GMT%v
BuildDepends: netcdf (>= 3.6.0-1002)
Depends: netcdf-shlibs (>= 3.6.0-1002)
NoSetCPPFLAGS: true
-# -no-cpp-precomp
SetCFLAGS: -O2 -ansi -pedantic -funroll-loops -fexpensive-optimizations
-# -I%p/include
-# -L/sw/lib
SetLDFLAGS: -L%p/lib
-# for gmt >4.1.1, should be able to --disable-mex
-ConfigureParams: --mandir='${prefix}/share/man' --disable-shared
--datadir='${prefix}/share/%n' --enable-netcdf=%p
+
+# don't build xgrid to avoid x11 dependency.
+# don't build mex (won't work unless matlab installed).
+ConfigureParams: --mandir='${prefix}/share/man' --disable-shared
--datadir='${prefix}/share/%n' --enable-netcdf=%p --disable-xgrid
+
Patch: %n.patch
CompileScript: <<
#!/bin/sh -ev
export NETCDFHOME=%p
- # don't build xgrid to avoid x11 dependency.
- /bin/rm -rf src/xgrid
- # don't build mex (won't work unless matlab installed).
- /bin/rm -rf src/mex
./configure %c
make gmt suppl
<<
Index: scilab-atlas.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scilab-atlas.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- scilab-atlas.patch 20 Jan 2006 20:30:40 -0000 1.1
+++ scilab-atlas.patch 20 Dec 2006 18:01:14 -0000 1.1.2.1
@@ -1,22 +1,273 @@
---- scilab-3.0_ori/configure Fri Jul 9 10:28:05 2004
-+++ scilab-3.0/configure Wed Aug 11 17:20:47 2004
-@@ -22460,7 +22460,7 @@
- FC=g77
+diff -ur scilab-4.0_ori/routines/console/dynamic_menus.c
scilab-4.0/routines/console/dynamic_menus.c
+--- scilab-4.0_ori/routines/console/dynamic_menus.c 2005-10-22
20:53:10.000000000 +0200
++++ scilab-4.0/routines/console/dynamic_menus.c 2006-06-18
11:30:09.000000000 +0200
+@@ -3,6 +3,9 @@
+ * [EMAIL PROTECTED]
+ * Changed: steer, jpc 2004
+ *--------------------------------------------------------------------------*/
++#ifdef __APPLE__
++#include <stdio.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #include <stdio.h>
+diff -ur scilab-4.0_ori/routines/interf/intinterp.c
scilab-4.0/routines/interf/intinterp.c
+--- scilab-4.0_ori/routines/interf/intinterp.c 2005-11-05 22:19:15.000000000
+0100
++++ scilab-4.0/routines/interf/intinterp.c 2006-06-18 11:25:57.000000000
+0200
+@@ -10,6 +10,9 @@
+ #if WIN32
+ #include <string.h>
+ #endif
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #include <math.h>
+
+
+diff -ur scilab-4.0_ori/routines/os_specific/link_SYSV.c
scilab-4.0/routines/os_specific/link_SYSV.c
+--- scilab-4.0_ori/routines/os_specific/link_SYSV.c 2003-02-04
22:16:08.000000000 +0100
++++ scilab-4.0/routines/os_specific/link_SYSV.c 2006-06-18
11:27:24.000000000 +0200
+@@ -34,7 +34,7 @@
+ #endif
+
+
+-#if defined(linux) || defined(netbsd) || defined(freebsd)
++#if defined(linux) || defined(netbsd) || defined(freebsd) ||
defined(__APPLE__)
+ #include <unistd.h>
+ #include <sys/wait.h>
+ #endif
+diff -ur scilab-4.0_ori/routines/scicos/matscicos.c
scilab-4.0/routines/scicos/matscicos.c
+--- scilab-4.0_ori/routines/scicos/matscicos.c 2005-11-05 22:19:15.000000000
+0100
++++ scilab-4.0/routines/scicos/matscicos.c 2006-06-18 11:34:24.000000000
+0200
+@@ -3,6 +3,9 @@
+ /* INRIA 2005 */
+ /* Allan CORNET */
+
/*-----------------------------------------------------------------------------------*/
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #if WIN32
+ #include <Windows.h>
+ #include "../os_specific/win_mem_alloc.h"
+diff -ur scilab-4.0_ori/routines/wintools/intOEMconvert.h
scilab-4.0/routines/wintools/intOEMconvert.h
+--- scilab-4.0_ori/routines/wintools/intOEMconvert.h 2005-05-10
16:52:08.000000000 +0200
++++ scilab-4.0/routines/wintools/intOEMconvert.h 2006-06-18
11:39:18.000000000 +0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTOEMCONVERT__
+ #define __INTOEMCONVERT__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
+diff -ur scilab-4.0_ori/routines/wintools/intabout.h
scilab-4.0/routines/wintools/intabout.h
+--- scilab-4.0_ori/routines/wintools/intabout.h 2005-03-02
16:47:56.000000000 +0100
++++ scilab-4.0/routines/wintools/intabout.h 2006-06-18 11:40:02.000000000
+0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTABOUT__
+ #define __INTABOUT__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
+diff -ur scilab-4.0_ori/routines/wintools/intconsoledos.h
scilab-4.0/routines/wintools/intconsoledos.h
+--- scilab-4.0_ori/routines/wintools/intconsoledos.h 2005-03-02
16:47:56.000000000 +0100
++++ scilab-4.0/routines/wintools/intconsoledos.h 2006-06-18
11:40:34.000000000 +0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTCONSOLEDOS__
+ #define __INTCONSOLEDOS__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
+diff -ur scilab-4.0_ori/routines/wintools/intfileassociationbox.h
scilab-4.0/routines/wintools/intfileassociationbox.h
+--- scilab-4.0_ori/routines/wintools/intfileassociationbox.h 2005-09-18
21:18:49.000000000 +0200
++++ scilab-4.0/routines/wintools/intfileassociationbox.h 2006-06-18
11:44:52.000000000 +0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTFILEASSOCIATIONBOX__
+ #define __INTFILEASSOCIATIONBOX__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include "../wsci/FilesAssociationBox.h"
+ #include "../wsci/wgnuplib.h"
+diff -ur scilab-4.0_ori/routines/wintools/intihmcolor.h
scilab-4.0/routines/wintools/intihmcolor.h
+--- scilab-4.0_ori/routines/wintools/intihmcolor.h 2005-08-05
23:26:44.000000000 +0200
++++ scilab-4.0/routines/wintools/intihmcolor.h 2006-06-18 11:44:21.000000000
+0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTIHMCOLOR__
+ #define __INTIHMCOLOR__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
+diff -ur scilab-4.0_ori/routines/wintools/intmcisendstring.h
scilab-4.0/routines/wintools/intmcisendstring.h
+--- scilab-4.0_ori/routines/wintools/intmcisendstring.h 2005-05-02
20:35:23.000000000 +0200
++++ scilab-4.0/routines/wintools/intmcisendstring.h 2006-06-18
11:38:30.000000000 +0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTMCISENDSTRING__
+ #define __INTMCISENDSTRING__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
+diff -ur scilab-4.0_ori/routines/wintools/intpathname.h
scilab-4.0/routines/wintools/intpathname.h
+--- scilab-4.0_ori/routines/wintools/intpathname.h 2005-03-02
16:47:56.000000000 +0100
++++ scilab-4.0/routines/wintools/intpathname.h 2006-06-18 11:41:38.000000000
+0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTPATHNAME__
+ #define __INTPATHNAME__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
+diff -ur scilab-4.0_ori/routines/wintools/intprintbox.h
scilab-4.0/routines/wintools/intprintbox.h
+--- scilab-4.0_ori/routines/wintools/intprintbox.h 2005-08-03
15:26:51.000000000 +0200
++++ scilab-4.0/routines/wintools/intprintbox.h 2006-06-18 11:43:35.000000000
+0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTPRINTBOX__
+ #define __INTPRINTBOX__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
+diff -ur scilab-4.0_ori/routines/wintools/intsetlanguagemenu.h
scilab-4.0/routines/wintools/intsetlanguagemenu.h
+--- scilab-4.0_ori/routines/wintools/intsetlanguagemenu.h 2005-03-02
16:47:56.000000000 +0100
++++ scilab-4.0/routines/wintools/intsetlanguagemenu.h 2006-06-18
11:42:12.000000000 +0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTSETLANGUAGEMENU__
+ #define __INTSETLANGUAGEMENU__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
+diff -ur scilab-4.0_ori/routines/wintools/inttoolbar.h
scilab-4.0/routines/wintools/inttoolbar.h
+--- scilab-4.0_ori/routines/wintools/inttoolbar.h 2005-03-02
16:47:56.000000000 +0100
++++ scilab-4.0/routines/wintools/inttoolbar.h 2006-06-18 11:42:36.000000000
+0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTTOOLBAR__
+ #define __INTTOOLBAR__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
+diff -ur scilab-4.0_ori/routines/wintools/inttoprint.h
scilab-4.0/routines/wintools/inttoprint.h
+--- scilab-4.0_ori/routines/wintools/inttoprint.h 2005-08-04
14:12:02.000000000 +0200
++++ scilab-4.0/routines/wintools/inttoprint.h 2006-06-18 11:43:56.000000000
+0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTTOPRINT__
+ #define __INTTOPRINT__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
+diff -ur scilab-4.0_ori/routines/wintools/intwinopen.h
scilab-4.0/routines/wintools/intwinopen.h
+--- scilab-4.0_ori/routines/wintools/intwinopen.h 2005-03-02
16:47:56.000000000 +0100
++++ scilab-4.0/routines/wintools/intwinopen.h 2006-06-18 11:43:00.000000000
+0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTWINOPEN__
+ #define __INTWINOPEN__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
+diff -ur scilab-4.0_ori/routines/wintools/intwintools.h
scilab-4.0/routines/wintools/intwintools.h
+--- scilab-4.0_ori/routines/wintools/intwintools.h 2005-03-02
16:47:56.000000000 +0100
++++ scilab-4.0/routines/wintools/intwintools.h 2006-06-18 11:37:20.000000000
+0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTWINTOOLS__
+ #define __INTWINTOOLS__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #include <stdio.h>
+--- scilab-4.0/routines/interf/matelm.f~ 2006-01-23 18:12:31.000000000
+0100
++++ scilab-4.0/routines/interf/matelm.f 2006-06-18 12:33:47.000000000
+0200
+@@ -5080,7 +5080,7 @@
+ tiniest = dlamch('u')
+ if ( tiniest/b .ne. 0.d0 ) then
+ c denormalised number are used
+- do i = 1, dlamch('n') - 1
++ do i = 1, int(dlamch('n')) - 1
+ tiniest = tiniest / b
+ enddo
+ endif
+--- scilab-4.0/routines/interf/matdes.c~ 2006-02-01 15:25:08.000000000
+0100
++++ scilab-4.0/routines/interf/matdes.c 2006-06-18 14:41:02.000000000
+0200
+@@ -5166,7 +5166,7 @@
+
+
+
/*-----------------------------------------------------------------------------------*/
+-int move(char *fname,unsigned long fname_len)
++int scimove(char *fname,unsigned long fname_len)
+ {
+ long hdl;
+ integer m1,n1,l1,m2,n2,l2,m3,n3,l3,n;
+--- scilab-4.0/routines/interf/intgraphics.c~ 2005-12-05 11:18:49.000000000
+0100
++++ scilab-4.0/routines/interf/intgraphics.c 2006-06-18 14:41:26.000000000
+0200
+@@ -84,7 +84,7 @@
+ extern int sci_delete _PARAMS((char *fname, unsigned long fname_len));
+ extern int addcb _PARAMS((char *fname, unsigned long fname_len));
+ extern int copy _PARAMS((char *fname, unsigned long
subwinparenttarget));
+-extern int move _PARAMS((char *fname, unsigned long fname_len));
++extern int scimove _PARAMS((char *fname, unsigned long fname_len));
+ extern int glue _PARAMS((char *fname, unsigned long fname_len));
+ extern int unglue _PARAMS((char *fname, unsigned long fname_len));
+ extern int drawnow _PARAMS((char *fname, unsigned long fname_len));
+@@ -181,7 +181,7 @@
+ {sci_delete,"delete"},
+ {addcb,"addcb"},
+ {copy,"copy"},
+- {move,"move"},
++ {scimove,"move"},
+ {glue,"glue"},
+ {unglue,"unglue"},
+ {drawnow,"drawnow"},
+--- scilab/configure.orig 2006-12-18 06:52:31.000000000 -0700
++++ scilab/configure 2006-12-18 06:52:49.000000000 -0700
+@@ -25983,7 +25983,7 @@
+ FC=g95
FC_OPTIONS='-O2'
FC_OPTIONS_O0=
-- FC_LDFLAGS='-L/sw/lib -ldl'
-+ FC_LDFLAGS='-L/sw/lib -ldl -lcc_dynamic'
+- FC_LDFLAGS='-L/sw/lib -ldl -lcc_dynamic'
++ FC_LDFLAGS='-L/sw/lib -ldl'
FC_PICFLAGS='-fPIC'
LD=ld
LD_LDFLAGS=
---- scilab-3.0/routines/console/zzledt.c~ Wed Oct 6 18:10:01 2004
-+++ scilab-3.0/routines/console/zzledt.c Wed Jan 5 23:09:05 2005
-@@ -68,7 +68,7 @@
- #if defined(netbsd) || defined(freebsd)
- #define TERMCAP
- #endif
--
-+#define B42UNIX
- #include <stdio.h>
- #include <ctype.h>
- #include "../machine.h"
Index: gmt.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gmt.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- gmt.patch 22 Mar 2006 22:10:22 -0000 1.2
+++ gmt.patch 20 Dec 2006 18:01:14 -0000 1.2.2.1
@@ -1,229 +1,208 @@
-diff -r -u GMT4.1.1.old/Makefile GMT4.1.1/Makefile
---- GMT4.1.1.old/Makefile 2006-02-27 19:25:01.000000000 -0500
-+++ GMT4.1.1/Makefile 2006-03-03 16:55:56.000000000 -0500
-@@ -109,19 +109,21 @@
- done
-
- mex_config:
-+ if [ -d src/mex ]; then \
- if [ ! -f src/mex/makefile ]; then \
- cd src/mex; \
- \rm -f config.{cache,log,status}; \
- ./configure; \
-+ fi \
- fi
--
- xgrid_config:
-+ if [ -d src/xgrid ]; then \
- if [ ! -f src/xgrid/makefile ]; then \
- cd src/xgrid; \
- \rm -f config.{cache,log,status}; \
- ./configure; \
-+ fi \
- fi
--
- gmtmacros:
- if [ ! -s src/makegmt.macros ]; then \
- echo "src/makegmt.macros is empty - you must rerun
configure in the main GMT directory"; \
-diff -r -u GMT4.1.1.old/src/gmt_init.c GMT4.1.1/src/gmt_init.c
---- GMT4.1.1.old/src/gmt_init.c 2006-02-22 17:52:55.000000000 -0500
-+++ GMT4.1.1/src/gmt_init.c 2006-03-03 15:23:01.000000000 -0500
-@@ -2351,7 +2351,7 @@
-
- if (get == 0) { /* Must use GMT system defaults via gmt.conf */
-
-- sprintf (line, "%s%cshare%cgmt.conf", GMTHOME, DIR_DELIM,
DIR_DELIM);
-+ sprintf (line, "%s%cshare%cgmt%cgmt.conf", GMTHOME, DIR_DELIM,
DIR_DELIM,DIR_DELIM);
- if ((fp = fopen (line, "r")) == NULL) {
- fprintf (stderr, "GMT Fatal Error: Cannot open/find GMT
configuration file %s\n", line);
- exit (EXIT_FAILURE);
-@@ -2372,7 +2372,7 @@
- id = get;
-
- id--; /* Get 0 or 1 */
-- sprintf (line, "%s%cshare%c.gmtdefaults_%s", GMTHOME, DIR_DELIM,
DIR_DELIM, suffix[id]);
-+ sprintf (line, "%s%cshare%cgmt%c.gmtdefaults_%s", GMTHOME, DIR_DELIM,
DIR_DELIM, DIR_DELIM, suffix[id]);
-
- path = (char *) GMT_memory (VNULL, (size_t)(strlen (line) + 1),
(size_t)1, GMT_program);
-
-@@ -2481,7 +2481,7 @@
- FILE *fp;
- char line[BUFSIZ], path[BUFSIZ];
-
-- sprintf (path, "%s%cshare%c%s", GMTHOME, DIR_DELIM, DIR_DELIM,
name);
-+ sprintf (path, "%s%cshare%cgmt%c%s", GMTHOME, DIR_DELIM,
DIR_DELIM, DIR_DELIM, name);
-
- if (!strcmp ("Sphere", name)) {
- /* Special case where previous setting in .gmtdefaults4
is a custom ellipse which
-@@ -2560,7 +2560,7 @@
-
- GMT_set_home ();
-
-- sprintf (line, "%s%cshare%cgmtmedia.d", GMTHOME, DIR_DELIM, DIR_DELIM);
-+ sprintf (line, "%s%cshare%cgmt%gmtmedia.d", GMTHOME, DIR_DELIM,
DIR_DELIM, DIR_DELIM);
- if ((fp = fopen (line, "r")) == NULL) return (0);
-
- n_alloc = GMT_TINY_CHUNK;
-@@ -2618,10 +2618,10 @@
- char file[BUFSIZ], line[BUFSIZ], full[16], abbrev[16], c[16], dwu;
- int i, nm = 0, nw = 0, nu = 0;
-
-- sprintf (file, "%s%cshare%ctime%c%s.d", GMTHOME, DIR_DELIM, DIR_DELIM,
DIR_DELIM, name);
-+ sprintf (file, "%s%cshare%cgmt%ctime%c%s.d", GMTHOME, DIR_DELIM,
DIR_DELIM, DIR_DELIM, DIR_DELIM, name);
- if ((fp = fopen (file, "r")) == NULL) {
- fprintf (stderr, "GMT Warning: Could not load %s - revert to us
(English)!\n", name);
-- sprintf (file, "%s%cshare%ctime%cus.d", GMTHOME, DIR_DELIM,
DIR_DELIM, DIR_DELIM);
-+ sprintf (file, "%s%cshare%cgmt%ctime%cus.d", GMTHOME,
DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM);
- if ((fp = fopen (file, "r")) == NULL) {
- fprintf (stderr, "GMT Error: Could not find %s!\n",
file);
- exit (EXIT_FAILURE);
-@@ -4809,7 +4809,7 @@
- int code = 0, pos;
- FILE *in;
-
-- sprintf (line, "%s%cshare%cpslib%c%s.ps", GMTHOME, DIR_DELIM,
DIR_DELIM, DIR_DELIM, enc->name);
-+ sprintf (line, "%s%cshare%cgmt%cpslib%c%s.ps", GMTHOME, DIR_DELIM,
DIR_DELIM, DIR_DELIM, DIR_DELIM, enc->name);
- in = GMT_fopen (line, "r");
-
- if (!in)
-@@ -4886,7 +4886,7 @@
-
- /* First the standard 35 PostScript fonts from Adobe */
-
-- sprintf (fullname, "%s%cshare%cpslib%cPS_font_info.d", GMTHOME,
DIR_DELIM, DIR_DELIM, DIR_DELIM);
-+ sprintf (fullname, "%s%cshare%cgmt%cpslib%cPS_font_info.d", GMTHOME,
DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM);
-
- if ((in = fopen (fullname, "r")) == NULL)
- {
-@@ -4916,7 +4916,7 @@
-
- /* Then any custom fonts */
+diff -u -r GMT4.1.4-orig/src/gmt_io.c GMT4.1.4/src/gmt_io.c
+--- GMT4.1.4-orig/src/gmt_io.c 2006-10-30 11:17:36.000000000 -0500
++++ GMT4.1.4/src/gmt_io.c 2006-12-04 17:07:58.000000000 -0500
+@@ -224,14 +224,23 @@
+ /* Finally try to get file from $GMTHOME/share[/subdirname] */
-- sprintf (fullname, "%s%cshare%cpslib%cCUSTOM_font_info.d", GMTHOME,
DIR_DELIM, DIR_DELIM, DIR_DELIM);
-+ sprintf (fullname, "%s%cshare%cgmt%cpslib%cCUSTOM_font_info.d",
GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM);
+ if (subdir) {
+- sprintf (path, "%s%cshare%c%s%c%s%s", GMTHOME, DIR_DELIM,
DIR_DELIM, subdir, DIR_DELIM, stem, suffix);
++ sprintf (path, "%s%cshare%cgmt%c%s%c%s%s", GMTHOME, DIR_DELIM,
DIR_DELIM, DIR_DELIM, subdir, DIR_DELIM, stem, suffix);
++ }
++ else {
++ sprintf (path, "%s%cshare%cgmt%c%s%s", GMTHOME, DIR_DELIM,
DIR_DELIM, DIR_DELIM, stem, suffix);
++ }
++ if (!access (path, R_OK)) return (TRUE); /* Yes, use the file in
$GMTHOME/share/subdir */
- if (!access (fullname, R_OK)) { /* Decode Custom font file */
++ /* For debian systems (e.g. fink) these may hide in a gmt subdir under
share */
++ if (subdir) {
++ sprintf (path, "%s%cshare%cgmt%c%s%c%s%s", GMTHOME, DIR_DELIM,
DIR_DELIM, DIR_DELIM, subdir, DIR_DELIM, stem, suffix);
+ }
+ else {
+- sprintf (path, "%s%cshare%c%s%s", GMTHOME, DIR_DELIM,
DIR_DELIM, stem, suffix);
++ sprintf (path, "%s%cshare%cgmt%c%s%s", GMTHOME, DIR_DELIM,
DIR_DELIM, DIR_DELIM, stem, suffix);
+ }
+ if (!access (path, R_OK)) return (TRUE); /* Yes, use the file in
$GMTHOME/share/subdir */
-diff -r -u GMT4.1.1.old/src/gmt_support.c GMT4.1.1/src/gmt_support.c
---- GMT4.1.1.old/src/gmt_support.c 2006-02-20 20:51:21.000000000 -0500
-+++ GMT4.1.1/src/gmt_support.c 2006-03-03 15:28:29.000000000 -0500
-@@ -1009,9 +1009,9 @@
++
+ return (FALSE); /* No file found, give up */
+ }
- if (!ok) { /* No table in current dir, try /share */
- if (table)
-- sprintf (CPT_file, "%s%cshare%ccpt%cGMT_%s.cpt",
GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, table);
-+ sprintf (CPT_file, "%s%cshare%cgmt%ccpt%cGMT_%s.cpt",
GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM, table);
- else /* Default to rainbow colors */
-- sprintf (CPT_file, "%s%cshare%ccpt%cGMT_rainbow.cpt",
GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM);
-+ sprintf (CPT_file, "%s%cshare%cgmt%ccpt%cGMT_rainbow.cpt",
GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM);
+diff -u -r GMT4.1.4-orig/src/gmt_shore.c GMT4.1.4/src/gmt_shore.c
+--- GMT4.1.4-orig/src/gmt_shore.c 2006-10-30 11:17:37.000000000 -0500
++++ GMT4.1.4/src/gmt_shore.c 2006-12-04 17:09:50.000000000 -0500
+@@ -973,7 +973,7 @@
+
+ /* 2. Then check the $GMTHOME/share/coast directory */
- ok = !access (CPT_file, R_OK);
- if (!ok)
-@@ -5457,7 +5457,7 @@
+- sprintf (path, "%s%cshare%ccoast%c%s", GMTHOME, DIR_DELIM, DIR_DELIM,
DIR_DELIM, name);
++ sprintf (path, "%s%cshare%cgmt%ccoast%c%s", GMTHOME, DIR_DELIM,
DIR_DELIM, DIR_DELIM, DIR_DELIM, name);
+ if (!access (path, R_OK)) return (TRUE); /* File exists and is
readable, return with name */
- /* First check the $GMTHOME/share directory */
+ /* File was not readable. Now check if it exists */
+@@ -985,7 +985,7 @@
+
+ /* 3. Nothing in share/coast; do a backwards-compatible check in the
$GMTHOME/share directory */
- sprintf (path, "%s%cshare%c%s", GMTHOME, DIR_DELIM, DIR_DELIM, name);
+ sprintf (path, "%s%cshare%cgmt%c%s", GMTHOME, DIR_DELIM, DIR_DELIM,
DIR_DELIM, name);
if (!access (path, R_OK)) return (TRUE); /* File exists and is
readable, return with name */
/* File was not readable. Now check if it exists */
-@@ -5471,7 +5471,7 @@
+@@ -999,7 +999,7 @@
* It is not an error if we cannot find the named file, only if it is
found
* but cannot be read due to permission problems */
- sprintf (dir, "%s%cshare%ccoastline.conf", GMTHOME, DIR_DELIM,
DIR_DELIM);
+ sprintf (dir, "%s%cshare%cgmt%ccoastline.conf", GMTHOME, DIR_DELIM,
DIR_DELIM, DIR_DELIM);
- if (!access (dir, F_OK)) { /* File exists... */
- if (access (dir, R_OK)) { /* ...but cannot be read */
- fprintf (stderr, "%s: Error: GMT does not have
permission to open %s!\n", GMT_program, dir);
-@@ -6100,7 +6100,7 @@
-
- /* Open the list in $GMTHOME/share */
-
-- sprintf (list, "%s%cshare%cGMT_CustomSymbols.lis", GMTHOME, DIR_DELIM,
DIR_DELIM);
-+ sprintf (list, "%s%cshare%cgmt%cGMT_CustomSymbols.lis", GMTHOME,
DIR_DELIM, DIR_DELIM);
-
- if ((fp = fopen (list, "r")) == NULL) {
- fprintf (stderr, "%s: ERROR: Cannot open file %s\n",
GMT_program, list);
-@@ -7876,7 +7876,7 @@
- sprintf (file, "%s.def", name);
-
- if (access (file, R_OK)) { /* Not in current dir, try GMTHOME */
-- sprintf (file, "%s%cshare%ccustom%c%s.def", GMTHOME, DIR_DELIM,
DIR_DELIM, DIR_DELIM, name);
-+ sprintf (file, "%s%cshare%cgmt%ccustom%c%s.def", GMTHOME, DIR_DELIM,
DIR_DELIM, DIR_DELIM, DIR_DELIM, name);
- if (access (file, R_OK)) { /* Not there either - give up */
- fprintf (stderr, "GMT ERROR: %s : Could not find custom
symbol %s\n", GMT_program, name);
- exit (EXIT_FAILURE);
-diff -r -u GMT4.1.1.old/src/grd2cpt.c GMT4.1.1/src/grd2cpt.c
---- GMT4.1.1.old/src/grd2cpt.c 2005-12-17 00:59:22.000000000 -0500
-+++ GMT4.1.1/src/grd2cpt.c 2006-03-03 15:29:44.000000000 -0500
-@@ -70,7 +70,7 @@
-
- /* Get list of available color tables in $GMTHOME/share/cpt */
-
-- sprintf (CPT_lis, "%s%cshare%cGMT_CPT.lis", GMTHOME, DIR_DELIM,
DIR_DELIM);
-+ sprintf (CPT_lis, "%s%cshare%cgmt%cGMT_CPT.lis", GMTHOME, DIR_DELIM,
DIR_DELIM, DIR_DELIM);
-
- if ((fpc = fopen (CPT_lis, "r")) == NULL) {
- fprintf (stderr, "%s: ERROR: Cannot open file %s\n",
GMT_program, CPT_lis);
-diff -r -u GMT4.1.1.old/src/makecpt.c GMT4.1.1/src/makecpt.c
---- GMT4.1.1.old/src/makecpt.c 2005-12-17 00:59:22.000000000 -0500
-+++ GMT4.1.1/src/makecpt.c 2006-03-03 15:30:22.000000000 -0500
-@@ -48,7 +48,7 @@
-
- /* Get list of available color tables in $GMTHOME/share/cpt */
-
-- sprintf (CPT_lis, "%s%cshare%cGMT_CPT.lis", GMTHOME, DIR_DELIM,
DIR_DELIM);
-+ sprintf (CPT_lis, "%s%cshare%cgmt%cGMT_CPT.lis", GMTHOME, DIR_DELIM,
DIR_DELIM, DIR_DELIM);
-
- if ((fpc = fopen (CPT_lis, "r")) == NULL) {
- fprintf (stderr, "%s: ERROR: Cannot open file %s\n",
GMT_program, CPT_lis);
-diff -r -u GMT4.1.1.old/src/pslib.c GMT4.1.1/src/pslib.c
---- GMT4.1.1.old/src/pslib.c 2006-01-22 23:41:58.000000000 -0500
-+++ GMT4.1.1/src/pslib.c 2006-03-03 15:32:34.000000000 -0500
-@@ -889,7 +889,7 @@
- if ((image_no >= 0 && image_no < N_PATTERNS) &&
ps_pattern[image_no].status) return (image_no); /* Already done this */
+ found = shore_conffile (name, dir, path);
+
+ return (found);
+diff -u -r GMT4.1.4-orig/src/gmt_support.c GMT4.1.4/src/gmt_support.c
+--- GMT4.1.4-orig/src/gmt_support.c 2006-10-30 13:09:29.000000000 -0500
++++ GMT4.1.4/src/gmt_support.c 2006-12-04 15:35:05.000000000 -0500
+@@ -1105,9 +1105,9 @@
- if ((image_no >= 0 && image_no < N_PATTERNS)) /* Premade pattern yet
not used */
-- sprintf (file, "%s%cshare%cpattern%cps_pattern_%2.2d.ras",
PSHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, image_no);
-+ sprintf (file, "%s%cshare%cgmt%cpattern%cps_pattern_%2.2d.ras",
PSHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM, image_no);
- else { /* User image, check to see if already used */
+ if (!ok) { /* Finally try $GMTHOME/share/cpt */
+ if (table)
+- sprintf (CPT_file, "%s%cshare%ccpt%cGMT_%s.cpt",
GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, table);
++ sprintf (CPT_file, "%s%cshare%cgmt%ccpt%cGMT_%s.cpt",
GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM, table);
+ else /* Default to rainbow colors */
+- sprintf (CPT_file, "%s%cshare%ccpt%cGMT_rainbow.cpt",
GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM);
++ sprintf (CPT_file,
"%s%cshare%cgmt%ccpt%cGMT_rainbow.cpt", GMTHOME, DIR_DELIM, DIR_DELIM,
DIR_DELIM, DIR_DELIM);
- for (i = 0, found = FALSE; !found && i < ps_n_userimages; i++)
found = !strcmp (ps_user_image[i], imagefile);
-@@ -905,7 +905,7 @@
- if (!access (imagefile, R_OK))
- strcpy (file, imagefile);
- else
-- sprintf (file, "%s%cshare%c%s", PSHOME,
DIR_DELIM, DIR_DELIM, imagefile);
-+ sprintf (file, "%s%cshare%cgmt%c%s", PSHOME,
DIR_DELIM, DIR_DELIM, DIR_DELIM, imagefile);
+ ok = !access (CPT_file, R_OK);
+ if (!ok)
+diff -u -r GMT4.1.4-orig/src/mgd77/mgd77.c GMT4.1.4/src/mgd77/mgd77.c
+--- GMT4.1.4-orig/src/mgd77/mgd77.c 2006-10-06 20:22:07.000000000 -0400
++++ GMT4.1.4/src/mgd77/mgd77.c 2006-12-04 15:35:35.000000000 -0500
+@@ -2383,7 +2383,7 @@
+ if ((this = getenv ("GMTHOME")) != CNULL) {
+ fprintf (stderr, "mgd77: Warning: MGD77_HOME not
defined, set to $GMTHOME/share/mgd77\n");
+ F->MGD77_HOME = (char *) GMT_memory (VNULL,
(size_t)(strlen (this) + 13), 1, "MGD77_Set_Home");
+- sprintf (F->MGD77_HOME, "%s/share/mgd77", this);
++ sprintf (F->MGD77_HOME, "%s/share/gmt/mgd77", this);
}
- ps_user_image[ps_n_userimages] = (char *) ps_memory (VNULL,
(size_t)(strlen (imagefile)+1), sizeof (char));
- strcpy (ps_user_image[ps_n_userimages], imagefile);
-@@ -4187,7 +4187,7 @@
- char buf[80];
- char fullname[BUFSIZ];
-
-- sprintf (fullname, "%s%cshare%cpslib%c%s.ps", PSHOME, DIR_DELIM,
DIR_DELIM, DIR_DELIM, fname);
-+ sprintf (fullname, "%s%cshare%cgmt%cpslib%c%s.ps", PSHOME, DIR_DELIM,
DIR_DELIM, DIR_DELIM, DIR_DELIM, fname);
+ else {
+ fprintf (stderr, "mgd77: ERROR: Neither MGD77_HOME or
GMTHOME defined - give up\n");
+@@ -3494,7 +3494,7 @@
+ return (-1);
+ }
- in = fopen (fullname, "r");
- if (in == NULL)
-@@ -4212,7 +4212,7 @@
+- sprintf (buffer, "%s%cshare%cmgg%ccarter.d", SHAREDIR, DIR_DELIM,
DIR_DELIM, DIR_DELIM);
++ sprintf (buffer, "%s%cshare%cgmt%cmgg%ccarter.d", SHAREDIR, DIR_DELIM,
DIR_DELIM, DIR_DELIM, DIR_DELIM);
+ if ( (fp = fopen (buffer, "r")) == NULL) {
+ fprintf (stderr,"MGD77_carter_init: Cannot open r %s\n",
buffer);
+ return (-1);
+diff -u -r GMT4.1.4-orig/src/mgg/binlegs.c GMT4.1.4/src/mgg/binlegs.c
+--- GMT4.1.4-orig/src/mgg/binlegs.c 2006-03-26 16:43:05.000000000 -0500
++++ GMT4.1.4/src/mgg/binlegs.c 2006-12-04 15:35:57.000000000 -0500
+@@ -124,8 +124,8 @@
+ sprintf (index_file, "%s%cgmt_index.b", path, DIR_DELIM);
+ }
+ else {
+- sprintf (leg_file, "%s%cshare%cmgg%cgmt_legs.d", LIBDIR,
DIR_DELIM, DIR_DELIM, DIR_DELIM);
+- sprintf (index_file, "%s%cshare%cmgg%cgmt_index.b", LIBDIR,
DIR_DELIM, DIR_DELIM, DIR_DELIM);
++ sprintf (leg_file, "%s%cshare%cgmt%cmgg%cgmt_legs.d", LIBDIR,
DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM);
++ sprintf (index_file, "%s%cshare%cgmt%cmgg%cgmt_index.b",
LIBDIR, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM);
+ }
+
+
+diff -u -r GMT4.1.4-orig/src/mgg/gmt_mgg.c GMT4.1.4/src/mgg/gmt_mgg.c
+--- GMT4.1.4-orig/src/mgg/gmt_mgg.c 2005-12-26 23:28:12.000000000 -0500
++++ GMT4.1.4/src/mgg/gmt_mgg.c 2006-12-04 15:36:18.000000000 -0500
+@@ -172,7 +172,7 @@
+ exit (EXIT_FAILURE);
+ }
- /* First the standard 35 PostScript fonts from Adobe */
+- sprintf (file, "%s%cshare%cmgg%cgmtfile_paths", SHAREDIR, DIR_DELIM,
DIR_DELIM, DIR_DELIM);
++ sprintf (file, "%s%cshare%cgmt%cmgg%cgmtfile_paths", SHAREDIR,
DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM);
+
+ n_gmtmgg_paths = 0;
-- sprintf (fullname, "%s%cshare%cpslib%cPS_font_info.d", PSHOME,
DIR_DELIM, DIR_DELIM, DIR_DELIM);
-+ sprintf (fullname, "%s%cshare%cgmt%cpslib%cPS_font_info.d", PSHOME,
DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM);
+@@ -385,7 +385,7 @@
+ return (-1);
+ }
- if ((in = fopen (fullname, "r")) == NULL)
- {
-@@ -4242,7 +4242,7 @@
+- sprintf (buffer, "%s%cshare%cmgg%ccarter.d", SHAREDIR, DIR_DELIM,
DIR_DELIM, DIR_DELIM);
++ sprintf (buffer, "%s%cshare%cgmt%cmgg%ccarter.d", SHAREDIR, DIR_DELIM,
DIR_DELIM, DIR_DELIM, DIR_DELIM);
+ if ( (fp = fopen (buffer, "r")) == NULL) {
+ fprintf (stderr,"carter_setup: Cannot open r %s\n", buffer);
+ return (-1);
+diff -u -r GMT4.1.4-orig/src/mgg/gmtlegs.c GMT4.1.4/src/mgg/gmtlegs.c
+--- GMT4.1.4-orig/src/mgg/gmtlegs.c 2006-03-26 16:43:05.000000000 -0500
++++ GMT4.1.4/src/mgg/gmtlegs.c 2006-12-04 15:36:39.000000000 -0500
+@@ -90,12 +90,12 @@
+ exit (EXIT_FAILURE);
+ }
+
+- sprintf (file, "%s%cshare%cmgg%cgmt_legs.d", LIBDIR, DIR_DELIM,
DIR_DELIM, DIR_DELIM);
++ sprintf (file, "%s%cshare%cgmt%cmgg%cgmt_legs.d", LIBDIR, DIR_DELIM,
DIR_DELIM, DIR_DELIM, DIR_DELIM);
+ if ((fleg = fopen (file, "r")) == NULL) {
+ fprintf (stderr,"gmtlegs: Could not open %s\n", file);
+ exit (EXIT_FAILURE);
+ }
+- sprintf (file, "%s%cshare%cmgg%cgmt_index.b", LIBDIR, DIR_DELIM,
DIR_DELIM, DIR_DELIM);
++ sprintf (file, "%s%cshare%cgmt%cmgg%cgmt_index.b", LIBDIR, DIR_DELIM,
DIR_DELIM, DIR_DELIM, DIR_DELIM);
+ if ((fbin = fopen (file, "rb")) == NULL) {
+ fprintf(stderr,"gmtlegs: Could not open %s\n", file);
+ exit (EXIT_FAILURE);
+diff -u -r GMT4.1.4-orig/src/mgg/gmtlist.c GMT4.1.4/src/mgg/gmtlist.c
+--- GMT4.1.4-orig/src/mgg/gmtlist.c 2006-04-10 01:47:30.000000000 -0400
++++ GMT4.1.4/src/mgg/gmtlist.c 2006-12-04 15:36:51.000000000 -0500
+@@ -100,7 +100,7 @@
+
+ case 'C':
+ if (argv[i][2] == 0) /* Use default
corrfile */
+- sprintf (corrfile,
"%s%cshare%cmgg%cxx_corrections.b", LIBDIR, DIR_DELIM, DIR_DELIM, DIR_DELIM);
++ sprintf (corrfile,
"%s%cshare%cgmt%cmgg%cxx_corrections.b", LIBDIR, DIR_DELIM, DIR_DELIM,
DIR_DELIM, DIR_DELIM);
+ else
+ strcpy (corrfile, &argv[i][2]);
+ correct = TRUE;
+diff -u -r GMT4.1.4-orig/src/pslib.c GMT4.1.4/src/pslib.c
+--- GMT4.1.4-orig/src/pslib.c 2006-10-30 11:17:38.000000000 -0500
++++ GMT4.1.4/src/pslib.c 2006-12-04 15:37:26.000000000 -0500
+@@ -4580,11 +4580,11 @@
+ /* Finally try to get file from $GMTHOME/share[/subdirname] */
- /* Then any custom fonts */
+ if (subdir) {
+- sprintf (path, "%s%cshare%c%s%c%s%s", PSL_HOME, DIR_DELIM,
DIR_DELIM, subdir, DIR_DELIM, stem, suffix);
++ sprintf (path, "%s%cshare%cgmt%c%s%c%s%s", PSL_HOME, DIR_DELIM,
DIR_DELIM, DIR_DELIM, subdir, DIR_DELIM, stem, suffix);
-- sprintf (fullname, "%s%cshare%cpslib%cCUSTOM_font_info.d", PSHOME,
DIR_DELIM, DIR_DELIM, DIR_DELIM);
-+ sprintf (fullname, "%s%cshare%cgmt%cpslib%cCUSTOM_font_info.d", PSHOME,
DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM);
+ }
+ else {
+- sprintf (path, "%s%cshare%c%s%s", PSL_HOME, DIR_DELIM,
DIR_DELIM, stem, suffix);
++ sprintf (path, "%s%cshare%cgmt%c%s%s", PSL_HOME, DIR_DELIM,
DIR_DELIM, DIR_DELIM, stem, suffix);
+ }
+ if (!access (path, R_OK)) return (TRUE); /* Yes, use the file in
$GMTHOME/share/subdir */
- if (!access (fullname, R_OK)) { /* Decode Custom font file */
+diff -u -r GMT4.1.4-orig/src/x2sys/x2sys.c GMT4.1.4/src/x2sys/x2sys.c
+--- GMT4.1.4-orig/src/x2sys/x2sys.c 2006-10-18 15:00:08.000000000 -0400
++++ GMT4.1.4/src/x2sys/x2sys.c 2006-12-04 15:37:38.000000000 -0500
+@@ -495,7 +495,7 @@
+ }
+ else if ((this = getenv ("GMTHOME")) != CNULL) { /* Assume GMT
path */
+- X2SYS_HOME = (char *) GMT_memory (VNULL, (size_t)(strlen (this)
+ 13), 1, "x2sys_set_home");
++ X2SYS_HOME = (char *) GMT_memory (VNULL, (size_t)(strlen (this)
+ 17), 1, "x2sys_set_home");
+- sprintf (X2SYS_HOME, "%s%cshare%cx2sys", this, DIR_DELIM,
DIR_DELIM);
++ sprintf (X2SYS_HOME, "%s%cshare%cgmt%cx2sys", this, DIR_DELIM,
DIR_DELIM, DIR_DELIM);
+ }
+ else { /* Set default path */
+ #ifdef _WIN32
+diff -u -r GMT4.1.4-orig/src/x_system/x_setup.c GMT4.1.4/src/x_system/x_setup.c
+--- GMT4.1.4-orig/src/x_system/x_setup.c 2005-03-10 14:02:25.000000000
-0500
++++ GMT4.1.4/src/x_system/x_setup.c 2006-12-04 15:39:27.000000000 -0500
+@@ -95,12 +95,12 @@
+ exit (EXIT_FAILURE);
+ }
+- sprintf (line, "%s%cshare%cmgg%cgmt_legs.d", LIBDIR, DIR_DELIM,
DIR_DELIM, DIR_DELIM);
++ sprintf (line, "%s%cshare%cgmt%cmgg%cgmt_legs.d", LIBDIR, DIR_DELIM,
DIR_DELIM, DIR_DELIM, DIR_DELIM);
+ if ((fleg = fopen (line, "r")) == NULL) {
+ fprintf(stderr,"Could not open %s\n", line);
+ exit (EXIT_FAILURE);
+ }
+- sprintf (line, "%s%cshare%cmgg%cgmt_index.b", LIBDIR, DIR_DELIM,
DIR_DELIM, DIR_DELIM);
++ sprintf (line, "%s%cshare%cgmt%cmgg%cgmt_index.b", LIBDIR, DIR_DELIM,
DIR_DELIM, DIR_DELIM, DIR_DELIM);
+ if ((fbin = fopen (line, "rb")) == NULL) {
+ fprintf(stderr,"Could not open %sb\n", line);
+ exit (EXIT_FAILURE);
Index: scilab.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scilab.info,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- scilab.info 21 Jun 2006 12:52:56 -0000 1.4
+++ scilab.info 20 Dec 2006 18:01:14 -0000 1.4.2.1
@@ -1,21 +1,21 @@
Package: scilab
-Version: 4.0
+Version: 4.1
Revision: 1001
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Depends: g95, tcltk, xaw3d-shlibs
BuildDepends: tcltk-dev, xaw3d, libncurses5 (>= 5.4-20041023-1006), ocaml,
libsablot (>= 0.98-1024)
Conflicts: scilab-atlas
Replaces: scilab-atlas
-Source: http://www.scilab.org/download/stable/scilab-%v-src.tar.gz
+Source: http://www.scilab.org/download/%v/scilab-%v-src.tar.gz
SourceDirectory: scilab-%v
-Source-MD5: 26e1c1480453bb1021bcea3ac412ad19
+Source-MD5: 3003fe63088558b931a11127fb8d8ccc
Patch: %n.patch
PatchScript: <<
perl -pi -e 's,(head|tail) +\-([0-9]),\1 \-n\2,g' scripts/sc_cpp
perl -pi -e 's|[/]sw/|%p/|g' configure
perl -pi -e 's,\#ifdef B42UNIX,#define B42UNIX\n#ifdef B42UNIX,'
routines/console/zzledt.c
perl -pi -e 's|.*setslatecjmp.*||g' routines/interf/matimp.f
- /usr/bin/sed -i -e '21,41d' scripts/scilab.g.in
+ /usr/bin/sed -i -e '21,42d' scripts/scilab.g.in
<<
DescPackaging: Patch and patchscript contain /sw because upstream source does
ConfigureParams: --without-pvm --with-tcl-include=%p/include
--with-tcl-library=%p/lib --with-ocaml --without-java
Index: scilab-atlas.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scilab-atlas.info,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- scilab-atlas.info 22 Nov 2006 16:44:44 -0000 1.5
+++ scilab-atlas.info 20 Dec 2006 18:01:14 -0000 1.5.2.1
@@ -1,40 +1,38 @@
Package: scilab-atlas
-Version: 3.0
-Revision: 1008
-Architecture: powerpc
+Version: 4.1
+Revision: 1001
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
-Depends: g77, tcltk, xaw3d-shlibs
-BuildDepends: tcltk-dev, xaw3d, libncurses5 (>= 5.4-20041023-1006), ocaml,
atlas, libsablot (>= 0.98-1024)
+Depends: g95, tcltk, xaw3d-shlibs, atlas
+BuildDepends: tcltk-dev, xaw3d, libncurses5 (>= 5.4-20041023-1006), ocaml,
libsablot (>= 0.98-1024)
Conflicts: scilab
Replaces: scilab
-Source: ftp://ftp.inria.fr/INRIA/Scilab/distributions/scilab-%v.src.tar.gz
+Source: http://www.scilab.org/download/%v/scilab-%v-src.tar.gz
SourceDirectory: scilab-%v
-Source-MD5: d6fc5fe12519f99ccdd492c4ba96935a
+Source-MD5: 3003fe63088558b931a11127fb8d8ccc
+Patch: %n.patch
PatchScript: <<
perl -pi -e 's,(head|tail) +\-([0-9]),\1 \-n\2,g' scripts/sc_cpp
perl -pi -e 's|[/]sw/|%p/|g' configure
perl -pi -e 's,\#ifdef B42UNIX,#define B42UNIX\n#ifdef B42UNIX,'
routines/console/zzledt.c
- perl -pi -e 's,static int max_plus1,extern int max_plus1,'
routines/xsci/jpc_inter.c
- perl -pi -e 's,int max_plus1;,,' routines/xsci/x_data.c
+ perl -pi -e 's|.*setslatecjmp.*||g' routines/interf/matimp.f
+ /usr/bin/sed -i -e '21,42d' scripts/scilab.g.in
<<
DescPackaging: Patch and patchscript contain /sw because upstream source does
-ConfigureParams: --without-pvm --with-atlas-library=%p/lib
--with-tcl-include=%p/include --with-tcl-library=%p/lib --with-ocaml
+ConfigureParams: --without-pvm --with-tcl-include=%p/include
--with-tcl-library=%p/lib --with-ocaml --without-java
--with-atlas-library=%p/lib
CompileScript: <<
#!/bin/sh -ex
+ perl -pi -e 's|g77|g95|g' configure
./configure %c
- # The periX11 compiler bug is now fixed in the sources
- # make CFLAGS='-O -I/usr/X11R6/include' routines/graphics/periX11.o
+# on intel, dlamc1 needs -ffloat-store, otherwise it produces an infinite loop
+# doesn't harm on ppc either
+ make FC_OPTIONS="-O2 -ffloat-store" routines/lapack/dlamch.o
+# remove annoying disclaimer from greeting message
+ make CFLAGS="-U__APPLE__" routines/system/banier.o
make all man
<<
InstallScript: <<
- mkdir -p %i/lib
- mkdir -p %i/bin
- touch .binary
- echo bin/scilex
- (cd tests; make distclean)
- (cd examples; make distclean)
- (cd .. ; tar cf - scilab-%v | (cd %i/lib; tar xf -))
- rm .binary
+#!/bin/sh -ex
+ make install PREFIX=%i DESTDIR=%p
ln -fs %p/lib/scilab-%v/bin/scilab %i/bin/scilab
ln -fs %p/lib/scilab-%v/bin/intersci %i/bin/intersci
ln -fs %p/lib/scilab-%v/bin/intersci-n %i/bin/intersci-n
@@ -42,4 +40,4 @@
PostInstScript: (cd %p/lib/scilab-%v; make)
Description: Software package for numerical computations
License: OSI-Approved
-Homepage: http://www-rocq.inria.fr/scilab/
+Homepage: http://www.scilab.org
Index: scilab.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scilab.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- scilab.patch 21 Jun 2006 12:52:56 -0000 1.2
+++ scilab.patch 20 Dec 2006 18:01:15 -0000 1.2.2.1
@@ -260,3 +260,14 @@
{glue,"glue"},
{unglue,"unglue"},
{drawnow,"drawnow"},
+--- scilab/configure.orig 2006-12-18 06:52:31.000000000 -0700
++++ scilab/configure 2006-12-18 06:52:49.000000000 -0700
+@@ -25983,7 +25983,7 @@
+ FC=g95
+ FC_OPTIONS='-O2'
+ FC_OPTIONS_O0=
+- FC_LDFLAGS='-L/sw/lib -ldl -lcc_dynamic'
++ FC_LDFLAGS='-L/sw/lib -ldl'
+ FC_PICFLAGS='-fPIC'
+ LD=ld
+ LD_LDFLAGS=
Index: mbsystem.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/mbsystem.info,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- mbsystem.info 28 May 2006 12:35:13 -0000 1.4
+++ mbsystem.info 20 Dec 2006 18:01:14 -0000 1.4.2.1
@@ -1,14 +1,14 @@
Package: mbsystem
-Version: 5.0.9
+Version: 5.1.0
Revision: 1
Architecture: powerpc
Source: ftp://ftp.ldeo.columbia.edu/pub/MB-System/MB-System.%v.tar.gz
Source2: ftp://ftp.ldeo.columbia.edu/pub/MB-System/annual.gz
SourceRename: %n-%v.tar.gz
-Source-MD5: 153af0943a8b1291832ce18bf886aad7
+Source-MD5: 0fb23b904002bce4682b6633775f3922
Source2-MD5: d7b2f67c411c80b9e0018cfa149a64ef
-BuildDepends: gmt-dev (>=4.1), lesstif, netcdf, x11-dev
-Depends: gmt (>=4.1) , lesstif-shlibs, netcdf-shlibs, x11
+BuildDepends: gmt-dev (>=4.1.4), lesstif, netcdf, x11-dev
+Depends: gmt (>=4.1.4) , lesstif-shlibs, netcdf-shlibs, x11
PatchScript: <<
perl -pi.bak -e 's|[EMAIL PROTECTED]@|%p|g' install_makefiles
<<
@@ -28,8 +28,8 @@
mkdir -p %i/share/mbsystem && mv share/Projections.dat %i/share/mbsystem
echo "Initial dev idea"
mkdir -p %i/lib
- mv lib/libproj.a lib/libmbproj.a
- mv lib/libgsf.a lib/libmbgsf.a
+ #mv lib/libproj.a lib/libmbproj.a
+ #mv lib/libgsf.a lib/libmbgsf.a
cp lib/*.a %i/lib
ranlib %i/lib/lib*.a
mkdir -p %i/include/mbsystem
Index: ccp4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccp4.info,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -d -r1.17 -r1.17.2.1
--- ccp4.info 27 Nov 2006 22:38:57 -0000 1.17
+++ ccp4.info 20 Dec 2006 18:01:13 -0000 1.17.2.1
@@ -1,12 +1,12 @@
Package: ccp4
Version: 6.0.2
-Revision: 2
+Revision: 3
GCC: 4
Source: ftp://ftp.ccp4.ac.uk/ccp4/%v/source/ccp4-%v-core-src.tar.gz
Source-MD5: a47ae8b8e6fa76eef7f17baa85e8dc16
SourceDirectory: ccp4-%v
-Source2: ftp://ftp.ccp4.ac.uk/ccp4/%v/source/phaser-1.3.2-cctbx-src.tar.gz
-Source2-MD5: e4eee45ca8a299242a1089e35e63c7a0
+Source2: ftp://ftp.ccp4.ac.uk/ccp4/%v/source/phaser-1.3.3-cctbx-src.tar.gz
+Source2-MD5: edff4d201e7b6d987c05efcf965f6023
Source3: http://chemistry.ucsc.edu/~wgscott/xtal/xtalfink/XCCPJiffy-custom.gz
Source3-MD5: 21568dd2475505929573a3fd452c538f
Source4:
http://chemistry.ucsc.edu/~wgscott/xtal/xtalfink/ccp4_i686-apple-darwin8.6.1_libtool.gz
@@ -15,6 +15,11 @@
# http://www.ccp4.ac.uk/problems.php#ccp4-6.0.2
Source5: ftp://ftp.ccp4.ac.uk/ccp4/%v/patches/topp.f-r1.16.2.5-r1.16.2.6.diff
Source5-MD5: a23e9886620886a694295ac2e671156a
+Source6:
ftp://ftp.ccp4.ac.uk/ccp4/%v/patches/scala.f-r1.101.2.3-r1.101.2.4.diff
+Source6-MD5: 0c78e93e77c892d071ed0732f7a89102
+Source7:
ftp://ftp.ccp4.ac.uk/ccp4/%v/patches/util_windows.tcl-r1.27-r1.27.2.1.diff
+Source7-MD5: 52ac21688c047287d4fcbbd1aaaea774
+#
DescPort: <<
CCP4 is designed to compile with gfortran on OS X >= 10.4 by default.
Jack Howarth has provided multiple improvements in the patch file to
@@ -94,11 +99,7 @@
#!/bin/zsh -efv
#
umask 0022
- # This is temporary until they put the phaser tarball in the right
directory.
- cp -r ../ccp4-6.0/lib/cctbx lib/cctbx
- cp -r ../ccp4-6.0/lib/src/* lib/src/.
- cp -r ../ccp4-6.0/src/phaser src/phaser
- #
+
# Now apply the primary patch
sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
# setup script for tcsh, zsh and bash users
@@ -122,7 +123,9 @@
perl -pi.bak -e 's|enable_mmdbold=no|enable_mmdbold=yes|g'
lib/clipper/configure*
#
# Now apply all patches issued by CCP4 subsequent to the %v release:
- /usr/bin/patch src/topp_/topp.f
../topp.f-r1.16.2.5-r1.16.2.6.diff
+ /usr/bin/patch src/topp_/topp.f
../topp.f-r1.16.2.5-r1.16.2.6.diff
+ /usr/bin/patch src/scala_/scala.f
../scala.f-r1.101.2.3-r1.101.2.4.diff
+ /usr/bin/patch ccp4i/src/util_windows.tcl
../util_windows.tcl-r1.27-r1.27.2.1.diff
#
<<
################################################################################
@@ -387,7 +390,7 @@
License agreement is part of configure file -- print out form and mail
in,
additional comments at http://xanana.ucsc.edu/xtal/ccp4.html
CCP4 files will be installed under /sw/share/xtal/ccp4-6.0.2
- This revision includes all available CCP4 patches as of Nov 21, 2006.
+ This revision includes all available CCP4 patches as of Dec 19, 2006.
and new bash and zsh command completions specific to ccp4.
<<
DocFiles: <<
Index: mathomatic.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/mathomatic.info,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- mathomatic.info 17 Oct 2006 15:50:41 -0000 1.7
+++ mathomatic.info 20 Dec 2006 18:01:14 -0000 1.7.2.1
@@ -1,5 +1,5 @@
Package: mathomatic
-Version: 12.6.5
+Version: 12.6.8
Revision: 1001
Description: Symbolic algebra program
DescDetail: <<
@@ -20,7 +20,7 @@
BuildDepends: readline5 (>= 5.0-1004), libncurses5 (>= 5.4-20041023-1006)
Depends: readline5-shlibs (>= 5.0-1004), libncurses5-shlibs (>=
5.4-20041023-1006)
Source: http://www.panix.com/~gesslein/%n-%v.tar.bz2
-Source-MD5: d460c762fc3e65f346918ea205bb6bc8
+Source-MD5: 917c7806d61c71f2fad978b31c217b30
CompileScript: <<
make prefix=%p READLINE=1
make test
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
