Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17:/tmp/cvs-serv15748/main/finkinfo/sci
Modified Files:
Tag: pangocairo-branch
coot.info easychem.info gnuplot.info gperiodic.info
gperiodic.patch mayavi-py.info oleo.info oleo.patch
plotutils.info plotutils.patch plplot.info pointless.info
pymol-py.info pymol-py.patch sparky-py.info sparky-py.patch
tinysvm.info viennarna.info wip.info wip.patch
Added Files:
Tag: pangocairo-branch
octave-2.1.73-2.info octave-2.1.73.patch
Log Message:
missing stuff from HEAD
--- NEW FILE: octave-2.1.73-2.info ---
Package: octave
Version: 2.1.73
Revision: 2
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
BuildDependsOnly: false
Source: ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%v.tar.gz
Source-MD5: e75a109620e57de081ee73e0489e5990
BuildDepends: hdf5, readline5, texinfo, g95 (>= 0.50-20060321), libncurses5,
tetex-base, fftw3, texi2html, tetex-base
Depends: gnuplot, readline5-shlibs, fftw3-shlibs, hdf5-shlibs, ncurses,
libncurses5-shlibs, aquaterm
BuildConflicts: libcdparanoia0-dev, coot-dev, broken-gcc, lammpi-dev
GCC: 4.0
Patch: %n-%v.patch
Conflicts: octave-atlas
Replaces: octave-atlas
ConfigureParams: --with-f77=%p/bin/g95 --infodir='${prefix}/share/info'
--mandir='${prefix}/share/man' --libexecdir='${prefix}/lib' -enable-shared
-enable-dl --disable-static --build=%m-apple-darwin
CompileScript: <<
#!/bin/sh -ev
gcclib=`%p/bin/g95 --print-lib`
FLIBDIR=`dirname $gcclib`
export FLIBS="-L${FLIBDIR} -lf95"
export FFLAGS='-O2'
./configure %c
make
<<
InstallScript: <<
#!/bin/sh -ev
make install prefix=%i
mkdir -p %i/share/doc/%n
cp -R examples %i/share/doc/%n
cd %i/bin
perl -pi.bak -e 's|%p/bin/sed|/usr/bin/sed|g' mkoctfile
<<
DocFiles: BUGS ChangeLog INSTALL.OCTAVE README NEWS ROADMAP SENDING-PATCHES
COPYING
Description: Matlab-like language for computations
DescDetail: <<
It provides a convenient command line interface for solving linear and
nonlinear problems numerically, and for performing other numerical
experiments using a language that is mostly compatible with Matlab.
It may also be used as a batch-oriented language.
Octave has extensive tools for solving common numerical linear algebra
problems, finding the roots of nonlinear equations, integrating ordinary
functions, manipulating polynomials, and integrating ordinary differential
and differential-algebraic equations. It is easily extensible and
customizable via user-defined functions written in Octave's own language,
or using dynamically loaded modules written in C++, C, Fortran,
or other languages.
<<
DescUsage: <<
To use mkoctfile to build dynamically loadable modules, you will need
to install the hdf5, readline and fftw3 packages.
Octave cannot Depend on them since they are BuildDependsOnly.
<<
DescPort: <<
Thanks to Per Persson for most (if not all) of the work on the macos X port.
<<
Homepage: http://www.octave.org/
License: GPL
Index: wip.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/wip.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- wip.patch 28 Jul 2006 18:15:26 -0000 1.2
+++ wip.patch 19 Jul 2007 22:23:33 -0000 1.2.2.1
@@ -1,6 +1,6 @@
-diff -ruN -x *~ wip/COPYING wip.patched/COPYING
---- wip/COPYING Wed Dec 31 19:00:00 1969
-+++ wip.patched/COPYING Mon May 2 22:49:18 2005
+diff -ruN -x '*~' wip/COPYING wip.patched/COPYING
+--- wip/COPYING 1969-12-31 19:00:00.000000000 -0500
++++ wip.patched/COPYING 2007-06-27 18:27:40.000000000 -0400
@@ -0,0 +1,58 @@
+From the WIP User's manual:
+
@@ -60,9 +60,9 @@
+College Park, MD 20742
+INTERNET: [EMAIL PROTECTED]
+WWW: http://bima.astro.umd.edu/wip/
-diff -ruN -x *~ wip/makewip wip.patched/makewip
---- wip/makewip Fri Aug 16 10:15:21 1996
-+++ wip.patched/makewip Mon May 2 22:50:33 2005
+diff -ruN -x '*~' wip/makewip wip.patched/makewip
+--- wip/makewip 1996-08-16 10:15:21.000000000 -0400
++++ wip.patched/makewip 2007-06-27 18:52:11.000000000 -0400
@@ -1,4 +1,4 @@
-#!/bin/csh -f
+#!/bin/csh -ef
@@ -82,20 +82,24 @@
# The following is a list of acceptable hosts (all lowercase).
#
-set hostList = (sun solaris sgi u2 convex osf i386-linux aix hpux)
-+set hostList = (sun solaris sgi u2 convex osf i386-linux aix hpux darwin)
++set hostList = (sun solaris sgi u2 convex osf i386-linux aix hpux ppc-darwin
i386-darwin)
#
# Set up the defaults for the command line options.
#
-@@ -325,6 +326,8 @@
+@@ -325,6 +326,12 @@
endif
else if ($v_uname[1] == 'HP-UX') then
set wiphost = 'hpux'
+ else if ($v_uname[1] == 'Darwin') then
-+ set wiphost = 'darwin'
++ if (`uname -p` == 'i386') then
++ set wiphost = 'i386-darwin'
++ else
++ set wiphost = 'ppc-darwin'
++ endif
else
set wiphost = "$v_uname[1]"
endif
-@@ -375,14 +378,9 @@
+@@ -375,14 +382,9 @@
exit 1
endif
#
@@ -112,7 +116,7 @@
#
# Identify the output executable.
#
-@@ -524,8 +522,10 @@
+@@ -524,8 +526,10 @@
# For Linux, f77 is a shell script which runs f2c.
set doranlib = 1
set doliblm = 1
@@ -125,11 +129,11 @@
if ($dodebug > 0) then
set theM = "$theM -g"
set cFlags = "$cFlags -g -Dlinux"
-@@ -572,17 +572,29 @@
+@@ -572,17 +576,41 @@
set theF = "$theF -g"
set cFlags = "$cFlags -g"
endif
-+else if ("$wiphost" == 'darwin') then
++else if ("$wiphost" == 'ppc-darwin') then
+ set doranlib = 1
+ set doliblm = 1
+ set f77lib = ($f77lib -lgcc)
@@ -141,6 +145,18 @@
+ set theM = "$theM -O"
+ set cFlags = "$cFlags -O"
+ endif
++else if ("$wiphost" == 'i386-darwin') then
++ set doranlib = 1
++ set doliblm = 1
++ set f77lib = ($f77lib -lgcc)
++ set theM = 'g95'
++ if ($dodebug > 0) then
++ set theM = "$theM -g"
++ set cFlags = "$cFlags -g -DIEEEByteSwap"
++ else
++ set theM = "$theM -O"
++ set cFlags = "$cFlags -O -DIEEEByteSwap"
++ endif
endif
#
# Modify the f77lib to handle C code compiled with GNU C.
Index: plplot.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/plplot.info,v
retrieving revision 1.16.2.9
retrieving revision 1.16.2.10
diff -u -d -r1.16.2.9 -r1.16.2.10
--- plplot.info 15 Jul 2007 15:10:41 -0000 1.16.2.9
+++ plplot.info 19 Jul 2007 22:23:33 -0000 1.16.2.10
@@ -1,6 +1,6 @@
Package: plplot
Version: 5.6.1
-Revision: 1006
+Revision: 1007
BuildDepends: fontconfig2-dev (>= 2.3.2-13), readline5, freetype219 (>=
2.3.1-1), libiconv-dev, libncurses5, gd2, gd2-bin, libjpeg, libpng3,
libiconv-dev, x11-dev, hdf5 (>= 1.6.5-1002), fftw3, system-java14-dev,
aquaterm-dev (>= 1.0.0-1002), pango1-xft2-ft219-dev (>= 1.16.0-1), lasi-dev (>=
1.0.5-1005), gcc42, g95, xml-sax-expat-pm586, openjade, glib2-dev (>= 2.12.0-1)
Depends: %N-shlibs (= %v-%r), %N-dev (= %v-%r), freetype219-shlibs (>=
2.3.1-1), libncurses5-shlibs, libiconv, tcltk, tcltk-shlibs, python, python25,
numeric-py25, gd2-shlibs, libjpeg-shlibs, libpng3-shlibs, x11, pkgconfig (>=
0.21-1), qhull, system-java14, tcltk-dev, aquaterm (>= 1.0.0-1002), octave,
lasi (>= 1.0.5-1005), lasi-shlibs (>= 1.0.5-1005), glib2-shlibs (>= 2.12.0-1),
pango1-xft2-ft219-shlibs (>= 1.16.0-1), gcc42-shlibs
Index: mayavi-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/mayavi-py.info,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- mayavi-py.info 19 Jun 2007 21:17:53 -0000 1.2.2.1
+++ mayavi-py.info 19 Jul 2007 22:23:32 -0000 1.2.2.2
@@ -1,17 +1,17 @@
Info2: <<
Package: mayavi-py%type_pkg[python]
Version: 1.5
-Revision: 2
+Revision: 3
Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
-Type: python (2.3 2.4)
+Type: python (2.3 2.4 2.5)
Source: mirror:sourceforge:mayavi/MayaVi-%v.tar.gz
Source-MD5: 494a29e38b9e808157bae9daaf9fe044
License: BSD
Depends: python%type_pkg[python], x11, x11-shlibs, tcltk, tcltk-shlibs,
vtk-py%type_pkg[python] (>= 5.0.1-0)
BuildDepends: x11-dev
Provides: mayavi
-Conflicts: mayavi, mayavi-py23, mayavi-py24
-Replaces: mayavi, mayavi-py23, mayavi-py24
+Conflicts: mayavi, mayavi-py23, mayavi-py24, mayavi-py25
+Replaces: mayavi, mayavi-py23, mayavi-py24, mayavi-py25
CompileScript: true
InstallScript: <<
%p/bin/python%type_raw[python] setup.py install --verbose --root=%d
Index: sparky-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/sparky-py.info,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- sparky-py.info 19 Jun 2007 21:17:57 -0000 1.5.2.1
+++ sparky-py.info 19 Jul 2007 22:23:33 -0000 1.5.2.2
@@ -1,13 +1,12 @@
Info2: <<
Package: sparky-py%type_pkg[python]
-Version: 3.112
+Version: 3.113
Revision: 1000
-Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
GCC: 4.0
Maintainer: Jack Howarth <[EMAIL PROTECTED]>
Type: python (2.3 2.4 2.5)
-Source: http://www.cgl.ucsf.edu/home/sparky/distrib/sparky-source-%v.tar.gz
-Source-MD5: 2daf6845ce56ce0064a98e1570123126
+Source: http://www.cgl.ucsf.edu/home/sparky/distrib-%v/sparky-source-%v.tar.gz
+Source-MD5: f3491553b1d00d56eb43cec9f9fa290b
SourceDirectory: sparky
Depends: python%type_pkg[python], tcltk, x11
BuildDepends: python%type_pkg[python], tcltk-dev, x11-dev
@@ -15,8 +14,7 @@
Replaces: sparky-py22, sparky-py23, sparky-py24, sparky-py25
PatchScript: <<
sed 's|@FINKPREFIX@|%p|g' <%a/sparky-py.patch | sed 's|@BUILDDIR@|%b|g' | sed
's|@FINKDESTDIR@|%d|g' | sed 's|2.X|%type_raw[python]|g' |sed
's|sparky-py2X|sparky-py%type_pkg[python]|g' | patch -p1
-grep -v LIBRARY_PATH bin/sparky > bin/sparky_fixed
-mv bin/sparky_fixed bin/sparky
+perl -ni -e 'print unless /LIBRARY_PATH/' bin/sparky
<<
CompileScript: <<
make
Index: wip.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/wip.info,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- wip.info 28 Jul 2006 18:15:26 -0000 1.4
+++ wip.info 19 Jul 2007 22:23:33 -0000 1.4.2.1
@@ -1,6 +1,6 @@
Package: wip
Version: 2p3
-Revision: 1005
+Revision: 1006
Description: Interactive graphics software package
License: OSI-Approved
Maintainer: Sebastien Maret <[EMAIL PROTECTED]>
--- NEW FILE: octave-2.1.73.patch ---
--- octave/configure.orig 2006-12-22 07:35:54.000000000 -0700
+++ octave/configure 2006-12-22 07:36:59.000000000 -0700
@@ -9367,16 +9367,13 @@
LIBS="$save_LIBS"
fi
-# BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
+# BLAS in Apple vecLib framework? (Mac OS X)
if test $acx_blas_ok = no; then
- echo "$as_me:$LINENO: checking for ATL_xerbla in -latlas" >&5
-echo $ECHO_N "checking for ATL_xerbla in -latlas... $ECHO_C" >&6
-if test "${ac_cv_lib_atlas_ATL_xerbla+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-latlas $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+ vlib_flags="-framework vecLib"
+ save_LIBS="$LIBS"; LIBS="$vlib_flags $LIBS"
+ echo "$as_me:$LINENO: checking for $sgemm in $vlib_flags" >&5
+echo $ECHO_N "checking for $sgemm in $vlib_flags... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -9389,7 +9386,7 @@
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char ATL_xerbla ();
+char $sgemm ();
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
@@ -9401,7 +9398,7 @@
int
main ()
{
-ATL_xerbla ();
+$sgemm ();
;
return 0;
}
@@ -9427,28 +9424,29 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_atlas_ATL_xerbla=yes
+ acx_blas_ok=yes; BLAS_LIBS="$vlib_flags"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_atlas_ATL_xerbla=no
+BLAS_LIBS=""
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+ echo "$as_me:$LINENO: result: $acx_blas_ok" >&5
+echo "${ECHO_T}$acx_blas_ok" >&6
+ LIBS="$save_LIBS"
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_atlas_ATL_xerbla" >&5
-echo "${ECHO_T}$ac_cv_lib_atlas_ATL_xerbla" >&6
-if test $ac_cv_lib_atlas_ATL_xerbla = yes; then
- as_ac_Lib=`echo "ac_cv_lib_f77blas_$sgemm" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $sgemm in -lf77blas" >&5
-echo $ECHO_N "checking for $sgemm in -lf77blas... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+
+# BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
+if test $acx_blas_ok = no; then
+ echo "$as_me:$LINENO: checking for ATL_xerbla in -latlas" >&5
+echo $ECHO_N "checking for ATL_xerbla in -latlas... $ECHO_C" >&6
+if test "${ac_cv_lib_atlas_ATL_xerbla+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lf77blas -latlas $LIBS"
+LIBS="-latlas $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -9462,7 +9460,7 @@
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char $sgemm ();
+char ATL_xerbla ();
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
@@ -9474,7 +9472,7 @@
int
main ()
{
-$sgemm ();
+ATL_xerbla ();
;
return 0;
}
@@ -9500,27 +9498,28 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- eval "$as_ac_Lib=yes"
+ ac_cv_lib_atlas_ATL_xerbla=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_Lib=no"
+ac_cv_lib_atlas_ATL_xerbla=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- echo "$as_me:$LINENO: checking for cblas_dgemm in -lcblas" >&5
-echo $ECHO_N "checking for cblas_dgemm in -lcblas... $ECHO_C" >&6
-if test "${ac_cv_lib_cblas_cblas_dgemm+set}" = set; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_atlas_ATL_xerbla" >&5
+echo "${ECHO_T}$ac_cv_lib_atlas_ATL_xerbla" >&6
+if test $ac_cv_lib_atlas_ATL_xerbla = yes; then
+ as_ac_Lib=`echo "ac_cv_lib_f77blas_$sgemm" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $sgemm in -lf77blas" >&5
+echo $ECHO_N "checking for $sgemm in -lf77blas... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Lib+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcblas -lf77blas -latlas $LIBS"
+LIBS="-lf77blas -latlas $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -9534,7 +9533,7 @@
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char cblas_dgemm ();
+char $sgemm ();
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
@@ -9546,7 +9545,7 @@
int
main ()
{
-cblas_dgemm ();
+$sgemm ();
;
return 0;
}
@@ -9572,37 +9571,28 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_cblas_cblas_dgemm=yes
+ eval "$as_ac_Lib=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_cblas_cblas_dgemm=no
+eval "$as_ac_Lib=no"
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_cblas_cblas_dgemm" >&5
-echo "${ECHO_T}$ac_cv_lib_cblas_cblas_dgemm" >&6
-if test $ac_cv_lib_cblas_cblas_dgemm = yes; then
- acx_blas_ok=yes
- BLAS_LIBS="-lcblas -lf77blas -latlas"
-fi
-
-fi
-
-fi
-
-fi
-
-# BLAS in Apple vecLib framework? (Mac OS X)
-if test $acx_blas_ok = no; then
- vlib_flags="-framework vecLib"
- save_LIBS="$LIBS"; LIBS="$vlib_flags $LIBS"
- echo "$as_me:$LINENO: checking for $sgemm in $vlib_flags" >&5
-echo $ECHO_N "checking for $sgemm in $vlib_flags... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ echo "$as_me:$LINENO: checking for cblas_dgemm in -lcblas" >&5
+echo $ECHO_N "checking for cblas_dgemm in -lcblas... $ECHO_C" >&6
+if test "${ac_cv_lib_cblas_cblas_dgemm+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcblas -lf77blas -latlas $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -9615,7 +9605,7 @@
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char $sgemm ();
+char cblas_dgemm ();
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
@@ -9627,7 +9617,7 @@
int
main ()
{
-$sgemm ();
+cblas_dgemm ();
;
return 0;
}
@@ -9653,18 +9643,28 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- acx_blas_ok=yes; BLAS_LIBS="$vlib_flags"
+ ac_cv_lib_cblas_cblas_dgemm=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-BLAS_LIBS=""
+ac_cv_lib_cblas_cblas_dgemm=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $acx_blas_ok" >&5
-echo "${ECHO_T}$acx_blas_ok" >&6
- LIBS="$save_LIBS"
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_cblas_cblas_dgemm" >&5
+echo "${ECHO_T}$ac_cv_lib_cblas_cblas_dgemm" >&6
+if test $ac_cv_lib_cblas_cblas_dgemm = yes; then
+ acx_blas_ok=yes
+ BLAS_LIBS="-lcblas -lf77blas -latlas"
+fi
+
+fi
+
+fi
+
fi
# BLAS in PhiPACK libraries? (requires generic BLAS lib, too)
@@ -17312,7 +17312,7 @@
fi
- if test "$ac_cv_header_Mach_O_dyld_h" = yes; then
+ if test "$ac_cv_header_mach_o_dyld_h" = yes; then
dyld_api=true
else
Index: easychem.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/easychem.info,v
retrieving revision 1.4.2.12
retrieving revision 1.4.2.13
diff -u -d -r1.4.2.12 -r1.4.2.13
--- easychem.info 29 May 2007 20:21:43 -0000 1.4.2.12
+++ easychem.info 19 Jul 2007 22:23:32 -0000 1.4.2.13
@@ -1,6 +1,6 @@
Package: easychem
Version: 0.6
-Revision: 2
+Revision: 3
BuildDepends: <<
atk1 (>= 1.17.0-1),
cairo (>= 1.2-1),
Index: gperiodic.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gperiodic.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- gperiodic.patch 13 Jun 2007 23:19:21 -0000 1.1.2.1
+++ gperiodic.patch 19 Jul 2007 22:23:32 -0000 1.1.2.2
@@ -1,22 +1,10 @@
-diff -Nurd -x'*~' gperiodic-2.0.8.orig/Makefile gperiodic-2.0.8/Makefile
---- gperiodic-2.0.8.orig/Makefile 2003-08-09 15:33:27.000000000 -0400
-+++ gperiodic-2.0.8/Makefile 2007-06-13 18:40:08.000000000 -0400
+diff -Nurd -x'*~' gperiodic-2.0.9.orig/Makefile gperiodic-2.0.9/Makefile
+--- gperiodic-2.0.9.orig/Makefile 2007-06-13 16:21:44.000000000 -0400
++++ gperiodic-2.0.9/Makefile 2007-06-28 21:26:33.000000000 -0400
@@ -1,5 +1,5 @@
- CC=gcc
--CFLAGS=`pkg-config --cflags gtk+-2.0` -I. -DG_DISABLE_DEPRECATED
-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED
-+CFLAGS=-I. `pkg-config --cflags gtk+-2.0` -DG_DISABLE_DEPRECATED
-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED
- LIBS=`pkg-config --libs gtk+-2.0`
+ CC := gcc
+-CFLAGS := `pkg-config --cflags gtk+-2.0` -I. -DG_DISABLE_DEPRECATED
-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED
++CFLAGS := -I. `pkg-config --cflags gtk+-2.0` -DG_DISABLE_DEPRECATED
-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED
+ LIBS :=`pkg-config --libs gtk+-2.0`
bindir ?= /usr/bin
datadir ?= /usr/share
-@@ -17,8 +17,11 @@
-
- install:
- make -C po/ install enable_nls=1 datadir=$(datadir)
-+ install -d $(bindir)
- install gperiodic $(bindir)
-+ install -d $(datadir)/applications
- install gperiodic.desktop $(datadir)/applications
-+ install -d $(datadir)/pixmaps
- install gperiodic.png $(datadir)/pixmaps
- install gperiodic-crystal.png $(datadir)/pixmaps
- make clean
Index: gnuplot.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gnuplot.info,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -d -r1.4.2.4 -r1.4.2.5
--- gnuplot.info 11 Apr 2007 15:25:00 -0000 1.4.2.4
+++ gnuplot.info 19 Jul 2007 22:23:32 -0000 1.4.2.5
@@ -1,23 +1,24 @@
-Package: gnuplot
+Info2: <<
+Package: gnuplot%type_pkg[-nox]
Version: 4.2.0
-Revision: 3
+Revision: 5
+Type: -nox (boolean)
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
BuildConflicts: ccache-default
-Depends: libpng3-shlibs, texinfo, aquaterm, aquaterm-shlibs, readline5-shlibs,
pdflib6-shlibs, x11, ncurses, libncurses5-shlibs, gd2-shlibs, libjpeg-shlibs
-BuildDepends: libpng3, pdflib6, readline5, libncurses5, x11-dev, aquaterm-dev,
gd2, tetex-base, libjpeg, libiconv-dev
+Conflicts: gnuplot, gnuplot-nox
+Replaces: gnuplot, gnuplot-nox
+Depends: libpng3-shlibs, texinfo, aquaterm, aquaterm-shlibs, readline5-shlibs,
pdflib6-shlibs, (%type_raw[-nox] != -nox) x11, ncurses, libncurses5-shlibs,
(%type_raw[-nox] != -nox) gd2-shlibs, libjpeg-shlibs, (%type_raw[-nox] = -nox)
freetype219-shlibs
+BuildDepends: libpng3, pdflib6, readline5, libncurses5, (%type_raw[-nox] !=
-nox) x11-dev, aquaterm-dev, (%type_raw[-nox] != -nox) gd2, (%type_raw[-nox] =
-nox) gd2-nox, tetex-base, libjpeg, libiconv-dev, fink (>= 0.24.12),
(%type_raw[-nox] = -nox) freetype219
GCC: 4.0
-Source: mirror:sourceforge:%n/%n-%v.tar.gz
+Source: mirror:sourceforge:%{ni}/%{ni}-%v.tar.gz
Source-MD5: f688a578ddb4c376fd7d91ce444a0745
+PatchFile: %{Ni}.patch
+PatchFile-MD5: d84f7111ef4c33b6331649247906bee9
PatchScript:<<
perl -pi -e 's/\bClass\b/GP_Class/g' `find src -name \*.c -o -name \*.cpp -o
-name \*.h`
- sed -e 's,@FINKPREFIX@,%p,g' %a/%n.patch | patch -p1
+ sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
<<
-SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include
-NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib
-SetLIBS: -L%p/lib
-SetCFLAGS: -Os -pipe
-ConfigureParams: --mandir='${prefix}/share/man' --libexecdir='${prefix}/lib'
--infodir='${prefix}/share/info' --with-readline=gnu
+ConfigureParams: --mandir='${prefix}/share/man' --libexecdir='${prefix}/lib'
--infodir='${prefix}/share/info' --with-readline=gnu (%type_raw[-nox] = -nox)
--without-x --disable-dependency-tracking
CompileScript: <<
./configure %c
make
@@ -61,3 +62,4 @@
<<
Homepage: http://www.gnuplot.info/
License: Restrictive/Distributable
+<<
Index: pointless.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/pointless.info,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- pointless.info 11 Apr 2007 15:25:00 -0000 1.4.2.1
+++ pointless.info 19 Jul 2007 22:23:33 -0000 1.4.2.2
@@ -1,10 +1,10 @@
Package: pointless
-Version: 1.1.1.c
+Version: 1.1.5
Revision: 1
Source: ftp://ftp.ccp4.ac.uk/ccp4/6.0.2/prerelease/%n-%v-src.tar.gz
-Source-MD5: b162fb106caa9d5f463361feda471913
+Source-MD5: baa2c6b75119707f25cea1ced17f5b97
Source2: ftp://ftp.ccp4.ac.uk/ccp4/6.0.2/prerelease/%n.html
-Source2-MD5: c5923f0c135f8434fb97781e91b93987
+Source2-MD5: f2a318a6ba5914dab202780825c5d423
Source3: ftp://ftp.ccp4.ac.uk/ccp4/6.0.2/prerelease/%n-ccp4i-0.0.8.tar.gz
Source3-MD5: e4d9a43059ad3981ea7eda165c5ba5aa
Source4: ftp://ftp.ccp4.ac.uk/ccp4/6.0.2/source/phaser-1.3.3-cctbx-src.tar.gz
@@ -17,8 +17,8 @@
PatchScript: <<
#!/bin/bash -efv
mv pointless pointless-ccp4i
-cp Makefile.linux Makefile
-perl -pi -e 's|CCTBX \= \${CLIB}/cctbx|CCTBX \= ccp4-6.0.2/lib/cctbx|g'
Makefile
+#cp Makefile.linux Makefile
+perl -pi -e 's|CCTBX\=\${CLIB}/cctbx|CCTBX\=ccp4-6.0.2/lib/cctbx|g' Makefile
perl -pi -e 's|lm|lm -L%p/lib -ldrfftw -lfftw|' Makefile
<<
CompileScript: <<
Index: gperiodic.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gperiodic.info,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -d -r1.2.2.3 -r1.2.2.4
--- gperiodic.info 15 Jul 2007 14:45:47 -0000 1.2.2.3
+++ gperiodic.info 19 Jul 2007 22:23:32 -0000 1.2.2.4
@@ -1,9 +1,9 @@
Package: gperiodic
-Version: 2.0.8
+Version: 2.0.9
Revision: 2
Maintainer: None <[EMAIL PROTECTED]>
Source: http://www.frantz.fi/software/%n-%v.tar.gz
-Source-MD5: cfe23eaa21707c2c42bcd6399161ec2e
+Source-MD5: 6ecd96c3cf6b204cfe5210d67f107bcb
Depends: <<
atk1-shlibs (>= 1.17.0-1),
cairo-shlibs (>= 1.2-1),
Index: sparky-py.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/sparky-py.patch,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- sparky-py.patch 13 Dec 2006 17:32:44 -0000 1.4
+++ sparky-py.patch 19 Jul 2007 22:23:33 -0000 1.4.2.1
@@ -112,8 +112,9 @@
-CFLAGS =
+CFLAGS = -O3 -ffast-math -fPIC -fno-common
PYFLAGS = -I$(PYTHON_INC) -I$(PYTHON_LIB)/config
- TKFLAGS = -I$(TK_PREFIX)/include
+-TKFLAGS = -I$(TK_PREFIX)/include
-TKLIBS = -L$(TK_PREFIX)/lib -l$(TK_LIBNAME) -l$(TCL_LIBNAME)
-lX11
++TKFLAGS = -I$(TK_PREFIX)/include -I/usr/X11R6/include
+TKLIBS = -L$(TK_PREFIX)/lib -l$(TK_LIBNAME) -l$(TCL_LIBNAME)
-L/usr/X11R6/lib -lX11
EXTRALIBS =
SYSLIBS = -lm
Index: pymol-py.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/pymol-py.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- pymol-py.patch 25 Feb 2006 16:59:12 -0000 1.2
+++ pymol-py.patch 19 Jul 2007 22:23:33 -0000 1.2.2.1
@@ -1,3 +1,14 @@
+--- pymol-1.0/Makefile.delsci.org 2007-06-27 22:42:30.000000000 -0400
++++ pymol-1.0/Makefile.delsci 2007-06-27 22:46:28.000000000 -0400
+@@ -72,6 +72,8 @@
+
+ unix: .includes .depends .update
+ /bin/rm -f .update .includes
++ cd contrib;$(MAKE) -f Makefile.delsci
++ cd contrib/uiuc/plugins/molfile_plugin/src;$(MAKE) -f Makefile.delsci
+ $(CC) $(BUILD) $(DEST) */*.o ov/src/*.o
contrib/uiuc/plugins/molfile_plugin/src/*.o $(CFLAGS) $(LIB_DIRS) $(LIBS)
+
+ semistatic: .includes .depends .update
diff -uNr pymol-0.95.org/contrib/modules/Makefile.pre.in.src
pymol-0.95/contrib/modules/Makefile.pre.in.src
--- pymol-0.95.org/contrib/modules/Makefile.pre.in.src Thu Aug 14 16:59:06 2003
+++ pymol-0.95/contrib/modules/Makefile.pre.in.src Mon Apr 5 18:08:14 2004
@@ -89,7 +100,7 @@
fi
export PYTHONPATH
#
--/sw/bin/python $PYMOL_PATH/modules/pymol/__init__.py "$@"
[EMAIL PROTECTED]@/bin/python2.X $PYMOL_PATH/modules/pymol/__init__.py "$@"
+-exec /sw/bin/python $PYMOL_PATH/modules/pymol/__init__.py "$@"
++exec @FINKPREFIX@/bin/python2.X $PYMOL_PATH/modules/pymol/__init__.py "$@"
Index: plotutils.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/plotutils.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- plotutils.patch 28 Mar 2006 23:00:27 -0000 1.1
+++ plotutils.patch 19 Jul 2007 22:23:33 -0000 1.1.2.1
@@ -1,3 +1,15 @@
+diff -Nurd -x'*~' plotutils-2.4.1.orig/libplot/Makefile.in
plotutils-2.4.1/libplot/Makefile.in
+--- plotutils-2.4.1.orig/libplot/Makefile.in 2000-07-04 03:37:10.000000000
-0400
++++ plotutils-2.4.1/libplot/Makefile.in 2007-06-26 02:38:54.000000000
-0400
+@@ -88,7 +88,7 @@
+
+ libplot_la_LDFLAGS = -version-info 4:1:2
+
+-INCLUDES = $(X_CFLAGS) -I$(srcdir)/../include -DLIBPLOT
++INCLUDES = -I$(srcdir)/../include $(X_CFLAGS) -DLIBPLOT
+
+ MISRC = mi_alloc.c mi_api.c mi_arc.c mi_canvas.c mi_fllarc.c mi_fllrct.c
mi_fplycon.c mi_gc.c mi_ply.c mi_plycon.c mi_plygen.c mi_plypnt.c
mi_plyutil.c mi_spans.c mi_widelin.c mi_zerarc.c mi_zerolin.c mi_version.c
+
diff -Nurd -x'*~' plotutils-2.4.1.orig/libplot/g_write.c
plotutils-2.4.1/libplot/g_write.c
--- plotutils-2.4.1.orig/libplot/g_write.c 2000-05-19 12:10:01.000000000
-0400
+++ plotutils-2.4.1/libplot/g_write.c 2006-03-28 16:55:12.000000000 -0500
@@ -91,3 +103,15 @@
}
static void
+diff -Nurd -x'*~' plotutils-2.4.1.orig/libplotter/Makefile.in
plotutils-2.4.1/libplotter/Makefile.in
+--- plotutils-2.4.1.orig/libplotter/Makefile.in 2000-07-04
03:41:22.000000000 -0400
++++ plotutils-2.4.1/libplotter/Makefile.in 2007-06-26 02:38:33.000000000
-0400
+@@ -86,7 +86,7 @@
+
+ libplotter_la_LDFLAGS = -version-info 4:0:2
+
+-INCLUDES = $(X_CFLAGS) -I$(srcdir)/../include -DLIBPLOT -DLIBPLOTTER
++INCLUDES = -I$(srcdir)/../include $(X_CFLAGS) -DLIBPLOT -DLIBPLOTTER
+
+ MISRC = mi_alloc.cc mi_api.cc mi_arc.cc mi_canvas.cc mi_fllarc.cc
mi_fllrct.cc mi_fplycon.cc mi_gc.cc mi_ply.cc mi_plycon.cc mi_plygen.cc
mi_plypnt.cc mi_plyutil.cc mi_spans.cc mi_widelin.cc mi_zerarc.cc
mi_zerolin.cc mi_version.cc
+
Index: viennarna.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/viennarna.info,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- viennarna.info 7 Feb 2007 14:55:11 -0000 1.2.2.1
+++ viennarna.info 19 Jul 2007 22:23:33 -0000 1.2.2.2
@@ -1,6 +1,6 @@
Package: viennarna
Version: 1.5beta
-Revision: 16
+Revision: 15
Source: http://www.tbi.univie.ac.at/~ivo/RNA/ViennaRNA-%v.tar.gz
Source-MD5: f8737e07fc82ccd130cc30bfd09ccca5
SourceDirectory: ViennaRNA-1.5
Index: oleo.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/oleo.info,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- oleo.info 16 Jan 2007 16:03:12 -0000 1.5.2.1
+++ oleo.info 19 Jul 2007 22:23:32 -0000 1.5.2.2
@@ -1,18 +1,46 @@
Package: oleo
Version: 1.99.16
-Revision: 1019
+Revision: 1020
Maintainer: None <[EMAIL PROTECTED]>
-GCC: 4.0
Source: mirror:gnu:%n/%n-%v.tar.gz
Source-MD5: d59801055b8ba6c6980ed1247a603f5f
-Depends: xbae-shlibs, xmhtml-shlibs (>= 1.1.7-4), xlt-shlibs (>= 9.2.9-3),
lesstif-shlibs, gsl-shlibs, plotutils-shlibs (>= 2.4.1-1007), ncurses (>=
5.4-20041023-1006), libncurses5-shlibs (>= 5.4-20041023-1006), x11,
libgettext3-shlibs, mysql14-shlibs (>= 4.1.10-1002), libpng3-shlibs,
libjpeg-shlibs
-BuildDepends: xbae, xmhtml (>= 1.1.7-4), xlt (>= 9.2.9-3), lesstif, gsl,
plotutils-dev (>= 2.4.1-1007), cups-dev, libncurses5 (>= 5.4-20041023-1006),
x11-dev, libgettext3-dev, gettext-tools, mysql14-dev (>= 4.1.10-1002), libpng3,
libjpeg
+Depends: <<
+ gsl-shlibs,
+ libgettext3-shlibs,
+ libjpeg-shlibs,
+ libncurses5-shlibs (>= 5.4-20041023-1006),
+ libpng3-shlibs,
+ mysql15-shlibs (>= 5.0.38-1001),
+ ncurses (>= 5.4-20041023-1006),
+ openmotif3-shlibs,
+ plotutils-shlibs (>= 2.4.1-1007),
+ x11,
+ xbae-shlibs (>= 4.60.4-1),
+ xlt-shlibs (>= 9.2.9-3),
+ xmhtml-shlibs (>= 1.1.7-4)
+<<
+BuildDepends: <<
+ cups-dev,
+ gettext-tools,
+ gsl,
+ libgettext3-dev,
+ libjpeg,
+ libncurses5 (>= 5.4-20041023-1006),
+ libpng3,
+ mysql15-dev (>= 5.0.38-1001),
+ openmotif3,
+ plotutils-dev (>= 2.4.1-1007),
+ x11-dev,
+ xbae (>= 4.60.4-1),
+ xlt (>= 9.2.9-3),
+ xmhtml (>= 1.1.7-4)
+<<
PatchScript: sed 's|@prefix@|%p|g' <%a/%n.patch | patch -p1
UpdatePoMakefile: true
SetCPPFLAGS: -Wno-long-double
ConfigureParams: --infodir=%i/share/info --with-motif
CompileScript: <<
- ./configure %c
+ ac_cv_lib_mysqlclient_mysql_connect=yes ac_cv_lib_xbase_main=no
ac_cv_lib_sciplot_sp_begin_plot=no ./configure %c
mv intl/po2tbl.sed po
mv intl intl_UNUSED
make
@@ -43,6 +71,12 @@
dmacks: use libSystem for getopt instead of lib/; use libgettext3
packages instead of intl/ and patch po/ for modern xgettext.
+
+ Need to shim a mysql function that was removed from that lib long ago
+ But much harder to shim the ./configure test than to forge its results...
+
+ Make sure we don't find things that aren't in fink at this time but
+ might be in the future.
<<
License: GPL
Homepage: http://www.gnu.org/software/oleo/oleo.html
Index: pymol-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/pymol-py.info,v
retrieving revision 1.7.2.5
retrieving revision 1.7.2.6
diff -u -d -r1.7.2.5 -r1.7.2.6
--- pymol-py.info 15 Jul 2007 15:10:41 -0000 1.7.2.5
+++ pymol-py.info 19 Jul 2007 22:23:33 -0000 1.7.2.6
@@ -1,7 +1,7 @@
Info2: <<
Package: pymol-py%type_pkg[python]
-Version: 0.99
-Revision: 1006
+Version: 1.0
+Revision: 1000
Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
Maintainer: Jack Howarth <[EMAIL PROTECTED]>
Type: python (2.3 2.4 2.5)
@@ -15,8 +15,8 @@
Replaces: pymol, pymol-py22, pymol-py23, pymol-py24, pymol-py25
PatchScript: sed 's|@FINKPREFIX@|%p|g' <%a/pymol-py.patch | sed
's|python2.X|python%type_raw[python]|g' | sed
's|pymol-py2X|pymol-py%type_pkg[python]|g' | patch -p1
CompileScript: <<
-(cd setup; cp Rules.osx-fink %b/Rules.make)
-make
+(cd setup; cp Rules.osx-fink %b/Rules.delsci)
+make -f Makefile.delsci
<<
InstallScript: <<
mkdir -p %i/lib/%n/bin
@@ -27,7 +27,16 @@
echo "append_path PATH %p/lib/%n/bin" > %i/etc/profile.d/%n.sh
chmod 755 %i/etc/profile.d/%n.*
<<
-DocFiles: CHANGES DEVELOPERS LICENSE README
+DocFiles: DEVELOPERS LICENSE README
+PostInstScript: <<
+%p/bin/python%type_raw[python] -O %p/lib/python%type_raw[python]/compileall.py
-q %p/lib/%n/modules
+<<
+PreRmScript: <<
+PACKAGE=%N
+dpkg --listfiles $PACKAGE |
+ /usr/bin/awk '$0~/\.py$/ {print $0"c\n" $0"o"}' |
+ xargs rm -f >&2
+<<
Description: Molecular graphics system
DescDetail: <<
PyMOL is a molecular graphics system with an embedded Python interpreter
@@ -41,8 +50,8 @@
DescPackaging: <<
The tarball used for this version was created in accordance to the BSD
license of pymol using the following instructions...
- svn export -r 2974
https://svn.sourceforge.net/svnroot/pymol/branches/b099/pymol pymol-0.99rev10
- tar --exclude=.svn -zcvf pymol-0_99rev10-src.tgz pymol-0.99rev10
+ svn export https://svn.sourceforge.net/svnroot/pymol/trunk/pymol pymol-1.0
+ tar --exclude=.svn -zcvf pymol-1.0-src.tgz pymol-1.0
<<
DescUsage: Just type 'pymol' at the command prompt inside an X environment.
License: OSI-Approved
Index: tinysvm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/tinysvm.info,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- tinysvm.info 15 May 2007 02:42:01 -0000 1.1.2.2
+++ tinysvm.info 19 Jul 2007 22:23:33 -0000 1.1.2.3
@@ -1,32 +1,38 @@
Package: tinysvm
Version: 0.09
-Revision: 1
+Revision: 1002
Description: Support Vector Machines
License: LGPL
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
-Depends: %N-shlibs
+Depends: %N-shlibs (>= %v-%r)
+BuildDepends: autoconf (>= 2.60), automake1.9, libtool14
Source: http://www.chasen.org/~taku/software/TinySVM/src/TinySVM-%v.tar.gz
Source-MD5: 22d80bdd94c3c8373062761de0d27fde
ConfigureParams: '--mandir=${prefix}/share/man'
GCC: 4.0
+PatchScript: <<
+ perl -pi -e 's/(AC_DEFUN\()([^[]+)(,)/\1\[\2]\3/' configure.in
+ perl -pi -e 's/getopt\S+//g' src/Makefile.am
+ rm src/getopt.*
+<<
CompileScript: <<
+ autoreconf -f -i
./configure %c
- /usr/bin/sed -i.bak -e '/^archive_cmds/s/\\$CC/g++/' ./libtool
- make CXXFLAGS=-D__GNU_LIBRARY__
+ make
make check
<<
SplitOff: <<
Package: %N-dev
BuildDependsOnly: True
- Depends: %N-shlibs
+ Depends: %N-shlibs (= %v-%r)
Files: include lib/libtinysvm.dylib lib/libtinysvm.a lib/libtinysvm.la
DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
<<
SplitOff2: <<
Package: %N-shlibs
Files: lib/libtinysvm.1.dylib lib/libtinysvm.1.2.0.dylib
- Shlibs: %p/lib/libtinysvm.1.2.0.dylib 0.0.0 %n (>= 0.09-1)
+ Shlibs: %p/lib/libtinysvm.1.dylib 4.0.0 %n (>= 0.09-2)
DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
<<
DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS doc/*.{html,css}
@@ -37,4 +43,9 @@
learning theory, and applied to large number of real-world applications, such
as text categorization, hand-written character recognition.
<<
+DescPort: <<
+ OS X>=10.3 getopt is good enough, so don't build local one. Included libtool
+ is too old to know how to build libraries on darwin, so upgrade to modern one
+ and do necessary other cleanups for it.
+<<
Homepage: http://www.chasen.org/~taku/software/TinySVM/
Index: oleo.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/oleo.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- oleo.patch 29 Mar 2006 05:08:55 -0000 1.2
+++ oleo.patch 19 Jul 2007 22:23:32 -0000 1.2.2.1
@@ -20,7 +20,16 @@
# remove all the symlinks that come from automake
diff -Nurd -x'*~' oleo-1.99.16.orig/configure oleo-1.99.16/configure
--- oleo-1.99.16.orig/configure 2001-03-10 09:32:48.000000000 -0500
-+++ oleo-1.99.16/configure 2006-03-28 21:22:10.000000000 -0500
++++ oleo-1.99.16/configure 2007-06-26 04:11:59.000000000 -0400
+@@ -1703,7 +1703,7 @@
+ fi
+
+
+-if test -d /usr/local ; then
++if false ; then
+ INCLUDES="-I/usr/local/include $INCLUDES "
+ LIBS="-L/usr/local/lib $LIBS "
+ fi
@@ -5233,7 +5233,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -229,6 +238,25 @@
}
+diff -Nurd -x'*~' oleo-1.99.16.orig/src/mysql.c oleo-1.99.16/src/mysql.c
+--- oleo-1.99.16.orig/src/mysql.c 2000-07-22 02:13:16.000000000 -0400
++++ oleo-1.99.16/src/mysql.c 2007-06-26 01:48:28.000000000 -0400
+@@ -44,6 +44,15 @@
+ #include <mysql/mysql.h>
+
+ /*
++ The mysql_connect() function was removed from mysqlclient API many
++ versions ago. Here's an emulation using the modern-API functions.
++*/
++MYSQL *mysql_connect(MYSQL *mysql, const char *host, const char *user, const
char *passwd) {
++ mysql_init(mysql);
++ return(mysql_real_connect(mysql, host, user, passwd, NULL, 0, NULL, 0));
++}
++
++/*
+ * Define some MySQL access functions for Oleo
+ */
+
diff -Nurd -x'*~' oleo-1.99.16.orig/src/plotter.c oleo-1.99.16/src/plotter.c
--- oleo-1.99.16.orig/src/plotter.c 2000-11-22 14:33:01.000000000 -0500
+++ oleo-1.99.16/src/plotter.c 2006-03-28 22:14:13.000000000 -0500
@@ -280,6 +308,25 @@
}
else
{
+diff -Nurd -x'*~' oleo-1.99.16.orig/src/sysdef.h oleo-1.99.16/src/sysdef.h
+--- oleo-1.99.16.orig/src/sysdef.h 2001-02-04 10:54:21.000000000 -0500
++++ oleo-1.99.16/src/sysdef.h 2007-06-26 02:03:28.000000000 -0400
+@@ -49,6 +49,7 @@
+ #ifndef rindex
+ #define rindex strrchr
+ #endif
++#if 0
+ #ifndef bcopy
+ #define bcopy(s, d, n) memcpy ((d), (s), (n))
+ #endif
+@@ -58,6 +59,7 @@
+ #ifndef bzero
+ #define bzero(s, n) memset ((s), 0, (n))
+ #endif
++#endif
+ #else /* not STDC_HEADERS and not HAVE_STRING_H */
+ #include <strings.h>
+ /* memory.h and strings.h conflict on some systems. */
diff -Nurd -x'*~' oleo-1.99.16.orig/src/utils.c oleo-1.99.16/src/utils.c
--- oleo-1.99.16.orig/src/utils.c 2001-02-13 18:38:06.000000000 -0500
+++ oleo-1.99.16/src/utils.c 2006-03-28 21:22:10.000000000 -0500
Index: plotutils.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/plotutils.info,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- plotutils.info 31 Aug 2006 13:33:34 -0000 1.4
+++ plotutils.info 19 Jul 2007 22:23:33 -0000 1.4.2.1
@@ -1,6 +1,6 @@
Package: plotutils
Version: 2.4.1
-Revision: 1007
+Revision: 1008
GCC: 4.0
BuildDepends: x11-dev, libpng3
Depends: x11, libpng3-shlibs, %N-shlibs (= %v-%r)
@@ -11,11 +11,16 @@
UpdateLibtool: true
Patch: %n.patch
ConfigureParams: --enable-libplotter --mandir='${prefix}/share/man'
--infodir='${prefix}/share/info'
+CompileScript: <<
+ ./configure %c
+ perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/g' libtool
+ make
+<<
License: GPL
SplitOff: <<
Package: %N-shlibs
Replaces: %N (<= 2.4.1-1)
- Depends: libpng3-shlibs
+ Depends: x11-shlibs, libpng3-shlibs
Files: lib/libplot.*.dylib lib/libplotter.*.dylib
Shlibs: <<
%p/lib/libplotter.2.dylib 5.0.0 %n (>= 2.4.1-5)
@@ -28,7 +33,7 @@
BuildDependsOnly: True
Depends: %N-shlibs (= %v-%r)
Replaces: %N (<= 2.4.1-1)
- Files: include lib/*.a lib/*.la lib/libplot.dylib lib/libplotter.dylib
+ Files: include lib
DocFiles: README INSTALL.pkg COPYING KNOWN_BUGS PROBLEMS NEWS
<<
DocFiles: README INSTALL.pkg COPYING KNOWN_BUGS PROBLEMS NEWS
Index: coot.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/coot.info,v
retrieving revision 1.23.2.19
retrieving revision 1.23.2.20
diff -u -d -r1.23.2.19 -r1.23.2.20
--- coot.info 19 Jun 2007 14:41:42 -0000 1.23.2.19
+++ coot.info 19 Jul 2007 22:23:32 -0000 1.23.2.20
@@ -1,10 +1,10 @@
-Package: coot
-Version: 0.3.1
-Revision: 2
+Package:coot
+Version: 0.3.3
+Revision: 4
GCC: 4.0
Source: http://www.ysbl.york.ac.uk/~emsley/software/%n-%v.tar.gz
#Source: http://www.ysbl.york.ac.uk/~emsley/software/pre-release/%n-%v.tar.gz
-Source-MD5: 574d14666659ab9f7be3e2d92585444a
+Source-MD5: 538d7253f973823e0e485af959428cf7
SourceDirectory: %n-%v
Source2:
http://www.ysbl.york.ac.uk/~emsley/software/extras/refmac-lib-data-monomers.tar.gz
Source2-MD5: 88cdbabf47914740f2d13e6960eea3c6
@@ -21,7 +21,7 @@
guile16-dev ,
guile16-gtk-dev ,
gsl ,
- libglade2 (>= 2.6.1-1) ,
+ libglade2 (>= 2.6.1-1) ,
gtk-canvas-dev ,
libart2 (>= 2.3.16-2) ,
guile16-net-http ,
@@ -96,7 +96,6 @@
<<
###############################################################################
ConfigureParams: <<
---disable-dependency-tracking \
--with-mmdb-prefix=$CCP4 --with-clipper-prefix=$CCP4 --with-fftw=$CCP4 \
--with-glut-prefix=%p --with-gl-prefix=/usr/X11R6 \
--with-gtkcanvas-prefix=%p --with-ssmlib-prefix=$CCP4 \
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
