svn commit: r472261 - in head: . editors/emacs editors/emacs-devel editors/emacs-devel/files
Joseph Mingrone
jrm at FreeBSD.org
Tue Jun 12 16:03:58 UTC 2018
Author: jrm
Date: Tue Jun 12 16:03:56 2018
New Revision: 472261
URL: https://svnweb.freebsd.org/changeset/ports/472261
Log:
Emacs ports: Improve consistency between the two Emacs ports and...
- [1] Do not link liblockfile when MAILUTILS option is off. Users who want
mail functionality should turn on the MAILUTILS option. See PR 227799.
- [2] Create a link under exec_directory pointing to
${PREFIX}/bin/movemail. See upstream bug https://bugs.gnu.org/31737 and
PR 228833.
- Based on user feedback, change the package name for the nox flavor of
editors/emacs-devel from emacs-devel_nox to emacs-devel-nox. The
original motivation for naming the package emacs-devel_nox was so that
PKGNAMESUFFIX would match the flavor names for USES=emacs ports and
flavor names cannot contain '-'.
- Remove patches that are no longer necessary. The patch
emacs-devel/files/patch-configure.ac is no longer necessary because 10.3,
which included an old version of texinfo in base, is EOL. The lldb-gud
patch is no longer necessary because the LLDB option has been removed.
- Update editors/emacs-devel to a newer commit on the upstream master
branch.
- Customize COMMENT for nox flavor of editors/emacs-devel.
PR: 227799 [1], 228833 [2]
Submitted by: yasu at utahime.org [1], bengta at sics.se [2]
Approved by: ashish
Differential Revision: https://reviews.freebsd.org/D15728
Deleted:
head/editors/emacs-devel/files/extrapatch-lldb-gud.el
head/editors/emacs-devel/files/patch-configure.ac
Modified:
head/UPDATING
head/editors/emacs-devel/Makefile (contents, props changed)
head/editors/emacs-devel/distinfo (contents, props changed)
head/editors/emacs-devel/pkg-plist (contents, props changed)
head/editors/emacs/Makefile (contents, props changed)
head/editors/emacs/pkg-plist (contents, props changed)
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Tue Jun 12 15:51:26 2018 (r472260)
+++ head/UPDATING Tue Jun 12 16:03:56 2018 (r472261)
@@ -473,7 +473,7 @@ you update your ports collection, before attempting an
# pkg install emacs-canna
# pkg install emacs-nox
# pkg install emacs-devel
- # pkg install emacs-devel_nox
+ # pkg install emacs-devel-nox
For those building their own packages, a flavor other than the default must be
specified. For example, to build the nox flavor of editors/emacs, or to build
Modified: head/editors/emacs-devel/Makefile
==============================================================================
--- head/editors/emacs-devel/Makefile Tue Jun 12 15:51:26 2018 (r472260)
+++ head/editors/emacs-devel/Makefile Tue Jun 12 16:03:56 2018 (r472261)
@@ -9,29 +9,48 @@ PKGNAMESUFFIX= -devel
MAINTAINER= emacs at FreeBSD.org
COMMENT= GNU editing macros
+.if ${FLAVOR:U} == nox
+COMMENT+= (No X flavor)
+.endif
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-CONFLICTS_INSTALL= emacs emacs-canna emacs-nox
-
FLAVORS= full nox
-full_CONFLICTS_INSTALL= emacs-devel_nox
-full_PKGNAMESUFFIX= -devel
+full_CONFLICTS_INSTALL= emacs-devel-nox
nox_CONFLICTS_INSTALL= emacs-devel
-nox_PKGNAMESUFFIX= -devel_nox
+nox_PKGNAMESUFFIX= -devel-nox
USES= autoreconf:build cpe gmake localbase:ldflags makeinfo ncurses \
pkgconfig
+.if ${FLAVOR:U} != nox
+USES+= desktop-file-utils
+USE_XORG= ice sm x11 xcb xext xfixes xinerama xmu xrandr xt
+.endif
CPE_VENDOR= gnu
USE_GITHUB= yes
GH_ACCOUNT= emacs-mirror
-GH_TAGNAME= 0f48d18
+GH_TAGNAME= 66ad986
+CONFIGURE_ARGS= --disable-build-details \
+ --localstatedir=/var \
+ --with-gameuser=games:games
+.if ${FLAVOR:U} == nox
+CONFIGURE_ARGS+= --with-sound=no --without-cairo --without-dbus \
+ --without-gconf --without-gif --without-gsettings \
+ --with-x-toolkit=no --without-jpeg --without-lcms2 \
+ --without-m17n-flt --without-imagemagick \
+ --without-libotf --without-png \
+ --without-toolkit-scroll-bars --without-rsvg \
+ --without-tiff --without-x --without-xim --without-xpm \
+ --without-xwidgets
+.else
+CONFIGURE_ARGS+= --with-x
+.endif
+# See r468320 to determine if/when the next line can be removed
+CONFIGURE_ENV= ac_cv_header_sys_sysinfo_h=no
+CONFLICTS_INSTALL= emacs emacs-canna emacs-nox
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-gameuser=games:games
-CONFIGURE_ENV= ac_cv_header_sys_sysinfo_h=no \
- ac_cv_prog_liblockfile=no
INFO= ada-mode auth autotype bovine calc ccmode cl dbus dired-x \
ebrowse ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls \
emacs-mime epa erc ert eshell eudc eww flymake forms gnus \
@@ -40,16 +59,18 @@ INFO= ada-mode auth autotype bovine calc ccmode cl db
sasl sc semantic ses sieve smtpmail speedbar srecode todo-mode \
tramp url vhdl-mode vip viper widget wisent woman
INFO_PATH= ${DATADIR_REL}/info
+.if ${FLAVOR:U} != nox
+INSTALLS_ICONS= yes
+.endif
PLIST_SUB= EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET}
SUB_FILES= sources.el
-SUB_LIST= EMACS_VER=${EMACS_VER}
+SUB_LIST= EMACS_VER=${EMACS_VER} # sources.el
-OPTIONS_DEFINE= ACL DBUS GCONF GNUTLS GSETTINGS JSON LCMS2 LLDB M17N MAILUTILS \
+OPTIONS_DEFINE= ACL DBUS GCONF GNUTLS GSETTINGS JSON LCMS2 M17N MAILUTILS \
MODULES OTF SCROLLBARS SOURCES THREADS XFT XIM XML XWIDGETS
-OPTIONS_DEFAULT= ACL DBUS FREEDESKTOP GCONF GIF GNUTLS GSETTINGS GTK3 \
- JPEG JSON KQUEUE LCMS2 M17N MAGICK MODULES OSS OTF PNG \
+OPTIONS_DEFAULT= ACL DBUS GCONF GIF GNUTLS GSETTINGS GTK3 JPEG JSON \
+ KQUEUE LCMS2 M17N MAGICK MAILUTILS MODULES OSS OTF PNG \
SCROLLBARS SOURCES SVG THREADS TIFF XFT XIM XML XPM
-OPTIONS_SUB= YES
OPTIONS_GROUP= GRAPHICS
OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM
OPTIONS_RADIO= FILENOTIFY SOUND X11TOOLKIT
@@ -57,30 +78,34 @@ 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 GCONF GFILE GIF GSETTINGS GTK2 GTK3 \
+ 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= Experimental Cairo support (implies PNG, XFT)
+CAIRO_DESC= Experimental Cairo library support (implies PNG, XFT)
FILENOTIFY_DESC= File notification support
-GCONF_DESC= GConf configuration support
GFILE_DESC= File notification via gfile
GRAPHICS_DESC= Graphics support
-GSETTINGS_DESC= GSettings support (implies DBUS)
+GSETTINGS_DESC= GSettings API for application settings
KQUEUE_DESC= File notification via kqueue
-LLDB_DESC= Enable LLDB support for GUD
#LTO_DESC= Enable link-time optimization
-MAGICK_DESC= ImageMagick support
M17N_DESC= M17N support for text-shaping (implies XFT)
+MAGICK_DESC= ImageMagick image processing support
MAILUTILS_DESC= Mail framework via GNU Mailutils
MODULES_DESC= Dynamic modules support
-OTF_DESC= Opentype fonts support (implies XFT)
-SCROLLBARS_DESC=Toolkit scroll-bars
+OTF_DESC= Opentype fonts (implies XFT)
+SCROLLBARS_DESC= Toolkit scroll-bars
SOURCES_DESC= Install sources
-SVG_DESC= SVG support (implies PNG)
-THREADS_DESC= Emacs Lisp threading support
-X11TOOLKIT_DESC=X11 toolkit
+SVG_DESC= Scalable vector graphics support (implies PNG)
+X11TOOLKIT_DESC= X11 toolkit
XAW3D_DESC= Athena3D widgets
XAW_DESC= Athena widgets
-XIM_DESC= X Input Method Support
-XWIDGETS_DESC= GTK widgets in Emacs buffers (requires GTK3)
+XIM_DESC= X Input Method
+XWIDGETS_DESC= Experimental GTK widgets (requires GTK3)
ACL_CONFIGURE_ENABLE= acl
ALSA_CONFIGURE_ON= --with-sound=alsa
@@ -93,6 +118,7 @@ DBUS_CONFIGURE_WITH= dbus
GCONF_USE= GNOME=gconf2
GCONF_CONFIGURE_WITH= gconf
GFILE_CONFIGURE_ON= --with-file-notification=gfile
+GFILE_USE= GNOME=glib20
GIF_LIB_DEPENDS= libgif.so:graphics/giflib
GIF_CONFIGURE_WITH= gif
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
@@ -101,12 +127,10 @@ GSETTINGS_USE= GNOME=glib20
GSETTINGS_CONFIGURE_WITH= gsettings
GSETTINGS_IMPLIES= DBUS
GTK2_USE= GNOME=cairo,gtk20
-GTK2_USES= gettext
GTK2_CONFIGURE_ON= --with-x-toolkit=gtk2
GTK2_LIB_DEPENDS= libfreetype.so:print/freetype2 \
libfontconfig.so:x11-fonts/fontconfig
GTK3_USE= GNOME=cairo,gtk30
-GTK3_USES= gettext
GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3
JPEG_USES= jpeg
JPEG_CONFIGURE_WITH= jpeg
@@ -115,7 +139,6 @@ JSON_LIB_DEPENDS= libjansson.so:devel/jansson
KQUEUE_CONFIGURE_ON= --with-file-notification=kqueue
LCMS2_CONFIGURE_WITH= lcms2
LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2
-LLDB_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-lldb-gud.el
#LTO_CONFIGURE_ON= --enable-link-time-optimization
M17N_LIB_DEPENDS= libm17n.so:devel/m17n-lib
M17N_CONFIGURE_WITH= m17n-flt
@@ -123,6 +146,7 @@ M17N_IMPLIES= XFT
MAGICK_LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick
MAGICK_CONFIGURE_WITH= imagemagick
MAILUTILS_CONFIGURE_WITH= mailutils
+MAILUTILS_CONFIGURE_ENV_OFF= ac_cv_prog_liblockfile=no ac_cv_lib_lockfile_maillock=no
MAILUTILS_LIB_DEPENDS= libmailutils.so:mail/mailutils
MODULES_CONFIGURE_WITH= modules
MOTIF_USES= motif
@@ -138,7 +162,6 @@ SCROLLBARS_CONFIGURE_WITH= toolkit-scroll-bars
SVG_USE= GNOME=cairo,librsvg2
SVG_CONFIGURE_WITH= rsvg
SVG_IMPLIES= PNG
-SVG_USES= gettext
THREADS_CONFIGURE_WITH= threads
TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
TIFF_CONFIGURE_WITH= tiff
@@ -157,30 +180,12 @@ XPM_USE= XORG=xpm
XPM_CONFIGURE_WITH= xpm
XWIDGETS_USE= XORG=xcomposite
XWIDGETS_CONFIGURE_WITH= xwidgets
-XWIDGETS_LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3
+XWIDGETS_LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+ libsoup-2.4.so:devel/libsoup
XWIDGETS_IMPLIES= GTK3
-.if ${FLAVOR:U} == nox
-CONFIGURE_ARGS+= --with-sound=no --without-cairo --without-dbus \
- --without-gconf --without-gif --without-gsettings \
- --with-x-toolkit=no --without-jpeg --without-lcms2 \
- --without-m17n-flt --without-imagemagick \
- --without-libotf --without-png \
- --without-toolkit-scroll-bars --without-rsvg \
- --without-tiff --without-xim --without-xpm \
- --without-xwidgets
-OPTIONS_EXCLUDE= ALSA CAIRO DBUS GCONF GIF GSETTINGS GTK2 GTK3 JPEG \
- LCMS2 M17N MAGICK MOTIF OSS OTF PNG SCROLLBARS SVG TIFF \
- XAW XAW3D XFT XIM XPM XWIDGETS
-.else
-CONFIGURE_ARGS+= --with-x
-INSTALLS_ICONS= yes
-USE_XORG= ice sm x11 xcb xext xfixes xinerama xmu xrandr xt
-USES+= desktop-file-utils
-.endif
-
EMACS_VER= 27.0.50
-EMACS_REV= 20180529
+EMACS_REV= 20180607
.include <bsd.port.options.mk>
@@ -189,20 +194,32 @@ EMACS_REV= 20180529
USES+= compiler:openmp
.endif
+.if !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MGTK3} && !${PORT_OPTIONS:MMOTIF} \
+ && !${PORT_OPTIONS:MXAW} && !${PORT_OPTIONS:MXAW3D}
+CONFIGURE_ARGS+= --with-x-toolkit=no
+.endif
+
pre-configure:
@(cd ${WRKSRC} && ./autogen.sh all)
+.if ${FLAVOR} == nox
# With a desktop entry stage-qa will give a warning about requiring
-# desktop-file-utils and portlint -C will give a warning about INSTALL_ICONS,
+# desktop-file-utils and portlint -C will give a warning about INSTALLS_ICONS,
# but don't pull in those dependencies with the nox flavor.
-.if ${FLAVOR} == nox
post-patch:
@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
.endif
+post-install-MAILUTILS-on:
+ ${LN} -sf ${PREFIX}/bin/movemail \
+ ${STAGEDIR}${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
+
post-install-SOURCES-on:
@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
${INSTALL_DATA} ${WRKDIR}/sources.el ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
+
+post-install:
+ @${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd
.include <bsd.port.mk>
Modified: head/editors/emacs-devel/distinfo
==============================================================================
--- head/editors/emacs-devel/distinfo Tue Jun 12 15:51:26 2018 (r472260)
+++ head/editors/emacs-devel/distinfo Tue Jun 12 16:03:56 2018 (r472261)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527567403
-SHA256 (emacs-mirror-emacs-27.0.50.20180529-0f48d18_GH0.tar.gz) = 10c62f3adb7a6ca4f141eb5e0ea120b72c3b39d4e504437c4491b5fda62494e1
-SIZE (emacs-mirror-emacs-27.0.50.20180529-0f48d18_GH0.tar.gz) = 40076407
+TIMESTAMP = 1528574666
+SHA256 (emacs-mirror-emacs-27.0.50.20180607-66ad986_GH0.tar.gz) = d3428532d521e6fecf2dd895bd804d60a668722232d09b6fe3b9d8c963432a61
+SIZE (emacs-mirror-emacs-27.0.50.20180607-66ad986_GH0.tar.gz) = 40097057
Modified: head/editors/emacs-devel/pkg-plist
==============================================================================
--- head/editors/emacs-devel/pkg-plist Tue Jun 12 15:51:26 2018 (r472260)
+++ head/editors/emacs-devel/pkg-plist Tue Jun 12 16:03:56 2018 (r472261)
@@ -4,9 +4,8 @@ bin/emacs
bin/emacs-%%EMACS_VER%%
bin/emacsclient
bin/etags
-%%DBUS%%lib/systemd/user/emacs.service
libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/hexl
-%%NO_MAILUTILS%%libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/movemail
+libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/movemail
libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/profile
libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/rcs2log
@(games,games,4555) libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/update-game-score
@@ -3352,6 +3351,8 @@ share/applications/emacs.desktop
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/executable.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/f90.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/f90.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake-cc.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake-cc.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake-proc.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake-proc.elc
%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake.el.gz
@@ -3893,9 +3894,7 @@ share/applications/emacs.desktop
%%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.elc
%%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el
-%%DATADIR%%/%%EMACS_VER%%/src/json.c
-%%DATADIR%%/%%EMACS_VER%%/src/ptr-bounds.h
-%%DATADIR%%/%%EMACS_VER%%/src/w32cygwinx.c
+%%DATADIR%%/site-lisp/subdirs.el
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/alloc.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/atimer.c
@@ -3984,6 +3983,7 @@ share/applications/emacs.desktop
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/insdel.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/intervals.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/intervals.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/json.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keyboard.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keyboard.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keymap.c
@@ -4011,6 +4011,7 @@ share/applications/emacs.desktop
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/process.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/process.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/profiler.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/ptr-bounds.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/puresize.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/ralloc.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/regex.c
@@ -4061,6 +4062,7 @@ share/applications/emacs.desktop
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32common.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32console.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32cygwinx.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32fns.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32font.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32font.h
@@ -4102,7 +4104,6 @@ share/applications/emacs.desktop
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xterm.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.h
-%%DATADIR%%/site-lisp/subdirs.el
share/icons/hicolor/128x128/apps/emacs.png
share/icons/hicolor/16x16/apps/emacs.png
share/icons/hicolor/24x24/apps/emacs.png
Modified: head/editors/emacs/Makefile
==============================================================================
--- head/editors/emacs/Makefile Tue Jun 12 15:51:26 2018 (r472260)
+++ head/editors/emacs/Makefile Tue Jun 12 16:03:56 2018 (r472261)
@@ -3,6 +3,7 @@
PORTNAME= emacs
DISTVERSION= ${EMACS_VER}
+PORTREVISION= 1
PORTEPOCH= 3
CATEGORIES= editors ipv6
MASTER_SITES= GNU
@@ -60,7 +61,7 @@ CONFIGURE_ARGS+= --with-x
.endif
# See r468320 to determine if/when the next line can be removed
CONFIGURE_ENV= ac_cv_header_sys_sysinfo_h=no
-CONFLICTS_INSTALL= emacs-devel emacs-devel_nox
+CONFLICTS_INSTALL= emacs-devel emacs-devel-nox
GNU_CONFIGURE= yes
INFO= ada-mode auth autotype bovine calc ccmode cl dbus dired-x \
ebrowse ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls \
@@ -81,15 +82,13 @@ PLIST_FILES+= ${DATADIR}/${EMACS_VER}/lisp/canna.el.gz
.endif
PLIST_SUB= EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET}
SUB_FILES= sources.el
-SUB_LIST= ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET} \
- EMACS_VER=${EMACS_VER} # sources.el
+SUB_LIST= EMACS_VER=${EMACS_VER} # sources.el
-OPTIONS_DEFINE= ACL DBUS GCONF GNUTLS GSETTINGS LCMS2 M17N MAILUTILS MODULES OTF\
- SCROLLBARS SOURCES XFT XIM XML XWIDGETS
-OPTIONS_DEFAULT= ACL DBUS GCONF GIF GNUTLS GSETTINGS GTK3 JPEG KQUEUE \
- LCMS2 M17N MAGICK MAILUTILS MODULES OSS OTF PNG SCROLLBARS \
- SOURCES SVG TIFF XFT XIM XML XPM
-
+OPTIONS_DEFINE= ACL DBUS GCONF GNUTLS GSETTINGS JSON LCMS2 M17N MAILUTILS \
+ MODULES OTF SCROLLBARS SOURCES THREADS XFT XIM XML XWIDGETS
+OPTIONS_DEFAULT= ACL DBUS GCONF GIF GNUTLS GSETTINGS GTK3 JPEG JSON \
+ KQUEUE LCMS2 M17N MAGICK MAILUTILS MODULES OSS OTF PNG \
+ SCROLLBARS SOURCES SVG THREADS TIFF XFT XIM XML XPM
OPTIONS_GROUP= GRAPHICS
OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM
OPTIONS_RADIO= FILENOTIFY SOUND X11TOOLKIT
@@ -112,9 +111,9 @@ GRAPHICS_DESC= Graphics support
GSETTINGS_DESC= GSettings API for application settings
KQUEUE_DESC= File notification via kqueue
#LTO_DESC= Enable link-time optimization
+M17N_DESC= M17N support for text-shaping (implies XFT)
MAGICK_DESC= ImageMagick image processing support
MAILUTILS_DESC= Mail framework via GNU Mailutils
-M17N_DESC= M17N for text-shaping (implies XFT)
MODULES_DESC= Dynamic modules support
OTF_DESC= Opentype fonts (implies XFT)
SCROLLBARS_DESC= Toolkit scroll-bars
@@ -124,7 +123,7 @@ X11TOOLKIT_DESC= X11 toolkit
XAW3D_DESC= Athena3D widgets
XAW_DESC= Athena widgets
XIM_DESC= X Input Method
-XWIDGETS_DESC= GTK widgets in Emacs buffers (requires GTK3)
+XWIDGETS_DESC= Experimental GTK widgets (requires GTK3)
ACL_CONFIGURE_ENABLE= acl
ALSA_CONFIGURE_ON= --with-sound=alsa
@@ -146,33 +145,35 @@ GSETTINGS_USE= GNOME=glib20
GSETTINGS_CONFIGURE_WITH= gsettings
GSETTINGS_IMPLIES= DBUS
GTK2_USE= GNOME=cairo,gtk20
-GTK2_USES= gettext-runtime
GTK2_CONFIGURE_ON= --with-x-toolkit=gtk2
GTK2_LIB_DEPENDS= libfreetype.so:print/freetype2 \
libfontconfig.so:x11-fonts/fontconfig
GTK3_USE= GNOME=cairo,gtk30
-GTK3_USES= gettext-runtime
GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3
JPEG_USES= jpeg
JPEG_CONFIGURE_WITH= jpeg
+JSON_CONFIGURE_WITH= json
+JSON_LIB_DEPENDS= libjansson.so:devel/jansson
KQUEUE_CONFIGURE_ON= --with-file-notification=kqueue
LCMS2_CONFIGURE_WITH= lcms2
LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2
#LTO_CONFIGURE_ON= --enable-link-time-optimization
M17N_LIB_DEPENDS= libm17n.so:devel/m17n-lib
M17N_CONFIGURE_WITH= m17n-flt
+M17N_IMPLIES= XFT
MAGICK_LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick
MAGICK_CONFIGURE_WITH= imagemagick
MAILUTILS_CONFIGURE_WITH= mailutils
+MAILUTILS_CONFIGURE_ENV_OFF= ac_cv_prog_liblockfile=no ac_cv_lib_lockfile_maillock=no
MAILUTILS_LIB_DEPENDS= libmailutils.so:mail/mailutils
MODULES_CONFIGURE_WITH= modules
-MAILUTILS_PLIST_FILES_OFF= libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}/movemail
MOTIF_USES= motif
MOTIF_CONFIGURE_ON= --with-x-toolkit=motif
MOTIF_LIB_DEPENDS= libXp.so:x11/libXp
OSS_CONFIGURE_ON= --with-sound=oss
OTF_LIB_DEPENDS= libotf.so:print/libotf
OTF_CONFIGURE_WITH= libotf
+OTF_IMPLIES= XFT
PNG_LIB_DEPENDS= libpng.so:graphics/png
PNG_CONFIGURE_WITH= png
SCROLLBARS_CONFIGURE_WITH= toolkit-scroll-bars
@@ -182,7 +183,7 @@ SOURCES_PLIST_FILES= ${DATADIR}/${EMACS_VER}/src/canna
SVG_USE= GNOME=cairo,librsvg2
SVG_CONFIGURE_WITH= rsvg
SVG_IMPLIES= PNG
-SVG_USES= gettext-runtime
+THREADS_CONFIGURE_WITH= threads
TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
TIFF_CONFIGURE_WITH= tiff
XAW_USE= XORG=xaw
@@ -200,7 +201,8 @@ XPM_USE= XORG=xpm
XPM_CONFIGURE_WITH= xpm
XWIDGETS_USE= XORG=xcomposite
XWIDGETS_CONFIGURE_WITH= xwidgets
-XWIDGETS_LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3
+XWIDGETS_LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+ libsoup-2.4.so:devel/libsoup
XWIDGETS_IMPLIES= GTK3
EMACS_VER= 26.1
@@ -224,6 +226,10 @@ CONFIGURE_ARGS+= --with-x-toolkit=no
post-patch:
@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
.endif
+
+post-install-MAILUTILS-on:
+ ${LN} -sf ${PREFIX}/bin/movemail \
+ ${STAGEDIR}${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
post-install-SOURCES-on:
@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
Modified: head/editors/emacs/pkg-plist
==============================================================================
--- head/editors/emacs/pkg-plist Tue Jun 12 15:51:26 2018 (r472260)
+++ head/editors/emacs/pkg-plist Tue Jun 12 16:03:56 2018 (r472261)
@@ -5,6 +5,7 @@ bin/emacs-%%EMACS_VER%%
bin/emacsclient
bin/etags
libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/hexl
+libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/movemail
libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/profile
libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/rcs2log
@(games,games,4555) libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/update-game-score
@@ -3906,14 +3907,7 @@ share/applications/emacs.desktop
%%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.el.gz
%%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.elc
%%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lcms.c
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-25.h
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-26.h
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sheap.h
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systhread.c
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systhread.h
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/thread.c
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/thread.h
+%%DATADIR%%/site-lisp/subdirs.el
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/alloc.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/atimer.c
@@ -4008,6 +4002,7 @@ share/applications/emacs.desktop
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keymap.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/kqueue.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lastfile.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lcms.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lisp.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lread.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/macfont.h
@@ -4018,6 +4013,8 @@ share/applications/emacs.desktop
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/menu.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/menu.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/minibuf.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-25.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-26.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/msdos.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/msdos.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/nsgui.h
@@ -4035,6 +4032,7 @@ share/applications/emacs.desktop
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/scroll.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/search.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sheap.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sheap.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sound.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/syntax.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/syntax.h
@@ -4042,6 +4040,8 @@ share/applications/emacs.desktop
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sysselect.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/syssignal.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sysstdio.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systhread.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systhread.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systime.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systty.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/syswait.h
@@ -4053,6 +4053,8 @@ share/applications/emacs.desktop
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/terminfo.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/termopts.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/textprop.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/thread.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/thread.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/tparam.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/tparam.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/undo.c
@@ -4066,8 +4068,6 @@ share/applications/emacs.desktop
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/unexsol.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/unexw32.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/vm-limit.c
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.c
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.h
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w16select.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.h
@@ -4112,7 +4112,8 @@ share/applications/emacs.desktop
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xsmfns.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xterm.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xterm.h
-%%DATADIR%%/site-lisp/subdirs.el
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.h
share/icons/hicolor/128x128/apps/emacs.png
share/icons/hicolor/16x16/apps/emacs.png
share/icons/hicolor/24x24/apps/emacs.png
More information about the svn-ports-all
mailing list