Date: Mon, 22 Jun 2009 17:17:00 GMT From: bf <bf1783@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/135927: [PATCH]math/R: fix build in the case of a non-default LOCALBASE, PREFIX, etc. Message-ID: <200906221717.n5MHH0vw072352@www.freebsd.org> Resent-Message-ID: <200906221720.n5MHK3e0007922@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 135927
>Category: ports
>Synopsis: [PATCH]math/R: fix build in the case of a non-default LOCALBASE, PREFIX, etc.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Mon Jun 22 17:20:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: bf
>Release: 8-CURRENT amd64
>Organization:
-
>Environment:
>Description:
Fix a few minor problems:
-- broken build in the case of non-default LOCALBASE, PREFIX
-- F77 flags passed to configure script, but F90/95 flags weren't
-- use of a threaded tk broke run-time loading of tcltk module;
Reduce Makefile output with @.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN R.orig/Makefile R/Makefile
--- R.orig/Makefile 2009-06-22 13:04:12.000000000 -0400
+++ R/Makefile 2009-06-21 02:02:04.000000000 -0400
@@ -56,8 +56,8 @@
GNU_CONFIGURE= yes
USE_ICONV= yes
USE_PERL5= yes
-
-CONFIGURE_ENV= INSTALL_DATA="${INSTALL} ${COPY} ${_SHROWNGRP} -m 644"
+CONFIGURE_ENV= INSTALL_DATA="${INSTALL} ${COPY} ${_SHROWNGRP} -m 644" \
+ FCFLAGS="${FFLAGS}"
CONFIGURE_ARGS= --enable-R-shlib --with-system-bzlib --with-system-zlib \
rdocdir=${DOCSDIR}
@@ -120,6 +120,15 @@
CONFIGURE_ARGS+=--with-libpng
.endif
+.if defined(WITHOUT_THREADS)
+CONFIGURE_ARGS+=--disable-threads
+USE_TK_NO_THREADS= yes
+.else
+CONFIGURE_ARGS+=--enable-threads=posix
+LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CONFIGURE_ENV+=LDFLAGS="${LDFLAGS}"
+.endif
+
.if defined(WITHOUT_TCLTK)
CONFIGURE_ARGS+=--without-tcltk
PLIST_SUB+= TCLTK="@comment "
@@ -130,12 +139,6 @@
PLIST_SUB+= TCLTK=""
.endif
-.if defined(WITHOUT_THREADS)
-CONFIGURE_ARGS+=--disable-threads
-.else
-CONFIGURE_ARGS+=--enable-threads=posix
-.endif
-
.if defined(WITHOUT_X11)
CONFIGURE_ARGS+=--without-x
PLIST_SUB+= X11="@comment "
@@ -146,7 +149,7 @@
.endif
.if defined(WITH_DVI_MANUALS) && !defined(NOPORTDOCS)
-BUILD_DEPENDS+= pdflatex:${PORTSDIR}/print/teTeX-base
+BUILD_DEPENDS+= texi2dvi:${PORTSDIR}/print/teTeX-base
ALL_TARGET+= dvi
INSTALL_TARGET+=install-dvi
PLIST_SUB+= DVI_MANUAL=""
@@ -172,9 +175,18 @@
@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
${WRKSRC}/src/nmath/standalone/Makefile.in \
${WRKSRC}/src/unix/Makefile.in
- @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" \
+ ${WRKSRC}/configure \
+ ${WRKSRC}/src/scripts/javareconf
+ @${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" \
+ ${WRKSRC}/configure \
+ ${WRKSRC}/config.site \
+ ${WRKSRC}/src/extra/tzone/tzfile.h \
+ ${WRKSRC}/src/library/base/man/Startup.Rd \
+ ${WRKSRC}/src/library/profile/Rprofile.unix \
+ ${WRKSRC}/src/scripts/javareconf
.if defined(WITHOUT_NLS)
- (cd ${WRKSRC}/src/library/Recommended; \
+ @(cd ${WRKSRC}/src/library/Recommended; \
for tarfile in *.tgz *.tar.gz ; do \
${TAR} -czf temptgz --exclude='*/po/*' @$$tarfile ; \
${MV} temptgz $$tarfile ; \
@@ -191,7 +203,7 @@
${MV} ${PREFIX}/lib/libR.so ${PREFIX}/lib/libR.so.0
${LN} -sf ${PREFIX}/lib/libR.so.0 ${PREFIX}/lib/libR.so
.if defined(WITH_INFO_MANUALS) && !defined(NOPORTDOCS)
- (cd ${WRKSRC}/doc/manual; \
+ @(cd ${WRKSRC}/doc/manual; \
for infofile in ${INFO}; do \
${INSTALL_DATA} $${infofile}.info* ${PREFIX}/${INFO_PATH}/; \
done)
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906221717.n5MHH0vw072352>