Enable support for m17n/libotf

Similar diff from Eric Brown months ago.
This commit is contained in:
jca
2019-03-27 13:36:00 +00:00
parent 176e1366b3
commit 20647091ad
+20 -19
View File
@@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.83 2019/03/26 16:19:36 jca Exp $
# $OpenBSD: Makefile,v 1.84 2019/03/27 13:36:00 jca Exp $
COMMENT= GNU editor: extensible, customizable, self-documenting
VERSION= 26.1
DISTNAME= emacs-${VERSION}
REVISION= 4
REVISION= 5
CATEGORIES= editors
@@ -53,25 +53,25 @@ SUBST_VARS= GCCARCH VERSION
LIB_DEPENDS= security/gnutls \
textproc/libxml
# XXX enable for graphical flavors?
CONFIGURE_ARGS+= --without-libotf \
--without-m17n-flt
.if ${FLAVOR} == "no_x11"
CONFIGURE_ARGS+= --without-x \
--without-dbus \
--without-gsettings \
--without-jpeg \
--without-lcms2
--without-lcms2 \
--without-libotf \
--without-m17n-flt
.else
LIB_DEPENDS+= x11/dbus \
x11/gnome/librsvg \
LIB_DEPENDS+= devel/libotf \
graphics/jpeg \
graphics/png \
graphics/tiff \
graphics/giflib \
graphics/ImageMagick \
graphics/lcms2
graphics/lcms2 \
misc/m17n/lib \
x11/dbus \
x11/gnome/librsvg
RUN_DEPENDS+= devel/desktop-file-utils \
devel/xdg-utils \
x11/gtk+3,-guic
@@ -81,26 +81,27 @@ LIB_DEPENDS+= x11/Xaw3d
WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 X11-xcb
WANTLIB += Xaw3d Xext Xfixes Xft Xinerama Xmu Xpm Xrandr Xrender
WANTLIB += Xt cairo dbus-1 fontconfig freetype gdk_pixbuf-2.0
WANTLIB += gif gio-2.0 glib-2.0 gobject-2.0 intl jpeg lcms2 png
WANTLIB += rsvg-2 tiff xcb
WANTLIB += gif gio-2.0 glib-2.0 gobject-2.0 intl jpeg lcms2 m17n-core
WANTLIB += m17n-flt otf png16 rsvg-2 tiff xcb
. elif ${FLAVOR} == "gtk2"
CONFIGURE_ARGS+= --with-x-toolkit=gtk2
LIB_DEPENDS+= x11/gtk+2
WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 X11-xcb
WANTLIB += Xcomposite Xcursor Xdamage Xext Xfixes Xft Xi Xinerama
WANTLIB += Xpm Xrandr Xrender atk-1.0 cairo dbus-1 fontconfig
WANTLIB += freetype fribidi gdk-x11-2.0 gdk_pixbuf-2.0 gif gio-2.0
WANTLIB += glib-2.0 gobject-2.0 gtk-x11-2.0 intl jpeg lcms2 pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 png rsvg-2 tiff xcb
WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gif gio-2.0 glib-2.0
WANTLIB += gobject-2.0 gtk-x11-2.0 intl jpeg lcms2 m17n-core m17n-flt
WANTLIB += otf pango-1.0 pangocairo-1.0 pangoft2-1.0 png16 rsvg-2
WANTLIB += tiff xcb
. elif ${FLAVOR} == "gtk3"
CONFIGURE_ARGS+= --with-x-toolkit=gtk3
LIB_DEPENDS+= x11/gtk+3
WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 X11-xcb
WANTLIB += Xext Xfixes Xft Xinerama Xpm Xrandr Xrender atk-1.0
WANTLIB += cairo cairo-gobject dbus-1 fontconfig freetype fribidi
WANTLIB += gdk-3 gdk_pixbuf-2.0 gif gio-2.0 glib-2.0 gobject-2.0
WANTLIB += gtk-3 intl jpeg lcms2 pango-1.0 pangocairo-1.0 png
WANTLIB += rsvg-2 tiff xcb
WANTLIB += cairo cairo-gobject dbus-1 fontconfig freetype gdk-3
WANTLIB += gdk_pixbuf-2.0 gif gio-2.0 glib-2.0 gobject-2.0 gtk-3
WANTLIB += intl jpeg lcms2 m17n-core m17n-flt otf pango-1.0 pangocairo-1.0
WANTLIB += png16 rsvg-2 tiff xcb
. else
ERRORS+= "Fatal: Conflicting flavor: ${FLAVOR}"
. endif