Date: Tue, 23 Jun 2009 00:07:17 GMT From: bf <bf1783@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/135941: [PATCH]math/libRmath: update to 2.9.0 and fix build with non-default PREFIX, LOCALBASE Message-ID: <200906230007.n5N07Hph010069@www.freebsd.org> Resent-Message-ID: <200906230010.n5N0A1I4026173@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 135941 >Category: ports >Synopsis: [PATCH]math/libRmath: update to 2.9.0 and fix build with non-default PREFIX,LOCALBASE >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jun 23 00:10:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: bf >Release: 8-CURRENT amd64 >Organization: - >Environment: >Description: Looked into removing USE_FORTRAN as well, but it seems to be too much trouble for too little gain. The only port currently using this one requires Fortran to build, anyway. b. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN libRmath.orig/Makefile libRmath/Makefile --- libRmath.orig/Makefile 2009-06-22 19:55:29.000000000 -0400 +++ libRmath/Makefile 2009-06-22 19:54:31.000000000 -0400 @@ -7,7 +7,7 @@ # PORTNAME= libRmath -PORTVERSION= 2.8.1 +PORTVERSION= 2.9.0 CATEGORIES= math MASTER_SITES= http://cran.r-project.org/src/base/R-2/ \ ftp://cran.r-project.org/pub/R/src/base/R-2/ \ @@ -32,22 +32,34 @@ MAINTAINER= bf1783@gmail.com COMMENT= The standalone math library from R -USE_PERL5= yes -USE_FORTRAN= yes -GNU_CONFIGURE= yes -USE_LDCONFIG= yes -CONFIGURE_ARGS+=--with-readline=no --with-x=no +USE_PERL5_BUILD= yes +USE_FORTRAN= yes +GNU_CONFIGURE= yes +USE_LDCONFIG= yes +CONFIGURE_ARGS+=--with-readline=no --with-x=no --disable-mbcs --disable-nls --with-tcltk=no --with-cairo=no \ + --with-libpng=no --with-jpeglib=no --with-iconv=no --with-ICU=no --without-libintl-prefix +BUILD_WRKSRC= ${WRKSRC}/src/nmath/standalone PLIST_FILES= include/Rmath.h lib/libRmath.a lib/libRmath.so lib/libRmath.so.0 -do-build: - (cd ${WRKSRC}/src/nmath/standalone; ${MAKE}) +post-patch: + @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \ + ${WRKSRC}/src/nmath/standalone/Makefile.in + @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" \ + ${WRKSRC}/configure + @${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" \ + ${WRKSRC}/configure \ + ${WRKSRC}/config.site do-install: ${INSTALL_DATA} ${WRKSRC}/src/include/Rmath.h ${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/src/nmath/standalone/libRmath.a ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/src/nmath/standalone/libRmath.so \ + ${INSTALL_DATA} ${BUILD_WRKSRC}/libRmath.a ${PREFIX}/lib + ${INSTALL_DATA} ${BUILD_WRKSRC}/libRmath.so \ ${PREFIX}/lib/libRmath.so.0 (cd ${PREFIX}/lib; ${LN} -sf libRmath.so.0 libRmath.so) +test: install + @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \ + ${MAKE_ARGS} test && ${BUILD_WRKSRC}/test) + .include <bsd.port.mk> diff -ruN libRmath.orig/distinfo libRmath/distinfo --- libRmath.orig/distinfo 2009-06-22 19:55:29.000000000 -0400 +++ libRmath/distinfo 2009-06-22 13:42:24.000000000 -0400 @@ -1,3 +1,3 @@ -MD5 (R-2.8.1.tar.gz) = acd40621b8942a2464daa2f9cef3273d -SHA256 (R-2.8.1.tar.gz) = ab488af73ce7a4f2057afcf0e725be96c9ae37f8721143004397b91928ecfa60 -SIZE (R-2.8.1.tar.gz) = 16585380 +MD5 (R-2.9.0.tar.gz) = a5b79a2bc1372136cda4674b5f46d146 +SHA256 (R-2.9.0.tar.gz) = f2de4b710feabf0395ee3503befc69332b78ed6b159e959e93bc086a1a8ad818 +SIZE (R-2.9.0.tar.gz) = 18423754 diff -ruN libRmath.orig/files/patch-src__nmath__standalone__test.c libRmath/files/patch-src__nmath__standalone__test.c --- libRmath.orig/files/patch-src__nmath__standalone__test.c 1969-12-31 19:00:00.000000000 -0500 +++ libRmath/files/patch-src__nmath__standalone__test.c 2009-06-22 18:13:49.000000000 -0400 @@ -0,0 +1,11 @@ +--- src/nmath/standalone/test.c.orig 2009-06-22 18:12:00.000000000 -0400 ++++ src/nmath/standalone/test.c 2009-06-22 18:12:34.000000000 -0400 +@@ -38,7 +38,7 @@ + qnorm(0.7, 0.0, 1.0, 0, 0); + printf("*** loaded '%s'\n", argv[0]); + set_seed(123, 456); +- N01_kind = AHRENS_DIETER; ++ N01type N01_kind = AHRENS_DIETER; + printf("one normal %f\n", norm_rand()); + set_seed(123, 456); + N01_kind = BOX_MULLER; >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906230007.n5N07Hph010069>