aboutsummaryrefslogtreecommitdiff
path: root/editors/emacs
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2022-06-08 14:10:15 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2022-06-08 14:10:15 +0000
commit36c95c1ea027480641a9c34155b90edfa9032e26 (patch)
tree60403ef6b182496eb504109baffdaad7f264b1a2 /editors/emacs
parent4155a241bba1afb348101a00841178622e499fbd (diff)
downloadports-36c95c1ea027480641a9c34155b90edfa9032e26.tar.gz
ports-36c95c1ea027480641a9c34155b90edfa9032e26.zip
editors/emacs: remove GCONF option
Diffstat (limited to 'editors/emacs')
-rw-r--r--editors/emacs/Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 4cdec7031954..482693883c3a 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -42,6 +42,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-build-details \
--localstatedir=/var \
--without-libsystemd \
+ --without-gconf \
--without-selinux
.if ${FLAVOR:U} == canna
CONFIGURE_ARGS+= --with-canna
@@ -51,7 +52,6 @@ CONFIGURE_ARGS+= --with-sound=no \
--with-x-toolkit=no \
--without-cairo \
--without-dbus \
- --without-gconf \
--without-gif \
--without-gsettings \
--without-imagemagick \
@@ -96,7 +96,7 @@ PLIST_FILES+= ${DATADIR}/${DISTVERSION}/lisp/canna.el.gz \
PLIST_SUB= EMACS_VER=${DISTVERSION} \
GNU_HOST=${CONFIGURE_TARGET}
-OPTIONS_DEFINE= ACL DBUS FCITXPATCH GCONF GNUTLS GSETTINGS \
+OPTIONS_DEFINE= ACL DBUS FCITXPATCH GNUTLS GSETTINGS \
HARFBUZZ JSON LCMS2 M17N MAILUTILS MODULES \
NATIVECOMP OTF SCROLLBARS SOURCES THREADS XFT \
XIM XML XWIDGETS
@@ -111,7 +111,7 @@ 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 GCONF GFILE GIF \
+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
@@ -151,8 +151,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
-GCONF_USE= GNOME=gconf2
-GCONF_CONFIGURE_WITH= gconf
GFILE_USE= GNOME=glib20
GFILE_CONFIGURE_ON= --with-file-notification=gfile
GIF_LIB_DEPENDS= libgif.so:graphics/giflib