aboutsummaryrefslogtreecommitdiff
path: root/math/ess
diff options
context:
space:
mode:
Diffstat (limited to 'math/ess')
-rw-r--r--math/ess/Makefile27
-rw-r--r--math/ess/distinfo10
-rw-r--r--math/ess/files/patch-lisp_Makefile18
-rw-r--r--math/ess/pkg-plist29
4 files changed, 41 insertions, 43 deletions
diff --git a/math/ess/Makefile b/math/ess/Makefile
index aed30f102626..c1fc6fe26a3d 100644
--- a/math/ess/Makefile
+++ b/math/ess/Makefile
@@ -1,11 +1,15 @@
PORTNAME= ess
-DISTVERSION= 24.01.1
+DISTVERSION= 25.01.0
PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= http://ess.r-project.org/ \
- http://stat.ethz.ch/ESS/downloads/ess/
-DISTNAME= ESS-${DISTVERSION}
+ http://stat.ethz.ch/ESS/downloads/ess/ \
+ https://raw.githubusercontent.com/JuliaEditorSupport/:JULIA
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
+DISTFILES= ess-25.01.0.tgz \
+ julia-emacs/refs/heads/master/julia-mode.el:JULIA \
+ julia-emacs/refs/heads/master/julia-mode-latexsubs.el:JULIA
+EXTRACT_ONLY= ${DISTNAME}.tgz
MAINTAINER= rhurlin@FreeBSD.org
COMMENT= R support for Emacsen
@@ -16,13 +20,11 @@ LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= R:math/R
-USES= emacs gmake makeinfo perl5
+USES= emacs gmake makeinfo perl5 tar:tgz
USE_PERL5= build
NO_ARCH= yes
-#WRKSRC= ${WRKDIR}/ESS-${DISTVERSION}
-
INFO= ess
OPTIONS_DEFINE= DOCS
@@ -37,20 +39,15 @@ USE_TEX= latex:build dvipsk:build
INSTALL_TARGET= doc
.endif
+post-extract:
+ @${CP} -p ${DISTDIR}/julia-emacs/refs/heads/master/julia-mode*.el \
+ ${WRKSRC}/lisp/
+
post-patch:
@${REINPLACE_CMD} -e \
'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 \
'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}
diff --git a/math/ess/distinfo b/math/ess/distinfo
index 31adefca0773..24024a2937e8 100644
--- a/math/ess/distinfo
+++ b/math/ess/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1707484822
-SHA256 (ESS-24.01.1.tar.gz) = 8780b3bf80b3de0091f67c1275006b4666dc4c10224b002cef9d5e766acd7fde
-SIZE (ESS-24.01.1.tar.gz) = 701216
+TIMESTAMP = 1736769446
+SHA256 (ess-25.01.0.tgz) = f2c839e9b1be6c88602b9e220ca756247a48ef85635c743d9865ad4a396e2ce6
+SIZE (ess-25.01.0.tgz) = 796083
+SHA256 (julia-emacs/refs/heads/master/julia-mode.el) = 301b0f55d77046b617fd67498169bdf8565c5a8d7666c99346473d102f61fcab
+SIZE (julia-emacs/refs/heads/master/julia-mode.el) = 44716
+SHA256 (julia-emacs/refs/heads/master/julia-mode-latexsubs.el) = 8df3be3fe0e262feba2193372d396c30e0632596521ff6bed2f06eb2c6fc9583
+SIZE (julia-emacs/refs/heads/master/julia-mode-latexsubs.el) = 453405
diff --git a/math/ess/files/patch-lisp_Makefile b/math/ess/files/patch-lisp_Makefile
new file mode 100644
index 000000000000..71eec2028f99
--- /dev/null
+++ b/math/ess/files/patch-lisp_Makefile
@@ -0,0 +1,18 @@
+--- lisp/Makefile.orig 2025-01-10 12:11:57 UTC
++++ lisp/Makefile
+@@ -49,11 +49,11 @@ -include .dependencies
+ ##obsolete/%.elc: obsolete/%.el
+ ## $(COMPILE-SIMPLE) $<
+
+-JULIA-REPO=https://raw.githubusercontent.com/JuliaEditorSupport/julia-emacs/master
++#JULIA-REPO=https://raw.githubusercontent.com/JuliaEditorSupport/julia-emacs/master
+ ## Should happen before building ESS; definitely *NOT* after unpacking tarball :
+-$(JULIAS):
+- test -f ../etc/.IS.RELEASE || $(DOWNLOAD) $(JULIA-REPO)/julia-mode.el > julia-mode.el
+- test -f ../etc/.IS.RELEASE || $(DOWNLOAD) $(JULIA-REPO)/julia-mode-latexsubs.el > julia-mode-latexsubs.el
++#$(JULIAS):
++# test -f ../etc/.IS.RELEASE || $(DOWNLOAD) $(JULIA-REPO)/julia-mode.el > julia-mode.el
++# test -f ../etc/.IS.RELEASE || $(DOWNLOAD) $(JULIA-REPO)/julia-mode-latexsubs.el > julia-mode-latexsubs.el
+ julia-%.elc: julia-%.el
+ $(COMPILE-SIMPLE) $<
+
diff --git a/math/ess/pkg-plist b/math/ess/pkg-plist
index ce4d4075f9de..79bde09f419f 100644
--- a/math/ess/pkg-plist
+++ b/math/ess/pkg-plist
@@ -4,19 +4,8 @@
%%PORTDOCS%%%%DOCSDIR%%/readme.html
%%PORTDOCS%%%%DOCSDIR%%/readme.pdf
%%PORTDOCS%%%%DOCSDIR%%/refcard.pdf
-%%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/._BUILDESSR
-%%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/._LOADREMOTE
-%%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/._R
%%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/BUILDESSR
%%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/._misc.R
-%%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/R/.basic.R
%%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/R/.load.R
%%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/R/completion.R
@@ -27,20 +16,6 @@
%%EMACS_LIBDIR%%/%%ETCDIR%%/ESSR/R/pkg.R
%%EMACS_LIBDIR%%/%%ETCDIR%%/ess-julia.jl
%%EMACS_LIBDIR%%/%%ETCDIR%%/ess-sas-sh-command
-%%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_LIBDIR%%/%%ETCDIR%%/icons/README
%%EMACS_LIBDIR%%/%%ETCDIR%%/icons/rbuffer.xpm
%%EMACS_LIBDIR%%/%%ETCDIR%%/icons/rfunction.xpm
@@ -116,3 +91,7 @@
%%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-latexsubs.el
+%%EMACS_SITE_LISPDIR%%/ess/julia-mode-latexsubs.elc
+%%EMACS_SITE_LISPDIR%%/ess/julia-mode.el
+%%EMACS_SITE_LISPDIR%%/ess/julia-mode.elc