Index: Makefile
===================================================================
--- Makefile	(revision 418141)
+++ Makefile	(working copy)
@@ -1,321 +1,231 @@
 # Created by: Maurice Castro <maurice@serc.rmit.edu.au>
 # $FreeBSD$
 
-PORTNAME?=	R
-PORTVERSION=	3.3.1
-PORTREVISION=	1
-CATEGORIES=	math lang
-MASTER_SITES=	http://cran.r-project.org/%SUBDIR%/ \
-		ftp://cran.r-project.org/pub/R/%SUBDIR%/ \
-		http://cran.at.r-project.org/%SUBDIR%/ \
-		http://cran.au.r-project.org/%SUBDIR%/ \
-		http://cran.br.r-project.org/%SUBDIR%/ \
-		http://cran.ch.r-project.org/%SUBDIR%/ \
-		http://cran.es.r-project.org/%SUBDIR%/ \
-		http://cran.dk.r-project.org/%SUBDIR%/ \
-		http://cran.uk.r-project.org/%SUBDIR%/ \
-		http://cran.us.r-project.org/%SUBDIR%/ \
-		ftp://ftp.u-aizu.ac.jp/pub/lang/R/CRAN/%SUBDIR%/ \
-		http://lib.stat.cmu.edu/R/CRAN/%SUBDIR%/ \
-		http://cran.stat.ucla.edu/%SUBDIR%/ \
-		http://probability.ca/cran/%SUBDIR%/
+PORTNAME=		R
+PORTVERSION=		3.3.1
+PORTREVISION=		1
+CATEGORIES=		math lang
+MASTER_SITES=		http://cran.r-project.org/%SUBDIR%/ \
+			ftp://cran.r-project.org/pub/R/%SUBDIR%/ \
+			http://cran.at.r-project.org/%SUBDIR%/ \
+			http://cran.au.r-project.org/%SUBDIR%/ \
+			http://cran.br.r-project.org/%SUBDIR%/ \
+			http://cran.ch.r-project.org/%SUBDIR%/ \
+			http://cran.es.r-project.org/%SUBDIR%/ \
+			http://cran.dk.r-project.org/%SUBDIR%/ \
+			http://cran.uk.r-project.org/%SUBDIR%/ \
+			http://cran.us.r-project.org/%SUBDIR%/ \
+			ftp://ftp.u-aizu.ac.jp/pub/lang/R/CRAN/%SUBDIR%/ \
+			http://lib.stat.cmu.edu/R/CRAN/%SUBDIR%/ \
+			http://cran.stat.ucla.edu/%SUBDIR%/ \
+			http://probability.ca/cran/%SUBDIR%/
 MASTER_SITE_SUBDIR=	src/base/R-${PORTVERSION:C|\..*||}
 
-MAINTAINER=	jrm@ftfl.ca
-COMMENT?=	Language for statistical computing and graphics
+MAINTAINER=		jrm@ftfl.ca
+COMMENT=		Language for statistical computing and graphics
 
-LICENSE=	GPLv2
+LICENSE=		GPLv2
 
+LIB_DEPENDS=		libcurl.so:ftp/curl \
+			libpcre.so:devel/pcre
+RUN_DEPENDS=		${LOCALBASE}/bin/gsed:textproc/gsed
 BUILD_DEPENDS=		${LOCALBASE}/bin/gsed:textproc/gsed \
 			texi2dvi:print/texinfo
-LIB_DEPENDS=		libcurl.so:ftp/curl \
-			libpcre.so:devel/pcre
 
-CONFIGURE_ENV=		LIBR_LDFLAGS="${LDFLAGS}" OBJC="${CC}" \
+GNU_CONFIGURE=		yes
+USES=			fortran iconv perl5
+USE_PERL5=		build
+USE_LDCONFIG=		${PREFIX}/lib/R/lib
+
+CONFIGURE_ARGS=		--disable-java --enable-memory-profiling \
+			rdocdir=${DOCSDIR}
+CONFIGURE_ENV=		FCFLAGS="${FFLAGS}" \
+			LIBR_LDFLAGS="${LDFLAGS}" OBJC="${CC}" \
+			R_LD_LIBRARY_PATH="${R_LD_LIBRARY_PATH}" TAR="${TAR}" \
 			SED="${LOCALBASE}/bin/gsed" \
-			ac_cv_have_decl_powl=yes ac_cv_have_decl_log1pl=yes
+			ac_cv_have_decl_powl=yes \
+			ac_cv_have_decl_log1pl=yes
 
-OPTIONS_DEFINE=		MISSING DOCS LTO OPENMP LONGDOUBLE
-
-MISSING_DESC=		use libmissing rather than libquadmath
-LTO_DESC=		Try to produce faster code through LTO
-LONGDOUBLE_DESC=	Enable use of long double data type
-LTO_CONFIGURE_ENABLE=	lto
-OPENMP_CONFIGURE_ENABLE=	openmp
-LONGDOUBLE_CONFIGURE_ENABLE=	long-double
-
-OPTIONS_SINGLE=		BLAS
-OPTIONS_SINGLE_BLAS=	RBLAS ATLAS OPENBLAS NETLIB
-OPTIONS_DEFAULT=	OPENBLAS
-
-RBLAS_DESC=		Use internal blas implementation
-
-OPENBLAS_USES=		blaslapack:openblas
-NETLIB_USES=		blaslapack:netlib
-ATLAS_USES=		blaslapack:atlas
-RBLAS_CONFIGURE_ON=	--without-blas --without-lapack
-RBLAS_CONFIGURE_OFF=	--with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \
-			--with-lapack="${LAPACKLIB}"
-
-OPTIONS_SUB=		RBLAS
-
-.if defined(LIBRMATH_SLAVEPORT)
-BUILD_WRKSRC=		${WRKSRC}/src/nmath/standalone
-CONFIGURE_ARGS=		--disable-nls --with-ICU=no --with-cairo=no \
-			--with-jpeglib=no --with-libpng=no --with-libtiff=no \
-			--with-readline=no --with-tcltk=no --with-x=no \
-			--without-libintl-prefix
-CONFIGURE_ENV+=		ac_cv_header_iconv_h=no
-PLIST_SUB=		RMATH_SOVERSION="${RMATH_SOVERSION}"
-USE_LDCONFIG=		yes
-.else # LIBRMATH_SLAVEPORT
 ALL_TARGET=		all
 INSTALL_TARGET=		install-strip
-CONFIGURE_ARGS=		--enable-memory-profiling rdocdir=${DOCSDIR} \
-			--with-system-bzlib --with-system-zlib
-CONFIGURE_ENV+=		FCFLAGS="${FFLAGS}" \
-			R_LD_LIBRARY_PATH="${R_LD_LIBRARY_PATH}" TAR="${TAR}"
+R_LD_LIBRARY_PATH=	${_GCC_RUNTIME}:${LOCALBASE}/lib
+MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFINE+=	ICU THREADS
+OPTIONS_DEFINE=		DOCS ICU INFO LETTER LIBR LDOUBLE LTO MISSING NLS \
+			OPENMP THREADS X11
 
-ICU_DESC=		Use ICU for collation in multibyte locales
+OPTIONS_GROUP=		NEEDX11
+OPTIONS_GROUP_NEEDX11=	GHOSTSCRIPT JPEG CAIROPANGO PDF PNG TCLTK TIFF
 
-OPTIONS_DEFAULT+=	ICU THREADS
+OPTIONS_SINGLE=		BLAS
+OPTIONS_SINGLE_BLAS=	ATLAS OPENBLAS NETLIB RBLAS
 
-.if !defined(LIBR_SLAVEPORT)
-RUN_DEPENDS+=		${LOCALBASE}/bin/gsed:textproc/gsed
-USE_LDCONFIG=		${PREFIX}/lib/R/lib
-#now only used to build the R.1 manpage:
-USES+=			perl5
-USE_PERL5=		build
+OPTIONS_SUB=		YES
 
-OPTIONS_DEFINE+=	GHOSTSCRIPT INFO_MANUALS JPEG LETTER_PAPER LIBR \
-			PANGOCAIRO PDF_MANUALS PNG TCLTK TIFF X11
+ATLAS_DESC=		ATLAS BLAS implementation
+GHOSTSCRIPT_DESC=	Graphics Device for Bitmap Files via Ghostscript
+CAIROPANGO_DESC=	Cairo graphics device and Pango multi-language text
+INFO_DESC=		GNU info manuals
+JPEG_DESC=		JPEG graphics device
+LDOUBLE_DESC=		Enable long double data type
+LETTER_DESC=		US Letter paper
+LIBR_DESC=		Build dynamic (shared) R library
+LTO_DESC=		Try to produce faster code through LTO
+MISSING_DESC=		Use libmissing rather than libquadmath
+NEEDX11_DESC=		X11-Implying Options
+NETLIB_DESC=		Netlib BLAS implementation
+OPENBLAS_DESC=		OpenBLAS BLAS implementation
+PDF_DESC=		PDF manuals (requires TeX)
+PNG_DESC=		PNG graphics device
+RBLAS_DESC=		Use R-bundled BLAS implementation
+X11_DESC=		X11 graphics device
 
-GHOSTSCRIPT_DESC=	[dev2]bitmap() graphics devices
-INFO_MANUALS_DESC=	GNU info manuals
-JPEG_DESC=		jpeg() graphics device
-LETTER_PAPER_DESC=	US Letter paper
-LIBR_DESC=		R shared library and a dynamically-linked R
-PANGOCAIRO_DESC=	cairo and pango graphics support
-PDF_MANUALS_DESC=	PDF manuals (requires TeX)
-PNG_DESC=		png() graphics device
-TCLTK_DESC=		tcltk package
-X11_DESC=		X11() graphics device
+OPTIONS_DEFAULT=	GHOSTSCRIPT ICU INFO JPEG LTO LIBR OPENBLAS OPENMP \
+			CAIROPANGO PNG TCLTK TIFF THREADS X11
 
-OPTIONS_DEFAULT+=	GHOSTSCRIPT INFO_MANUALS JPEG LTO LIBR OPENMP \
-			PANGOCAIRO PNG TCLTK TIFF X11
-
 OPTIONS_DEFAULT_armv6+=		MISSING
 OPTIONS_DEFAULT_powerpc+=	MISSING
 OPTIONS_DEFAULT_powerpc64+=	MISSING
 OPTIONS_DEFAULT_sparc64+=	MISSING
 
-.endif # !LIBR_SLAVEPORT
-PLIST_SUB=		R_SOVERSION="${R_SOVERSION}" \
-			RBLAS_SOVERSION="${RBLAS_SOVERSION}" \
-			RLAPACK_SOVERSION="${RLAPACK_SOVERSION}"
-R_LD_LIBRARY_PATH=	${_GCC_RUNTIME}:${LOCALBASE}/lib
-USES+=			iconv
-.endif # LIBRMATH_SLAVEPORT
-GNU_CONFIGURE=		yes
-MAKE_JOBS_UNSAFE=	yes
-R_SOVERSION=		1
-RBLAS_SOVERSION=	2
-RLAPACK_SOVERSION=	4
-RMATH_SOVERSION=	0
-USES+=			fortran
+ATLAS_USES=		blaslapack:atlas
 
-.include "compiler.mk"
-.include <bsd.port.options.mk>
+GHOSTSCRIPT_IMPLIES=	X11
+GHOSTSCRIPT_USES=	ghostscript
 
-.if ${ARCH} == "sparc64" || ${ARCH} == "powerpc64"
-PICFLAG?=		-fPIC
-.else
-PICFLAG?=		-fpic
-.endif
-.for flag in LD CXXLD
-CONFIGURE_ENV +=	SHLIB_${flag}FLAGS="${PICFLAG}"
-.endfor
+ICU_CONFIGURE_WITH=	ICU
+ICU_LIB_DEPENDS=	libicui18n.so:devel/icu
 
-.if ${OSVERSION} > 1000052 && \
-(${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == ia64 || ${ARCH} == pc98 || ${ARCH} == sparc64)
-.for _f in coshl erfcl erfl lgammal powl sinhl tanhl tgammal
-CFLAGS+=	-fno-builtin-${_f}
-LDFLAGS+=	-fno-builtin-${_f}
-.endfor
-.endif
+INFO_IMPLIES=		DOCS
+INFO_ALL_TARGET=	info
+INFO_INSTALL_TARGET=	install-info
+INFO_INFO=		R-FAQ R-admin R-data R-exts R-ints R-intro R-lang
 
-.if ${PORT_OPTIONS:MMISSING}
-.for _f in acos asin atan cos cosh exp log pow sin sinh tan tanh
-CONFIGURE_ENV+=		ac_cv_have_decl_c${_f}=yes
-.endfor
-LIB_DEPENDS+=		libmissing.so:math/libmissing
-LIBM=			-L${LOCALBASE}/lib -lmissing -lm
-LIBMH=			"missing_math.h"
-.if defined(LIBRMATH_SLAVEPORT)
-CPPFLAGS+=		-I${LOCALBASE}/include
-.endif
-.else
-LIBM=			-lquadmath -lm
-LIBMH=			<quadmath.h>
-.endif
+JPEG_IMPLIES=		X11
+JPEG_CONFIGURE_WITH=	jpeglib
 
-.if !defined(LIBRMATH_SLAVEPORT)
+LETTER_CONFIGURE_ENV=	R_PAPERSIZE=letter
 
-.if ${PORT_OPTIONS:MICU}
-LIB_DEPENDS+=		libicui18n.so:devel/icu
-CONFIGURE_ARGS+=	--with-ICU
-.else
-CONFIGURE_ARGS+=	--without-ICU
-.endif
+LIBR_CONFIGURE_ENABLE=	R-shlib
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=			gettext
-PLIST_SUB+=		NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
-.endif
+LDOUBLE_CONFIGURE_ENABLE=long-double
 
-.if ${PORT_OPTIONS:MTHREADS}
-CONFIGURE_ARGS+=	--enable-threads=posix
-.else
-CONFIGURE_ARGS+=	--disable-threads
-.endif
+LTO_CONFIGURE_ENABLE=	lto
 
-.if defined(LIBR_SLAVEPORT)
+.for i in acos asin atan cos cosh exp log pow sin sinh tan tanh
+MISSING_CONFIGURE_ENV+=	ac_cv_have_decl_c${i}=yes
+.endfor
+MISSING_LIB_DEPENDS=	libmissing.so:math/libmissing
+MISSING_VARS=		LIBM="-L${LOCALBASE}/lib -lmissing -lm" \
+			LIBMH=<missing_math.h>
+MISSING_VARS_OFF=	LIBM='-lquadmath -lm' \
+			LIBMH=<quadmath.h>
 
-CONFIGURE_ARGS+=	--disable-BLAS-shlib --without-pic --without-x
-USES+=			readline
+NETLIB_USES=		blaslapack:netlib
 
-.else # LIBR_SLAVEPORT
+NLS_CONFIGURE_OFF=	--disable-nls
+NLS_USES=		gettext
 
-.if ${PORT_OPTIONS:MGHOSTSCRIPT}
-USES+=			ghostscript
-.endif
+OPENBLAS_USES=		blaslapack:openblas
 
-.if ${PORT_OPTIONS:MJPEG}
-USES+=			jpeg
-CONFIGURE_ARGS+=	--with-jpeglib
-.else
-CONFIGURE_ARGS+=	--without-jpeglib
-.endif
+OPENMP_CONFIGURE_ENABLE=openmp
 
-.if ${PORT_OPTIONS:MLETTER_PAPER}
-CONFIGURE_ENV +=	R_PAPERSIZE=letter
-.endif
+CAIROPANGO_IMPLIES=	X11
+CAIROPANGO_CONFIGURE_WITH=cairo
+CAIROPANGO_USES=	gettext jpeg pkgconfig
+CAIROPANGO_USE=		gnome=pango,cairo
 
-.if ${PORT_OPTIONS:MLIBR}
-CONFIGURE_ARGS+=	--enable-R-shlib
-PLIST_SUB+=		LIBR=""
-.else
-PLIST_SUB+=		LIBR="@comment "
-.endif
+PDF_IMPLIES=		DOCS X11
+PDF_USE=		tex=dvipsk:build,kpathsea:build,pdftex:build
+PDF_ALL_TARGET=		pdf
+PDF_INSTALL_TARGET=	install-pdf
+.for i in KPSEWHICH MAKEINDEX PDFLATEX PDFTEX TEX TEXI2DVI
+PDF_CONFIGURE_ENV_OFF+=	ac_cv_path_${i}=""
+.endfor
 
-.if ${PORT_OPTIONS:MPANGOCAIRO}
-USES+=			pkgconfig
-USE_GNOME+=		pango cairo
-PLIST_SUB+=		PANGOCAIRO=""
-.else
-CONFIGURE_ARGS+=	--without-cairo
-PLIST_SUB+=		PANGOCAIRO="@comment "
-.endif
+PNG_IMPLIES=		X11
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
+PNG_CONFIGURE_WITH=	libpng
 
-.if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=		libpng.so:graphics/png
-CONFIGURE_ARGS+=	--with-libpng
-.else
-CONFIGURE_ARGS+=	--without-libpng
-.endif
+RBLAS_CONFIGURE_ON=	--without-blas \
+			--without-lapack
+RBLAS_CONFIGURE_OFF=	--with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \
+			--with-lapack="${LAPACKLIB}"
 
-.if ${PORT_OPTIONS:MTCLTK}
-USES+=			tk:84+
-CONFIGURE_ARGS+=	--with-tcltk \
-			--with-tcl-config=${TCL_LIBDIR}/tclConfig.sh \
-			--with-tk-config=${TK_LIBDIR}/tkConfig.sh
-PLIST_SUB+=		TCLTK=""
-.else
-CONFIGURE_ARGS+=	--without-tcltk
-PLIST_SUB+=		TCLTK="@comment "
-.endif
+TCLTK_IMPLIES=		X11
+TCLTK_USES=		tcl tk:84+
+TCLTK_CONFIGURE_WITH=	tcltk \
+			tcl-config=${TCL_LIBDIR}/tclConfig.sh \
+			tk-config=${TK_LIBDIR}/tkConfig.sh
 
-.if ${PORT_OPTIONS:MTIFF}
-LIB_DEPENDS+=		libtiff.so:graphics/tiff
-CONFIGURE_ARGS+=	--with-libtiff
-.else
-CONFIGURE_ARGS+=	--without-libtiff
-.endif
+THREADS_CONFIGURE_ON=	--enable-threads=posix
+THREADS_CONFIGURE_OFF=	--disable-threads
 
-.if ${PORT_OPTIONS:MX11}
-CONFIGURE_ARGS+=	--with-x
-USE_XORG=		ice sm x11 xext xmu xscrnsaver xt
-PLIST_SUB+=		X11=""
+TIFF_IMPLIES=		X11
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
+TIFF_CONFIGURE_WITH=	libtiff
+
+X11_CONFIGURE_WITH=	x
+X11_USE=		xorg=ice,sm,x11,xext,xmu,xscrnsaver,xt
+
+.include "compiler.mk"
+.include <bsd.port.options.mk>
+
+.if ${ARCH} == "sparc64" || ${ARCH} == "powerpc64"
+PICFLAG?=		-fPIC
 .else
-CONFIGURE_ARGS+=	--without-x
-PLIST_SUB+=		X11="@comment "
+PICFLAG?=		-fpic
 .endif
 
-.if ${PORT_OPTIONS:MINFO_MANUALS} && ${PORT_OPTIONS:MDOCS}
-ALL_TARGET+=	info
-CONFIGURE_ENV+=	INSTALL_INFO="${LOCALBASE}/bin/install-info" \
-		MAKEINFO="${LOCALBASE}/bin/makeinfo"
-INFO=		R-FAQ R-admin R-data R-exts R-intro R-lang
-.endif
+.for i in LD CXXLD
+CONFIGURE_ENV+=		SHLIB_${i}FLAGS="${PICFLAG}"
+.endfor
 
-.if ${PORT_OPTIONS:MPDF_MANUALS} && ${PORT_OPTIONS:MDOCS}
-USE_TEX=		texlive dvipsk kpathsea pdftex
-#BUILD_DEPENDS +=	texi2dvi:print/texinfo
-ALL_TARGET+=		pdf
-CONFIGURE_ENV +=	INSTALL_INFO="${LOCALBASE}/bin/install-info" \
-			MAKEINFO="${LOCALBASE}/bin/makeinfo"
-INSTALL_TARGET+=	install-pdf
-PLIST_SUB+=		PDF_MANUAL=""
-.else
-.for _b in KPSEWHICH MAKEINDEX PDFLATEX PDFTEX TEX TEXI2DVI
-CONFIGURE_ENV+=		ac_cv_path_${_b}=""
+.if ${OSVERSION} > 1000052 && \
+(${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == ia64 || ${ARCH} == pc98 || \
+${ARCH} == sparc64)
+.for i in coshl erfcl erfl lgammal powl sinhl tanhl tgammal
+CFLAGS+=		-fno-builtin-${i}
+LDFLAGS+=		-fno-builtin-${i}
 .endfor
-PLIST_SUB+=		PDF_MANUAL="@comment "
 .endif
-.endif # LIBR_SLAVEPORT
-.endif # !LIBRMATH_SLAVEPORT
 
 post-patch:
-	@${REINPLACE_CMD} -e '\|LIBS=|s|-lrt ||' \
-		-e '\|-lm[". ]|s|-lm|${LIBM}|' \
-		${WRKSRC}/configure
 .if !${PORT_OPTIONS:MMISSING}
 .if ${OSVERSION} < 1000016
-	@${REINPLACE_CMD} -e 's/# define EXP expl/# define EXP(x) (long double)expq((__float128)(x))/' \
-		${WRKSRC}/src/nmath/pnchisq.c\
+	@${REINPLACE_CMD} -e \
+'s/# define EXP expl/# define EXP(x) (long double)expq((__float128)(x))/' \
+		${WRKSRC}/src/nmath/pnchisq.c \
 		${WRKSRC}/src/nmath/pgamma.c
-	@${REINPLACE_CMD} -e 's/# define LOG logl/# define LOG(x) (long double)logq((__float128)(x))/' \
-		${WRKSRC}/src/nmath/pnchisq.c\
+	@${REINPLACE_CMD} -e \
+'s/# define LOG logl/# define LOG(x) (long double)logq((__float128)(x))/' \
+		${WRKSRC}/src/nmath/pnchisq.c \
 		${WRKSRC}/src/nmath/pgamma.c
-
 .endif
 .if ${OSVERSION} < 1000034
-	@${REINPLACE_CMD} -Ee 's/(log)(1p)?l\(/(long double)\1\2q((__float128)/' \
+	@${REINPLACE_CMD} -Ee 's/(log)(1p)?l\(/(long double)\1\2q((__float128)/'\
 		${WRKSRC}/src/nmath/dnbeta.c \
 		${WRKSRC}/src/nmath/pnbeta.c
 .endif
-	@${REINPLACE_CMD} -Ee 's/powl\((.*)(long double)/(long double)powq((__float128)\1__float128/' \
+	@${REINPLACE_CMD} -Ee \
+'s/powl\((.*)(long double)/(long double)powq((__float128)\1__float128/' \
 		${WRKSRC}/src/main/format.c
-.else
+.else # !PORT_OPTIONS:MMISSING
 .if ${OSVERSION} > 1000052 && \
-(${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == ia64 || ${ARCH} == pc98 || ${ARCH} == sparc64)
+(${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == ia64 || ${ARCH} == pc98 || \
+${ARCH} == sparc64)
 	@${REINPLACE_CMD} -e '\|^FLIBS="$$ac_cv_f77_libs"|s|"|&${LIBM} |' \
 		${WRKSRC}/configure
 .endif
 	@${REINPLACE_CMD} -e \
-	'\|#[[:blank:]]*include[[:blank:]]*<complex.h>|{x;s|^.*$$|#include "missing_complex.h"|;H;x;}' \
+'\|#[[:blank:]]*include[[:blank:]]*<complex.h>|{x;s|^.*$$|#include "missing_complex.h"|;H;x;}' \
 		${WRKSRC}/src/main/complex.c
-.endif
+.endif # !PORT_OPTIONS:MMISSING
 	@${REINPLACE_CMD} -e \
-	'\|#[[:blank:]]*include[[:blank:]]*<math.h>|{x;s|^.*$$|#include ${LIBMH}|;H;x;}' \
+'\|#[[:blank:]]*include[[:blank:]]*<math.h>|{x;s|^.*$$|#include ${LIBMH}|;H;x;}'\
 		${WRKSRC}/src/nmath/nmath.h \
 		${WRKSRC}/src/include/Rmath.h0.in
-	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
+	@${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|/usr/local|${LOCALBASE}|g" \
@@ -322,16 +232,6 @@
 		${WRKSRC}/configure \
 		${WRKSRC}/src/library/profile/Rprofile.unix \
 		${WRKSRC}/src/scripts/javareconf.in
-.if !defined(LIBRMATH_SLAVEPORT)
-.if !${PORT_OPTIONS:MNLS}
-	@(cd ${WRKSRC}/src/library/Recommended; \
-	for tarfile in *.tgz *.tar.gz ; do \
-	${TAR} -czf temptgz --exclude='*/po/*' @$$tarfile ; \
-	${MV} temptgz $$tarfile ; \
-	done)
-	@${REINPLACE_CMD} -e '/ls -d $$srcdir\/inst/d' \
-		${WRKSRC}/src/library/translations/Makefile.in
-.endif
 
 .if !${PORT_OPTIONS:MMISSING}
 pre-configure:
@@ -341,24 +241,6 @@
 	exit 1 ; fi
 .endif
 
-.if defined(LIBR_SLAVEPORT)
-do-build:
-.for d in include extra
-	@(cd ${WRKSRC}/src/${d}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
-	${MAKE_ARGS} R)
-.endfor
-	@(cd ${WRKSRC}/src/main; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
-	${MAKE_ARGS} Makefile Makedeps libR.a)
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/R/lib
-	${INSTALL_DATA} ${WRKSRC}/src/main/libR.a ${STAGEDIR}${PREFIX}/lib/R/lib
-
-.else # LIBR_SLAVEPORT
-
-pre-configure-script:
-	@${FIND} ${WRKSRC} \( -name '*.orig' -o -name '*.bak' \) -delete
-
 check regression-test test: build
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} LANGUAGE=en \
 	LC_COLLATE=C LC_TIME=C ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} \
@@ -369,35 +251,4 @@
 	LC_COLLATE=C LC_TIME=C ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} \
 	check-all)
 
-post-install:
-.for L in R Rblas Rlapack
-	@if [ -d ${STAGEDIR}${PREFIX}/lib/R/lib ] ; then \
-	cd ${STAGEDIR}${PREFIX}/lib/R/lib; if [ -f lib${L}.so ] ; then \
-	${LN} -sf lib${L}.so lib${L}.so.${${L:tu}_SOVERSION} ; fi; fi
-.endfor
-.if ${PORT_OPTIONS:MINFO_MANUALS} && ${PORT_OPTIONS:MDOCS}
-	@(cd ${WRKSRC}/doc/manual; \
-	for infofile in ${INFO}; do \
-		${INSTALL_DATA} $${infofile}.info* ${STAGEDIR}${PREFIX}/${INFO_PATH}/; \
-	done)
-.endif
-
-	${FIND} ${STAGEDIR}${PREFIX}/lib/ -name "*.so" | ${XARGS} ${STRIP_CMD}
-
-.endif # LIBR_SLAVEPORT
-.else # !LIBRMATH_SLAVEPORT
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/src/include/Rmath.h ${STAGEDIR}${PREFIX}/include
-	${INSTALL_DATA} ${BUILD_WRKSRC}/libRmath.a ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_LIB} ${BUILD_WRKSRC}/libRmath.so \
-	${STAGEDIR}${PREFIX}/lib/libRmath.so.${RMATH_SOVERSION}
-	@(cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf libRmath.so.${RMATH_SOVERSION} libRmath.so)
-
-check regression-test test: build
-	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} LANGUAGE=en \
-	LC_COLLATE=C LC_TIME=C ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} test; \
-	${SETENV} LD_LIBRARY_PATH="${BUILD_WRKSRC}" ${BUILD_WRKSRC}/test)
-
-.endif # !LIBRMATH_SLAVEPORT
-
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 418141)
+++ pkg-plist	(working copy)
@@ -100,11 +100,8 @@
 lib/R/include/Rversion.h
 lib/R/include/S.h
 %%RBLAS%%lib/R/lib/libRblas.so
-%%RBLAS%%lib/R/lib/libRblas.so.%%RBLAS_SOVERSION%%
 %%RBLAS%%lib/R/lib/libRlapack.so
-%%RBLAS%%lib/R/lib/libRlapack.so.%%RLAPACK_SOVERSION%%
 %%LIBR%%lib/R/lib/libR.so
-%%LIBR%%lib/R/lib/libR.so.%%R_SOVERSION%%
 lib/R/library/KernSmooth/DESCRIPTION
 lib/R/library/KernSmooth/INDEX
 lib/R/library/KernSmooth/Meta/Rd.rds
@@ -585,7 +582,7 @@
 lib/R/library/grDevices/html/R.css
 lib/R/library/grDevices/icc/srgb
 lib/R/library/grDevices/icc/srgb.flate
-%%PANGOCAIRO%%lib/R/library/grDevices/libs/cairo.so
+%%CAIROPANGO%%lib/R/library/grDevices/libs/cairo.so
 lib/R/library/grDevices/libs/grDevices.so
 lib/R/library/graphics/DESCRIPTION
 lib/R/library/graphics/INDEX
@@ -628,51 +625,51 @@
 lib/R/library/grid/Meta/links.rds
 lib/R/library/grid/Meta/nsInfo.rds
 lib/R/library/grid/Meta/package.rds
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/Meta/vignette.rds
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/Meta/vignette.rds
 lib/R/library/grid/NAMESPACE
 lib/R/library/grid/R/grid
 lib/R/library/grid/R/grid.rdb
 lib/R/library/grid/R/grid.rdx
 lib/R/library/grid/doc/changes.txt
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/displaylist.R
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/displaylist.Rnw
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/displaylist.R
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/displaylist.Rnw
 lib/R/library/grid/doc/displaylist.pdf
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/frame.R
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/frame.Rnw
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/frame.R
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/frame.Rnw
 lib/R/library/grid/doc/frame.pdf
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/grid.R
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/grid.Rnw
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/grid.R
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/grid.Rnw
 lib/R/library/grid/doc/grid.pdf
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/grobs.R
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/grobs.Rnw
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/grobs.R
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/grobs.Rnw
 lib/R/library/grid/doc/grobs.pdf
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/index.html
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/interactive.R
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/interactive.Rnw
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/index.html
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/interactive.R
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/interactive.Rnw
 lib/R/library/grid/doc/interactive.pdf
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/locndimn.R
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/locndimn.Rnw
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/locndimn.R
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/locndimn.Rnw
 lib/R/library/grid/doc/locndimn.pdf
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/moveline.R
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/moveline.Rnw
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/moveline.R
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/moveline.Rnw
 lib/R/library/grid/doc/moveline.pdf
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/nonfinite.R
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/nonfinite.Rnw
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/nonfinite.R
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/nonfinite.Rnw
 lib/R/library/grid/doc/nonfinite.pdf
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/plotexample.R
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/plotexample.Rnw
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/plotexample.R
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/plotexample.Rnw
 lib/R/library/grid/doc/plotexample.pdf
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/rotated.R
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/rotated.Rnw
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/rotated.R
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/rotated.Rnw
 lib/R/library/grid/doc/rotated.pdf
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/saveload.R
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/saveload.Rnw
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/saveload.R
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/saveload.Rnw
 lib/R/library/grid/doc/saveload.pdf
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/sharing.R
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/sharing.Rnw
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/sharing.R
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/sharing.Rnw
 lib/R/library/grid/doc/sharing.pdf
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/viewports.R
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/grid/doc/viewports.Rnw
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/viewports.R
+%%PORTDOCS%%%%PDF%%lib/R/library/grid/doc/viewports.Rnw
 lib/R/library/grid/doc/viewports.pdf
 lib/R/library/grid/help/AnIndex
 lib/R/library/grid/help/aliases.rds
@@ -849,14 +846,14 @@
 lib/R/library/parallel/Meta/links.rds
 lib/R/library/parallel/Meta/nsInfo.rds
 lib/R/library/parallel/Meta/package.rds
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/parallel/Meta/vignette.rds
+%%PORTDOCS%%%%PDF%%lib/R/library/parallel/Meta/vignette.rds
 lib/R/library/parallel/NAMESPACE
 lib/R/library/parallel/R/parallel
 lib/R/library/parallel/R/parallel.rdb
 lib/R/library/parallel/R/parallel.rdx
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/parallel/doc/index.html
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/parallel/doc/parallel.R
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/parallel/doc/parallel.Rnw
+%%PORTDOCS%%%%PDF%%lib/R/library/parallel/doc/index.html
+%%PORTDOCS%%%%PDF%%lib/R/library/parallel/doc/parallel.R
+%%PORTDOCS%%%%PDF%%lib/R/library/parallel/doc/parallel.Rnw
 lib/R/library/parallel/doc/parallel.pdf
 lib/R/library/parallel/help/AnIndex
 lib/R/library/parallel/help/aliases.rds
@@ -1415,7 +1412,7 @@
 lib/R/library/utils/Meta/links.rds
 lib/R/library/utils/Meta/nsInfo.rds
 lib/R/library/utils/Meta/package.rds
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/utils/Meta/vignette.rds
+%%PORTDOCS%%%%PDF%%lib/R/library/utils/Meta/vignette.rds
 lib/R/library/utils/NAMESPACE
 lib/R/library/utils/R/sysdata.rdb
 lib/R/library/utils/R/sysdata.rdx
@@ -1424,10 +1421,10 @@
 lib/R/library/utils/R/utils.rdx
 lib/R/library/utils/Sweave/Sweave-test-1.Rnw
 lib/R/library/utils/Sweave/example-1.Rnw
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/utils/doc/Sweave.R
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/utils/doc/Sweave.Rnw
+%%PORTDOCS%%%%PDF%%lib/R/library/utils/doc/Sweave.R
+%%PORTDOCS%%%%PDF%%lib/R/library/utils/doc/Sweave.Rnw
 lib/R/library/utils/doc/Sweave.pdf
-%%PORTDOCS%%%%PDF_MANUAL%%lib/R/library/utils/doc/index.html
+%%PORTDOCS%%%%PDF%%lib/R/library/utils/doc/index.html
 lib/R/library/utils/help/AnIndex
 lib/R/library/utils/help/aliases.rds
 lib/R/library/utils/help/paths.rds
@@ -1492,14 +1489,14 @@
 %%DOCSDIR%%/html/NEWS.2.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Rlogo.pdf
 %%PORTDOCS%%%%DOCSDIR%%/html/Rlogo.svg
-%%PORTDOCS%%%%PDF_MANUAL%%%%DOCSDIR%%/manual/R-FAQ.pdf
-%%PORTDOCS%%%%PDF_MANUAL%%%%DOCSDIR%%/manual/R-admin.pdf
-%%PORTDOCS%%%%PDF_MANUAL%%%%DOCSDIR%%/manual/R-data.pdf
-%%PORTDOCS%%%%PDF_MANUAL%%%%DOCSDIR%%/manual/R-exts.pdf
-%%PORTDOCS%%%%PDF_MANUAL%%%%DOCSDIR%%/manual/R-intro.pdf
-%%PORTDOCS%%%%PDF_MANUAL%%%%DOCSDIR%%/manual/R-ints.pdf
-%%PORTDOCS%%%%PDF_MANUAL%%%%DOCSDIR%%/manual/R-lang.pdf
-%%PORTDOCS%%%%PDF_MANUAL%%%%DOCSDIR%%/manual/fullrefman.pdf
+%%PORTDOCS%%%%PDF%%%%DOCSDIR%%/manual/R-FAQ.pdf
+%%PORTDOCS%%%%PDF%%%%DOCSDIR%%/manual/R-admin.pdf
+%%PORTDOCS%%%%PDF%%%%DOCSDIR%%/manual/R-data.pdf
+%%PORTDOCS%%%%PDF%%%%DOCSDIR%%/manual/R-exts.pdf
+%%PORTDOCS%%%%PDF%%%%DOCSDIR%%/manual/R-intro.pdf
+%%PORTDOCS%%%%PDF%%%%DOCSDIR%%/manual/R-ints.pdf
+%%PORTDOCS%%%%PDF%%%%DOCSDIR%%/manual/R-lang.pdf
+%%PORTDOCS%%%%PDF%%%%DOCSDIR%%/manual/fullrefman.pdf
 %%PORTDOCS%%%%DOCSDIR%%/BioC_mirrors.csv
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS.0