1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-20 08:27:15 +00:00

- Update to 2.9.2

- Fix build with custom PREFIX

PR:		based on 135927
Submitted by:	bf <bf1783@gmail.com> (maintainer)
This commit is contained in:
Martin Wilke 2009-08-27 09:16:19 +00:00
parent 20e32def98
commit 7b422ac63c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=240390
4 changed files with 1813 additions and 1726 deletions

View File

@ -7,8 +7,7 @@
#
PORTNAME= R
PORTVERSION= 2.9.0
PORTREVISION= 1
PORTVERSION= 2.9.2
CATEGORIES= math lang
MASTER_SITES= http://cran.r-project.org/src/base/R-2/ \
ftp://cran.r-project.org/pub/R/src/base/R-2/ \
@ -57,8 +56,8 @@ ALL_TARGET= all
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}
@ -125,9 +124,12 @@ CONFIGURE_ARGS+=--with-libpng
CONFIGURE_ARGS+=--without-tcltk
PLIST_SUB+= TCLTK="@comment "
.else
USE_TK_NO_THREADS= yes
USE_TK = 83+
.include "${PORTSDIR}/Mk/bsd.tcl.mk"
CONFIGURE_ARGS+=--with-tcltk
CONFIGURE_ARGS+=--with-tcltk \
--with-tcl-config=${TCL_LIBDIR}/tclConfig.sh \
--with-tk-config=${TK_LIBDIR}/tkConfig.sh
PLIST_SUB+= TCLTK=""
.endif
@ -147,7 +149,7 @@ PLIST_SUB+= X11=""
.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=""
@ -173,9 +175,18 @@ post-patch:
@${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 ; \
@ -192,7 +203,7 @@ post-install:
${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)

View File

@ -1,3 +1,3 @@
MD5 (R-2.9.0.tar.gz) = a5b79a2bc1372136cda4674b5f46d146
SHA256 (R-2.9.0.tar.gz) = f2de4b710feabf0395ee3503befc69332b78ed6b159e959e93bc086a1a8ad818
SIZE (R-2.9.0.tar.gz) = 18423754
MD5 (R-2.9.2.tar.gz) = 112e2a1306cf71320e45d14e87e5b913
SHA256 (R-2.9.2.tar.gz) = 2b2bfa9edab38d2c0c9a6262767336f2f19780cb30483aedcb7c69524ec1dbb8
SIZE (R-2.9.2.tar.gz) = 18591679

View File

@ -0,0 +1,12 @@
#extra linker flags for threaded tk
--- configure.orig 2009-06-03 19:08:21.000000000 -0400
+++ configure 2009-06-03 19:48:48.000000000 -0400
@@ -43400,7 +43400,7 @@
## Part 2. Try finding the tk library.
if test -n "${TK_CONFIG}"; then
. ${TK_CONFIG}
- TCLTK_LIBS="${TCLTK_LIBS} ${TK_LIB_SPEC} ${TK_XLIBSW}"
+ TCLTK_LIBS="${TCLTK_LIBS} ${TK_LIB_SPEC} ${TK_XLIBSW} ${TCL_LD_FLAGS}"
else
{ echo "$as_me:$LINENO: checking for Tk_Init in -ltk" >&5

File diff suppressed because it is too large Load Diff