Fix configure's handling of libblas when compiling with f2c and therefore

remove conditional PLIST entry no longer required. Bump PKGREVISION.

4 files changed, 38 insertions, 13 deletions

diff --git a/math/R/Makefile b/math/R/Makefile
index 5322de34e04..005f741e9eb 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.89 2007/03/18 13:13:02 markd Exp $
+# $NetBSD: Makefile,v 1.90 2007/03/20 11:00:58 markd Exp $
 
 DISTNAME=		R-2.4.1
+PKGREVISION=		1
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_R_CRAN:=base/R-2/}
 
@@ -100,9 +101,3 @@ post-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/R
 
 .include "../../mk/bsd.pkg.mk"
-
-.if !empty(BUILDLINK_PACKAGES:Mf2c)
-PLIST_SUBST+=		USE_F2C=""
-.else
-PLIST_SUBST+=		USE_F2C="@comment "
-.endif
diff --git a/math/R/PLIST b/math/R/PLIST
index 12ef198c0a2..625165eaa80 100644
--- a/math/R/PLIST
+++ b/math/R/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2007/03/18 13:13:02 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/03/20 11:00:58 markd Exp $
 bin/R
 lib/R/COPYING
 lib/R/NEWS
@@ -114,7 +114,6 @@ lib/R/include/Rmath.h
 lib/R/include/Rversion.h
 lib/R/include/S.h
 lib/R/lib/libR.so
-${USE_F2C}lib/R/lib/libRblas.so
 lib/R/lib/libRlapack.so
 lib/R/library/KernSmooth/CONTENTS
 lib/R/library/KernSmooth/DESCRIPTION
diff --git a/math/R/distinfo b/math/R/distinfo
index eec69372765..74bf1acf50b 100644
--- a/math/R/distinfo
+++ b/math/R/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.33 2007/03/14 11:50:34 markd Exp $
+$NetBSD: distinfo,v 1.34 2007/03/20 11:00:58 markd Exp $
 
 SHA1 (R-2.4.1.tar.gz) = 5ab0a29a29c35dc2cb06c875539e62b57503c762
 RMD160 (R-2.4.1.tar.gz) = 2a03cc81b870d594a695e9eb1e77720379c60194
 Size (R-2.4.1.tar.gz) = 14570344 bytes
 SHA1 (patch-aa) = 917482116fb288c46bee3b8fad8359bc87961bd3
 SHA1 (patch-ab) = b724b549cd9920865c4d4ae60c71dff48c4c0c06
-SHA1 (patch-ac) = 7688043787b2ed5e9a6f21532c1560b10da840b2
+SHA1 (patch-ac) = c256a35ac50b908abd5484ddd4cc95f503f05b68
 SHA1 (patch-ad) = 666dccbc9741b90bc7af11e51ccf25240906da8b
diff --git a/math/R/patches/patch-ac b/math/R/patches/patch-ac
index b01903ae409..01a2fd34ab7 100644
--- a/math/R/patches/patch-ac
+++ b/math/R/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.18 2007/03/14 11:50:35 markd Exp $
+$NetBSD: patch-ac,v 1.19 2007/03/20 11:00:58 markd Exp $
 
 --- configure.orig	2006-12-07 00:16:29.000000000 +1300
 +++ configure
@@ -467,7 +467,38 @@ $NetBSD: patch-ac,v 1.18 2007/03/14 11:50:35 markd Exp $
        ;;
      *)
        { echo "$as_me:$LINENO: WARNING: I could not determine FPICFLAGS." >&5
-@@ -39649,7 +39506,7 @@ cat >>confdefs.h <<\_ACEOF
+@@ -36377,6 +36234,15 @@ cat > conftest.c <<EOF
+ #endif
+ extern void F77_SYMBOL(test1)(int *iflag);
+ 
++#ifdef F77_DUMMY_MAIN
++
++#  ifdef __cplusplus
++     extern "C"
++#  endif
++   int F77_DUMMY_MAIN() { return 1; }
++
++#endif
++
+ int main () {
+   int iflag;
+   F77_SYMBOL(test1)(&iflag);
+@@ -36441,6 +36307,14 @@ else
+ #else
+ # define F77_SYMBOL(x)   x
+ #endif
++#ifdef F77_DUMMY_MAIN
++
++#  ifdef __cplusplus
++     extern "C"
++#  endif
++   int F77_DUMMY_MAIN() { return 1; }
++
++#endif
+ void F77_SYMBOL(xerbla)(char *srname, int *info)
+ {}
+ void blas_set () {
+@@ -39649,7 +39523,7 @@ cat >>confdefs.h <<\_ACEOF
  _ACEOF
  
    r_save_LIBS=${LIBS}