Clean up in preparation for update,

no functional change:
- indent more uniformly
- simplify slave port conditionals
- sort variables, pkg-plist

3 files changed, 89 insertions, 93 deletions

diff --git a/math/R/Makefile b/math/R/Makefile
index d7f52b378f18..19c99a476812 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -6,11 +6,7 @@
 # $FreeBSD$
 #
 
-.if defined(LIBRMATH_SLAVEPORT)
-PORTNAME=	libRmath
-.else
-PORTNAME=	R
-.endif
+PORTNAME?=	R
 PORTVERSION=	2.12.2
 CATEGORIES=	math lang
 MASTER_SITES=	http://cran.r-project.org/src/base/R-2/ \
@@ -33,145 +29,141 @@ MASTER_SITES=	http://cran.r-project.org/src/base/R-2/ \
 DISTNAME=	R-${PORTVERSION}
 
 MAINTAINER=	bf@FreeBSD.org
-.if defined(LIBRMATH_SLAVEPORT)
-COMMENT=	The standalone math library from R
-.else
-COMMENT=	A language for statistical computing and graphics
-.endif
+COMMENT?=	A language for statistical computing and graphics
 
-.if !defined(LIBRMATH_SLAVEPORT)
-OPTIONS=	ATLAS	"Use ATLAS instead of BLAS/LAPACK" off \
-		GHOSTSCRIPT  "Enable the [dev2]bitmap() graphics devices" on \
-		ICU		"Improve collation in multibyte locales with ICU" on \
-		JPEG         "Enable the jpeg() graphics device" on \
-		LETTER_PAPER	"Use US Letter paper" off \
-		NLS		"Build with NLS support" on \
-		PCRE_PORT	"Use PCRE port instead of bundled source" on \
-		PNG	"Enable the png() graphics device" on \
-		STATIC_LIBR "Build a static, rather than a shared, libR" off \
-		TCLTK	"Use Tcl/Tk (for the tcltk package)" on \
-		THREADS "Build a multithreaded R" on \
-		X11	"Enable the X11() graphics device" on \
-		DVI_MANUALS  "Install DVI manuals (requires TeX)" off \
-		INFO_MANUALS "Install GNU info manuals" on
-
-MAN1=		R.1 Rscript.1
-.endif # !LIBRMATH_SLAVEPORT
-USE_LDCONFIG=	yes
-USE_FORTRAN=	yes
-MAKE_JOBS_UNSAFE=	yes
-GNU_CONFIGURE=	yes
 .if defined(LIBRMATH_SLAVEPORT)
 BUILD_WRKSRC=		${WRKSRC}/src/nmath/standalone
-CONFIGURE_ARGS+=--with-readline=no --with-x=no --disable-nls --with-tcltk=no --with-cairo=no \
-		--with-libpng=no --with-jpeglib=no --with-iconv=no --with-ICU=no --without-libintl-prefix
+CONFIGURE_ARGS =	--disable-nls --with-ICU=no --with-cairo=no --with-iconv=no \
+			--with-jpeglib=no --with-libpng=no --with-readline=no \
+			--with-tcltk=no --with-x=no --without-libintl-prefix
 USE_PERL5_BUILD=	yes
 .else # LIBRMATH_SLAVEPORT
-INSTALL_TARGET=	install install-libR
-ALL_TARGET=	all
-USE_ICONV=	yes
-USE_PERL5=	yes
-CONFIGURE_ENV=	INSTALL_DATA="${INSTALL} ${COPY} ${_SHROWNGRP} -m 644" \
-		FCFLAGS="${FFLAGS}" LDFLAGS="${LDFLAGS}" TAR="${TAR}" \
-		R_LD_LIBRARY_PATH="${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}"
-CONFIGURE_ARGS=	--with-system-bzlib --with-system-zlib rdocdir=${DOCSDIR} \
-		--enable-memory-profiling
+ALL_TARGET=		all
+CONFIGURE_ARGS =	--enable-memory-profiling rdocdir=${DOCSDIR} \
+			--with-system-bzlib --with-system-zlib
+CONFIGURE_ENV=		FCFLAGS="${FFLAGS}" \
+			INSTALL_DATA="${INSTALL} ${COPY} ${_SHROWNGRP} -m 644" \
+			LDFLAGS="${LDFLAGS}"  \
+			R_LD_LIBRARY_PATH="${R_LD_LIBRARY_PATH}" TAR="${TAR}"
+INSTALL_TARGET=		install install-libR
+MAN1=		R.1 Rscript.1
+OPTIONS=	ATLAS		"Use ATLAS instead of BLAS/LAPACK" off \
+		GHOSTSCRIPT	"Enable the [dev2]bitmap() graphics devices" on \
+		ICU		"Improve collation in multibyte locales with ICU" on \
+		JPEG		"Enable the jpeg() graphics device" on \
+		LETTER_PAPER	"Use US Letter paper" off \
+		NLS		"Build with NLS support" on \
+		PCRE_PORT	"Use PCRE port instead of bundled source" on \
+		PNG		"Enable the png() graphics device" on \
+		STATIC_LIBR	"Build a static, rather than a shared, libR" off \
+		TCLTK		"Use Tcl/Tk (for the tcltk package)" on \
+		THREADS		"Build a multithreaded R" on \
+		X11		"Enable the X11() graphics device" on \
+		DVI_MANUALS	"Install DVI manuals (requires TeX)" off \
+		INFO_MANUALS	"Install GNU info manuals" on
+R_LD_LIBRARY_PATH=	${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}
+USE_ICONV=		yes
+USE_PERL5=		yes
 .endif # LIBRMATH_SLAVEPORT
+GNU_CONFIGURE=		yes
+MAKE_JOBS_UNSAFE=	yes
+USE_FORTRAN=		yes
+USE_LDCONFIG=		yes
 
 .include <bsd.port.pre.mk>
 
 .if !defined(LIBRMATH_SLAVEPORT)
 .if defined(WITH_ATLAS)
-LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
-CONFIGURE_ARGS+=--with-blas="-lf77blas -latlas"
+LIB_DEPENDS+=		atlas.2:${PORTSDIR}/math/atlas
+CONFIGURE_ARGS+=	--with-blas="-lf77blas -latlas"
 # A workaround to prevent hangs during the build.
 .if ${ARCH} != "i386"
-CONFIGURE_ARGS+=--with-lapack="-lalapack -lcblas"
+CONFIGURE_ARGS+=	--with-lapack="-lalapack -lcblas"
 .endif
 .else
-LIB_DEPENDS+=	blas.2:${PORTSDIR}/math/blas \
-		lapack.4:${PORTSDIR}/math/lapack
-CONFIGURE_ARGS+=--with-blas="-lblas" --with-lapack="-llapack -lblas"
+LIB_DEPENDS+=		blas.2:${PORTSDIR}/math/blas \
+			lapack.4:${PORTSDIR}/math/lapack
+CONFIGURE_ARGS+=	--with-blas="-lblas" --with-lapack="-llapack -lblas"
 .endif
 
 .if !defined(WITHOUT_GHOSTSCRIPT)
-USE_GHOSTSCRIPT_RUN=yes
+USE_GHOSTSCRIPT_RUN=	yes
 .endif
 
 .if defined(WITHOUT_ICU)
-CONFIGURE_ARGS+=--without-ICU
+CONFIGURE_ARGS+=	--without-ICU
 .else
-LIB_DEPENDS+=	icui18n:${PORTSDIR}/devel/icu
-CONFIGURE_ARGS+=--with-ICU
+LIB_DEPENDS+=		icui18n:${PORTSDIR}/devel/icu
+CONFIGURE_ARGS+=	--with-ICU
 .endif
 
 .if defined(WITHOUT_JPEG)
-CONFIGURE_ARGS+=--without-jpeglib
+CONFIGURE_ARGS+=	--without-jpeglib
 .else
-LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
-CONFIGURE_ARGS+=--with-jpeglib
+LIB_DEPENDS+=		jpeg.11:${PORTSDIR}/graphics/jpeg
+CONFIGURE_ARGS+=	--with-jpeglib
 .endif
 
 .if defined(WITH_LETTER_PAPER)
-CONFIGURE_ENV+=	R_PAPERSIZE=letter
+CONFIGURE_ENV +=	R_PAPERSIZE=letter
 .endif
 
 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
+USE_GETTEXT=		yes
+PLIST_SUB+=		NLS=""
 .else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS="@comment "
 .endif
 
 .if defined(WITHOUT_PCRE_PORT)
-CONFIGURE_ARGS+=--without-system-pcre
+CONFIGURE_ARGS+=	--without-system-pcre
 .else
-LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
-CONFIGURE_ARGS+=--with-system-pcre
+LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre
+CONFIGURE_ARGS+=	--with-system-pcre
 .endif
 
 .if defined(WITHOUT_PNG)
-CONFIGURE_ARGS+=--without-libpng
+CONFIGURE_ARGS+=	--without-libpng
 .else
-LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png
-CONFIGURE_ARGS+=--with-libpng
+LIB_DEPENDS+=		png.6:${PORTSDIR}/graphics/png
+CONFIGURE_ARGS+=	--with-libpng
 .endif
 
 .if defined(WITH_STATIC_LIBR)
-CONFIGURE_ARGS+=--enable-R-static-lib
-PLIST_SUB+=	STATIC_LIBR="" SHARED_LIBR="@comment "
+CONFIGURE_ARGS+=	--enable-R-static-lib
+PLIST_SUB+=		STATIC_LIBR="" SHARED_LIBR="@comment "
 .else
-CONFIGURE_ARGS+=--enable-R-shlib
-PLIST_SUB+=	STATIC_LIBR="@comment " SHARED_LIBR=""
+CONFIGURE_ARGS+=	--enable-R-shlib
+PLIST_SUB+=		STATIC_LIBR="@comment " SHARED_LIBR=""
 .endif
 
 .if defined(WITHOUT_TCLTK)
-CONFIGURE_ARGS+=--without-tcltk
-PLIST_SUB+=	TCLTK="@comment "
+CONFIGURE_ARGS+=	--without-tcltk
+PLIST_SUB+=		TCLTK="@comment "
 .else
 USE_TK_NO_THREADS=	yes
-USE_TK =	84+
+USE_TK =		84+
 .include "${PORTSDIR}/Mk/bsd.tcl.mk"
-CONFIGURE_ARGS+=--with-tcltk \
-		--with-tcl-config=${TCL_LIBDIR}/tclConfig.sh \
-		--with-tk-config=${TK_LIBDIR}/tkConfig.sh
-PLIST_SUB+=	TCLTK=""
+CONFIGURE_ARGS+=	--with-tcltk \
+			--with-tcl-config=${TCL_LIBDIR}/tclConfig.sh \
+			--with-tk-config=${TK_LIBDIR}/tkConfig.sh
+PLIST_SUB+=		TCLTK=""
 .endif
 
 .if defined(WITHOUT_THREADS)
-CONFIGURE_ARGS+=--disable-threads
+CONFIGURE_ARGS+=	--disable-threads
 .else
-CONFIGURE_ARGS+=--enable-threads=posix
+CONFIGURE_ARGS+=	--enable-threads=posix
 .endif
 
 .if defined(WITHOUT_X11)
-CONFIGURE_ARGS+=--without-x
-PLIST_SUB+=	X11="@comment "
+CONFIGURE_ARGS+=	--without-x
+PLIST_SUB+=		X11="@comment "
 .else
-CONFIGURE_ARGS+=--with-x
-USE_XORG=	x11 xt
-PLIST_SUB+=	X11=""
+CONFIGURE_ARGS+=	--with-x
+USE_XORG=		x11 xt
+PLIST_SUB+=		X11=""
 .endif
 
 .if defined(WITH_INFO_MANUALS) && !defined(NOPORTDOCS)
@@ -180,12 +172,12 @@ INFO=		R-FAQ R-admin R-data R-exts R-intro R-lang
 .endif
 
 .if defined(WITH_DVI_MANUALS) && !defined(NOPORTDOCS)
-BUILD_DEPENDS+=	texi2dvi:${PORTSDIR}/print/teTeX-base
-ALL_TARGET+=	dvi
+BUILD_DEPENDS +=	texi2dvi:${PORTSDIR}/print/teTeX-base
+ALL_TARGET+=		dvi
 INSTALL_TARGET+=	install-dvi
-PLIST_SUB+=	DVI_MANUAL=""
+PLIST_SUB+=		DVI_MANUAL=""
 .else
-PLIST_SUB+=	DVI_MANUAL="@comment "
+PLIST_SUB+=		DVI_MANUAL="@comment "
 .endif
 .endif # !LIBRMATH_SLAVEPORT
 
@@ -212,11 +204,11 @@ post-patch:
 
 check regression-test test: build
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
-		${MAKE_ARGS} check)
+	${MAKE_ARGS} check)
 
 check-all: build
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
-		${MAKE_ARGS} check-all)
+	${MAKE_ARGS} check-all)
 
 post-install:
 .if !defined(WITH_STATIC_LIBR)
diff --git a/math/R/pkg-plist b/math/R/pkg-plist
index 6d34711f3a41..9fc43678d2f5 100644
--- a/math/R/pkg-plist
+++ b/math/R/pkg-plist
@@ -657,8 +657,8 @@ lib/R/library/grid/libs/grid.so
 %%NLS%%lib/R/library/grid/po/ja/LC_MESSAGES/grid.mo
 %%NLS%%lib/R/library/grid/po/ko/LC_MESSAGES/R-grid.mo
 %%NLS%%lib/R/library/grid/po/ko/LC_MESSAGES/grid.mo
-%%NLS%%lib/R/library/grid/po/pt_BR/LC_MESSAGES/grid.mo
 %%NLS%%lib/R/library/grid/po/pt_BR/LC_MESSAGES/R-grid.mo
+%%NLS%%lib/R/library/grid/po/pt_BR/LC_MESSAGES/grid.mo
 %%NLS%%lib/R/library/grid/po/ru/LC_MESSAGES/R-grid.mo
 %%NLS%%lib/R/library/grid/po/ru/LC_MESSAGES/grid.mo
 %%NLS%%lib/R/library/grid/po/zh_CN/LC_MESSAGES/R-grid.mo
@@ -1017,8 +1017,8 @@ lib/R/library/survival/R/survival.rdx
 lib/R/library/survival/data/Rdata.rdb
 lib/R/library/survival/data/Rdata.rds
 lib/R/library/survival/data/Rdata.rdx
-lib/R/library/survival/doc/validate.tex
 lib/R/library/survival/doc/index.html
+lib/R/library/survival/doc/validate.tex
 lib/R/library/survival/help/AnIndex
 lib/R/library/survival/help/aliases.rds
 lib/R/library/survival/help/paths.rds
diff --git a/math/libRmath/Makefile b/math/libRmath/Makefile
index 96ffe6f2fef7..992f27bb36f6 100644
--- a/math/libRmath/Makefile
+++ b/math/libRmath/Makefile
@@ -6,6 +6,10 @@
 # $FreeBSD$
 #
 
+PORTNAME=	libRmath
+
+COMMENT=	The standalone math library from R
+
 DESCR=	${.CURDIR}/pkg-descr
 LIBRMATH_SLAVEPORT=	yes
 MASTERDIR=	${.CURDIR}/../R