Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv7951

Modified Files:
        qepcad.info saclib.info 
Log Message:
qepcad-1.65, +gcc4.6

Index: qepcad.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qepcad.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- qepcad.info 14 Apr 2011 22:51:12 -0000      1.8
+++ qepcad.info 13 Jul 2011 23:17:33 -0000      1.9
@@ -1,7 +1,7 @@
 Info2: <<
-Package: qepcad%type_pkg[-gcc4.5]
+Package: qepcad%type_pkg[-gcc4.6]
 Version: 1.61
-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
@@ -9,13 +9,13 @@
 Source2: http://www.usna.edu/Users/cs/qepcad/SLFQ/simplify-1.18.tar.gz
 Source2-MD5: 8b4ea6c64ddd54b8aed622420b3c1981
 SourceDirectory: qesource
-Type: -gcc4.5 (boolean)
-BuildDepends: readline5, saclib%type_pkg[-gcc4.5] (>= 2.2.5-1), sed, 
flex-devel, (%type_pkg[-gcc4.5]) gcc45-compiler, freeglut
-Depends: readline5-shlibs, (%type_pkg[-gcc4.5]) gcc45-shlibs, ( %m != x86_64 ) 
singular, freeglut-shlibs
-Recommends: saclib%type_pkg[-gcc4.5]
+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
+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
-Replaces: %{Ni}, %{Ni}-gcc44, %{Ni}-gcc45
+Conflicts: %{Ni}, %{Ni}-gcc44, %{Ni}-gcc45, %{Ni}-gcc46
+Replaces: %{Ni}, %{Ni}-gcc44, %{Ni}-gcc45, %{Ni}-gcc46
 
 PatchScript: <<
   #!/bin/sh -ev
@@ -24,15 +24,15 @@
   ## no /usr/local
   sed -i'' -e 's,#!/usr/local/bin/perl,#!/usr/bin/env perl,' 
extensions/{newadj/ps,rend/rgbinfo}.pl
   ## CFLAGS and LDFLAGS and the like :
-  if [ "%type_raw[-gcc4.5]" == "-gcc4.5" ] ; then nopic=''; else 
nopic="-mdynamic-no-pic"; fi
+  if [ "%type_raw[-gcc4.6]" == "-gcc4.6" ] ; then nopic=''; else 
nopic="-mdynamic-no-pic"; fi
   cflags="$nopic -Wall -Wextra -Wstrict-aliasing=2"
   # Makefiles don't respect CC or CXX
-  if [ "%type_raw[-gcc4.5]" == "-gcc4.5" ]; then CXX=g++-4
+  if [ "%type_raw[-gcc4.6]" == "-gcc4.6" ]; then CXX=g++-4
        elif test -f /usr/bin/g++-4.2; then CXX=g++-4.2
        else CXX=g++
   fi
   find .. -name Makefile -exec sed -i'' -e "s,g[+][+],$CXX,g" \{\} \;
-  # get rid of gcc45's libgcc_s
+  # get rid of gcc46's libgcc_s
   if [ `uname -r | cut -f1 -d.` -ge 9 ]; then 
LDFLAGS="-Wl,-dead_strip_dylibs"; else LDFLAGS=''; fi
   # to strip binaries ( using "-s" would lead at launch to dyld error "lazy 
pointer not found" ):
   echo '__mh_execute_header' > symlst
@@ -73,7 +73,7 @@
 CompileScript: <<
   #!/bin/sh -ev
   export PATH="%p/lib/flex/bin:$PATH"
-  if [ "%type_raw[-gcc4.5]" == "-gcc4.5" ]; then export 
PATH=%p/lib/gcc4.5/bin:$PATH; fi
+  if [ "%type_raw[-gcc4.6]" == "-gcc4.6" ]; then export 
PATH=%p/lib/gcc4.5/bin:$PATH; fi
   export CPATH=%p/include
   export saclib=%p
   export qe=`pwd`

Index: saclib.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/saclib.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- saclib.info 31 Aug 2010 22:36:31 -0000      1.4
+++ saclib.info 13 Jul 2011 23:17:33 -0000      1.5
@@ -1,16 +1,16 @@
 Info2: <<
-Package: saclib%type_pkg[-gcc4.5]
+Package: saclib%type_pkg[-gcc4.6]
 Version: 2.2.5
-Revision: 1
+Revision: 2
 Architecture: i386, x86_64
 ## Would be relativel to revive ppc too, if there was any genuine demand for 
it..
 # But apparently currently abandoned upstream
 Source: http://www.usna.edu/Users/cs/qepcad/INSTALL/%{Ni}%v.tar.gz
 Source-MD5: 84bc4f972b1362d635edce8c1ba6bb30
-Type: -gcc4.5 (boolean)
-BuildDepends: fink (>= 0.24.12), (%type_pkg[-gcc4.5]) gcc45-compiler
-Conflicts: %{Ni}, %{Ni}-gcc44, %{Ni}-gcc45
-Replaces: %{Ni}, %{Ni}-gcc44, %{Ni}-gcc45
+Type: -gcc4.6 (boolean)
+BuildDepends: fink (>= 0.24.12), (%type_pkg[-gcc4.6]) gcc46-compiler
+Conflicts: %{Ni}, %{Ni}-gcc44, %{Ni}-gcc45, %{Ni}-gcc46
+Replaces: %{Ni}, %{Ni}-gcc44, %{Ni}-gcc45, %{Ni}-gcc46
 
 PatchScript: <<
   #!/bin/sh -ev
@@ -24,7 +24,7 @@
   sed -i.bak -e 's,ifdef __STDC__,if defined (__STDC__) || defined 
(__APPLE__),' include/sacsys.h src/FAIL.c
 
   ### Getting control over CFLAGS ...
-  if [ "%type_raw[-gcc4.5]" == "-gcc4.5" ] ; then nopic=''; else 
nopic="-mdynamic-no-pic"; fi
+  if [ "%type_raw[-gcc4.6]" == "-gcc4.6" ] ; then nopic=''; else 
nopic="-mdynamic-no-pic"; fi
   nopic="$nopic -Wall -Wextra -Wstrict-prototypes -Wstrict-aliasing=2"
   ## first line next is to avoid optimizing away the flushing of regs in GC.
  sed -i.bak \
@@ -44,8 +44,8 @@
 
 CompileScript: <<
   #!/bin/sh -ev
-  if [ "%type_raw[-gcc4.5]" == "-gcc4.5" ]
-       then export PATH=%p/lib/gcc4.5/bin:$PATH CC=gcc-4 CXX=g++-4
+  if [ "%type_raw[-gcc4.6]" == "-gcc4.6" ]
+       then export PATH=%p/lib/gcc4.6/bin:$PATH CC=gcc-4 CXX=g++-4
        elif test -f /usr/bin/gcc-4.2
                then export CC=gcc-4.2 CXX=g++-4.2
        else export CC=gcc CXX=g++


------------------------------------------------------------------------------
AppSumo Presents a FREE Video for the SourceForge Community by Eric 
Ries, the creator of the Lean Startup Methodology on "Lean Startup 
Secrets Revealed." This video shows you how to validate your ideas, 
optimize your ideas and identify your business strategy.
http://p.sf.net/sfu/appsumosfdev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to