git: a8024698e5e1 - main - math/ess: Update to 24.01.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Rainer Hurling <rhurlin_at_FreeBSD.org>
Date: Sun, 04 Feb 2024 18:35:44 UTC
The branch main has been updated by rhurlin:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a8024698e5e17686207d060555c83486a371963a

commit a8024698e5e17686207d060555c83486a371963a
Author:     Rainer Hurling <rhurlin@FreeBSD.org>
AuthorDate: 2024-02-04 18:25:53 +0000
Commit:     Rainer Hurling <rhurlin@FreeBSD.org>
CommitDate: 2024-02-04 18:35:31 +0000

    math/ess: Update to 24.01.0
    
    Changelog: https://github.com/emacs-ess/ESS/compare/v18.10.2...v24.01.0
    
    Reported by:    Repology
---
 math/ess/Makefile                          | 58 ++++++++++++++++++--------
 math/ess/distinfo                          |  6 +--
 math/ess/files/patch-lisp_ess-r-package.el | 11 -----
 math/ess/pkg-plist                         | 66 ++----------------------------
 4 files changed, 49 insertions(+), 92 deletions(-)

diff --git a/math/ess/Makefile b/math/ess/Makefile
index d450b09dcb78..76d8f9cc8f2a 100644
--- a/math/ess/Makefile
+++ b/math/ess/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	ess
-DISTVERSION=	18.10.2
-PORTREVISION=	18
+DISTVERSION=	24.01.0
 CATEGORIES=	math
 MASTER_SITES=	http://ess.r-project.org/downloads/ess/ \
 		http://stat.ethz.ch/ESS/downloads/ess/
@@ -15,32 +14,59 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	R:math/R
 
-USES=		emacs gmake makeinfo perl5 tar:tgz
+USES=		emacs gmake makeinfo perl5
 USE_PERL5=	build
 
 NO_ARCH=	yes
 
+WRKSRC=		${WRKDIR}/ESS-${DISTVERSION}
+
 INFO=		ess
 
 OPTIONS_DEFINE=	DOCS
 
+.include <bsd.port.options.mk>
+
+.if ${OPTIONS_DEFINE:MDOCS}
+BUILD_DEPENDS+=	makeinfo:print/texinfo \
+		texi2html:textproc/texi2html
+USES+=		tex
+USE_TEX=	latex:build dvipsk:build
+INSTALL_TARGET=	doc
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|^DESTDIR|#DESTDIR| ; \
-		 s|^PREFIX|#PREFIX| ; \
-		 s|=$$(PREFIX)|=$$(DESTDIR)$$(PREFIX)| ; \
-		 s|share/info|${INFO_PATH}|' ${WRKSRC}/Makeconf
+		's|sed -i|sed -i .orig|g' ${WRKSRC}/Makefile
+#	@${REINPLACE_CMD} -e \
+#		's|^DESTDIR|#DESTDIR| ; \
+#		 s|^PREFIX|#PREFIX| ; \
+#		 s|=$$(PREFIX)|=$$(DESTDIR)$$(PREFIX)|' ${WRKSRC}/Makeconf
 	@${REINPLACE_CMD} -e \
-		'/^PDFs/s|=.*|=|' ${WRKSRC}/doc/Makefile
-	@${REINPLACE_CMD} -e \
-		"s|require 'cl)|require 'cl-lib)|g" \
-		${WRKSRC}/lisp/julia-mode.el
-	@${REINPLACE_CMD} -e \
-		"/require 'cl)/d" \
-		${WRKSRC}/lisp/ess-tracebug.el \
-		${WRKSRC}/lisp/ess.el \
+			's|info text|info text html pdf|' ${WRKSRC}/doc/Makefile
+	# JULIAS disabled, because it downloads .el files for testing
+	@${REINPLACE_CMD} -e '/^.PHONY: julia/,+3d' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e '/^JULIAS/d' ${WRKSRC}/lisp/Makefile
+	@${REINPLACE_CMD} -e 's/ $$(JULIAS)//' ${WRKSRC}/lisp/Makefile
+	@${REINPLACE_CMD} -e '/^$$(JULIAS):/,+4d' ${WRKSRC}/lisp/Makefile
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf         ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/refcard/*.pdf ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/html/*.html   ${STAGEDIR}${DOCSDIR}
 
 post-install:
-	@${CP} ${WRKSRC}/lisp/*.el ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/ess/
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/ess/
+	@${CP} ${WRKSRC}/lisp/*.el  ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/ess/
+	@${CP} ${WRKSRC}/lisp/*.elc ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/ess/
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_LIBDIR}/etc/ess/
+	${INSTALL_DATA} ${WRKSRC}/doc/info/ess.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
+	(cd ${WRKSRC}/etc && ${CP} ess-julia.jl ess-sas-sh-command \
+		${STAGEDIR}${PREFIX}/${EMACS_LIBDIR}/etc/ess/)
+	${CP} -R ${WRKSRC}/etc/ESSR \
+		${STAGEDIR}${PREFIX}/${EMACS_LIBDIR}/etc/ess/
+	${CP} -R ${WRKSRC}/etc/icons \
+		${STAGEDIR}${PREFIX}/${EMACS_LIBDIR}/etc/ess/
 
 .include <bsd.port.mk>
diff --git a/math/ess/distinfo b/math/ess/distinfo
index 735340bd028f..db92e56b836c 100644
--- a/math/ess/distinfo
+++ b/math/ess/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1542041727
-SHA256 (ess-18.10.2.tgz) = f77b42283c698da091aabca9ccd14a648c3240f00898b93128490feefa04e9d6
-SIZE (ess-18.10.2.tgz) = 2939425
+TIMESTAMP = 1706208485
+SHA256 (ess-24.01.0.tar.gz) = 9a8d3b47117333e213865dd5f709ac83ee396e01aa99ebaefb708ec0675933c0
+SIZE (ess-24.01.0.tar.gz) = 681458
diff --git a/math/ess/files/patch-lisp_ess-r-package.el b/math/ess/files/patch-lisp_ess-r-package.el
deleted file mode 100644
index a367fae3ca47..000000000000
--- a/math/ess/files/patch-lisp_ess-r-package.el
+++ /dev/null
@@ -1,11 +0,0 @@
---- lisp/ess-r-package.el.orig	2021-01-22 20:38:19 UTC
-+++ lisp/ess-r-package.el
-@@ -557,7 +557,7 @@ package mode. Use this function if state of the buffer
-   (error "As of ESS 16.04, `ess-developer' is deprecated. Use `ess-r-set-evaluation-env' instead"))
- 
- (defalias 'ess-toggle-developer 'ess-developer)
--(define-obsolete-function-alias 'ess-r-devtools-check-package-buildwin 'ess-r-devtools-check-with-winbuilder)
-+(define-obsolete-function-alias 'ess-r-devtools-check-package-buildwin 'ess-r-devtools-check-with-winbuilder "18.04")
- (define-obsolete-function-alias 'ess-r-devtools-ask 'ess-r-devtools-execute-command "18.04")
- 
- (make-obsolete-variable 'ess-developer "Please use `ess-developer-select-package' and `ess-r-set-evaluation-env' instead." "16.04")
diff --git a/math/ess/pkg-plist b/math/ess/pkg-plist
index 551a79ab92f0..0d5c876acd14 100644
--- a/math/ess/pkg-plist
+++ b/math/ess/pkg-plist
@@ -4,7 +4,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/readme.html
 %%PORTDOCS%%%%DOCSDIR%%/readme.pdf
 %%PORTDOCS%%%%DOCSDIR%%/refcard.pdf
-%%EMACS_LIBDIR%%/%%ETCDIR%%/.IS.RELEASE
+%%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/BUILDESSR
 %%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/LOADREMOTE
 %%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/R/.basic.R
 %%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/R/.load.R
@@ -14,23 +14,22 @@
 %%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/R/mpi.R
 %%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/R/ns-eval.R
 %%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/R/pkg.R
-%%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/VERSION
 %%EMACS_LIBDIR%%/%%ETCDIR%%/ess-julia.jl
 %%EMACS_LIBDIR%%/%%ETCDIR%%/ess-sas-sh-command
-%%EMACS_LIBDIR%%/%%ETCDIR%%/git-ref
+%%EMACS_LIBDIR%%/%%ETCDIR%%/icons/README
 %%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.png
 %%EMACS_LIBDIR%%/%%ETCDIR%%/icons/splus_letters_large.xpm
 %%EMACS_LIBDIR%%/%%ETCDIR%%/icons/spluslogo.xpm
+%%EMACS_LIBDIR%%/%%ETCDIR%%/icons/spluslogo.xpm.safe
 %%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_SITE_LISPDIR%%/ess/ess-arc-d.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-arc-d.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-autoloads.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-bugs-d.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-bugs-d.elc
@@ -38,13 +37,6 @@
 %%EMACS_SITE_LISPDIR%%/ess/ess-bugs-l.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-custom.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-custom.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-dde.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-dde.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-eldoc.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-font-lock.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-font-lock.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-generics.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-generics.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-gretl.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-gretl.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-help.el
@@ -55,31 +47,12 @@
 %%EMACS_SITE_LISPDIR%%/ess/ess-jags-d.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-julia.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-julia.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-lsp-l.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-lsp-l.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-mode.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-mode.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-mouse.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-mouse.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-noweb-font-lock-mode.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-noweb-font-lock-mode.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-noweb-mode.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-noweb-mode.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-noweb.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-noweb.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-omg-d.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-omg-d.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-omg-l.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-omg-l.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-r-a.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-r-a.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-r-args.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-completion.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-completion.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-flymake.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-flymake.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-r-gui.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-r-gui.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-mode.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-mode.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-r-package.el
@@ -94,14 +67,8 @@
 %%EMACS_SITE_LISPDIR%%/ess/ess-rdired.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-roxy.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-roxy.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-rutils.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-rutils.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-s-lang.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-s-lang.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-s3-d.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-s3-d.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-s4-d.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-s4-d.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-sas-a.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-sas-a.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-sas-d.el
@@ -110,22 +77,8 @@
 %%EMACS_SITE_LISPDIR%%/ess/ess-sas-l.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-site.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-site.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-sp3-d.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-sp3-d.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-sp4-d.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-sp4-d.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-sp5-d.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-sp5-d.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-sp6-d.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-sp6-d.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-sp6w-d.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-sp6w-d.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-stata-lang.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-stata-lang.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-stata-mode.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-stata-mode.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-swv.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-swv.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-toolbar.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-toolbar.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-tracebug.el
@@ -134,18 +87,7 @@
 %%EMACS_SITE_LISPDIR%%/ess/ess-trns.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess-utils.el
 %%EMACS_SITE_LISPDIR%%/ess/ess-utils.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-vst-d.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-vst-d.elc
-%%EMACS_SITE_LISPDIR%%/ess/ess-xls-d.el
-%%EMACS_SITE_LISPDIR%%/ess/ess-xls-d.elc
 %%EMACS_SITE_LISPDIR%%/ess/ess.el
 %%EMACS_SITE_LISPDIR%%/ess/ess.elc
 %%EMACS_SITE_LISPDIR%%/ess/essd-els.el
 %%EMACS_SITE_LISPDIR%%/ess/essd-els.elc
-%%EMACS_SITE_LISPDIR%%/ess/julia-mode.el
-%%EMACS_SITE_LISPDIR%%/ess/julia-mode.elc
-%%EMACS_SITE_LISPDIR%%/ess/make-regexp.el
-%%EMACS_SITE_LISPDIR%%/ess/make-regexp.elc
-%%EMACS_SITE_LISPDIR%%/ess/mouseme.el
-%%EMACS_SITE_LISPDIR%%/ess/mouseme.elc
-%%EMACS_SITE_LISPDIR%%/ess/msdos.elc