Changeset 14599 for trunk/dports

Timestamp:

Oct 13, 2005, 7:03:13 PM (19 years ago)

Author:

gwright

Message:

Version bump to 2.2.0.
Bug: 5364
Submitted by: Kjell Konis
Reviewed by: Greg Wright
Approved by:
Obtained from:

File:

• trunk/dports/math/R/Portfile (modified) (5 diffs)

trunk/dports/math/R/Portfile

@@ -1 @@
-# $Id: Portfile,v 1.11 2005/09/03 00:07:06 toby Exp $
+# $Id: Portfile,v 1.12 2005/10/13 19:03:13 gwright Exp $
 
 PortSystem 1.0
 name             R
-version          2.1.1
-revision         1
+version          2.2.0
 categories       math science
 maintainers      konis@stats.ox.ac.uk
@@ -19 +18 @@
                  http://cran.at.r-project.org/src/base/R-2/ \
                  http://cran.hu.r-project.org/src/base/R-2/
-checksums        md5 e755b0ba5851ec261000af6b5c510335
-depends_lib      lib:libreadline.5:readline \
-                 bin:DPtclsh:tcl \
-                 bin:DPwish:tk \
-                 bin:gettext:gettext \
-                 lib:libgraph:graphviz \
+checksums        md5 6bddf439ae417a48bd31892996ea111c \
+                 sha1 ebaafa21036877b4ee3d4de9d85cce20f5cf9cbc \
+                 rmd160 9f54eb83c34565cbc483d2ffcc7dcae730ca674a
+depends_build    port:gcc34 \
+                 port:teTeX
+depends_lib      port:readline \
+                 port:gettext \
                  lib:libjpeg:jpeg \
                  lib:libpng:libpng
-depends_build    bin:g77-dp-3.4:gcc34 \
-                 bin:latex:teTeX
 configure.env    CPPFLAGS="-I${prefix}/include" \
                  LDFLAGS="-L${prefix}/lib" \
@@ -34 +32 @@
                  CXX=g++-dp-3.4 \
                  F77=g77-dp-3.4
-configure.args   --with-tcl-config="${prefix}/lib/tclConfig.sh" \
-                 --with-tk-config="${prefix}/lib/tkConfig.sh" \
-                 --disable-R-framework --enable-R-shlib
+configure.args   --enable-R-shlib \
+                 --disable-R-framework \
+                 --without-aqua
+test.run         yes
+test.target      check
 destroot.destdir prefix=${destroot}${prefix}
 
@@ -44 +44 @@
 
 platform macosx {
+    configure.env-delete CC=gcc-dp-3.4 CXX=g++-dp-3.4
     configure.env-append CC=gcc-3.3 CXX=g++-3.3
-    configure.args-append --with-blas="-framework vecLib" --with-lapack
+    configure.env-delete LDFLAGS="-L${prefix}/lib"
+    configure.env-append LDFLAGS="-L/usr/lib/gcc/darwin/3.3 -L${prefix}/lib -lgcc"
 }
 
@@ -53 +55 @@
     reinplace "s|R_HOME_DIR=${destroot}|R_HOME_DIR=|" \
         "${destroot}${prefix}/lib/R/bin/R"
+    reinplace "s|R_SHARE_DIR=${destroot}|R_SHARE_DIR=|" \
+        "${destroot}${prefix}/bin/R"
+    reinplace "s|R_SHARE_DIR=${destroot}|R_SHARE_DIR=|" \
+        "${destroot}${prefix}/lib/R/bin/R"
+    reinplace "s|R_INCLUDE_DIR=${destroot}|R_INCLUDE_DIR=|" \
+        "${destroot}${prefix}/bin/R"
+    reinplace "s|R_INCLUDE_DIR=${destroot}|R_INCLUDE_DIR=|" \
+        "${destroot}${prefix}/lib/R/bin/R"
+    reinplace "s|R_DOC_DIR=${destroot}|R_DOC_DIR=|" \
+        "${destroot}${prefix}/bin/R"
+    reinplace "s|R_DOC_DIR=${destroot}|R_DOC_DIR=|" \
+        "${destroot}${prefix}/lib/R/bin/R"
 }