Module Name: pkgsrc-wip
Committed By: Makoto Fujiwara (CF-SX2) <makoto%ki.nu@localhost>
Pushed By: mef
Date: Thu Jun 14 06:22:23 2018 +0900
Changeset: 11aae140e39de9af0aff9df5e31cc7980135e690
Modified Files:
emacs26/options.mk
Log Message:
(editors/emacs26/options.mk) +ImageMagick, GConf, xaw3d, not confirmed. +comments on combinaions
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=11aae140e39de9af0aff9df5e31cc7980135e690
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
emacs26/options.mk | 175 ++++++++++++++++++++++++++++++++++-------------------
1 file changed, 112 insertions(+), 63 deletions(-)
diffs:
diff --git a/emacs26/options.mk b/emacs26/options.mk
index 0103209151..3e5a3bf777 100644
--- a/emacs26/options.mk
+++ b/emacs26/options.mk
@@ -1,17 +1,29 @@
-# $NetBSD: options.mk,v 1.3 2017/04/27 13:27:57 ryoon Exp $
+# $NetBSD: options.mk,v 1.35 2015/04/24 01:23:24 makoto Exp $
+### Set options
PKG_OPTIONS_VAR= PKG_OPTIONS.emacs
-PKG_SUPPORTED_OPTIONS= dbus xft2 svg xml gnutls
+PKG_SUPPORTED_OPTIONS= dbus gconf gnutls imagemagick svg xaw3d xft2 xml
+# xaw3d is only valid with tookit = xaw
+
PKG_OPTIONS_OPTIONAL_GROUPS+= window-system
PKG_OPTIONS_GROUP.window-system= x11 nextstep
+
+# tempted to have 'nox11' :-)
+
PKG_OPTIONS_OPTIONAL_GROUPS+= toolkit
-PKG_OPTIONS_GROUP.toolkit= gtk2 gtk3 motif xaw
PKG_SUGGESTED_OPTIONS.Darwin= nextstep
-PKG_SUGGESTED_OPTIONS.*= x11
-PKG_SUGGESTED_OPTIONS+= dbus svg xft2 xml
+# --with-x-toolkit=KIT use an X toolkit (KIT one of: yes or gtk, gtk2,
+# gtk3, lucid or athena, motif, no)
+# gtk in next line implies gtk2, xaw = athena = lucid
+PKG_OPTIONS_GROUP.toolkit= gtk motif xaw lucid
+# gtk is default in the logic below (even not included in SUGGESTED_=
+# gconf, gtk and xft2 will be ingnored for nextstep even shown as selected.
+
+PKG_SUGGESTED_OPTIONS= dbus gconf gnutls imagemagick svg xaw3d xft2 xml x11
.include "../../mk/bsd.options.mk"
+### --- Check window-system independent options first
###
### Support D-BUS
###
@@ -26,128 +38,132 @@ CONFIGURE_ARGS+= --without-dbus
###
.if !empty(PKG_OPTIONS:Mxml)
USE_TOOLS+= pkg-config
-BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.17
+BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.17
.include "../../textproc/libxml2/buildlink3.mk"
.else
CONFIGURE_ARGS+= --without-xml2
.endif
###
-### Support GnuTLS
+### Support gnutls
###
.if !empty(PKG_OPTIONS:Mgnutls)
-USE_TOOLS+= pkg-config
.include "../../security/gnutls/buildlink3.mk"
.else
CONFIGURE_ARGS+= --without-gnutls
.endif
+###
+### Check non nextstep (implies x11) options ---------------------
+###
+### x11 is selected (as SUGGESTED above)
+###
+.if !empty(PKG_OPTIONS:Mx11)
###
### Support SVG
###
-.if !empty(PKG_OPTIONS:Msvg) && empty(PKG_OPTIONS:Mnextstep)
+. if !empty(PKG_OPTIONS:Msvg)
+.include "../../graphics/cairo/buildlink3.mk"
.include "../../graphics/librsvg/buildlink3.mk"
-.else
+. else
CONFIGURE_ARGS+= --without-rsvg
-.endif
+. endif
###
-### Any of the "toolkit" options with no window-system option implies "x11"
+### Support gconf
###
-.if !empty(PKG_OPTIONS:Mgtk2) || !empty(PKG_OPTIONS:Mgtk3) || !empty(PKG_OPTIONS:Mmotif) || !empty(PKG_OPTIONS:Mxaw) || !empty(PKG_OPTIONS:Mxft2)
-. if empty(PKG_OPTIONS:Mx11) && empty(PKG_OPTIONS:Mnextstep)
-PKG_OPTIONS+= x11
+. if !empty(PKG_OPTIONS:Mgconf)
+.include "../../devel/gconfmm/buildlink3.mk"
+. else
+CONFIGURE_ARGS+= --without-gconf
. endif
-.endif
###
-### Default to using GTK if none is specified.
+### Support ImageMagick
###
-.if !empty(PKG_OPTIONS:Mx11)
-. if empty(PKG_OPTIONS:Mgtk2) && empty(PKG_OPTIONS:Mgtk3) && empty(PKG_OPTIONS:Mmotif) && empty(PKG_OPTIONS:Mxaw)
-PKG_OPTIONS+= gtk3
-. endif
+.if !empty(PKG_OPTIONS:Mimagemagick)
+.include "../../graphics/ImageMagick/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-imagemagick
.endif
###
-### Support drawing pretty X11 widgets.
-###
-.if !empty(PKG_OPTIONS:Mx11)
-
-CONFIGURE_ARGS+= --with-x
-CONFIGURE_ARGS+= --with-xpm
-CONFIGURE_ARGS+= --with-jpeg
-CONFIGURE_ARGS+= --with-tiff
-CONFIGURE_ARGS+= --with-gif
-CONFIGURE_ARGS+= --with-png
-
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/giflib/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-
+### Support Xaw3d (This is only valid with Lucid Toolkit)
###
+. if !empty(PKG_OPTIONS:Mxaw3d)
+.include "../../x11/libXaw3d/buildlink3.mk"
+. else
+CONFIGURE_ARGS+= --without-xaw3d
+. endif
### Enable font backend
###
. if !empty(PKG_OPTIONS:Mxft2)
-USE_TOOLS+= pkg-config
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/libotf/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../x11/libXft/buildlink3.mk"
.include "../../devel/m17n-lib/buildlink3.mk"
. else
-CONFIGURE_ARGS+= --without-xft --without-otf --without-m17n-flt
+CONFIGURE_ARGS+= --without-xft --without-libotf --without-m17n-flt
. endif
###
-### Support using GTK3 X11 widgets.
+### Toolkit selection
###
-. if !empty(PKG_OPTIONS:Mgtk3)
+. if (empty(PKG_OPTIONS:Mxaw) && empty(PKG_OPTIONS:Mlucid) && empty(PKG_OPTIONS:Mmotif))
+# defaults to gtk
USE_TOOLS+= pkg-config
-.include "../../x11/gtk3/buildlink3.mk"
-.include "../../graphics/adwaita-icon-theme/buildlink3.mk"
-CONFIGURE_ARGS+= --with-x-toolkit=gtk3
-
-###
-### Support using GTK2 X11 widgets.
-###
-. elif !empty(PKG_OPTIONS:Mgtk2)
+.include "../../x11/gtk2/buildlink3.mk"
+CONFIGURE_ARGS+= --with-x-toolkit=gtk
+. elif !empty(PKG_OPTIONS:Mgtk)
USE_TOOLS+= pkg-config
.include "../../x11/gtk2/buildlink3.mk"
-CONFIGURE_ARGS+= --with-x-toolkit=gtk2
-
-###
-### Support using Motif X11 widgets.
-###
+CONFIGURE_ARGS+= --with-x-toolkit=gtk
+. elif !empty(PKG_OPTIONS:Mxaw)
+.include "../../mk/xaw.buildlink3.mk"
+CONFIGURE_ARGS+= --with-x-toolkit=athena
+. elif !empty(PKG_OPTIONS:Mlucid)
+.include "../../mk/xaw.buildlink3.mk"
+CONFIGURE_ARGS+= --with-x-toolkit=athena
. elif !empty(PKG_OPTIONS:Mmotif)
.include "../../mk/motif.buildlink3.mk"
CONFIGURE_ARGS+= --with-x-toolkit=motif
+. endif
###
-### Support using Xaw (Lucid) X11 widgets.
-###
-. elif !empty(PKG_OPTIONS:Mxaw)
-.include "../../mk/xaw.buildlink3.mk"
-CONFIGURE_ARGS+= --with-x-toolkit=athena
-. endif
+### End of Check non nextstep (implies x11) options ---------------------
+
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
###
### Support using NextStep (Cocoa or GNUstep) windowing system
###
+# If you check the variable system-configuration-options after Emacs is
+# built, you may see many x11 related configurations. But if you have
+# --without-x there, all other x11 related configurations were ignored.
+#
.elif !empty(PKG_OPTIONS:Mnextstep)
. if exists(/System/Library/Frameworks/Cocoa.framework)
APPLICATIONS_DIR= Applications
+NS_APPBINDIR= nextstep/Emacs.app/Contents/MacOS
PLIST_SRC+= PLIST.cocoa
CHECK_WRKREF_SKIP+= Applications/Emacs.app/Contents/MacOS/Emacs
. else
.include "../../x11/gnustep-gui/buildlink3.mk"
MAKE_FILE= Makefile
APPLICATIONS_DIR= share/GNUstep/Local/Applications
+NS_APPBINDIR= nextstep/Emacs.app
PLIST_SRC+= PLIST.gnustep
+CHECK_WRKREF_SKIP+= share/GNUstep/Local/Applications/Emacs.app/Emacs
. endif
+# more args for nextstep
CONFIGURE_ARGS+= --without-x
CONFIGURE_ARGS+= --with-ns
CONFIGURE_ARGS+= --disable-ns-self-contained
@@ -159,7 +175,8 @@ post-install:
cd ${WRKSRC}/nextstep && \
pax -rw -pp -pm Emacs.app ${DESTDIR}${PREFIX}/${APPLICATIONS_DIR}
-.else
+.else # no window system
+#.if empty(PKG_OPTIONS:Mx11)
CONFIGURE_ARGS+= --without-x
CONFIGURE_ARGS+= --without-xpm
CONFIGURE_ARGS+= --without-jpeg
@@ -167,3 +184,35 @@ CONFIGURE_ARGS+= --without-tiff
CONFIGURE_ARGS+= --without-gif
CONFIGURE_ARGS+= --without-png
.endif
+
+# Local Variables:
+# mode: outline-minor
+# outline-regexp: "\\(.[ \t]*\\(if\\|endif\\|else\\|elif\\|include.*options\\|PKG_SUGGES\\)\\)\\|### .\\|# Local"
+# End:
+
+### How To Test (or the possible combinations) -- watch the result of 'make configure'
+# Set PKG_OPTIONS.emacs= result
+# ---------- ----------------------------------------------------------
+# (none) .. x11 gtk svg gconf xft2 dbus gnutls imagemagick
+
+# xaw .. x11 lucid svg gconf xaw3d xft2 dbus gnutls imagemagick
+# lucid .. x11 lucid svg gconf xaw3d xft2 dbus gnutls imagemagick
+# motif .. x11 motif svg gconf xft2 dbus gnutls imagemagick
+
+# -x11 nextstep .. nextstep
+# -xft2 .. x11 gtk svg gconf dbus gnutls imagemagick
+# -gnutls .. x11 gtk svg gconf xft2 dbus imagemagick
+# -gnutls -imagemagick -dbus
+# .. x11 gtk svg gconf xft2
+# -x11 -svg -gconf -xaw3d -xft2
+# .. nox11 dbus gnutls xml2
+# -x11 .. nox11 dbus gnutls imagemagick
+# .. nox11 but several x11 libraries built and not used
+
+### Window system options and result matrix
+# x11 | YES none NO
+# nextstep |
+# -------- +----- -------- -------
+# YES | -- NextStep NextStep
+# none | X11 X11 (no Window)
+# NO | X11 X11 (no Window)