- Update from 13.09-1 to 14.09 [1]

- Use options helpers

PR:		194281
Submitted by:	cjr@cruwe.de (maintainer) [1]

3 files changed, 39 insertions, 37 deletions

diff --git a/math/ess/Makefile b/math/ess/Makefile
index f9bcf2304c33..90a1be4432b3 100644
--- a/math/ess/Makefile
+++ b/math/ess/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ess
-DISTVERSION=	13.09-1
-PORTREVISION=	5
+DISTVERSION=	14.09
 CATEGORIES=	math
 MASTER_SITES=	http://ess.r-project.org/downloads/ess/
 EXTRACT_SUFX=	.tgz
@@ -20,12 +19,10 @@ USES=		gmake
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
+DOCS_USES=	makeinfo
+DOCS_INFO=	ess
 
-.if ${PORT_OPTIONS:MDOCS}
-USES+=	makeinfo
-INFO=	ess
-.endif
+.include <bsd.port.options.mk>
 
 #attention, dirty hack: because 'ETCDIR =' is typed _with_ trailing
 #space in Makefile, $STAGEDIR append fails without the additional
@@ -45,8 +42,8 @@ post-patch: .SILENT
 	${REINPLACE_CMD} -e "s|\$$(INSTALL)|${INSTALL_SCRIPT}|g" \
 		${WRKSRC}/lisp/Makefile
 
-.if ${PORT_OPTIONS:MDOCS}
 post-build:
+.if ${PORT_OPTIONS:MDOCS}
 	@(cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} \
 		${MAKE_ARGS} info)
 .endif
diff --git a/math/ess/distinfo b/math/ess/distinfo
index 7f3cf9e48583..d89b4f313e80 100644
--- a/math/ess/distinfo
+++ b/math/ess/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ess-13.09-1.tgz) = 3ad92bc0235329dae5236a674a7048bf4afab2b2894356ffb43a363fe0944113
-SIZE (ess-13.09-1.tgz) = 3331643
+SHA256 (ess-14.09.tgz) = b6f1badd065e2e42f1d9d75a4e7a04290849d6f7a2bdb8413f73e0eae4014571
+SIZE (ess-14.09.tgz) = 3350987
diff --git a/math/ess/pkg-plist b/math/ess/pkg-plist
index 476e8e6096ce..ceb2462f7744 100644
--- a/math/ess/pkg-plist
+++ b/math/ess/pkg-plist
@@ -1,30 +1,30 @@
-%%EMACS_LIBDIR%%/etc/ess/ESSR/LOADREMOTE
-%%EMACS_LIBDIR%%/etc/ess/ESSR/R/.basic.R
-%%EMACS_LIBDIR%%/etc/ess/ESSR/R/.load.R
-%%EMACS_LIBDIR%%/etc/ess/ESSR/R/completion.R
-%%EMACS_LIBDIR%%/etc/ess/ESSR/R/debug.R
-%%EMACS_LIBDIR%%/etc/ess/ESSR/R/developer.R
-%%EMACS_LIBDIR%%/etc/ess/ESSR/R/misc.R
-%%EMACS_LIBDIR%%/etc/ess/ESSR/VERSION
-%%EMACS_LIBDIR%%/etc/ess/SVN-REVISION
-%%EMACS_LIBDIR%%/etc/ess/ess-s4.S
-%%EMACS_LIBDIR%%/etc/ess/ess-sas-sh-command
-%%EMACS_LIBDIR%%/etc/ess/ess-sp3.S
-%%EMACS_LIBDIR%%/etc/ess/function-outline.S
-%%EMACS_LIBDIR%%/etc/ess/icons/rbuffer.xpm
-%%EMACS_LIBDIR%%/etc/ess/icons/rfunction.xpm
-%%EMACS_LIBDIR%%/etc/ess/icons/rline.xpm
-%%EMACS_LIBDIR%%/etc/ess/icons/rregion.xpm
-%%EMACS_LIBDIR%%/etc/ess/icons/splus_letter_small.xpm
-%%EMACS_LIBDIR%%/etc/ess/icons/splus_letters_large.xpm
-%%EMACS_LIBDIR%%/etc/ess/icons/spluslogo.xpm
-%%EMACS_LIBDIR%%/etc/ess/icons/startr.xpm
-%%EMACS_LIBDIR%%/etc/ess/icons/switch_ess.xpm
-%%EMACS_LIBDIR%%/etc/ess/icons/switchr.xpm
-%%EMACS_LIBDIR%%/etc/ess/icons/switchs.xpm
-%%EMACS_LIBDIR%%/etc/ess/sas-keys.doc
-%%EMACS_LIBDIR%%/etc/ess/sas-keys.ps
-%%EMACS_LIBDIR%%/etc/ess/sas-keys.rtf
+%%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/LOADREMOTE
+%%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/R/.basic.R
+%%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/R/.load.R
+%%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/R/completion.R
+%%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/R/debug.R
+%%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/R/developer.R
+%%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/R/misc.R
+%%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/VERSION
+%%EMACS_LIBDIR%%/%%ETCDIR%%/SVN-REVISION
+%%EMACS_LIBDIR%%/%%ETCDIR%%/ess-s4.S
+%%EMACS_LIBDIR%%/%%ETCDIR%%/ess-sas-sh-command
+%%EMACS_LIBDIR%%/%%ETCDIR%%/ess-sp3.S
+%%EMACS_LIBDIR%%/%%ETCDIR%%/function-outline.S
+%%EMACS_LIBDIR%%/%%ETCDIR%%/icons/rbuffer.xpm
+%%EMACS_LIBDIR%%/%%ETCDIR%%/icons/rfunction.xpm
+%%EMACS_LIBDIR%%/%%ETCDIR%%/icons/rline.xpm
+%%EMACS_LIBDIR%%/%%ETCDIR%%/icons/rregion.xpm
+%%EMACS_LIBDIR%%/%%ETCDIR%%/icons/splus_letter_small.xpm
+%%EMACS_LIBDIR%%/%%ETCDIR%%/icons/splus_letters_large.xpm
+%%EMACS_LIBDIR%%/%%ETCDIR%%/icons/spluslogo.xpm
+%%EMACS_LIBDIR%%/%%ETCDIR%%/icons/startr.xpm
+%%EMACS_LIBDIR%%/%%ETCDIR%%/icons/switch_ess.xpm
+%%EMACS_LIBDIR%%/%%ETCDIR%%/icons/switchr.xpm
+%%EMACS_LIBDIR%%/%%ETCDIR%%/icons/switchs.xpm
+%%EMACS_LIBDIR%%/%%ETCDIR%%/sas-keys.doc
+%%EMACS_LIBDIR%%/%%ETCDIR%%/sas-keys.ps
+%%EMACS_LIBDIR%%/%%ETCDIR%%/sas-keys.rtf
 %%EMACS_SITE_LISPDIR%%/ChangeLog
 %%EMACS_SITE_LISPDIR%%/ess-arc-d.el
 %%EMACS_SITE_LISPDIR%%/ess-arc-d.elc
@@ -138,3 +138,8 @@
 %%EMACS_SITE_LISPDIR%%/mouseme.elc
 %%EMACS_SITE_LISPDIR%%/msdos.el
 %%EMACS_SITE_LISPDIR%%/msdos.elc
+@dirrmtry %%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/R
+@dirrmtry %%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR
+@dirrmtry %%EMACS_LIBDIR%%/%%ETCDIR%%/icons
+@dirrmtry %%EMACS_LIBDIR%%/%%ETCDIR%%
+@dirrmtry %%EMACS_LIBDIR%%/etc