Update of /cvsroot/fink/experimental/jfmertens/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv23962

Modified Files:
        lpsolve-extra.info lpsolve.info lpsolve.patch qepcad.info 
Log Message:
misc updates

Index: lpsolve.patch
===================================================================
RCS file: /cvsroot/fink/experimental/jfmertens/main/finkinfo/sci/lpsolve.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lpsolve.patch       12 Sep 2010 17:10:29 -0000      1.1
+++ lpsolve.patch       25 Jan 2012 16:36:56 -0000      1.2
@@ -22,7 +22,7 @@
 ## no strict-aliasing for the lib, since it gives a warning in lp_matrix.c 
2357-2358)
   sed -i'' -e "{
        /fpic/d
-       s;-shared.*;*.o -dynamiclib -Wl,-x -dead_strip -exported_symbols_list 
../exp_sym -compatibility_version $comp_v -current_version $curr_v -o 
lib${N}.$v.dylib -install_name $p/lib/lib${N}.$t.dylib;
+       s;-shared.*;*.o -dynamiclib -single_module -Wl,-x -dead_strip 
-exported_symbols_list ../exp_sym -compatibility_version $comp_v 
-current_version $curr_v -o lib${N}.$v.dylib -install_name 
$p/lib/lib${N}.$t.dylib;
        /^ar /c ar rc lib${N}.$v.a *.o
        s,$T,.$v,
        }" ${N}$T/ccc

Index: lpsolve.info
===================================================================
RCS file: /cvsroot/fink/experimental/jfmertens/main/finkinfo/sci/lpsolve.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- lpsolve.info        12 Sep 2010 17:10:29 -0000      1.8
+++ lpsolve.info        25 Jan 2012 16:36:56 -0000      1.9
@@ -3,7 +3,7 @@
 Description: Mixed Integer Linear Programming (ILP) solver
 Type: maj (5.5)
 Version: 5.5.2.0 
-Revision: 1
+Revision: 2
 
 BuildDepends: sed | ssed, bison, flex-devel, fink (>= 0.24.12)
 Depends: %N%type_raw[maj]-shlibs (= %v-%r)
@@ -14,7 +14,7 @@
 SourceDirectory: lp_solve_%type_raw[maj]
 
 PatchFile: %{Ni}.patch
-PatchFile-MD5: f27f7a5dbd1d2411e2b83ac7db502bf9
+PatchFile-MD5: 5f39de620f43ea3c4e8911c28cf494d8
 PatchScript: <<
 #!/bin/sh -ev
 N=%N

Index: qepcad.info
===================================================================
RCS file: /cvsroot/fink/experimental/jfmertens/main/finkinfo/sci/qepcad.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- qepcad.info 13 Jul 2011 23:19:29 -0000      1.13
+++ qepcad.info 25 Jan 2012 16:36:56 -0000      1.14
@@ -1,7 +1,7 @@
 Info2: <<
 Package: qepcad%type_pkg[-gcc4.6]
 Version: 1.65
-Revision: 1
+Revision: 2
 Architecture: i386, x86_64
 # Arch-restriction inherited fom saclib
 Source: http://www.usna.edu/Users/cs/qepcad/INSTALL/%{Ni}-B.%v.tar.gz
@@ -11,7 +11,7 @@
 SourceDirectory: qesource
 Type: -gcc4.6 (boolean)
 BuildDepends: readline5, saclib%type_pkg[-gcc4.6] (>= 2.2.5-1), sed, 
flex-devel, (%type_pkg[-gcc4.6]) gcc46-compiler, freeglut
-Depends: readline5-shlibs, (%type_pkg[-gcc4.6]) gcc46-shlibs, ( %m != x86_64 ) 
singular, freeglut-shlibs
+Depends: readline5-shlibs, (%type_pkg[-gcc4.6]) gcc46-shlibs, singular, 
freeglut-shlibs
 Recommends: saclib%type_pkg[-gcc4.6]
 # Strictly speaking, the recommends would be a "depends" when using qepcad 
under gdb 
 Conflicts: %{Ni}, %{Ni}-gcc44, %{Ni}-gcc45, %{Ni}-gcc46
@@ -102,8 +102,6 @@
   ranlib %i/lib/%{Ni}/*.a
   cp -p source/%{Ni}{,d} cad2d/cad2d{,d} plot2d/ADJ2D_plot %i/bin
   cp -p source/qepcad.help %i/share/%{Ni}
-  # singular still not available on x86_64
-  if [ "%m" == "x86_64" ] ; then sed -i -e 's,SINGULAR,#&,' qepcadrc; fi
   cp -p qepcadrc %i/etc
   cp -p ../simplify/{slfq,parself} %i/bin
   cp -pPR ../simplify/{README,examples} %i/share/doc/%{Ni}/simplify
@@ -122,13 +120,6 @@
   E.g., run "slfq -N 20 %p/share/doc/qepcad/simplify/Ex4" to see
   what the beast is capable of (+/- 30 min here) - and view input file..
   For QE , still limited ..
-  Linking with singular brings a substantial increase in efficiency;
-  however not possible in 64bit mode (the more efficient), due to
-  continuing absence of singular for that arch.
-  64bit users who ca build a 32bit singular can still use it advantageously
-  by replacing in %p/etc/qepcadrc (which IS a conf file!) the line
-  containing "SINGULAR" by
-SINGULAR /your/path/to/32bit_singular_executable
 <<
 DescPackaging: <<
   Install by hand; there is no install target.

Index: lpsolve-extra.info
===================================================================
RCS file: 
/cvsroot/fink/experimental/jfmertens/main/finkinfo/sci/lpsolve-extra.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- lpsolve-extra.info  12 Sep 2010 17:10:29 -0000      1.8
+++ lpsolve-extra.info  25 Jan 2012 16:36:56 -0000      1.9
@@ -6,7 +6,7 @@
 # rev-up and adapt next line at version-increases of lpsolve or glpk
 Type: glpk (4.44), maj (5.5)
 
-BuildDepends: lpsolve%type_raw[maj]-dev (>= %v-1), glpk (>= 
%type_raw[glpk]-1), bison, flex, sed | ssed, fink (>= 0.24.12)
+BuildDepends: lpsolve%type_raw[maj]-dev (>= %v-1), glpk (>= 
%type_raw[glpk]-1), bison, flex-devel, sed | ssed, fink (>= 0.24.12)
 Depends: lpsolve%type_raw[maj]-shlibs (>= %type_raw[maj].0.0-1)
 
 # we need the lp_solve source again, for yacc_read.c lp_Hash.c lp_utils.c 
shared/{commonlib,myblas}.c and colamd/colamd.c
@@ -40,7 +40,7 @@
 SourceDirectory: lp_solve_%type_raw[maj]
 
 PatchFile: lpsolve.patch
-PatchFile-MD5: f27f7a5dbd1d2411e2b83ac7db502bf9
+PatchFile-MD5: 5f39de620f43ea3c4e8911c28cf494d8
 PatchScript: <<
 #!/bin/sh -ev
 N=lpsolve


------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to