Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27807

Modified Files:
        macaulay2.patch pari-gp.info pari-gp.patch 
Added Files:
        macaulay2-10.4.info macaulay2.info 
Removed Files:
        macaulay2-10.5.info macaulay2-powerpc.info 
Log Message:
latest version to stable


--- NEW FILE: macaulay2.info ---
Info2: <<
Package: macaulay2%type_pkg[-64bit]
Version: 1.2
Revision: 1001
Distribution: 10.5, 10.6
GCC: 4.0
Architecture: ( %type_raw[-64bit] = -64bit ) powerpc, ( %type_raw[-64bit] = 
-64bit ) i386
Type: -64bit (.)
Source: 
http://www.math.uiuc.edu/Macaulay2/Downloads/SourceCode/Macaulay2-%v-src-fat-fink.tar.bz2
Source-MD5: 57a1a2ee6a9bbb6eb7beff1c833b7235
#SourceDirectory: Macaulay2-%v
PatchFile: %{Ni}.patch
PatchFile-MD5: eccb997d3a07faa38b4c0bb060a8979d
Depends: readline5%type_pkg[-64bit]-shlibs, gdbm3%type_pkg[-64bit]-shlibs, 
gc%type_pkg[-64bit]-shlibs, libmpfr1%type_pkg[-64bit]-shlibs, 
gmp%type_pkg[-64bit]-shlibs, libncurses5%type_pkg[-64bit]-shlibs, ( 
%type_raw[-64bit] = -64bit ) 64bit-cpu
BuildDepends: readline5%type_pkg[-64bit] (>= 5.0-1005), gdbm3%type_pkg[-64bit] 
(>= 1.8.3-2), gmp%type_pkg[-64bit] (>= 4.2.2-1001), libmpfr1%type_pkg[-64bit] 
(>= 2.3.1-1), ntl%type_pkg[-64bit] (>= 5.4.1-1001), gc%type_pkg[-64bit] (>= 
7.0-1001), make (>= 3.81), pari-gp-nox%type_pkg[-64bit] (>= 2.3.4-1003), 
libncurses5%type_pkg[-64bit], fink (>= 0.24.12), autoconf
Conflicts: macaulay2, macaulay2-64bit
Replaces: macaulay2, macaulay2-64bit
BuildConflicts: broken-gcc, singular-factory, singular-libfac
Suggests: emacs | xemacs
PatchScript: <<
 #!/bin/bash -ev
 if [ "%m" == "i386" ]; then
  perl -pi -e 's|  Darwin-9\.\*\) REL=10\.5 ; OS=MacOS ;;|  Darwin-9.*\) 
REL=10.5 ; OS=MacOS ;;\n  Darwin-10.*\) REL=10.6 ; OS=MacOS ;;|' configure.ac
 else
  patch -p1 < %{PatchFile}
 fi
<<
CompileScript: <<
 #!/bin/bash -ev
 make
 cd BUILD
 if [ "%type_raw[-64bit]" == "." ]; then
  ../configure --prefix=%p --enable-build-libraries="factory libfac frobby" 
--libdir='${prefix}/%lib'
  make
 else
  if [ "%m" == "i386" ]; then
   ../configure CC="gcc -m64" CXX="g++ -m64" --prefix=%p \
   --enable-build-libraries="factory libfac frobby" \
   --libdir='${prefix}/%lib' --build=x86_64-apple-darwin
  else
   ../configure CC="gcc -m64" CXX="g++ -m64" --prefix=%p \
   --enable-build-libraries="factory libfac frobby" \
   --libdir='${prefix}/%lib' --build=ppc64-apple-darwin
  fi
  make
 fi
<<
InstallScript: <<
 cd BUILD; make install prefix=%i
<<
InfoDocs: <<
 Benchmark.info
 BGG.info
 BoijSoederberg.info
 Browse.info
 Bruns.info
 ChainComplexExtras.info
 Classic.info
 ConwayPolynomials.info
 Depth.info
 Dmodules.info
 EdgeIdeals.info
 Elimination.info
 FirstPackage.info
 FourierMotzkin.info
 FourTiTwo.info
 GenericInitialIdeal.info
 HyperplaneArrangements.info
 IntegralClosure.info
 InvolutiveBases.info
 LexIdeals.info
 LLLBases.info
 LocalRings.info
 Macaulay2Doc.info
 Markov.info
 NoetherNormalization.info
 PackageTemplate.info
 Parsing.info
 Points.info
 Polyhedra.info
 PrimaryDecomposition.info
 ReesAlgebra.info
 Regularity.info
 Schubert2.info
 SchurFunctors.info
 SchurRings.info
 SimpleDoc.info
 SimplicialComplexes.info
 Style.info
 SymmetricPolynomials.info
 TangentCone.info
 Text.info
<<
DocFiles: <<
 Macaulay2/COPYING arch/MacOSX/ReadMe-fink
<<
License: GPL
Description: Computer algebra system for algebraic geometry
DescPackaging: <<
 The former 'singular-factory' and 'singular-libfac' packages are now obsolete;
 instead, this package compiles those libraries (statically, as before), and
 then links them in to macaulay2.  The 'singular' package provides factory
 and libfac libraries suitable for other uses.

 Note that we must builddepend on pari-gp-nox%type_pkg[-64bit] (and not the
 alternatives) for the sake of 64bit on 10.4, where the X11 libs are not
 64bit ready.
<<
DescUsage: <<
 Run Macaulay2 using the command "M2".  Users should, the first time they
 run M2, call the setup function: 'setup()':
   /sw/bin/M2 -e'setup();exit 0'
 This will place Macaulay2 support for emacs into the users ~/.emacs file, 
 backing up the file, if it already existed.
<<
DescPort: <<
 The powerpc version uses macaulay2.patch, which patches to svn revision 8470.
 The i386 version could probably use the same patch, but to avoid forcing
 a rebuild we did not do this.  (Could be unified in a future revision.)
<<
Homepage: http://www.math.uiuc.edu/Macaulay2
Maintainer: Dave Morrison <[email protected]>
<<

Index: macaulay2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/macaulay2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- macaulay2.patch     20 Jan 2006 20:12:58 -0000      1.1
+++ macaulay2.patch     31 May 2009 16:33:25 -0000      1.2
@@ -1,289 +1,1074 @@
-diff -ruN Macaulay2-0.9.2/Macaulay2/README.MacOSX 
Macaulay2-0.9.2-patched/Macaulay2/README.MacOSX
---- Macaulay2-0.9.2/Macaulay2/README.MacOSX    Wed Dec 31 19:00:00 1969
-+++ Macaulay2-0.9.2-patched/Macaulay2/README.MacOSX    Wed May  7 08:58:13 2003
-@@ -0,0 +1,42 @@
-+
+diff -ruN Macaulay2-1.2-src-fat-fink/BUILD/dan/Makefile.cygwin 
1.2/BUILD/dan/Makefile.cygwin
+--- Macaulay2-1.2-src-fat-fink/BUILD/dan/Makefile.cygwin       2009-01-28 
09:39:14.000000000 -0800
++++ 1.2/BUILD/dan/Makefile.cygwin      2009-02-12 00:32:50.000000000 -0800
+@@ -3,13 +3,15 @@
+ CONFIGOPTIONS += --enable-cygwin
+ CONFIGOPTIONS += --build=i486-pc-cygwin
[...1291 lines suppressed...]
++--- 
/home/dan/M2/BUILD/dan/builds/debian64/libraries/frobby/tmp/frobby_vmike3/src/hash_map/hash_map
   2008-12-10 21:04:17.000000000 -0500
+++++ frobby_vmike3/src/hash_map/hash_map       2009-02-15 16:18:52.000000000 
-0500
+ @@ -292,10 +292,10 @@
+      class hash_multimap
+      {
+@@ -86,3 +86,14 @@
+       
+      private:
+        typedef hashtable<pair<const _Key, _Tp>, _Key, _HashFn,
++diff -ur --exclude=configure 
/home/dan/M2/BUILD/dan/builds/debian64/libraries/frobby/tmp/frobby_vmike3/src/stdinc.h
 frobby_vmike3/src/stdinc.h
++--- 
/home/dan/M2/BUILD/dan/builds/debian64/libraries/frobby/tmp/frobby_vmike3/src/stdinc.h
    2008-12-10 21:04:17.000000000 -0500
+++++ frobby_vmike3/src/stdinc.h        2009-02-15 16:30:12.000000000 -0500
++@@ -14,6 +14,7 @@
++    You should have received a copy of the GNU General Public License
++    along with this program.  If not, see http://www.gnu.org/licenses/.
++ */
+++#include <stdio.h> /* to get FILE defined for gmp.h */
++ #include <gmp.h>
++ #include <gmpxx.h>
++ #include <memory>

--- NEW FILE: macaulay2-10.4.info ---
Info2: <<
Package: macaulay2%type_pkg[-64bit]
Version: 1.2
Revision: 1001
Architecture: (%type_pkg[-64bit]) i386
Distribution: 10.4
GCC: 4.0
Type: -64bit (.)
Source: 
http://www.math.uiuc.edu/Macaulay2/Downloads/SourceCode/Macaulay2-%v-src-fat-fink.tar.bz2
Source-MD5: 57a1a2ee6a9bbb6eb7beff1c833b7235
#SourceDirectory: Macaulay2-%v
PatchFile: %{Ni}.patch
PatchFile-MD5: eccb997d3a07faa38b4c0bb060a8979d
Depends: readline5%type_pkg[-64bit]-shlibs, gdbm3%type_pkg[-64bit]-shlibs, 
gc%type_pkg[-64bit]-shlibs, libmpfr1%type_pkg[-64bit]-shlibs, 
gmp%type_pkg[-64bit]-shlibs, libncurses5%type_pkg[-64bit]-shlibs, ( 
%type_raw[-64bit] = -64bit ) 64bit-cpu
BuildDepends: readline5%type_pkg[-64bit] (>= 5.0-1005), gdbm3%type_pkg[-64bit] 
(>= 1.8.3-2), gmp%type_pkg[-64bit] (>= 4.2.2-1001), libmpfr1%type_pkg[-64bit] 
(>= 2.3.1-1), ntl%type_pkg[-64bit] (>= 5.4.1-1001), gc%type_pkg[-64bit] (>= 
7.0-1001), make (>= 3.81), pari-gp-nox%type_pkg[-64bit] (>= 2.3.4-1003), 
libncurses5%type_pkg[-64bit], fink (>= 0.24.12), autoconf
Conflicts: macaulay2, macaulay2-64bit
Replaces: macaulay2, macaulay2-64bit
BuildConflicts: broken-gcc, singular-factory, singular-libfac
Suggests: emacs | xemacs
PatchScript: <<
 #!/bin/bash -ev
 if [ "%m" == "i386" ]; then
  perl -pi -e 's|  Darwin-9\.\*\) REL=10\.5 ; OS=MacOS ;;|  Darwin-9.*\) 
REL=10.5 ; OS=MacOS ;;\n  Darwin-10.*\) REL=10.6 ; OS=MacOS ;;|' configure.ac
 else
  patch -p1 < %{PatchFile}
 fi
<<
CompileScript: <<
 #!/bin/bash -ev
 make
 cd BUILD
 if [ "%type_raw[-64bit]" == "." ]; then
  ../configure --prefix=%p --enable-build-libraries="factory libfac frobby" 
--libdir='${prefix}/%lib'
  make
 else
  if ["%m" == "i386" ]; then
   ../configure CC="gcc -m64" CXX="g++ -m64" --prefix=%p \
   --enable-build-libraries="factory libfac frobby" \
   --libdir='${prefix}/%lib' --build=x86_64-apple-darwin
  else
   ../configure CC="gcc -m64" CXX="g++ -m64" --prefix=%p \
   --enable-build-libraries="factory libfac frobby" \
   --libdir='${prefix}/%lib' --build=ppc64-apple-darwin
  fi
  make
 fi
<<
InstallScript: <<
 cd BUILD; make install prefix=%i
<<
InfoDocs: <<
 Benchmark.info
 BGG.info
 BoijSoederberg.info
 Browse.info
 Bruns.info
 ChainComplexExtras.info
 Classic.info
 ConwayPolynomials.info
 Depth.info
 Dmodules.info
 EdgeIdeals.info
 Elimination.info
 FirstPackage.info
 FourierMotzkin.info
 FourTiTwo.info
 GenericInitialIdeal.info
 HyperplaneArrangements.info
 IntegralClosure.info
 InvolutiveBases.info
 LexIdeals.info
 LLLBases.info
 LocalRings.info
 Macaulay2Doc.info
 Markov.info
 NoetherNormalization.info
 PackageTemplate.info
 Parsing.info
 Points.info
 Polyhedra.info
 PrimaryDecomposition.info
 ReesAlgebra.info
 Regularity.info
 Schubert2.info
 SchurFunctors.info
 SchurRings.info
 SimpleDoc.info
 SimplicialComplexes.info
 Style.info
 SymmetricPolynomials.info
 TangentCone.info
 Text.info
<<
DocFiles: <<
 Macaulay2/COPYING arch/MacOSX/ReadMe-fink
<<
License: GPL
Description: Computer algebra system for algebraic geometry
DescPackaging: <<
 The former 'singular-factory' and 'singular-libfac' packages are now obsolete;
 instead, this package compiles those libraries (statically, as before), and
 then links them in to macaulay2.  The 'singular' package provides factory
 and libfac libraries suitable for other uses.

 Note that we must builddepend on pari-gp-nox%type_pkg[-64bit] (and not the
 alternatives) for the sake of 64bit on 10.4, where the X11 libs are not
 64bit ready.
<<
DescUsage: <<
 Run Macaulay2 using the command "M2".  Users should, the first time they
 run M2, call the setup function: 'setup()':
   /sw/bin/M2 -e'setup();exit 0'
 This will place Macaulay2 support for emacs into the users ~/.emacs file, 
 backing up the file, if it already existed.
<<
DescPort: <<
 The powerpc version uses macaulay2.patch, which patches to svn revision 8470.
 The i386 version could probably use the same patch, but to avoid forcing
 a rebuild we did not do this.  (Could be unified in a future revision.)
<<
Homepage: http://www.math.uiuc.edu/Macaulay2
Maintainer: Dave Morrison <[email protected]>
<<

--- macaulay2-powerpc.info DELETED ---

Index: pari-gp.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/pari-gp.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pari-gp.patch       29 Mar 2006 06:19:28 -0000      1.2
+++ pari-gp.patch       31 May 2009 16:33:25 -0000      1.3
@@ -23,11 +23,11 @@
 +echo install/pari-gp: Handling install of emacsen flavor ${FLAVOR}
 +
 +byte_compile_options="-batch -f batch-byte-compile"
-+el_files="pari.el"
-+el_d...@fink@/share/emacs/site-lisp/pari-gp
-+elc_d...@fink@/share/${FLAVOR}/site-lisp/pari-gp
-+el_path_list="${el_dir}/pari.el"
-+elc_path_list="${elc_dir}/pari.el"
++el_files="pari.el pari-*.el sli-tools.el"
++el_d...@fink@/share/emacs/site-lisp/pari
++elc_d...@fink@/share/${FLAVOR}/site-lisp/pari
++el_path_list="${el_dir}/pari.el ${el_dir}/pari-*.el ${el_dir}/sli-tools.el"
++elc_path_list="${elc_dir}/pari.el ${elc_dir}/pari-*.el 
${elc_dir}/sli-tools.el"
 +
 +if [ ${FLAVOR} != emacs ]
 +then
@@ -62,74 +62,20 @@
 +if [ ${FLAVOR} != emacs ]
 +then
 +  echo emacsen-common: purging byte-compiled files for ${FLAVOR}
-+  rm -f @FINK@/share/${FLAVOR}/site-lisp/pari-gp/*.elc
++  rm -f @FINK@/share/${FLAVOR}/site-lisp/pari/*.elc
 +fi
 +exit 0;
---- pari-2.1.5/src/gp/gp.c.bak 2005-04-03 14:40:32.000000000 -0700
-+++ pari-2.1.5/src/gp/gp.c     2005-04-03 14:41:14.000000000 -0700
-@@ -45,7 +45,7 @@
- #   endif
- #  endif
-   extern int isatty(int);
--  extern void add_history(char*);
-+  extern int add_history(const char*);
- ENDEXTERN
- #endif
+diff -ruN pari-2.3.0/misc/gprc.dft pari-2.3.0-patched/misc/gprc.dft
+--- pari-2.3.0/misc/gprc.dft   2005-09-03 10:26:31.000000000 -0700
++++ pari-2.3.0-patched/misc/gprc.dft   2006-06-30 05:57:30.000000000 -0700
+@@ -5,8 +5,8 @@
+  * Customize (by uncommenting and modifying the relevant lines) and put in
+  * $HOME/.gprc (or $GPRC) or /etc/gprc. Syntax explained at the end. */
  
---- pari-2.1.5/src/gp/gp_rl.c.bak      2005-04-03 14:41:39.000000000 -0700
-+++ pari-2.1.5/src/gp/gp_rl.c  2005-04-03 14:47:55.000000000 -0700
-@@ -42,9 +42,9 @@
- extern int rl_clear_message();
- extern int rl_begin_undo_group(), rl_end_undo_group();
- extern int rl_read_key();
--extern int rl_stuff_char();
--extern char *filename_completion_function(char *text,int state);
--extern char *username_completion_function(char *text,int state);
-+extern void rl_stuff_char(int);
-+extern char *filename_completion_function(const char *text,int state);
-+extern char *username_completion_function(const char *text,int state);
- #endif
- char **pari_completion(char *text, int start, int end);
- extern int rl_completion_query_items;
-@@ -639,8 +639,8 @@
+-\\ read "lib/gpalias"
+-/* Read lib/gpalias BEFORE gp prompts you for commands.
++read "@FINK@/gpalias"
++/* Read @FINK@/gpalias BEFORE gp prompts you for commands.
+  * The file contains some standard abbreviations (correct the path first !) */
  
-   Bind('h', rl_short_help, emacs_meta_keymap);
-   Bind('H', rl_long_help,  emacs_meta_keymap);
--  Bind('h', rl_short_help, vi_movement_keymap);
--  Bind('H', rl_long_help,  vi_movement_keymap);
-+  /*Bind('h', rl_short_help, vi_movement_keymap);
-+  Bind('H', rl_long_help,  vi_movement_keymap);*/
-   Bind('(', pari_rl_matched_insert, emacs_standard_keymap);
-   Bind('[', pari_rl_matched_insert, emacs_standard_keymap);
-   Bind(6, pari_rl_forward_sexp,  emacs_meta_keymap); /* M-C-f */
-diff -ruN pari-2.1.5/Configure pari-2.1.5-patched/Configure
---- pari-2.1.5/Configure       2003-04-03 11:11:02.000000000 -0800
-+++ pari-2.1.5-patched/Configure       2005-09-29 22:28:23.000000000 -0700
-@@ -418,6 +418,7 @@
-       fi;;
-       os2) libpth=`echo $LIBRARY_PATH | sed 's/;/ /g' | sed 's,\\\\,/,g'`;;
-       *) libpth="\
-+      @FINK@/lib\
-       /usr/local/lib\
-       /lib\
-       /usr/lib\
-@@ -546,6 +547,7 @@
-        $cygtop/H-${arch}-cygwin32/${arch}-cygwin32/include\
-      ";;
-       *) incpth="\
-+      @FINK@/include/readline\
-       /usr/local/include/readline\
-       /usr/include/readline\
-       /opt/include/readline\
-diff -ruN pari-2.1.7/config/locatelib pari-2.1.7-patched/config/locatelib
---- pari-2.1.7/config/locatelib        2002-06-22 06:18:29.000000000 -0700
-+++ pari-2.1.7-patched/config/locatelib        2005-10-08 08:24:33.000000000 
-0700
-@@ -3,7 +3,7 @@
-     os2)
-       try=`ls $dir/$lib.a 2> /dev/null`;;
-     *)
--      ok=`(ls $dir/lib$lib.* | head -1) 2> /dev/null`
-+      ok=`(ls $dir/lib$lib.* | head -n 1) 2> /dev/null`
-       if test -n "$ok"; then
-         # for .so and .sl
-         try=`ls $dir/lib$lib.s? 2> /dev/null` 
+ \\ compatible = 0

Index: pari-gp.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/pari-gp.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pari-gp.info        29 Mar 2009 08:30:33 -0000      1.5
+++ pari-gp.info        31 May 2009 16:33:25 -0000      1.6
@@ -1,79 +1,122 @@
 Info2: <<
-Package: pari-gp%type_pkg[-nox]
-Type: -nox (boolean)
-Version: 2.1.7
-Revision: 1002
+Package: pari-gp%type_pkg[-nox]%type_pkg[-64bit]
+Type: -nox (. -nox -xemacs), -64bit (.)
+Version: 2.3.4
+Revision: 1003
+Architecture: ( %type_raw[-64bit] = -64bit ) powerpc, ( %type_raw[-64bit] = 
-64bit ) i386
+Distribution: ( %type_raw[-64bit] = -64bit ) 10.5, ( %type_raw[-64bit] = 
-64bit ) 10.6
 PatchFile: %{ni}.patch
-PatchFile-MD5: 170ba02ed8292e6beaa6a54a9a40e2cb
+PatchFile-MD5: ee49103c3b23e2bf4dfd3a4eda77e3af
 Depends: <<
- readline5-shlibs (>= 5.0-1004), emacsen-common, libncurses5-shlibs (>= 
5.4-20041023-1006),
- (%type_raw[-nox] = .) x11-shlibs
+ readline5%type_pkg[-64bit]-shlibs (>= 5.0-1004), 
+ libncurses5%type_pkg[-64bit]-shlibs (>= 5.4-20041023-1006),
+ gmp%type_pkg[-64bit]-shlibs,
+ (%type_raw[-nox] != -xemacs) emacsen-common, 
+ (%type_raw[-nox] != -nox) x11-shlibs,
+ ( %type_raw[-64bit] = -64bit ) 64bit-cpu
 <<
 BuildDepends: <<
  fink (>= 0.24.12-1),
- tetex-base, readline5 (>= 5.0-1004), libncurses5 (>= 5.4-20041023-1006),
- (%type_raw[-nox] = .) x11, 
- (%type_raw[-nox] = .) x11-dev
+ tetex-base, 
+ readline5%type_pkg[-64bit] (>= 5.0-1004), 
+ libncurses5%type_pkg[-64bit] (>= 5.4-20041023-1006),
+ gmp%type_pkg[-64bit],
+ (%type_raw[-nox] = -xemacs) xemacs,
+ (%type_raw[-nox] != -nox) x11, 
+ (%type_raw[-nox] != -nox) x11-dev
 <<
-#Provides: (%type_raw[-nox] = .) pari-gp-xemacs
-Replaces: pari-gp-xemacs
-Source: http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-%v.tgz
-Source-MD5: 357b7a42e89e2761a5367bbcbfcca5f2
-Source2: http://www.gn-50uma.de/ftp/pari/galdata.tar.gz
-Source2-MD5: 25eab5f9dfdb8715b9ace8cd68210425
-Source2ExtractDir: pari-%v/galdata
+Conflicts: pari-gp, pari-gp-nox, pari-gp-xemacs, pari-gp-64bit, 
pari-gp-nox-64bit, pari-gp-xemacs-64bit
+Replaces: pari-gp, pari-gp-nox, pari-gp-xemacs, pari-gp-64bit, 
pari-gp-nox-64bit, pari-gp-xemacs-64bit
+Source: http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-%v.tar.gz
+Source-MD5: 35c896266e4257793387ba22d5d76078
+Source2: http://pari.math.u-bordeaux.fr/pub/pari/packages/galdata.tgz
+Source2-MD5: 4b5203e36ddd9e1786cd761e78fdc4f0
+Source2ExtractDir: pari-%v
+Source3: http://pari.math.u-bordeaux.fr/pub/pari/packages/elldata.tgz
+Source3-MD5: f7798ba3587c3d51432f4abf5c69c885
+Source3ExtractDir: pari-%v
 PatchScript: <<
  sed 's|@FINK@|%p|g' < %{PatchFile} | patch -p1
 <<
 CompileScript: <<
-#!/bin/bash -ev
- if [ "%type_raw[-nox]" == "." ]; then
-  ./Configure --prefix=%p
- fi
- if [ "%type_raw[-nox]" == "-nox" ]; then
-  ./Configure --prefix=%p --graphic=none
- fi
- sed s+\\\\\\\\\ read\ \"lib/gpalias\"+read\ \"%p/etc/gpalias\"+ < 
misc/gprc.dft >misc/gprc
- make gp
- make bench
- make doc
+#!/usr/bin/perl
+if (open(GCC, '/usr/bin/gcc --version 2>/dev/null |')) {
+       my $version = <GCC>;
+       close(GCC);
+       if( ! defined $version ) {
+               die "Your gcc version is undefined.";
+       }
+       chomp($version);
+       my ($build) = $version =~ /build (\d+)/i;
+       if ($build < 5341) {
+               die "\nSorry, this package requires XCode 2.3 or later to 
build.  Please upgrade\nyour XCode and try again.\n\n";
+       }
+} else {
+       die "Couldn't run '/usr/bin/gcc --version'.\n";
+}
+if ("%type_raw[-64bit]" eq "." ) {
+ if ( "%type_raw[-nox]" eq "-nox" ) {
+  system("./Configure  --prefix=%p --libdir=%p/%lib --with-readline=%p 
--with-readline-lib=%p/%lib --with-ncurses-lib=%p/%lib --with-gmp=%p 
--with-gmp-lib=%p/%lib --graphic=none");
+ } else {
+  system("./Configure  --prefix=%p --libdir=%p/%lib --with-readline=%p 
--with-readline-lib=%p/%lib --with-ncurses-lib=%p/%lib --with-gmp=%p 
--with-gmp-lib=%p/%lib");
+}
+} else {
+ if ( "%type_raw[-nox]" eq "-nox" ) {
+  system("export CC='gcc -m64'; ./Configure  --prefix=%p --libdir=%p/%lib 
--with-readline=%p --with-readline-lib=%p/%lib --with-ncurses-lib=%p/%lib 
--with-gmp=%p --with-gmp-lib=%p/%lib --graphic=none");
+ } else {
+  system("export CC='gcc -m64'; ./Configure  --prefix=%p --libdir=%p/%lib 
--with-readline=%p --with-readline-lib=%p/%lib --with-ncurses-lib=%p/%lib 
--with-gmp=%p --with-gmp-lib=%p/%lib");
+}
+}
+
+system( "make all; make bench");
 <<
 InstallScript: <<
+#!/bin/bash -ev
  make install DESTDIR=%d
  mkdir -p %i/etc
- install -m644 misc/gprc %i/etc
+ install -m644 misc/gprc.dft %i/etc/gprc
  install -m644 misc/gpalias %i/etc
- mkdir -p %i/lib/pari/galdata
- install -p -m644 galdata/* %i/lib/pari/galdata
- mkdir -p %i/share/man/man1
- mv %i/man/man1/* %i/share/man/man1
- rm -R %i/man
- mkdir -p %i/share/doc/pari-gp
- (cd %i/lib/pari; mv AUTHORS Announce.2.1 CHANGES COMPAT COPYING CVS.txt 
MACHINES NEW README TODO %i/share/doc/pari-gp)
- rm %i/lib/pari/emacs/pari.elc
- mkdir -p %i/share/emacs/site-lisp
- mv %i/lib/pari/emacs %i/share/emacs/site-lisp
- mv %i/share/emacs/site-lisp/emacs %i/share/emacs/site-lisp/pari-gp
+if [ "%type_raw[-nox]" != "-xemacs" ]; then
+ rm %i/share/emacs/site-lisp/pari/*.elc
  mkdir -p %i/lib/emacsen-common/packages/install
  mkdir -p %i/lib/emacsen-common/packages/remove
  install -m 755 emacsen-install %i/lib/emacsen-common/packages/install/%n
  install -m 755 emacsen-remove %i/lib/emacsen-common/packages/remove/%n
+fi
 <<
-PostInstScript: %p/lib/emacsen-common/emacs-package-install %n
-PreRmScript:    %p/lib/emacsen-common/emacs-package-remove %n
+PostInstScript: <<
+if [ "%type_raw[-nox]" != "-xemacs" ]; then
+ %p/lib/emacsen-common/emacs-package-install %n
+fi
+<<
+PreRmScript: <<
+if [ "%type_raw[-nox]" != "-xemacs" ]; then
+ %p/lib/emacsen-common/emacs-package-remove %n
+fi
+<<
+DocFiles: AUTHORS Announce.2.1 CHANGES CHANGES-2.2 COMPAT COPYING MACHINES NEW 
README
 ConfFiles: %p/etc/gprc %p/etc/gpalias
 License: GPL
 Description: Computer-aided number theory (calculator and C-library)
 DescPort: <<
- * Had to move some files around after installation.  
  * Edited gp.c so that %p/etc/gprc is recognized in addition to /etc/gprc. 
  * No longer makes or installs the pdf doc files.
- * Patches for gcc 4.0 compatibility thanks to Matt Sachs.
- * More patches to help it find fink's readline
+ * Thanks to Matt Sachs for patches for gcc 4.0 compatibility (no longer 
+needed.)
+ * Someday we might want to build shared libs, in which case the following 
+line could be useful (but needs modification for 64bit):
+   perl -pi -e 's|darwin\)  DLLD=;|darwin\)  DLLD=gcc;|' config/get_dlld
 <<
 DescPackaging: <<
  Depends on tetex during building, which is used to make the documentation.
- Depends on emacsen-common for proper handling of pari.el file.
+ Depends on emacsen-common for proper handling of pari.el file, except for
+ the -xemacs variant.
+
+ We need to make sure that this is compiled with XCode 2.3 or later, and
+ we could have used BuildDepends:  gcc4.0 (>= 4.0.1-5341), but this would
+ have left users with no clue about the source of the problem and how to
+ fix it if their XCode was not up to date.  Instead, we have cribbed some
+ code from VirtPackage.pm.
 <<
 Homepage: http://pari.math.u-bordeaux.fr/
 Maintainer:  Dave Morrison <[email protected]>

--- macaulay2-10.5.info DELETED ---


------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT 
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, & 
iPhoneDevCamp as they present alongside digital heavyweights like Barbarian 
Group, R/GA, & Big Spaceship. http://p.sf.net/sfu/creativitycat-com 
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to