[cvs] dists/10.3/unstable/main/finkinfo/sci r-base.info,1.19,1.20

[Daniel M. <dm...@us...>]

Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv25135/10.3/unstable/main/finkinfo/sci

Modified Files:
	r-base.info 
Log Message:
Backport new %v and minor validation tweak (maintainer notified)


Index: r-base.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/r-base.info,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- r-base.info	9 Jun 2006 12:00:15 -0000	1.19
+++ r-base.info	27 Jun 2006 17:06:19 -0000	1.20
@@ -1,25 +1,25 @@
 Package: r-base
-Version: 2.3.0
+Version: 2.3.1
 Revision: 1
 Maintainer: Jeffrey Whitaker <js...@fa...>
 
 # for 10.4 tree
-#Depends: tcltk, tcltk-shlibs, readline-shlibs (>= 4.3-1028), libjpeg-shlibs, libpng3-shlibs, pcre-shlibs
-#BuildDepends: readline (>= 4.3-1028), libjpeg, libpng3, tcltk-dev, g95 (>= 0.50-20060512), texinfo, pcre, bzip2-dev, libncurses5 (>= 5.4-20041023-1006), tetex-base
-#GCC: 4.0.1
+#Depends: tcltk, tcltk-shlibs, readline-shlibs (>= 4.3-1028), libjpeg-shlibs, libpng3-shlibs, pcre-shlibs, libgettext3-shlibs, libiconv
+#BuildDepends: readline (>= 4.3-1028), libjpeg, libpng3, tcltk-dev, g95 (>= 0.50-20060512), texinfo, pcre, bzip2-dev, libncurses5 (>= 5.4-20041023-1006), tetex-base, libgettext3-dev, libiconv-dev
+#GCC: 4.0
 # for 10.4-transitional, 10.3 trees
 Depends: tcltk, tcltk-shlibs, readline5-shlibs, libjpeg-shlibs, libpng3-shlibs, pcre-shlibs, libgettext3-shlibs, libiconv
 BuildDepends: readline5, libjpeg, libpng3, tcltk-dev, g95 (>= 0.50-20060321), texinfo, pcre, bzip2-dev, libncurses5, tetex-base, libgettext3-dev, libiconv-dev
 GCC: 3.3
 
 Source: http://cran.r-project.org/src/base/R-2/R-%v.tar.gz
-Source-MD5: 11cc1e9df640ab52e608cf9e695f7354
+Source-MD5: a1d6d8081af4c71006a6e5a3ed54e4da
 Patch: %n.patch
 SourceDirectory: R-%v
 ConfigureParams: --without-gnome --mandir='${prefix}/share/man' --with-tcl-config=%p/lib/tclConfig.sh --with-tk-config=%p/lib/tkConfig.sh --with-blas="-framework vecLib" --with-lapack --with-aqua  --enable-R-framework=%p/Library/Frameworks
 Conflicts: r-recommended
 CompileScript: <<
- #!/bin/sh -e
+ #!/bin/sh -ev
  export F77=%p/bin/g95
  g95gcclib=`%p/bin/g95 -print-libgcc-file-name`
  # use FSF c compiler from g95 package (r-base won't 
@@ -34,7 +34,7 @@
  #make check-all
 <<
 InstallScript: <<
- #!/bin/sh -e
+ #!/bin/sh -ev
  make install prefix=%i/Library/Frameworks
  perl -pi.bak -e 's|%i|%p|g' %i/Library/Frameworks/R.framework/Resources/bin/R
  perl -pi.bak -e 's|%i|%p|g' %i/Library/Frameworks/R.framework/Resources/etc/Makeconf