summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
Diffstat (limited to 'editors')
-rw-r--r--editors/apel/Makefile1
-rw-r--r--editors/emacs/Makefile26
-rw-r--r--editors/emacs/distinfo6
-rw-r--r--editors/emacs/files/extra-patch-src_xfns.c12
-rw-r--r--editors/emacs/pkg-plist2
-rw-r--r--editors/flim/Makefile1
-rw-r--r--editors/paredit-mode.el/Makefile2
-rw-r--r--editors/psgml/Makefile2
-rw-r--r--editors/semi/Makefile1
-rw-r--r--editors/slime/Makefile2
-rw-r--r--editors/sly-asdf/Makefile2
-rw-r--r--editors/sly-named-readtables/Makefile2
-rw-r--r--editors/sly-quicklisp/Makefile2
-rw-r--r--editors/sly/Makefile2
-rw-r--r--editors/tamago/Makefile1
-rw-r--r--editors/web-mode/Makefile2
-rw-r--r--editors/with-editor-devel/Makefile1
-rw-r--r--editors/with-editor/Makefile2
18 files changed, 30 insertions, 39 deletions
diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index c7686a13f33b..2e678aa027f0 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -1,5 +1,6 @@
PORTNAME= apel
PORTVERSION= 10.8.${SNAPDATE}
+PORTREVISION= 1
CATEGORIES= editors elisp
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index d89e2ddbe2cc..74dde03bc798 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,13 +1,12 @@
PORTNAME= emacs
-DISTVERSION= 28.1
-PORTREVISION= 1
+DISTVERSION= 28.2
PORTEPOCH= 3
CATEGORIES= editors
MASTER_SITES= GNU
.if ${FLAVOR:U} == canna
-PATCH_SITES+= https://www.gentei.org/~yuuji/software/emacs28canna/:canna
-PATCHFILES+= emacs28.1-canna-20220406b.diff.gz:-p1:canna
+PATCH_SITES+= https://www.gentei.org/~yuuji/software/emacs28canna/:canna
+PATCHFILES+= emacs28.1-canna-20220406b.diff.gz:-p1:canna
.endif
MAINTAINER= emacs@FreeBSD.org
@@ -40,8 +39,8 @@ USE_XORG= ice sm x11 xcb xext xfixes xinerama xmu xrandr xt
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-build-details \
--localstatedir=/var \
- --without-libsystemd \
--without-gconf \
+ --without-libsystemd \
--without-selinux
.if ${FLAVOR:U} == canna
CONFIGURE_ARGS+= --with-canna
@@ -95,10 +94,9 @@ PLIST_FILES+= ${DATADIR}/${DISTVERSION}/lisp/canna.el.gz \
PLIST_SUB= EMACS_VER=${DISTVERSION} \
GNU_HOST=${CONFIGURE_TARGET}
-OPTIONS_DEFINE= ACL DBUS FCITXPATCH GNUTLS GSETTINGS \
- HARFBUZZ JSON LCMS2 M17N MAILUTILS MODULES \
- NATIVECOMP OTF SCROLLBARS SOURCES THREADS XFT \
- XIM XML XWIDGETS
+OPTIONS_DEFINE= ACL DBUS GNUTLS GSETTINGS HARFBUZZ JSON LCMS2 \
+ M17N MAILUTILS MODULES NATIVECOMP OTF \
+ SCROLLBARS SOURCES THREADS XFT XIM XML XWIDGETS
OPTIONS_DEFAULT= ACL CAIRO DBUS GIF GNUTLS GSETTINGS GTK3 \
HARFBUZZ JPEG JSON KQUEUE LCMS2 M17N MAILUTILS \
MODULES OSS OTF PNG SCROLLBARS SOURCES SVG \
@@ -110,16 +108,15 @@ OPTIONS_RADIO_FILENOTIFY= GFILE KQUEUE
OPTIONS_RADIO_SOUND= ALSA OSS
OPTIONS_RADIO_X11TOOLKIT= GTK2 GTK3 MOTIF XAW XAW3D
.if ${FLAVOR:U} == nox
-OPTIONS_EXCLUDE= ALSA CAIRO DBUS FCITXPATCH GFILE GIF \
- GSETTINGS GTK2 GTK3 HARFBUZZ JPEG LCMS2 M17N \
- MAGICK MOTIF OSS OTF PNG SCROLLBARS SVG TIFF \
- XAW XAW3D XFT XIM XPM XWIDGETS
+OPTIONS_EXCLUDE= ALSA CAIRO DBUS GFILE GIF GSETTINGS GTK2 GTK3 \
+ HARFBUZZ JPEG LCMS2 M17N MAGICK MOTIF OSS OTF \
+ PNG SCROLLBARS SVG TIFF XAW XAW3D XFT XIM XPM \
+ XWIDGETS
.endif
OPTIONS_SUB= YES
ACL_DESC= Access control list support
CAIRO_DESC= Cairo graphics library support [implies PNG, XFT]
-FCITXPATCH_DESC= Patch to pass C-Space to Fcitx input method
FILENOTIFY_DESC= File notification support
GFILE_DESC= File notification via gfile
GRAPHICS_DESC= Graphics support
@@ -149,7 +146,6 @@ CAIRO_USE= GNOME=cairo
CAIRO_CONFIGURE_WITH= cairo
DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus
DBUS_CONFIGURE_WITH= dbus
-FCITXPATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_xfns.c
GFILE_USE= GNOME=glib20
GFILE_CONFIGURE_ON= --with-file-notification=gfile
GIF_LIB_DEPENDS= libgif.so:graphics/giflib
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo
index ed3b97dab281..aacd3598deac 100644
--- a/editors/emacs/distinfo
+++ b/editors/emacs/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1649256614
-SHA256 (emacs-28.1.tar.xz) = 28b1b3d099037a088f0a4ca251d7e7262eab5ea1677aabffa6c4426961ad75e1
-SIZE (emacs-28.1.tar.xz) = 47699512
+TIMESTAMP = 1663333582
+SHA256 (emacs-28.2.tar.xz) = ee21182233ef3232dc97b486af2d86e14042dbb65bbc535df562c3a858232488
+SIZE (emacs-28.2.tar.xz) = 47722600
SHA256 (emacs28.1-canna-20220406b.diff.gz) = a57b7ca032229ce4d1eb2b2e59458db40e9ffc371a15e833699f3ce7caf05684
SIZE (emacs28.1-canna-20220406b.diff.gz) = 30564
diff --git a/editors/emacs/files/extra-patch-src_xfns.c b/editors/emacs/files/extra-patch-src_xfns.c
deleted file mode 100644
index 01b0f666e419..000000000000
--- a/editors/emacs/files/extra-patch-src_xfns.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/xfns.c.orig 2020-02-17 01:35:32 UTC
-+++ src/xfns.c
-@@ -2237,8 +2237,8 @@ static XIMStyle best_xim_style (XIMStyles *);
-
- static const XIMStyle supported_xim_styles[] =
- {
-- XIMPreeditPosition | XIMStatusArea,
- XIMPreeditPosition | XIMStatusNothing,
-+ XIMPreeditPosition | XIMStatusArea,
- XIMPreeditPosition | XIMStatusNone,
- XIMPreeditNothing | XIMStatusArea,
- XIMPreeditNothing | XIMStatusNothing,
diff --git a/editors/emacs/pkg-plist b/editors/emacs/pkg-plist
index 55d434a855d5..8128eb1b01b0 100644
--- a/editors/emacs/pkg-plist
+++ b/editors/emacs/pkg-plist
@@ -3652,6 +3652,8 @@ share/metainfo/emacs.metainfo.xml
%%DATADIR%%/%%EMACS_VER%%/lisp/term/common-win.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/term/cygwin.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/term/cygwin.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/fbterm.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/fbterm.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/term/internal.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/term/internal.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/term/iris-ansi.el.gz
diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index 8785c415a145..0d7fe09b33a1 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -1,5 +1,6 @@
PORTNAME= flim
PORTVERSION= 1.14.9.${SNAPDATE}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= editors elisp
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
diff --git a/editors/paredit-mode.el/Makefile b/editors/paredit-mode.el/Makefile
index 88834df6faee..83bee1d217ca 100644
--- a/editors/paredit-mode.el/Makefile
+++ b/editors/paredit-mode.el/Makefile
@@ -1,6 +1,6 @@
PORTNAME= paredit-mode.el
PORTVERSION= 24
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= editors elisp
MASTER_SITES= http://mumble.net/~campbell/emacs/
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile
index 67eeb6e25be9..9e45005fba2c 100644
--- a/editors/psgml/Makefile
+++ b/editors/psgml/Makefile
@@ -1,6 +1,6 @@
PORTNAME= psgml
PORTVERSION= 1.4.0
-PORTREVISION= 14
+PORTREVISION= 15
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 9ba961df0784..cbf7aa611864 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -1,5 +1,6 @@
PORTNAME= semi
PORTVERSION= ${SEMI_VER}.${SNAPDATE}
+PORTREVISION= 1
CATEGORIES= editors elisp
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
diff --git a/editors/slime/Makefile b/editors/slime/Makefile
index c5d0795c03a5..87d658f64c54 100644
--- a/editors/slime/Makefile
+++ b/editors/slime/Makefile
@@ -1,7 +1,7 @@
PORTNAME= slime
DISTVERSIONPREFIX= v
DISTVERSION= 2.26.1-9
-PORTREVISION= 4
+PORTREVISION= 5
DISTVERSIONSUFFIX= -gf368e22a
CATEGORIES= editors elisp
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
diff --git a/editors/sly-asdf/Makefile b/editors/sly-asdf/Makefile
index e16b986cef22..1f25694feba0 100644
--- a/editors/sly-asdf/Makefile
+++ b/editors/sly-asdf/Makefile
@@ -1,6 +1,6 @@
PORTNAME= sly-asdf
PORTVERSION= 20210308
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= editors elisp
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
diff --git a/editors/sly-named-readtables/Makefile b/editors/sly-named-readtables/Makefile
index a1b35636dc0c..e7c783a32244 100644
--- a/editors/sly-named-readtables/Makefile
+++ b/editors/sly-named-readtables/Makefile
@@ -1,6 +1,6 @@
PORTNAME= sly-named-readtables
PORTVERSION= 20191013
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= editors elisp
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
diff --git a/editors/sly-quicklisp/Makefile b/editors/sly-quicklisp/Makefile
index ad5e9ddb1a72..4ee056975a7b 100644
--- a/editors/sly-quicklisp/Makefile
+++ b/editors/sly-quicklisp/Makefile
@@ -1,6 +1,6 @@
PORTNAME= sly-quicklisp
PORTVERSION= 20200707
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= editors elisp
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
diff --git a/editors/sly/Makefile b/editors/sly/Makefile
index c99df6a902b1..3b84700e8c98 100644
--- a/editors/sly/Makefile
+++ b/editors/sly/Makefile
@@ -1,6 +1,6 @@
PORTNAME= sly
DISTVERSION= 1.0.43
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= editors elisp
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index a0649551e693..78f04eacce5f 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -1,5 +1,6 @@
PORTNAME= tamago
PORTVERSION= 4.0.6.0.20041122.19.15
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= editors elisp
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
diff --git a/editors/web-mode/Makefile b/editors/web-mode/Makefile
index 5486d7e509b3..490507d39ea4 100644
--- a/editors/web-mode/Makefile
+++ b/editors/web-mode/Makefile
@@ -1,7 +1,7 @@
PORTNAME= web-mode
PORTVERSION= 15.1
DISTVERSIONPREFIX= v
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= editors elisp
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
diff --git a/editors/with-editor-devel/Makefile b/editors/with-editor-devel/Makefile
index 07d07bd0551b..218da4d98528 100644
--- a/editors/with-editor-devel/Makefile
+++ b/editors/with-editor-devel/Makefile
@@ -1,6 +1,7 @@
PORTNAME= with-editor
DISTVERSIONPREFIX= v
DISTVERSION= 3.2.0-26
+PORTREVISION= 1
DISTVERSIONSUFFIX= -g1d5860c
CATEGORIES= editors elisp
PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX}
diff --git a/editors/with-editor/Makefile b/editors/with-editor/Makefile
index 63aef9051414..90d2ff056adc 100644
--- a/editors/with-editor/Makefile
+++ b/editors/with-editor/Makefile
@@ -1,7 +1,7 @@
PORTNAME= with-editor
DISTVERSIONPREFIX= v
DISTVERSION= 3.2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= editors elisp
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}