diff options
Diffstat (limited to 'editors')
27 files changed, 47 insertions, 41 deletions
diff --git a/editors/apel/Makefile b/editors/apel/Makefile index 61bcdd5e8578..ce4ad0aac936 100644 --- a/editors/apel/Makefile +++ b/editors/apel/Makefile @@ -1,6 +1,6 @@ PORTNAME= apel PORTVERSION= 10.8.${SNAPDATE} -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= editors elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 3d5285e799c9..8e4c5462c7e2 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -78,7 +78,7 @@ PLIST_SUB+= SHLIB_VER=17.0.0 .include <bsd.port.pre.mk> post-patch: -.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 +.if ${COMPILER_TYPE} == clang @${REINPLACE_CMD} -e 's|std::binary_function|std::__binary_function|g' \ ${WRKSRC}/filters/words/msword-odf/wv2/src/word97_helper.cpp @${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \ diff --git a/editors/e93/Makefile b/editors/e93/Makefile index 43a60b90a1ea..b7c79e54153c 100644 --- a/editors/e93/Makefile +++ b/editors/e93/Makefile @@ -22,7 +22,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> -.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 +.if ${COMPILER_TYPE} == clang CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index 1476a8671fbd..e49da8fb2f0f 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -1,6 +1,5 @@ PORTNAME= emacs -DISTVERSION= 30.0.50.20240615 -PORTREVISION= 2 +DISTVERSION= 31.0.50.20240704 PORTEPOCH= 3 CATEGORIES= editors PKGNAMESUFFIX= -devel @@ -10,9 +9,6 @@ COMMENT= GNU editing macros ${COMMENT_${FLAVOR}} WWW= https://www.gnu.org/software/emacs/ COMMENT_nox= (No X flavor) -PATCH_SITES+= https://github.com/emacs-mirror/emacs/commit/ -PATCHFILES+= c645e1d8205f0f0663ec4a2d27575b238c646c7c.patch:-p1 - LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING @@ -28,7 +24,7 @@ USES= autoreconf:build cpe gmake localbase:ldflags makeinfo ncurses \ CPE_VENDOR= gnu USE_GITHUB= yes GH_ACCOUNT= emacs-mirror -GH_TAGNAME= 25452986cb +GH_TAGNAME= fa6f088a48 GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo index aca5505d77b6..38de8d1577c2 100644 --- a/editors/emacs-devel/distinfo +++ b/editors/emacs-devel/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1719196469 -SHA256 (emacs-mirror-emacs-30.0.50.20240615-25452986cb_GH0.tar.gz) = 6229fb101852367adc18120386c8b0508c6ec620dcb714421b175d012c58e30d -SIZE (emacs-mirror-emacs-30.0.50.20240615-25452986cb_GH0.tar.gz) = 50514262 +TIMESTAMP = 1720110684 +SHA256 (emacs-mirror-emacs-31.0.50.20240704-fa6f088a48_GH0.tar.gz) = 90265add1a3c87a97d1dff9c68379f823e87d594ac307af73054ecf783c6b357 +SIZE (emacs-mirror-emacs-31.0.50.20240704-fa6f088a48_GH0.tar.gz) = 50597231 SHA256 (c645e1d8205f0f0663ec4a2d27575b238c646c7c.patch) = fa7978109a164a894479c2827b297228566bfdf46d1a3def00975a35595ba0bf SIZE (c645e1d8205f0f0663ec4a2d27575b238c646c7c.patch) = 2873 diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist index bdab7f988906..c3986563ccbb 100644 --- a/editors/emacs-devel/pkg-plist +++ b/editors/emacs-devel/pkg-plist @@ -42,6 +42,7 @@ share/applications/emacsclient.desktop %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.27 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.28 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.29 +%%DATADIR%%/%%EMACS_VER%%/etc/NEWS.30 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.unknown %%DATADIR%%/%%EMACS_VER%%/etc/NEXTSTEP %%DATADIR%%/%%EMACS_VER%%/etc/NXML-NEWS @@ -183,6 +184,7 @@ share/applications/emacsclient.desktop %%DATADIR%%/%%EMACS_VER%%/etc/charsets/stdenc.map %%DATADIR%%/%%EMACS_VER%%/etc/charsets/symbol.map %%DATADIR%%/%%EMACS_VER%%/etc/compilation.txt +%%DATADIR%%/%%EMACS_VER%%/etc/copyright-assign.txt %%DATADIR%%/%%EMACS_VER%%/etc/e/README %%DATADIR%%/%%EMACS_VER%%/etc/e/eterm-color %%DATADIR%%/%%EMACS_VER%%/etc/e/eterm-color.ti @@ -1570,6 +1572,18 @@ share/applications/emacsclient.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/echistory.elc %%DATADIR%%/%%EMACS_VER%%/lisp/ecomplete.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/ecomplete.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-conf-mode.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-conf-mode.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-core-handle.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-core-handle.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-core.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-core.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-fnmatch.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-fnmatch.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-tools.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-tools.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig.elc %%DATADIR%%/%%EMACS_VER%%/lisp/edmacro.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/edmacro.elc %%DATADIR%%/%%EMACS_VER%%/lisp/ehelp.el.gz @@ -4243,6 +4257,8 @@ share/applications/emacsclient.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/xt-mouse.elc %%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/which-key.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/which-key.elc %%DATADIR%%/%%EMACS_VER%%/lisp/yank-media.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/yank-media.elc %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el @@ -4388,6 +4404,7 @@ share/applications/emacsclient.desktop %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-28.h %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-29.h %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-30.h +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-31.h %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/msdos.c %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/msdos.h %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/nsgui.h diff --git a/editors/flim/Makefile b/editors/flim/Makefile index 93302f9a6a01..298cd4e13f23 100644 --- a/editors/flim/Makefile +++ b/editors/flim/Makefile @@ -1,6 +1,6 @@ PORTNAME= flim PORTVERSION= 1.14.9.${SNAPDATE} -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= editors elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/editors/gomate/Makefile b/editors/gomate/Makefile index ec748d4a48f6..a94aae44dcc4 100644 --- a/editors/gomate/Makefile +++ b/editors/gomate/Makefile @@ -1,6 +1,6 @@ PORTNAME= gomate DISTVERSION= g20170711 -PORTREVISION= 21 +PORTREVISION= 22 CATEGORIES= editors MAINTAINER= fabian.freyer@physik.tu-berlin.de diff --git a/editors/imhex-current/Makefile b/editors/imhex-current/Makefile index 8e6fa10714f5..dd5dc2444891 100644 --- a/editors/imhex-current/Makefile +++ b/editors/imhex-current/Makefile @@ -106,8 +106,7 @@ NLS_USES= gettext .include <bsd.port.pre.mk> # Before LLVM 17 import into the base system -.if (${OSVERSION} < 1302510 \ - || (${OSREL:R} == 14 && ${OSVERSION} < 1400504) \ +.if ((${OSREL:R} == 14 && ${OSVERSION} < 1400504) \ || (${OSREL:R} == 15 && ${OSVERSION} < 1500006)) IGNORE= requires libc++ of LLVM 17 on the base system .endif diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index 2bd0510f7f6a..876c7688215d 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -374,15 +374,6 @@ CONFIGURE_ARGS+= --disable-skia CONFIGURE_ARGS+= --enable-gtk3-kde5 .endif -.if ${PORT_OPTIONS:MLTO} && ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 130 -LLVM_DEFAULT= 13 -CPP= ${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} -CC= ${LOCALBASE}/bin/clang${LLVM_DEFAULT} -CXX= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT} -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -LLD_UNSAFE= yes -.endif - .if ${CHOSEN_COMPILER_TYPE} == clang CXXFLAGS_WARN= -Woverloaded-virtual -Wno-c++11-narrowing \ -Wno-unused-parameter -Wno-unused-local-typedefs diff --git a/editors/micro/Makefile b/editors/micro/Makefile index cd6d362e5d5b..75154161d134 100644 --- a/editors/micro/Makefile +++ b/editors/micro/Makefile @@ -1,7 +1,7 @@ PORTNAME= micro DISTVERSIONPREFIX= v DISTVERSION= 2.0.13 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= editors MAINTAINER= lcook@FreeBSD.org diff --git a/editors/orbiton/Makefile b/editors/orbiton/Makefile index 29dd78ba8bf3..5b85444fe1bd 100644 --- a/editors/orbiton/Makefile +++ b/editors/orbiton/Makefile @@ -1,6 +1,7 @@ PORTNAME= orbiton DISTVERSIONPREFIX= v DISTVERSION= 2.65.12 +PORTREVISION= 1 CATEGORIES= editors MAINTAINER= yuri@FreeBSD.org diff --git a/editors/paredit-mode.el/Makefile b/editors/paredit-mode.el/Makefile index 42c99107758e..1ad4f5710fe3 100644 --- a/editors/paredit-mode.el/Makefile +++ b/editors/paredit-mode.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= paredit-mode.el PORTVERSION= 24 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= editors elisp MASTER_SITES= http://mumble.net/~campbell/emacs/ PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile index ab6cb7eb741e..1cfd0ee430c2 100644 --- a/editors/psgml/Makefile +++ b/editors/psgml/Makefile @@ -1,6 +1,6 @@ PORTNAME= psgml PORTVERSION= 1.4.0 -PORTREVISION= 22 +PORTREVISION= 23 CATEGORIES= editors elisp MASTER_SITES= SF/${PORTNAME}/ALPHA%20${PORTNAME}/1.3.2 PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/editors/semi/Makefile b/editors/semi/Makefile index 418eccd26cb2..70f0f4397401 100644 --- a/editors/semi/Makefile +++ b/editors/semi/Makefile @@ -1,6 +1,6 @@ PORTNAME= semi PORTVERSION= ${SEMI_VER}.${SNAPDATE} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= editors elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/editors/slime/Makefile b/editors/slime/Makefile index e2ee3a3d8a65..9f5b84decf59 100644 --- a/editors/slime/Makefile +++ b/editors/slime/Makefile @@ -1,7 +1,7 @@ PORTNAME= slime DISTVERSIONPREFIX= v DISTVERSION= 2.26.1-9 -PORTREVISION= 12 +PORTREVISION= 13 DISTVERSIONSUFFIX= -gf368e22a CATEGORIES= editors elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/editors/sly-asdf/Makefile b/editors/sly-asdf/Makefile index 9d95b9b6208e..962aa5191f9b 100644 --- a/editors/sly-asdf/Makefile +++ b/editors/sly-asdf/Makefile @@ -1,6 +1,6 @@ PORTNAME= sly-asdf DISTVERSION= 0.2.0-20221119 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= editors elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/editors/sly-named-readtables/Makefile b/editors/sly-named-readtables/Makefile index ca15d6eb5db8..4d825b983c6b 100644 --- a/editors/sly-named-readtables/Makefile +++ b/editors/sly-named-readtables/Makefile @@ -1,6 +1,6 @@ PORTNAME= sly-named-readtables PORTVERSION= 20191013 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= editors elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/editors/sly-quicklisp/Makefile b/editors/sly-quicklisp/Makefile index aa9970345797..543de7738b35 100644 --- a/editors/sly-quicklisp/Makefile +++ b/editors/sly-quicklisp/Makefile @@ -1,6 +1,6 @@ PORTNAME= sly-quicklisp PORTVERSION= 20211206 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= editors elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/editors/sly/Makefile b/editors/sly/Makefile index 58aa3c697ed4..01b7ac36fd54 100644 --- a/editors/sly/Makefile +++ b/editors/sly/Makefile @@ -1,6 +1,6 @@ PORTNAME= sly DISTVERSION= 1.0.43-20230624 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= editors elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile index 5d26ed4e51a4..27efff2e2e3d 100644 --- a/editors/tamago/Makefile +++ b/editors/tamago/Makefile @@ -1,6 +1,6 @@ PORTNAME= tamago PORTVERSION= 4.0.6.0.20041122.19.15 -PORTREVISION= 8 +PORTREVISION= 9 DISTVERSIONPREFIX= v CATEGORIES= editors elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/editors/vim/Makefile b/editors/vim/Makefile index fd6901a4fc49..38f31bae513d 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -1,5 +1,5 @@ PORTNAME= vim -PORTVERSION= 9.1.0470 +PORTVERSION= 9.1.0530 DISTVERSIONPREFIX= v CATEGORIES= editors diff --git a/editors/vim/distinfo b/editors/vim/distinfo index ba10e523f9fd..331185fd4cfd 100644 --- a/editors/vim/distinfo +++ b/editors/vim/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1717909317 -SHA256 (vim-vim-v9.1.0470_GH0.tar.gz) = d76ed5d1191b5c76fe7195125c9975d78c92a54254b8b5d377c6caf5739da259 -SIZE (vim-vim-v9.1.0470_GH0.tar.gz) = 17919981 +TIMESTAMP = 1720151591 +SHA256 (vim-vim-v9.1.0530_GH0.tar.gz) = fd7e252ab237e26cb8f18b8c05ff11d848f0b985c81c962b63b21ff4e763cf15 +SIZE (vim-vim-v9.1.0530_GH0.tar.gz) = 17968363 diff --git a/editors/web-mode/Makefile b/editors/web-mode/Makefile index 1d4d119bab8b..e82b6e732956 100644 --- a/editors/web-mode/Makefile +++ b/editors/web-mode/Makefile @@ -1,7 +1,7 @@ PORTNAME= web-mode PORTVERSION= 15.1 DISTVERSIONPREFIX= v -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= editors elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/editors/with-editor-devel/Makefile b/editors/with-editor-devel/Makefile index c133569bba61..1dcb93eb022e 100644 --- a/editors/with-editor-devel/Makefile +++ b/editors/with-editor-devel/Makefile @@ -1,6 +1,7 @@ PORTNAME= with-editor DISTVERSIONPREFIX= v DISTVERSION= 3.3.4 +PORTREVISION= 1 DISTVERSIONSUFFIX= CATEGORIES= editors elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} diff --git a/editors/with-editor/Makefile b/editors/with-editor/Makefile index b3bfbe912191..a0f5796fc906 100644 --- a/editors/with-editor/Makefile +++ b/editors/with-editor/Makefile @@ -1,6 +1,7 @@ PORTNAME= with-editor DISTVERSIONPREFIX= v DISTVERSION= 3.3.4 +PORTREVISION= 1 CATEGORIES= editors elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/editors/zile/Makefile b/editors/zile/Makefile index a501f06b84ff..f2187b729fed 100644 --- a/editors/zile/Makefile +++ b/editors/zile/Makefile @@ -35,7 +35,7 @@ PLIST_FILES= bin/${PORTNAME} \ .include <bsd.port.pre.mk> -.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 +.if ${COMPILER_TYPE} == clang CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif |