Index: Mk/Uses/emacs.mk =================================================================== --- Mk/Uses/emacs.mk +++ Mk/Uses/emacs.mk @@ -34,15 +34,15 @@ # This will prevent flavors. # # Variables, which can be read by ports: -# EMACS_CMD: Emacs command with full path (e.g. /usr/local/bin/emacs-28.1) +# EMACS_CMD: Emacs command with full path (e.g. /usr/local/bin/emacs-28.2) # EMACS_FLAVOR: Used for dependencies (e.g. BUILD_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash@${EMACS_FLAVOR}) # EMACS_LIBDIR: Emacs Library directory without ${PREFIX} (e.g. share/emacs) -# EMACS_LIBDIR_WITH_VER: Library directory without ${PREFIX} including version (e.g. share/emacs/28.1) +# EMACS_LIBDIR_WITH_VER: Library directory without ${PREFIX} including version (e.g. share/emacs/28.2) # EMACS_MAJOR_VER: Emacs major version (e.g. 28) # EMACS_PKGNAMESUFFIX: PKGNAMESUFFIX to distinguish Emacs flavors # EMACS_SITE_LISPDIR: Emacs site-lisp directory without ${PREFIX} (e.g. share/emacs/site-lisp) -# EMACS_VER: Emacs version (e.g. 28.1) -# EMACS_VERSION_SITE_LISPDIR: Include version (e.g. share/emacs/28.1/site-lisp) +# EMACS_VER: Emacs version (e.g. 28.2) +# EMACS_VERSION_SITE_LISPDIR: Include version (e.g. share/emacs/28.2/site-lisp) #------------------------------------------------------------------------------- # # MAINTAINER: emacs@FreeBSD.org @@ -108,7 +108,7 @@ EMACS_VER= 29.0.50 EMACS_PORTDIR= editors/emacs-devel . else -EMACS_VER= 28.1 +EMACS_VER= 28.2 EMACS_PORTDIR= editors/emacs . endif Index: audio/emms/Makefile =================================================================== --- audio/emms/Makefile +++ audio/emms/Makefile @@ -1,6 +1,6 @@ PORTNAME= emms DISTVERSION= 5.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= audio elisp MASTER_SITES= GNU PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: cad/dinotrace/Makefile =================================================================== --- cad/dinotrace/Makefile +++ cad/dinotrace/Makefile @@ -1,5 +1,6 @@ PORTNAME= dinotrace PORTVERSION= 9.4f +PORTREVISION= 1 CATEGORIES= cad MASTER_SITES= http://www.veripool.org/ftp/ PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: cad/verilog-mode.el/Makefile =================================================================== --- cad/verilog-mode.el/Makefile +++ cad/verilog-mode.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= verilog-mode.el PORTVERSION= 801 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= cad elisp MASTER_SITES= http://www.veripool.org/ftp/ PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: databases/bbdb/Makefile =================================================================== --- databases/bbdb/Makefile +++ databases/bbdb/Makefile @@ -1,7 +1,7 @@ PORTNAME= bbdb DISTVERSIONPREFIX= v DISTVERSION= 3.2.2a -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: databases/closql/Makefile =================================================================== --- databases/closql/Makefile +++ databases/closql/Makefile @@ -1,7 +1,7 @@ PORTNAME= closql DISTVERSIONPREFIX= v DISTVERSION= 1.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: databases/emacsql/Makefile =================================================================== --- databases/emacsql/Makefile +++ databases/emacsql/Makefile @@ -1,6 +1,6 @@ PORTNAME= emacsql DISTVERSION= 3.0.0-17 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONSUFFIX= -g3747260 CATEGORIES= databases elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: databases/gnats4/Makefile =================================================================== --- databases/gnats4/Makefile +++ databases/gnats4/Makefile @@ -1,6 +1,6 @@ PORTNAME= gnats PORTVERSION= 4.1.0 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= databases devel MASTER_SITES= GNU PKGNAMESUFFIX= 4 Index: databases/pg.el/Makefile =================================================================== --- databases/pg.el/Makefile +++ databases/pg.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= pg.el DISTVERSION= 0.13 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: deskutils/howm/Makefile =================================================================== --- deskutils/howm/Makefile +++ deskutils/howm/Makefile @@ -1,6 +1,6 @@ PORTNAME= howm PORTVERSION= 1.4.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils MASTER_SITES= http://howm.sourceforge.jp/a/ PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: devel/cask/Makefile =================================================================== --- devel/cask/Makefile +++ devel/cask/Makefile @@ -1,7 +1,7 @@ PORTNAME= cask PORTVERSION= 0.8.3 DISTVERSIONPREFIX= v -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: devel/clojure-cider/Makefile =================================================================== --- devel/clojure-cider/Makefile +++ devel/clojure-cider/Makefile @@ -1,5 +1,6 @@ PORTNAME= clojure-cider PORTVERSION= 1.5.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: devel/dash.el/Makefile =================================================================== --- devel/dash.el/Makefile +++ devel/dash.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= dash.el DISTVERSION= 2.19.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: devel/distel/Makefile =================================================================== --- devel/distel/Makefile +++ devel/distel/Makefile @@ -1,6 +1,6 @@ PORTNAME= distel PORTVERSION= 4.1.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: devel/epl.el/Makefile =================================================================== --- devel/epl.el/Makefile +++ devel/epl.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= epl.el PORTVERSION= 0.8 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: devel/forge-devel/Makefile =================================================================== --- devel/forge-devel/Makefile +++ devel/forge-devel/Makefile @@ -1,6 +1,7 @@ PORTNAME= forge DISTVERSIONPREFIX= v DISTVERSION= 0.3.1-69 +PORTREVISION= 1 DISTVERSIONSUFFIX= -g6a820a4 CATEGORIES= devel elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} Index: devel/forge/Makefile =================================================================== --- devel/forge/Makefile +++ devel/forge/Makefile @@ -1,7 +1,7 @@ PORTNAME= forge DISTVERSIONPREFIX= v DISTVERSION= 0.3.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: devel/gettext-po-mode/Makefile =================================================================== --- devel/gettext-po-mode/Makefile +++ devel/gettext-po-mode/Makefile @@ -1,5 +1,5 @@ PORTNAME= gettext-po-mode -PORTREVISION= 1 +PORTREVISION= 2 MAINTAINER= mandree@FreeBSD.org COMMENT= GNU gettext po-mode for emacs Index: devel/ghub-devel/Makefile =================================================================== --- devel/ghub-devel/Makefile +++ devel/ghub-devel/Makefile @@ -1,6 +1,7 @@ PORTNAME= ghub DISTVERSIONPREFIX= v DISTVERSION= 3.5.6-36 +PORTREVISION= 1 DISTVERSIONSUFFIX= -g4e5bb75 CATEGORIES= devel elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} Index: devel/ghub/Makefile =================================================================== --- devel/ghub/Makefile +++ devel/ghub/Makefile @@ -1,7 +1,7 @@ PORTNAME= ghub DISTVERSIONPREFIX= v DISTVERSION= 3.5.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: devel/git-modes/Makefile =================================================================== --- devel/git-modes/Makefile +++ devel/git-modes/Makefile @@ -1,6 +1,6 @@ PORTNAME= git-modes DISTVERSION= 1.4.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: devel/libegit2/Makefile =================================================================== --- devel/libegit2/Makefile +++ devel/libegit2/Makefile @@ -1,6 +1,6 @@ PORTNAME= libegit2 DISTVERSION= g20200515 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: devel/lua-mode/Makefile =================================================================== --- devel/lua-mode/Makefile +++ devel/lua-mode/Makefile @@ -1,5 +1,6 @@ PORTNAME= lua-mode PORTVERSION= 20210802 +PORTREVISION= 1 DISTVERSIONPREFIX=v CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: devel/magit-devel/Makefile =================================================================== --- devel/magit-devel/Makefile +++ devel/magit-devel/Makefile @@ -1,6 +1,7 @@ PORTNAME= magit DISTVERSIONPREFIX= v DISTVERSION= 3.3.0-430 +PORTREVISION= 1 DISTVERSIONSUFFIX= -gc1def981 CATEGORIES= devel elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} Index: devel/magit/Makefile =================================================================== --- devel/magit/Makefile +++ devel/magit/Makefile @@ -1,7 +1,7 @@ PORTNAME= magit DISTVERSIONPREFIX= v DISTVERSION= 3.3.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: devel/p5-Sepia/Makefile =================================================================== --- devel/p5-Sepia/Makefile +++ devel/p5-Sepia/Makefile @@ -1,6 +1,6 @@ PORTNAME= Sepia PORTVERSION= 0.992 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- Index: devel/pkg-info.el/Makefile =================================================================== --- devel/pkg-info.el/Makefile +++ devel/pkg-info.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= pkg-info.el PORTVERSION= 0.6 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: devel/psvn/Makefile =================================================================== --- devel/psvn/Makefile +++ devel/psvn/Makefile @@ -1,6 +1,6 @@ PORTNAME= psvn PORTVERSION= 20150720.214200 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel elisp MASTER_SITES= http://www.xsteve.at/prg/emacs/ PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: devel/tablist/Makefile =================================================================== --- devel/tablist/Makefile +++ devel/tablist/Makefile @@ -1,6 +1,7 @@ PORTNAME= tablist DISTVERSIONPREFIX= v DISTVERSION= 1.0-13 +PORTREVISION= 1 DISTVERSIONSUFFIX= -gfaab7a0 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: devel/transient-devel/Makefile =================================================================== --- devel/transient-devel/Makefile +++ devel/transient-devel/Makefile @@ -1,6 +1,7 @@ PORTNAME= transient DISTVERSIONPREFIX= v DISTVERSION= 0.3.7-159 +PORTREVISION= 1 DISTVERSIONSUFFIX= -g6b9c93a CATEGORIES= devel elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} Index: devel/transient/Makefile =================================================================== --- devel/transient/Makefile +++ devel/transient/Makefile @@ -1,7 +1,7 @@ PORTNAME= transient DISTVERSIONPREFIX= v DISTVERSION= 0.3.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: devel/treepy.el/Makefile =================================================================== --- devel/treepy.el/Makefile +++ devel/treepy.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= treepy.el DISTVERSION= 0.1.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: devel/xcscope.el/Makefile =================================================================== --- devel/xcscope.el/Makefile +++ devel/xcscope.el/Makefile @@ -1,7 +1,7 @@ PORTNAME= xcscope.el DISTVERSIONPREFIX= v DISTVERSION= 1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= jhb@FreeBSD.org Index: editors/apel/Makefile =================================================================== --- editors/apel/Makefile +++ editors/apel/Makefile @@ -1,6 +1,6 @@ PORTNAME= apel PORTVERSION= 10.8.${SNAPDATE} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= editors elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: editors/emacs/Makefile =================================================================== --- editors/emacs/Makefile +++ 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 @@ 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_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_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_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 Index: editors/emacs/distinfo =================================================================== --- editors/emacs/distinfo +++ 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 Index: editors/emacs/files/extra-patch-src_xfns.c =================================================================== --- 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, Index: editors/emacs/pkg-plist =================================================================== --- editors/emacs/pkg-plist +++ editors/emacs/pkg-plist @@ -3652,6 +3652,8 @@ %%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 Index: editors/flim/Makefile =================================================================== --- editors/flim/Makefile +++ editors/flim/Makefile @@ -1,6 +1,6 @@ PORTNAME= flim PORTVERSION= 1.14.9.${SNAPDATE} -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= editors elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: editors/paredit-mode.el/Makefile =================================================================== --- editors/paredit-mode.el/Makefile +++ 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} Index: editors/psgml/Makefile =================================================================== --- editors/psgml/Makefile +++ 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} Index: editors/semi/Makefile =================================================================== --- editors/semi/Makefile +++ editors/semi/Makefile @@ -1,6 +1,6 @@ PORTNAME= semi PORTVERSION= ${SEMI_VER}.${SNAPDATE} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= editors elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: editors/slime/Makefile =================================================================== --- editors/slime/Makefile +++ 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} Index: editors/sly-asdf/Makefile =================================================================== --- editors/sly-asdf/Makefile +++ editors/sly-asdf/Makefile @@ -1,6 +1,6 @@ PORTNAME= sly-asdf PORTVERSION= 20210308 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= editors elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: editors/sly-named-readtables/Makefile =================================================================== --- editors/sly-named-readtables/Makefile +++ 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} Index: editors/sly-quicklisp/Makefile =================================================================== --- editors/sly-quicklisp/Makefile +++ editors/sly-quicklisp/Makefile @@ -1,6 +1,6 @@ PORTNAME= sly-quicklisp PORTVERSION= 20200707 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= editors elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: editors/sly/Makefile =================================================================== --- editors/sly/Makefile +++ editors/sly/Makefile @@ -1,6 +1,6 @@ PORTNAME= sly DISTVERSION= 1.0.43 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= editors elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: editors/tamago/Makefile =================================================================== --- editors/tamago/Makefile +++ 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} Index: editors/web-mode/Makefile =================================================================== --- editors/web-mode/Makefile +++ 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} Index: editors/with-editor-devel/Makefile =================================================================== --- editors/with-editor-devel/Makefile +++ 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} Index: editors/with-editor/Makefile =================================================================== --- editors/with-editor/Makefile +++ 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} Index: irc/riece/Makefile =================================================================== --- irc/riece/Makefile +++ irc/riece/Makefile @@ -1,6 +1,6 @@ PORTNAME= riece PORTVERSION= 9.0.0 -PORTREVISION= 17 +PORTREVISION= 18 PORTEPOCH= 1 CATEGORIES= irc elisp MASTER_SITES= SAVANNAH Index: japanese/boiled-mozc/Makefile =================================================================== --- japanese/boiled-mozc/Makefile +++ japanese/boiled-mozc/Makefile @@ -1,7 +1,7 @@ PORTNAME= boiled-mozc PORTVERSION= 0.7 DISTVERSIONPREFIX=v -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= japanese editors elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: japanese/cp5022x-el/Makefile =================================================================== --- japanese/cp5022x-el/Makefile +++ japanese/cp5022x-el/Makefile @@ -1,6 +1,6 @@ PORTNAME= cp5022x PORTVERSION= 0.0.20120324 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= japanese elisp PKGNAMESUFFIX= -el${EMACS_PKGNAMESUFFIX} Index: japanese/ddskk/Makefile =================================================================== --- japanese/ddskk/Makefile +++ japanese/ddskk/Makefile @@ -1,6 +1,6 @@ PORTNAME= ddskk DISTVERSION= 16.2 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= japanese elisp MASTER_SITES= ftp://ftp.ring.gr.jp/pub/elisp/skk/maintrunk/ \ http://www.ring.gr.jp/archives/elisp/skk/maintrunk/ \ Index: japanese/lookup/Makefile =================================================================== --- japanese/lookup/Makefile +++ japanese/lookup/Makefile @@ -1,6 +1,6 @@ PORTNAME= lookup PORTVERSION= 1.99.96.20180209 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= japanese elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: japanese/migemo.el/Makefile =================================================================== --- japanese/migemo.el/Makefile +++ japanese/migemo.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= migemo.el PORTVERSION= 1.9.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= japanese elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: japanese/mozc-server/Makefile =================================================================== --- japanese/mozc-server/Makefile +++ japanese/mozc-server/Makefile @@ -1,7 +1,7 @@ PORTNAME= mozc PORTVERSION= 2.23.2815.102.01 DISTVERSIONPREFIX= v -PORTREVISION?= 7 +PORTREVISION?= 8 CATEGORIES= japanese MAINTAINER= hrs@FreeBSD.org Index: japanese/navi2ch/Makefile =================================================================== --- japanese/navi2ch/Makefile +++ japanese/navi2ch/Makefile @@ -1,6 +1,6 @@ PORTNAME= navi2ch PORTVERSION= 2.0.0.d -PORTREVISION= 15 +PORTREVISION= 16 PORTEPOCH= 1 CATEGORIES= japanese www elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: japanese/yc.el/Makefile =================================================================== --- japanese/yc.el/Makefile +++ japanese/yc.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= yc.el PORTVERSION= 5.2.1 -PORTREVISION= 20 +PORTREVISION= 21 PORTEPOCH= 1 CATEGORIES= japanese elisp MASTER_SITES= http://www.ceres.dti.ne.jp/~knak/ Index: lang/alchemist.el/Makefile =================================================================== --- lang/alchemist.el/Makefile +++ lang/alchemist.el/Makefile @@ -1,7 +1,7 @@ PORTNAME= alchemist.el PORTVERSION= 1.8.2 DISTVERSIONPREFIX= v -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= lang PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: lang/clojure-mode.el/Makefile =================================================================== --- lang/clojure-mode.el/Makefile +++ lang/clojure-mode.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= clojure-mode.el PORTVERSION= 5.11.0 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 1 CATEGORIES= lang elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: lang/csharp-mode.el/Makefile =================================================================== --- lang/csharp-mode.el/Makefile +++ lang/csharp-mode.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= csharp-mode.el PORTVERSION= 0.9.2 -PORTREVISION= 6 +PORTREVISION= 7 DISTVERSIONPREFIX= v CATEGORIES= lang elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: lang/elixir-mode.el/Makefile =================================================================== --- lang/elixir-mode.el/Makefile +++ lang/elixir-mode.el/Makefile @@ -1,7 +1,7 @@ PORTNAME= elixir-mode.el DISTVERSIONPREFIX= v PORTVERSION= 2.3.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= lang PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: lang/haskell-mode.el/Makefile =================================================================== --- lang/haskell-mode.el/Makefile +++ lang/haskell-mode.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= haskell-mode DISTVERSION= 17.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: lang/php-mode.el/Makefile =================================================================== --- lang/php-mode.el/Makefile +++ lang/php-mode.el/Makefile @@ -1,6 +1,7 @@ PORTNAME= php-mode.el DISTVERSIONPREFIX= v DISTVERSION= 1.24.1 +PORTREVISION= 1 CATEGORIES= lang elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: lang/tuareg-mode.el/Makefile =================================================================== --- lang/tuareg-mode.el/Makefile +++ lang/tuareg-mode.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= tuareg-mode PORTVERSION= 2.0.8 -PORTREVISION= 11 +PORTREVISION= 12 PORTEPOCH= 1 CATEGORIES= lang elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: mail/anubis/Makefile =================================================================== --- mail/anubis/Makefile +++ mail/anubis/Makefile @@ -1,6 +1,6 @@ PORTNAME= anubis PORTVERSION= 4.2 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= mail MASTER_SITES= GNU Index: mail/c-sig/Makefile =================================================================== --- mail/c-sig/Makefile +++ mail/c-sig/Makefile @@ -1,6 +1,6 @@ PORTNAME= c-sig PORTVERSION= 3.8.0.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= mail elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: mail/mailest/Makefile =================================================================== --- mail/mailest/Makefile +++ mail/mailest/Makefile @@ -1,7 +1,7 @@ PORTNAME= mailest PORTVERSION= 0.9.24 DISTVERSIONPREFIX= ${PORTNAME}- -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= mail PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: mail/mailutils/Makefile =================================================================== --- mail/mailutils/Makefile +++ mail/mailutils/Makefile @@ -1,5 +1,6 @@ PORTNAME= mailutils PORTVERSION= 3.15 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= GNU GNU_ALPHA Index: mail/mew-devel/Makefile =================================================================== --- mail/mew-devel/Makefile +++ mail/mew-devel/Makefile @@ -2,7 +2,7 @@ DISTVERSIONPREFIX= v DISTVERSION= 6.8-72 DISTVERSIONSUFFIX= -gfc4bca6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} Index: mail/mew/Makefile =================================================================== --- mail/mew/Makefile +++ mail/mew/Makefile @@ -1,6 +1,6 @@ PORTNAME= mew PORTVERSION= 6.8 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= mail elisp MASTER_SITES= http://www.mew.org/Release/ PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: mail/mu4e-maildirs/Makefile =================================================================== --- mail/mu4e-maildirs/Makefile +++ mail/mu4e-maildirs/Makefile @@ -1,6 +1,6 @@ PORTNAME= mu4e-maildirs PORTVERSION= 0.8.20201028 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: mail/mu4e/Makefile =================================================================== --- mail/mu4e/Makefile +++ mail/mu4e/Makefile @@ -1,5 +1,6 @@ PORTNAME= mu4e PORTVERSION= 1.6.10 +PORTREVISION= 1 CATEGORIES= mail PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: mail/notmuch-emacs/Makefile =================================================================== --- mail/notmuch-emacs/Makefile +++ mail/notmuch-emacs/Makefile @@ -1,3 +1,4 @@ +PORTREVISION= 1 CATEGORIES= mail elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX:S/^$/-emacs/} COMMENT= Emacs major-mode for the Notmuch email search and tagging application Index: mail/wanderlust/Makefile =================================================================== --- mail/wanderlust/Makefile +++ mail/wanderlust/Makefile @@ -1,6 +1,6 @@ PORTNAME= wanderlust PORTVERSION= 2.15.9.b.${SNAPDATE} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: mail/x-face-e21/Makefile =================================================================== --- mail/x-face-e21/Makefile +++ mail/x-face-e21/Makefile @@ -1,6 +1,6 @@ PORTNAME= x-face-e21 PORTVERSION= 20070306 -PORTREVISION= 23 +PORTREVISION= 24 CATEGORIES= mail elisp MASTER_SITES= http://www.jpl.org/elips/ PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: mail/xcite/Makefile =================================================================== --- mail/xcite/Makefile +++ mail/xcite/Makefile @@ -1,6 +1,6 @@ PORTNAME= xcite PORTVERSION= 1.60 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= mail elisp MASTER_SITES= https://www.gentei.org/~yuuji/software/ PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: math/coq/Makefile =================================================================== --- math/coq/Makefile +++ math/coq/Makefile @@ -1,6 +1,6 @@ PORTNAME= coq PORTVERSION= 8.6 -PORTREVISION= 11 +PORTREVISION= 12 PORTEPOCH= 3 CATEGORIES= math MASTER_SITES= http://coq.inria.fr/distrib/V${PORTVERSION}/files/ \ Index: math/ess/Makefile =================================================================== --- math/ess/Makefile +++ math/ess/Makefile @@ -1,6 +1,6 @@ PORTNAME= ess DISTVERSION= 18.10.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= math MASTER_SITES= http://ess.r-project.org/downloads/ess/ \ http://stat.ethz.ch/ESS/downloads/ess/ Index: misc/compat.el/Makefile =================================================================== --- misc/compat.el/Makefile +++ misc/compat.el/Makefile @@ -1,5 +1,6 @@ PORTNAME= compat.el DISTVERSION= 28.1.2.2 +PORTREVISION= 1 CATEGORIES= misc elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: misc/elscreen/Makefile =================================================================== --- misc/elscreen/Makefile +++ misc/elscreen/Makefile @@ -1,6 +1,6 @@ PORTNAME= elscreen PORTVERSION= 1.4.6.20180320 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= misc elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: net/gnu-radius/Makefile =================================================================== --- net/gnu-radius/Makefile +++ net/gnu-radius/Makefile @@ -1,6 +1,6 @@ PORTNAME= gnu-radius PORTVERSION= 1.6.1 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= net MASTER_SITES= GNU/radius DISTNAME= radius-${PORTVERSION} Index: print/a2ps/Makefile =================================================================== --- print/a2ps/Makefile +++ print/a2ps/Makefile @@ -1,6 +1,6 @@ PORTNAME= a2ps PORTVERSION= 4.13b -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= print MASTER_SITES= GNU LOCAL/hrs/a2ps/:i18n Index: print/auctex/Makefile =================================================================== --- print/auctex/Makefile +++ print/auctex/Makefile @@ -1,5 +1,6 @@ PORTNAME= auctex PORTVERSION= 13.1 +PORTREVISION= 1 CATEGORIES= print elisp MASTER_SITES= GNU PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: print/hyperlatex/Makefile =================================================================== --- print/hyperlatex/Makefile +++ print/hyperlatex/Makefile @@ -1,6 +1,6 @@ PORTNAME= Hyperlatex DISTVERSION= 2.9a -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= print MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME:tl}/2.9a PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: print/pdf-tools/Makefile =================================================================== --- print/pdf-tools/Makefile +++ print/pdf-tools/Makefile @@ -2,7 +2,7 @@ DISTVERSIONPREFIX= v DISTVERSION= 0.91-54 DISTVERSIONSUFFIX= -gbb0b71f -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: print/yatex/Makefile =================================================================== --- print/yatex/Makefile +++ print/yatex/Makefile @@ -1,6 +1,6 @@ PORTNAME= yatex PORTVERSION= 1.82 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES?= print elisp MASTER_SITES= http://www.yatex.org/ PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: security/starttls/Makefile =================================================================== --- security/starttls/Makefile +++ security/starttls/Makefile @@ -1,6 +1,6 @@ PORTNAME= starttls PORTVERSION= 0.10 -PORTREVISION= 24 +PORTREVISION= 25 CATEGORIES= security MASTER_SITES= ftp://ftp.opaopa.org/pub/elisp/ PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: sysutils/lr/Makefile =================================================================== --- sysutils/lr/Makefile +++ sysutils/lr/Makefile @@ -1,7 +1,7 @@ PORTNAME= lr DISTVERSIONPREFIX= v DISTVERSION= 1.5.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MAINTAINER= ports@FreeBSD.org Index: sysutils/puppet-mode.el/Makefile =================================================================== --- sysutils/puppet-mode.el/Makefile +++ sysutils/puppet-mode.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= puppet-mode.el PORTVERSION= 0.2 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= sysutils elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: textproc/dictem/Makefile =================================================================== --- textproc/dictem/Makefile +++ textproc/dictem/Makefile @@ -1,6 +1,6 @@ PORTNAME= dictem PORTVERSION= 1.0.4 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= textproc net elisp MASTER_SITES= SF/dictem/dictem/dictem-${PORTVERSION} PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: textproc/dictionary/Makefile =================================================================== --- textproc/dictionary/Makefile +++ textproc/dictionary/Makefile @@ -1,6 +1,6 @@ PORTNAME= dictionary PORTVERSION= 1.8.7 -PORTREVISION= 29 +PORTREVISION= 30 CATEGORIES= textproc net elisp MASTER_SITES= http://me.in-berlin.de/~myrkr/dictionary/ \ http://bsdchat.com/dist/dryice/ Index: textproc/doc-mode.el/Makefile =================================================================== --- textproc/doc-mode.el/Makefile +++ textproc/doc-mode.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= doc-mode.el PORTVERSION= 1.1 -PORTREVISION= 22 +PORTREVISION= 23 CATEGORIES= textproc elisp MASTER_SITES= SF/xpt/doc-mode/doc-mode-${PORTVERSION} PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: textproc/markdown-mode.el/Makefile =================================================================== --- textproc/markdown-mode.el/Makefile +++ textproc/markdown-mode.el/Makefile @@ -1,7 +1,7 @@ PORTNAME= markdown-mode.el DISTVERSIONPREFIX= v DISTVERSION= 2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: textproc/muse/Makefile =================================================================== --- textproc/muse/Makefile +++ textproc/muse/Makefile @@ -1,6 +1,6 @@ PORTNAME= muse PORTVERSION= 3.20 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= textproc elisp MASTER_SITES= http://download.gna.org/muse-el/ \ LOCAL/dryice \ Index: textproc/uim-el/Makefile =================================================================== --- textproc/uim-el/Makefile +++ textproc/uim-el/Makefile @@ -1,5 +1,6 @@ PORTNAME= uim-el PORTVERSION= 1.8.9.b.${SNAPDATE} +PORTREVISION= 1 CATEGORIES= textproc PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: textproc/xml-lite.el/Makefile =================================================================== --- textproc/xml-lite.el/Makefile +++ textproc/xml-lite.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= xml-lite.el PORTVERSION= 1.1 -PORTREVISION= 17 +PORTREVISION= 18 PORTEPOCH= 1 CATEGORIES= textproc elisp MASTER_SITES= http://dogbiscuit.org/mdub/software/ Index: textproc/yaml-mode.el/Makefile =================================================================== --- textproc/yaml-mode.el/Makefile +++ textproc/yaml-mode.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= yaml-mode.el PORTVERSION= 0.0.15 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: textproc/yaml.el/Makefile =================================================================== --- textproc/yaml.el/Makefile +++ textproc/yaml.el/Makefile @@ -1,6 +1,7 @@ PORTNAME= yaml.el DISTVERSIONPREFIX= v DISTVERSION= 0.5.1 +PORTREVISION= 1 CATEGORIES= textproc elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} Index: www/emacs-w3m/Makefile =================================================================== --- www/emacs-w3m/Makefile +++ www/emacs-w3m/Makefile @@ -1,5 +1,6 @@ PORTNAME= emacs-w3m PORTVERSION= 1.4.632.b.${SNAPDATE} +PORTREVISION= 1 CATEGORIES= www elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}