aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Mingrone <jrm@FreeBSD.org>2022-01-16 18:05:14 +0000
committerJoseph Mingrone <jrm@FreeBSD.org>2022-01-17 17:52:43 +0000
commitf95666b0e173824fc79966167e4e34a76a58edf2 (patch)
tree1b2204172f6ce9bcad99a5b8e4cd86e8dc7f25c9
parentf1f911568f959fdd79b41a636c2da84fcd0f3e0c (diff)
downloadports-f95666b0e173824fc79966167e4e34a76a58edf2.tar.gz
ports-f95666b0e173824fc79966167e4e34a76a58edf2.zip
editors/emacs-devel: Set GLIB_SCHEMAS
...rather than guarding the file in pkg-plist. glib-compile-schemas is run during the build, but use the macro regardless. It could make certain changes like a major version bump of glib easier to deal with. Reported by: jbeich Sponsored by: The FreeBSD Foundation
-rw-r--r--editors/emacs-devel/Makefile1
-rw-r--r--editors/emacs-devel/pkg-plist1
2 files changed, 1 insertions, 1 deletions
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 460a88666b19..5fdaee6aba5d 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -142,6 +142,7 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
GNUTLS_CONFIGURE_WITH= gnutls
GSETTINGS_USE= GNOME=glib20
GSETTINGS_CONFIGURE_WITH= gsettings
+GSETTINGS_VARS= GLIB_SCHEMAS+=org.gnu.emacs.defaults.gschema.xml
GTK2_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
GTK2_USE= GNOME=cairo,gtk20
diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist
index 08a11436f060..32344d122cbc 100644
--- a/editors/emacs-devel/pkg-plist
+++ b/editors/emacs-devel/pkg-plist
@@ -4265,7 +4265,6 @@ share/applications/emacsclient-mail.desktop
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.c
%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.h
include/emacs-module.h
-%%GSETTINGS%%share/glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml
share/icons/hicolor/128x128/apps/emacs.png
share/icons/hicolor/16x16/apps/emacs.png
share/icons/hicolor/24x24/apps/emacs.png