Update to 1.9.0.

Revised from a submission by Chris Kuethe <ckuethe@ualberta.ca>.

math/R/Makefile

@@ -1,49 +1,46 @@
-# $OpenBSD: Makefile,v 1.7 2003/05/17 04:46:04 ian Exp $
+# $OpenBSD: Makefile,v 1.8 2004/04/28 21:40:31 naddy Exp $
 
-# R, a clone of the S-Plus (based on AT&T S) statistical package 
+NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
 COMMENT=	"clone of S, a powerful math/statistics/graphics language"
-DISTNAME=		R-1.7.0
-CATEGORIES=     	math
+DISTNAME=	R-1.9.0
+CATEGORIES=    	math
+HOMEPAGE=	http://www.r-project.org/
 
-HOMEPAGE=		http://www.r-project.org/
-
-MAINTAINER=		Ian Darwin <ian@openbsd.org>
-
-BROKEN=		Problems with dynamic loading
-
-# Licensing:  GPL
+# GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		http://cran.r-project.org/src/base/ \
-			http://cran.uk.r-project.org/src/base/ \
-			http://cran.us.r-project.org/src/base/ \
-			http://cran.dk.r-project.org/src/base/
-EXTRACT_SUFX=		.tgz
+MASTER_SITES=	http://cran.r-project.org/src/base/ \
+		http://cran.uk.r-project.org/src/base/ \
+		http://cran.us.r-project.org/src/base/ \
+		http://cran.dk.r-project.org/src/base/
+EXTRACT_SUFX=	.tgz
 
-FAKE_FLAGS=PREFIX=${PREFIX} DESTDIR=${WRKINST}
+USE_X11=	Yes
+LIB_DEPENDS=	bz2.10::archivers/bzip2 \
+		jpeg.62::graphics/jpeg \
+		png.2::graphics/png \
+		pcre.0::devel/pcre
 
-MAKE_ENV+=		CC=${CC} CXX=${CXX} SUDO=${SUDO}
-USE_X11=		Yes
-CONFIGURE_STYLE=	gnu dest
-CONFIGURE_ARGS+=	--with-readline
-CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
-#CONFIGURE_ENV+=		LDFLAGS="-Wl,-E"
-MODGNU_CONFIG_GUESS_DIRS=${WRKSRC} ${WRKSRC}/tools
+CONFIGURE_STYLE=gnu dest
+MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/tools
+CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
+		--with-readline --without-tcltk \
+		--with-zlib --with-bzlib --with-pcre
+CONFIGURE_ENV=	FFLAGS="${FFLAGS}"
 
-FLAVOR?=
-.if ${FLAVOR:L:Mno-x11}
-CONFGURE_ARGS+=--without-x
-.else
-LIB_DEPENDS+=	jpeg.62::graphics/jpeg png.2::graphics/png
-.endif
+MAKE_FLAGS=	INSTALL='install -c' \
+		INSTALL_DATA='install -c -m 644' \
+		INSTALL_PROGRAM='install -c -s -m 555' \
+		INSTALL_SCRIPT='install -c -m 555'
+
+FAKE_FLAGS=	PREFIX=${PREFIX} DESTDIR=${WRKINST}
 
 post-install:
-	cd ${PREFIX}/bin && \
-		sed -e "s@^R_HOME_DIR=.*@R_HOME_DIR=${TRUEPREFIX}/lib/R@" R > R.new && \
-		rm -f R && ${INSTALL_PROGRAM} R.new R
+	perl -i -pe 's:^R_HOME_DIR=.*:R_HOME_DIR=${TRUEPREFIX}/lib/R:' \
+		${PREFIX}/bin/R
 
 .include <bsd.port.mk>

math/R/distinfo

@@ -1,3 +1,3 @@
-MD5 (R-1.7.0.tgz) = 292dbe4dc47e6b492ff72a62471654ca
-RMD160 (R-1.7.0.tgz) = bd87a0d498e2d1e09a77d0b786426fddc41c3cf4
-SHA1 (R-1.7.0.tgz) = 48c4acc39a6c50789b920cac188390834cd37e63
+MD5 (R-1.9.0.tgz) = 79ae9d20a7bed94d7c92504c8c130310
+RMD160 (R-1.9.0.tgz) = 671283fc4f9d60d19a72ea9691a604eb5006a6aa
+SHA1 (R-1.9.0.tgz) = 7b74c59838fb4a4129a21bbcbe1c83eeed7ac4b9

math/R/patches/patch-Makeconf.in

@@ -1,22 +0,0 @@
-$OpenBSD: patch-Makeconf.in,v 1.4 2003/05/17 04:46:04 ian Exp $
-
-Their scripts use "install -u root" internally, to cp scripts and include
-files, f'gosh sakes. Try to make it honor ${SUDO} for these.
-
---- Makeconf.in.orig	Sat Feb 22 14:11:44 2003
-+++ Makeconf.in	Sat May 17 00:28:52 2003
-@@ -31,10 +31,10 @@ GETWD = @GETWD@
- GNOMEUI_LIBS = @GNOMEUI_LIBS@
- GNOME_LIBDIR = @GNOME_LIBDIR@
- GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@
--INSTALL = @INSTALL@
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL = ${SUDO} @INSTALL@
-+INSTALL_DATA = ${SUDO} @INSTALL_DATA@
-+INSTALL_PROGRAM = ${SUDO} @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = ${SUDO} @INSTALL_SCRIPT@
- INSTALL_DIR = ${INSTALL} -d
- JAVAC = @JAVAC@
- LATEX = @LATEX@

math/R/patches/patch-src_main_main_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_main_main_c,v 1.1 2004/04/28 21:40:31 naddy Exp $
+--- src/main/main.c.orig	2004-04-14 14:50:53.000000000 -0600
++++ src/main/main.c	2004-04-14 14:54:11.000000000 -0600
+@@ -460,7 +460,8 @@ void setup_Rmainloop(void)
+ 	}
+ #endif
+ #ifdef HAVE_NL_LANGINFO
+-    utf8locale = strcmp(nl_langinfo(CODESET), "UTF-8") == 0;
++    // utf8locale = strcmp(nl_langinfo(CODESET), "UTF-8") == 0;
++    utf8locale = 0;
+ #endif
+     /* gc_inhibit_torture = 0; */
+ 

math/R/patches/patch-src_main_platform_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_main_platform_c,v 1.1 2004/04/28 21:40:31 naddy Exp $
+--- src/main/platform.c.orig	2004-04-14 14:54:25.000000000 -0600
++++ src/main/platform.c	2004-04-14 14:54:50.000000000 -0600
+@@ -915,7 +915,8 @@ SEXP do_getlocale(SEXP call, SEXP op, SE
+     else  SET_STRING_ELT(ans, 0, mkChar(""));
+     UNPROTECT(1);
+ #ifdef HAVE_NL_LANGINFO
+-    utf8locale = strcmp(nl_langinfo(CODESET), "UTF-8") == 0;
++    // utf8locale = strcmp(nl_langinfo(CODESET), "UTF-8") == 0;
++    utf8locale = 0;
+ #endif    
+     return ans;
+ #else

math/R/patches/patch-src_modules_X11_dataentry_c

@@ -0,0 +1,19 @@
+$OpenBSD: patch-src_modules_X11_dataentry_c,v 1.1 2004/04/28 21:40:31 naddy Exp $
+--- src/modules/X11/dataentry.c.orig	2004-04-14 14:57:20.000000000 -0600
++++ src/modules/X11/dataentry.c	2004-04-14 15:47:29.000000000 -0600
+@@ -19,6 +19,7 @@
+  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
++#include <sys/types.h>
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
+@@ -26,7 +27,6 @@
+ #include <stdlib.h>
+ 
+ /* don't use X11 function prototypes (which tend to ...): */
+-#define NeedFunctionPrototypes 0
+ #include <X11/X.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>