rtyler
/
pkgsrc-wip
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

emacs-git: use harfbuzz. Add jansson option (for JSON support). 

Update PLIST for upstream changes.
This commit is contained in:
Thomas Klausner 2019-06-30 00:25:46 +02:00
parent c023be23cd
commit 2e51ee2434
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
emacs-git/Makefile
View File

@ -60,6 +60,7 @@ pre-configure:
(cd ${WRKSRC}; ${PKGSRC_SETENV} ${CONFIGURE_ENV} ${CONFIG_SHELL} ./autogen.sh)
.include "../../wip/mk/git-package.mk"
.include "../../fonts/harfbuzz/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/libimagequant/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"

4
emacs-git/PLIST
View File

@ -2964,6 +2964,8 @@ share/emacs/${PKGVERSION}/lisp/obsolete/lucid.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/lucid.elc
share/emacs/${PKGVERSION}/lisp/obsolete/mailpost.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/mailpost.elc
share/emacs/${PKGVERSION}/lisp/obsolete/mantemp.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/mantemp.elc
share/emacs/${PKGVERSION}/lisp/obsolete/meese.el.gz
share/emacs/${PKGVERSION}/lisp/obsolete/meese.elc
share/emacs/${PKGVERSION}/lisp/obsolete/messcompat.el
@ -3468,8 +3470,6 @@ share/emacs/${PKGVERSION}/lisp/progmodes/m4-mode.el.gz
share/emacs/${PKGVERSION}/lisp/progmodes/m4-mode.elc
share/emacs/${PKGVERSION}/lisp/progmodes/make-mode.el.gz
share/emacs/${PKGVERSION}/lisp/progmodes/make-mode.elc
share/emacs/${PKGVERSION}/lisp/progmodes/mantemp.el.gz
share/emacs/${PKGVERSION}/lisp/progmodes/mantemp.elc
share/emacs/${PKGVERSION}/lisp/progmodes/meta-mode.el.gz
share/emacs/${PKGVERSION}/lisp/progmodes/meta-mode.elc
share/emacs/${PKGVERSION}/lisp/progmodes/mixal-mode.el.gz

12
emacs-git/options.mk
View File

@ -2,7 +2,8 @@
### Set options
PKG_OPTIONS_VAR= PKG_OPTIONS.emacs
PKG_SUPPORTED_OPTIONS= dbus gconf gnutls imagemagick svg xaw3d xft2 xml
PKG_SUPPORTED_OPTIONS= dbus gconf gnutls imagemagick jansson svg xaw3d xft2 xml
PKG_SUGGESTED_OPTIONS= jansson
# xaw3d is only valid with tookit = xaw
PKG_OPTIONS_OPTIONAL_GROUPS+= window-system
@ -90,6 +91,15 @@ CONFIGURE_ARGS+= --without-gconf
CONFIGURE_ARGS+= --without-imagemagick
. endif
###
### Support jansson (JSON library)
###
. if !empty(PKG_OPTIONS:Mjansson)
.include "../../textproc/jansson/buildlink3.mk"
. else
CONFIGURE_ARGS+= --without-json
. endif
###
### Support Xaw3d (This is only valid with Lucid Toolkit)
###