[cvs] dists/10.4/unstable/main/finkinfo/text tex4ht.info,1.1,1.2

2007-09-23 Thread Martin Costabel
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text
In directory sc8-pr-cvs17:/tmp/cvs-serv31588/text

Modified Files:
tex4ht.info 
Log Message:
New upstream version 20070918

Index: tex4ht.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/tex4ht.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tex4ht.info 20 Jan 2006 20:32:31 -  1.1
+++ tex4ht.info 23 Sep 2007 07:00:10 -  1.2
@@ -1,19 +1,14 @@
 Package: tex4ht
-Version: 20050816
-Revision: 2
+Version: 20070918
+Revision: 1
 Depends: ghostscript | ghostscript-nox, tetex-base, imagemagick (= 5.4.5-2)
-BuildDepends: libjpeg, libpng3, libtiff, libxml2, gdbm, expat, tcltk-dev, 
libkpathsea4
-#Source:http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/%n.tar.gz
-#Source: http://www.cse.ohio-state.edu/~gurari/TeX4ht/%n-%v.zip
-#SourceRename: %n-%v.tar.gz
-Source: http://perso.wanadoo.fr/costabel/%n-%v.tar.gz
-SourceDirectory: %n-1.0.2005_08_16_2117
+BuildDepends: libjpeg, libpng3, libtiff, libxml2, gdbm, expat1, tcltk-dev, 
libkpathsea4
+Source:http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/%n-1.0.2007_09_18_1138.tar.gz
 Source2: http://www.latex-project.org/lppl/lppl-1-3a.txt
-Source-MD5: 2b7e87c246e94acdd6cafd25e9c2fa75
+Source-MD5: c86d70ee387bd802a595604720989562
 Source2-MD5: d8418ee9cb69385dac8a7b5cc0181469
-Patch: %n.patch
 PatchScript: 
-#!/bin/sh
+#!/bin/sh -ex
  perl -pi -e '
s|~/tex4ht.dir/texmf/tex4ht/ht-fonts|%p/share/%n/ht-fonts|g
' bin/unix/* texmf/tex/generic/tex4ht/mkht-scripts.4ht 
texmf/tex4ht/base/unix/tex4ht.env 


-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.4/unstable/main/finkinfo/sci octave.info,1.22,1.23

2007-09-23 Thread Jeff Whitaker
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17:/tmp/cvs-serv17084

Modified Files:
octave.info 
Log Message:
new upstream version.


Index: octave.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/octave.info,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- octave.info 27 Aug 2007 23:50:09 -  1.22
+++ octave.info 23 Sep 2007 12:03:26 -  1.23
@@ -1,10 +1,10 @@
 Package: octave
-Version: 2.9.13
+Version: 2.9.14
 Revision: 1
 Maintainer: Jeffrey Whitaker [EMAIL PROTECTED]
 BuildDependsOnly: false
 Source: ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%v.tar.gz
-Source-MD5: 493e9dfc66bfda1ea270bf1dfc8ec6cc
+Source-MD5: b3253a5e21f114a96183b4fef31a5a41
 BuildDepends: glpk-dev, hdf5, readline5, texinfo, g95 (= 0.50-20060321), 
libncurses5, fftw3, texi2html, tetex-base, libcurl4, sed, pcre
 Depends: glpk-shlibs, gnuplot | gnuplot-nox, readline5-shlibs, fftw3-shlibs, 
hdf5-shlibs, ncurses, libncurses5-shlibs, aquaterm, libcurl4-shlibs, pcre-shlibs
 BuildConflicts: coot-dev, broken-gcc, lammpi-dev


-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.4/unstable/main/finkinfo/sci octave.patch,1.7,1.8

2007-09-23 Thread Jeff Whitaker
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17:/tmp/cvs-serv8560

Modified Files:
octave.patch 
Log Message:
fixed patch


Index: octave.patch
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/octave.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- octave.patch26 May 2007 13:00:33 -  1.7
+++ octave.patch23 Sep 2007 19:57:56 -  1.8
@@ -1,6 +1,6 @@
 octave/configure.orig  2006-12-22 07:35:54.0 -0700
-+++ octave/configure   2006-12-22 07:36:59.0 -0700
-@@ -12693,16 +12693,13 @@
+--- octave/configure.orig  2007-09-23 13:52:42.0 -0600
 octave/configure   2007-09-23 13:53:32.0 -0600
+@@ -12961,16 +12961,13 @@
LIBS=$save_LIBS
  fi
  
@@ -23,7 +23,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h conftest.$ac_ext
-@@ -12715,7 +12712,7 @@
+@@ -12983,7 +12980,7 @@
  #ifdef __cplusplus
  extern C
  #endif
@@ -32,7 +32,7 @@
  #ifdef F77_DUMMY_MAIN
  
  #  ifdef __cplusplus
-@@ -12727,7 +12724,7 @@
+@@ -12995,7 +12992,7 @@
  int
  main ()
  {
@@ -41,7 +41,7 @@
;
return 0;
  }
-@@ -12750,29 +12747,31 @@
+@@ -13018,29 +13015,31 @@
 test ! -s conftest.err
 }  test -s conftest$ac_exeext 
 $as_test_x conftest$ac_exeext; then
@@ -83,7 +83,7 @@
  cat conftest.$ac_ext _ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -12837,13 +12836,14 @@
+@@ -13105,13 +13104,14 @@
   { echo $as_me:$LINENO: result: $ac_res 5
  echo ${ECHO_T}$ac_res 6; }
  if test `eval echo '${'$as_ac_Lib'}'` = yes; then
@@ -102,7 +102,7 @@
  cat conftest.$ac_ext _ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -12857,7 +12857,7 @@
+@@ -13125,7 +13125,7 @@
  #ifdef __cplusplus
  extern C
  #endif
@@ -111,7 +111,7 @@
  #ifdef F77_DUMMY_MAIN
  
  #  ifdef __cplusplus
-@@ -12869,7 +12869,7 @@
+@@ -13137,7 +13137,7 @@
  int
  main ()
  {
@@ -120,7 +120,7 @@
;
return 0;
  }
-@@ -12892,38 +12892,31 @@
+@@ -13160,38 +13160,31 @@
 test ! -s conftest.err
 }  test -s conftest$ac_exeext 
 $as_test_x conftest$ac_exeext; then
@@ -174,7 +174,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h conftest.$ac_ext
-@@ -12971,31 +12964,40 @@
+@@ -13239,31 +13232,40 @@
 test ! -s conftest.err
 }  test -s conftest$ac_exeext 
 $as_test_x conftest$ac_exeext; then
@@ -226,7 +226,7 @@
  cat conftest.$ac_ext _ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13009,7 +13011,7 @@
+@@ -13277,7 +13279,7 @@
  #ifdef __cplusplus
  extern C
  #endif
@@ -235,7 +235,7 @@
  #ifdef F77_DUMMY_MAIN
  
  #  ifdef __cplusplus
-@@ -13021,7 +13023,7 @@
+@@ -13289,7 +13291,7 @@
  int
  main ()
  {
@@ -244,7 +244,7 @@
;
return 0;
  }
-@@ -13044,30 +13046,29 @@
+@@ -13312,30 +13314,29 @@
 test ! -s conftest.err
 }  test -s conftest$ac_exeext 
 $as_test_x conftest$ac_exeext; then
@@ -284,7 +284,7 @@
  cat conftest.$ac_ext _ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13081,7 +13082,7 @@
+@@ -13349,7 +13350,7 @@
  #ifdef __cplusplus
  extern C
  #endif
@@ -293,7 +293,7 @@
  #ifdef F77_DUMMY_MAIN
  
  #  ifdef __cplusplus
-@@ -13093,7 +13094,7 @@
+@@ -13361,7 +13362,7 @@
  int
  main ()
  {
@@ -302,7 +302,7 @@
;
return 0;
  }
-@@ -13132,14 +13133,13 @@
+@@ -13400,14 +13401,13 @@
   { echo $as_me:$LINENO: result: $ac_res 5
  echo ${ECHO_T}$ac_res 6; }
  if test `eval echo '${'$as_ac_Lib'}'` = yes; then
@@ -321,7 +321,7 @@
  cat conftest.$ac_ext _ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13153,7 +13153,7 @@
+@@ -13421,7 +13421,7 @@
  #ifdef __cplusplus
  extern C
  #endif
@@ -330,7 +330,7 @@
  #ifdef F77_DUMMY_MAIN
  
  #  ifdef __cplusplus
-@@ -13165,7 +13165,7 @@
+@@ -13433,7 +13433,7 @@
  int
  main ()
  {
@@ -339,7 +339,7 @@
;
return 0;
  }
-@@ -13188,23 +13188,23 @@
+@@ -13456,23 +13456,23 @@
 test ! -s conftest.err
 }  test -s conftest$ac_exeext 
 $as_test_x conftest$ac_exeext; then
@@ -370,3 +370,11 @@
  fi
  
  fi
+@@ -13481,6 +13481,7 @@
+ 
+ fi
+ 
++
+ # BLAS in Alpha CXML library?
+ if test $acx_blas_ok = no; then
+   as_ac_Lib=`echo ac_cv_lib_cxml_$sgemm | $as_tr_sh`


-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.4/unstable/main/finkinfo/sci scientificpython-py.info, 1.10, 1.11

2007-09-23 Thread Jeff Whitaker
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17:/tmp/cvs-serv9330

Modified Files:
scientificpython-py.info 
Log Message:
bumped revision number


Index: scientificpython-py.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scientificpython-py.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- scientificpython-py.info22 Sep 2007 21:17:08 -  1.10
+++ scientificpython-py.info23 Sep 2007 19:59:41 -  1.11
@@ -2,7 +2,7 @@
 
 Package: scientificpython-py%type_pkg[python]
 Version: 2.7.6
-Revision: 1
+Revision: 2
 Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
 Type: python (2.3 2.4 2.5)
 Maintainer: Jeffrey Whitaker [EMAIL PROTECTED]


-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.4/unstable/main/finkinfo/net lftp.info,1.4,1.5

2007-09-23 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net
In directory sc8-pr-cvs17:/tmp/cvs-serv30929/10.4/unstable/main/finkinfo/net

Modified Files:
lftp.info 
Log Message:
fix obsoleting/upgrading; don't clear implicit value and then explicitly re-add 
it; speed fink build process


Index: lftp.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/lftp.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- lftp.info   13 Jan 2007 21:19:04 -  1.4
+++ lftp.info   23 Sep 2007 22:15:23 -  1.5
@@ -1,11 +1,10 @@
 Package: lftp
 Version: 3.5.4
-Revision: 10
+Revision: 1001
 ###
-Depends: expat-shlibs, libgettext3-shlibs, libiconv, libncurses5-shlibs (= 
5.4-20041023-1006), readline5-shlibs (= 5.0-1004)
-BuildDepends: expat, libgettext3-dev, libiconv-dev, libncurses5 (= 
5.4-20041023-1006), readline5 (= 5.0-1004), system-openssl-dev
-Conflicts: lftp
-Replaces: lftp
+Depends: expat1-shlibs, libgettext3-shlibs, libiconv, libncurses5-shlibs (= 
5.4-20041023-1006), readline5-shlibs (= 5.0-1004)
+BuildDepends: expat1, libgettext3-dev, libiconv-dev, libncurses5 (= 
5.4-20041023-1006), readline5 (= 5.0-1004), system-openssl-dev
+Replaces: lftp-ssl
 ###
 CustomMirror: 
   Primary: ftp://ftp.yars.free.net/lftp/
@@ -37,20 +36,18 @@
 GCC: 4.0
 ###
 SetCPPFLAGS: -Wno-long-double -DBIND_8_COMPAT
-NoSetLDFLAGS: true
-NoSetLIBS: true
-SetLDFLAGS: -L%p/lib/system-openssl/lib -L%p/lib
+SetLDFLAGS: -L%p/lib/system-openssl/lib
 ###
 DocFiles: ABOUT-NLS BUGS COPYING ChangeLog FAQ FEATURES INSTALL MIRRORS NEWS 
README* THANKS TODO lftp.lsm
 ConfFiles: %p/etc/lftp.conf
 ###
-ConfigureParams: --with-pic --enable-share --enable-static --with-modules 
--without-socksdante --with-openssl=/usr --without-gnutls 
--with-locale-dir=%p/share/locale --with-included-readline=no 
--with-included-gettext=no --mandir=%p/share/man --infodir=%p/share/info 
--libexecdir=%p/lib
+ConfigureParams: --with-pic --enable-share --enable-static --with-modules 
--without-socksdante --with-openssl=/usr --without-gnutls 
--with-locale-dir=%p/share/locale --with-included-readline=no 
--with-included-gettext=no --mandir=%p/share/man --infodir=%p/share/info 
--libexecdir=%p/lib --disable-dependency-tracking
 ###
 InstallScript: make install DESTDIR=%d
 ###
 SplitOff: 
   Package: lftp-ssl
-  Depends: lftp (= %v-%r)
+  Depends: lftp (= %v-%r), fink-obsolete-packages
   DocFiles: COPYING
 
 ###


-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.4/unstable/main/finkinfo/net lftp.info,1.5,1.6

2007-09-23 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net
In directory sc8-pr-cvs17:/tmp/cvs-serv16944

Modified Files:
lftp.info 
Log Message:
rm broken flags...one typo, both overridden by --with-modules setting


Index: lftp.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/lftp.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- lftp.info   23 Sep 2007 22:15:23 -  1.5
+++ lftp.info   23 Sep 2007 23:02:24 -  1.6
@@ -41,7 +41,7 @@
 DocFiles: ABOUT-NLS BUGS COPYING ChangeLog FAQ FEATURES INSTALL MIRRORS NEWS 
README* THANKS TODO lftp.lsm
 ConfFiles: %p/etc/lftp.conf
 ###
-ConfigureParams: --with-pic --enable-share --enable-static --with-modules 
--without-socksdante --with-openssl=/usr --without-gnutls 
--with-locale-dir=%p/share/locale --with-included-readline=no 
--with-included-gettext=no --mandir=%p/share/man --infodir=%p/share/info 
--libexecdir=%p/lib --disable-dependency-tracking
+ConfigureParams: --with-pic --with-modules --without-socksdante 
--with-openssl=/usr --without-gnutls --with-locale-dir=%p/share/locale 
--with-included-readline=no --with-included-gettext=no --mandir=%p/share/man 
--infodir=%p/share/info --libexecdir=%p/lib --disable-dependency-tracking
 ###
 InstallScript: make install DESTDIR=%d
 ###


-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.4/unstable/main/finkinfo/sci lpsolve-octave.info, 1.2, 1.3

2007-09-23 Thread Jean-Fran�ois Mertens
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17:/tmp/cvs-serv14025

Modified Files:
lpsolve-octave.info 
Log Message:
matching octave's update

Index: lpsolve-octave.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/lpsolve-octave.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lpsolve-octave.info 6 Feb 2007 23:13:57 -   1.2
+++ lpsolve-octave.info 24 Sep 2007 00:18:14 -  1.3
@@ -1,9 +1,9 @@
 Info2: 
 Package: lpsolve-octave
 Version: 5.5.0.10
-Revision: 1
+Revision: 2
 ## It is probably prudent to rev-up and change the next line whenever octave 
or lpsolve go to a new version
-Type: octave (2.1.73), maj (5.5)
+Type: octave (2.9.14), maj (5.5)
 
 BuildDepends: fftw3, hdf5, libncurses5, lpsolve%type_raw[maj]-dev (= %v-1), 
octave (= %type_raw[octave]-1), readline5
 Depends: fftw3-shlibs, hdf5-shlibs, libncurses5-shlibs, 
lpsolve%type_raw[maj]-shlibs (= %type_raw[maj].0.0-1), octave (= 
%type_raw[octave]-1), readline5-shlibs


-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] experimental/jfmertens/main/finkinfo/sci atlas.info, NONE, 1.1 atlas.patch, NONE, 1.1 scilab-atlas.info, NONE, 1.1 scilab-atlas.patch, NONE, 1.1 lpsolve-scilab.info, 1.5, 1.6 glpk-java.info, 1.2

2007-09-23 Thread Jean-Fran�ois Mertens
Update of /cvsroot/fink/experimental/jfmertens/main/finkinfo/sci
In directory sc8-pr-cvs17:/tmp/cvs-serv13575

Modified Files:
lpsolve-scilab.info 
Added Files:
atlas.info atlas.patch scilab-atlas.info scilab-atlas.patch 
Removed Files:
glpk-java.info glpk.info gnuplot.info lpsolve-extra.info 
octave-forge.info octave.info 
Log Message:
finally a scilab pkg with which lpsolve-scilab seems to work.
Cleanup too.

--- glpk-java.info DELETED ---

--- NEW FILE: scilab-atlas.patch ---
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.0 +0200
+++ scilab-4.0/routines/console/dynamic_menus.c 2006-06-18 11:30:09.0 
+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.0 
+0100
+++ scilab-4.0/routines/interf/intinterp.c  2006-06-18 11:25:57.0 
+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.0 +0100
+++ scilab-4.0/routines/os_specific/link_SYSV.c 2006-06-18 11:27:24.0 
+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.0 
+0100
+++ scilab-4.0/routines/scicos/matscicos.c  2006-06-18 11:34:24.0 
+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.h2005-05-10 
16:52:08.0 +0200
+++ scilab-4.0/routines/wintools/intOEMconvert.h2006-06-18 
11:39:18.0 +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.0 
+0100
+++ scilab-4.0/routines/wintools/intabout.h 2006-06-18 11:40:02.0 
+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.h2005-03-02 
16:47:56.0 +0100
+++ scilab-4.0/routines/wintools/intconsoledos.h2006-06-18 
11:40:34.0 +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.h2005-09-18 
21:18:49.0 +0200
+++ scilab-4.0/routines/wintools/intfileassociationbox.h2006-06-18 
11:44:52.0 +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.0 +0200
+++ scilab-4.0/routines/wintools/intihmcolor.h  2006-06-18 11:44:21.0 
+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.0 +0200
+++ 

[cvs] dists/10.4/unstable/main/finkinfo/net lftp.info,1.6,1.7

2007-09-23 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net
In directory sc8-pr-cvs17:/tmp/cvs-serv8189/10.4/unstable/main/finkinfo/net

Modified Files:
lftp.info 
Log Message:
Uber-strict disentanglement of apple's and fink's openssl and other installed 
stuff


Index: lftp.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/lftp.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- lftp.info   23 Sep 2007 23:02:24 -  1.6
+++ lftp.info   24 Sep 2007 02:52:21 -  1.7
@@ -1,6 +1,6 @@
 Package: lftp
 Version: 3.5.4
-Revision: 1001
+Revision: 1011
 ###
 Depends: expat1-shlibs, libgettext3-shlibs, libiconv, libncurses5-shlibs (= 
5.4-20041023-1006), readline5-shlibs (= 5.0-1004)
 BuildDepends: expat1, libgettext3-dev, libiconv-dev, libncurses5 (= 
5.4-20041023-1006), readline5 (= 5.0-1004), system-openssl-dev
@@ -31,6 +31,9 @@
 
   ### lftp 3.4.7 redef of srandom
   perl -pi -e 's,CDECL void srandom\(unsigned seed\);,,g' src/ResMgr.cc
+
+  ### don't link against already-installed version
+  perl -pi -e 's/-L\$\(DESTDIR\)\$\(pkgverlibdir\)//g' src/Makefile.in
 
 ###
 GCC: 4.0
@@ -41,7 +44,7 @@
 DocFiles: ABOUT-NLS BUGS COPYING ChangeLog FAQ FEATURES INSTALL MIRRORS NEWS 
README* THANKS TODO lftp.lsm
 ConfFiles: %p/etc/lftp.conf
 ###
-ConfigureParams: --with-pic --with-modules --without-socksdante 
--with-openssl=/usr --without-gnutls --with-locale-dir=%p/share/locale 
--with-included-readline=no --with-included-gettext=no --mandir=%p/share/man 
--infodir=%p/share/info --libexecdir=%p/lib --disable-dependency-tracking
+ConfigureParams: --with-pic --with-modules --without-socksdante 
--with-openssl=%p/lib/system-openssl --without-gnutls 
--with-locale-dir=%p/share/locale --with-included-readline=no 
--with-included-gettext=no --mandir=%p/share/man --infodir=%p/share/info 
--libexecdir=%p/lib --disable-dependency-tracking
 ###
 InstallScript: make install DESTDIR=%d
 ###


-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.3/unstable/main/finkinfo/net lftp.info,1.26,1.27

2007-09-23 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/net
In directory sc8-pr-cvs17:/tmp/cvs-serv8582/10.3/unstable/main/finkinfo/net

Modified Files:
lftp.info 
Log Message:
backport new and unified from 10.4


Index: lftp.info
===
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/net/lftp.info,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- lftp.info   1 Mar 2006 03:34:01 -   1.26
+++ lftp.info   24 Sep 2007 02:53:05 -  1.27
@@ -1,10 +1,9 @@
 Package: lftp
-Version: 3.3.4
-Revision: 1
+Version: 3.5.4
+Revision: 11
 ###
-Depends: expat-shlibs, libgettext3-shlibs, libiconv, readline5-shlibs, 
libncurses5-shlibs
-BuildDepends: expat, libgettext3-dev, libiconv-dev, readline5, libncurses5
-Conflicts: lftp-ssl
+Depends: expat1-shlibs, libgettext3-shlibs, libiconv, libncurses5-shlibs (= 
5.4-20041023-1), readline5-shlibs (= 5.0-1)
+BuildDepends: expat1, libgettext3-dev, libiconv-dev, libncurses5 (= 
5.4-20041023-1), readline5 (= 5.0-1), system-openssl-dev
 Replaces: lftp-ssl
 ###
 CustomMirror: 
@@ -13,33 +12,49 @@
 
 ###
 Source: mirror:custom:lftp-%v.tar.bz2
-Source-MD5: b37c36c8b2bc58cd3020324cd2df1348
+Source-MD5: 1c7f49822793d03588fd4080c40281a7
 ###
 PatchScript: 
   ### Fix getopt linking in lftp (multi defs)
-  perl -pi -e 's,\*\) LIBOBJS=\$LIBOBJS getopt.\$ac_objext ;;,\*\) 
LIBOBJS=\$LIBOBJS ;;,g' configure
-  perl -pi -e 's,\*\) LIBOBJS=\$LIBOBJS getopt1.\$ac_objext ;;,\*\) 
LIBOBJS=\$LIBOBJS ;;,g' configure
+  #perl -pi -e 's,\*\) LIBOBJS=\$LIBOBJS getopt.\$ac_objext ;;,\*\) 
LIBOBJS=\$LIBOBJS ;;,g' configure
+  #perl -pi -e 's,\*\) LIBOBJS=\$LIBOBJS getopt1.\$ac_objext ;;,\*\) 
LIBOBJS=\$LIBOBJS ;;,g' configure
 
   ### Fix for resolv.h
-  perl -pi -e 's,\$ac_includes_default,\$ac_includes_default\n#include 
\netinet/in.h\\n#include \arpa/nameser.h\,g' configure
-  perl -pi -e 's,\#include \resolv.h\,\#include \nameser.h\\n\#include 
\resolv.h\,g' configure
+  #perl -pi -e 's,\$ac_includes_default,\$ac_includes_default\n#include 
\netinet/in.h\\n#include \arpa/nameser.h\,g' configure
+  #perl -pi -e 's,\#include \resolv.h\,\#include \nameser.h\\n\#include 
\resolv.h\,g' configure
 
   ### Fix libtool relink
   perl -pi -e 's,need_relink=yes,need_relink=no,g' ltmain.sh
+
+  ### Force configure to not use 10.4's native poll function
+  sed -i -e 's/poll_works=yes/poll_works=no/' configure
+
+  ### lftp 3.4.7 redef of srandom
+  perl -pi -e 's,CDECL void srandom\(unsigned seed\);,,g' src/ResMgr.cc
+
+  ### don't link against already-installed version
+  perl -pi -e 's/-L\$\(DESTDIR\)\$\(pkgverlibdir\)//g' src/Makefile.in
 
 ###
 GCC: 3.3
 ###
-SetCPPFLAGS: -no-cpp-precomp -Wno-long-double -DBIND_8_COMPAT
+SetCPPFLAGS: -Wno-long-double -DBIND_8_COMPAT
+SetLDFLAGS: -L%p/lib/system-openssl/lib
 ###
 DocFiles: ABOUT-NLS BUGS COPYING ChangeLog FAQ FEATURES INSTALL MIRRORS NEWS 
README* THANKS TODO lftp.lsm
 ConfFiles: %p/etc/lftp.conf
 ###
-ConfigureParams: --with-pic --enable-share --enable-static --with-modules 
--without-socksdante --without-ssl --without-gnutls 
--with-locale-dir=%p/share/locale --with-included-readline=no 
--with-included-gettext=no --mandir=%p/share/man --infodir=%p/share/info 
--libexecdir=%p/lib
+ConfigureParams: --with-pic --with-modules --without-socksdante 
--with-openssl=%p/lib/system-openssl --without-gnutls 
--with-locale-dir=%p/share/locale --with-included-readline=no 
--with-included-gettext=no --mandir=%p/share/man --infodir=%p/share/info 
--libexecdir=%p/lib --disable-dependency-tracking
 ###
 InstallScript: make install DESTDIR=%d
 ###
-Description: Sophisticated command line based FTP client
+SplitOff: 
+  Package: lftp-ssl
+  Depends: lftp (= %v-%r), fink-obsolete-packages
+  DocFiles: COPYING
+
+###
+Description: Sophisticated command line based FTP client (SSL)
 DescDetail: 
   lftp is a sophisticated command line based FTP client. It has a
   multithreaded design allowing you to issue and execute multiple


-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.3/unstable/crypto/finkinfo lftp-ssl.info,1.27,NONE

2007-09-23 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo
In directory sc8-pr-cvs17:/tmp/cvs-serv8582/10.3/unstable/crypto/finkinfo

Removed Files:
lftp-ssl.info 
Log Message:
backport new and unified from 10.4


--- lftp-ssl.info DELETED ---


-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.3/unstable/main/finkinfo/graphics fontforge.info, 1.56, 1.57 fontforge.patch, 1.16, 1.17

2007-09-23 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs17:/tmp/cvs-serv6727

Modified Files:
fontforge.info fontforge.patch 
Log Message:
backport new version from 10.4 with 10.3 system header tweak


Index: fontforge.info
===
RCS file: 
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/fontforge.info,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- fontforge.info  2 Sep 2007 18:16:49 -   1.56
+++ fontforge.info  24 Sep 2007 04:11:36 -  1.57
@@ -1,6 +1,6 @@
 Package: fontforge
-Version: 20070808
-Revision: 2
+Version: 20070915
+Revision: 1
 License: BSD
 Description: Outline font editor
 DescDetail: 
@@ -17,15 +17,16 @@
Had to remove setting of DYLD_LIBRARY_PATH in start.c.
Caused ImageIO problems. Yuck.
Enabled python scripting. Uses system python.
+   Patched Makefile.in's to remove useless -I and reorder flags.
 
 Homepage: http://fontforge.sourceforge.net/
 Maintainer: Daniel Johnson [EMAIL PROTECTED]
 
 Source: mirror:sourceforge:%n/%n_full-%v.tar.bz2
-Source-MD5: 5c549d22c700304949db08c7097e9989
+Source-MD5: d3248d5bd7c63be9cdfd9daf37866b35
 SourceDirectory: %n-%v
 Source2: mirror:sourceforge:%n/%n_htdocs-%v.tar.bz2
-Source2-MD5: fa40da4254d2cd8cc8a63a4a91ed27a0
+Source2-MD5: d67b864de7c0143c63f4c275e3145399
 Source2ExtractDir: %n-%v/htdocs
 
 Depends: 
@@ -61,11 +62,16 @@
 DocFiles: AUTHORS INSTALL LICENSE README-Mac.html README-Unix.html VERSION
 
 PatchFile: %n.patch
-PatchFile-MD5: e1ac8b9f4f70ea7579f2f4b77af20097
+PatchFile-MD5: 1e5b18fbdb5b5c35dfd35b495aa93512
 PatchScript: 
patch -p1 %{PatchFile}
-   perl -pi -e 's/#ifndef NODYNAMIC/#if 1/' gdraw/gio.c
perl -pi -e 's,python -c,/usr/bin/python -c,g' configure
+   # These patches fix temporary bugs. Should be fixed in future.
+   perl -pi -e 's/GImage \*GImageReadJpeg\(FILE \*infile/GImage 
\*GImageRead_Jpeg\(FILE \*infile/' gdraw/gimagereadjpeg.c
+   perl -pi -e 's/ret = GImageWrite_Png\(gi,fp,progressive/int ret = 
GImageWrite_Png\(gi,fp,progressive/g' gdraw/gimagewritepng.c
+
+   # 10.3-specific header issue
+   perl -pi -e 's,#include arpa/inet.h,#include netinet/in.h\n$,' 
fontforge/http.c
 
 
 NoSetMAKEFLAGS: true

Index: fontforge.patch
===
RCS file: 
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/fontforge.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- fontforge.patch 26 Jul 2007 01:48:07 -  1.16
+++ fontforge.patch 24 Sep 2007 04:11:36 -  1.17
@@ -1,19 +1,61 @@
-diff -ru fontforge-20070723.orig/Makefile.dynamic.in 
fontforge-20070723/Makefile.dynamic.in
 fontforge-20070723.orig/Makefile.dynamic.in2007-05-28 
15:34:59.0 -0400
-+++ fontforge-20070723/Makefile.dynamic.in 2007-07-24 14:43:38.0 
-0400
-@@ -92,7 +92,7 @@
-   $(INSTALL_DATA) $(srcdir)/fontforge/fontimage.1 $(mandir)/man1
+diff -ru fontforge-20070831.orig/Makefile.dynamic.in 
fontforge-20070831/Makefile.dynamic.in
+--- fontforge-20070831.orig/Makefile.dynamic.in2007-08-17 
22:06:04.0 -0400
 fontforge-20070831/Makefile.dynamic.in 2007-09-15 18:08:25.0 
-0400
+@@ -94,7 +94,7 @@
+   $(INSTALL_DATA) $(srcdir)/fontforge/fontlint.1 $(DESTDIR)$(mandir)/man1
  #explicit use of sh to make sure we don't invoke csh with different if 
syntax
sh -c if test -d $(srcdir)/htdocs /dev/null ; then $(MAKE) 
install_docs ; fi
 -  sh  systemspecific
 +# sh  systemspecific
  
  uninstall:
-   -rm $(bindir)/fontforge
-diff -ru fontforge-20070723.orig/configure fontforge-20070723/configure
 fontforge-20070723.orig/configure  2007-07-13 23:19:53.0 -0400
-+++ fontforge-20070723/configure   2007-07-24 14:43:39.0 -0400
-@@ -2684,9 +2684,7 @@
+   -rm $(DESTDIR)$(bindir)/fontforge
+diff -ru fontforge-20070831.orig/Unicode/Makefile.dynamic.in 
fontforge-20070831/Unicode/Makefile.dynamic.in
+--- fontforge-20070831.orig/Unicode/Makefile.dynamic.in2007-05-28 
10:20:55.0 -0400
 fontforge-20070831/Unicode/Makefile.dynamic.in 2007-09-15 
18:11:35.0 -0400
+@@ -18,8 +18,8 @@
+  cjk.lo memory.lo ucharmap.lo unialt.lo ustring.lo utype.lo \
+  usprintf.lo gwwiconv.lo
+ 
+-Incs = -I$(top_srcdir)/inc -I/usr/pkg/include -I/usr/pkg/include/giflib
+-CFLAGS = @CFLAGS@ @CPPFLAGS@ $(Incs) @WFLAGS@ @DEFS@
++Incs = -I$(top_srcdir)/inc
++CFLAGS = $(Incs) @CFLAGS@ @CPPFLAGS@ @WFLAGS@ @DEFS@
+ 
+ ../libgunicode.la: $(libgunicode_OBJECTS)
+   $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -no-undefined @LDFLAGS@ -o 
../libgunicode.la $(libgunicode_OBJECTS) \
+diff -ru fontforge-20070831.orig/Unicode/Makefile.in 
fontforge-20070831/Unicode/Makefile.in
+--- fontforge-20070831.orig/Unicode/Makefile.in2007-05-28 

[cvs] dists/10.4/unstable/main/finkinfo/sound esound.info,1.4,1.5

2007-09-23 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound
In directory sc8-pr-cvs17:/tmp/cvs-serv27550/10.4/unstable/main/finkinfo/sound

Modified Files:
esound.info 
Log Message:
document bug and solution, thanks to
http://forums.macosxhints.com/showthread.php?t=20433

rm no-op flag on 10.3


Index: esound.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/esound.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- esound.info 21 Sep 2007 01:37:21 -  1.4
+++ esound.info 24 Sep 2007 05:05:32 -  1.5
@@ -89,6 +89,10 @@
 Employs a patch from Ojas Parekh for CoreAudio device selection.
 http://bugzilla.gnome.org/show_bug.cgi?id=478292
 
+DescUsage: 
+Users have reported that esd can suddenly stop producing sound due to
+changes to the OS X MIDI output bit-rate, and that 44100 Hz works.
+
 License: GPL/LGPL
 Maintainer: Ojas Parekh [EMAIL PROTECTED]
 Homepage: http://www.gnome.org/


-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.3/unstable/main/finkinfo/sound esound.info,1.13,1.14

2007-09-23 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sound
In directory sc8-pr-cvs17:/tmp/cvs-serv27550/10.3/unstable/main/finkinfo/sound

Modified Files:
esound.info 
Log Message:
document bug and solution, thanks to
http://forums.macosxhints.com/showthread.php?t=20433

rm no-op flag on 10.3


Index: esound.info
===
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sound/esound.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- esound.info 30 Sep 2005 22:38:50 -  1.13
+++ esound.info 24 Sep 2007 05:05:32 -  1.14
@@ -18,7 +18,7 @@
 
 NoSetCPPFLAGS: true
 NoSetLDFLAGS: true
-SetCPPFLAGS: -no-cpp-precomp -pipe
+SetCPPFLAGS: -pipe
 ConfigureParams: --mandir=%p/share/man --with-libwrap 
--disable-dependency-tracking
 CompileScript: 
   ./configure %c
@@ -86,6 +86,10 @@
 present as libesd_la-util.o in libesd.dylib, which is also linked into
 esd. See: http://bugzilla.gnome.org/show_bug.cgi?id=317554
 
+DescUsage: 
+Users have reported that esd can suddenly stop producing sound due to
+changes to the OS X MIDI output bit-rate, and that 44100 Hz works.
+
 License: GPL/LGPL
 Maintainer: None [EMAIL PROTECTED]
 Homepage: http://www.gnome.org/


-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits