diff options
| author | rillig <rillig@pkgsrc.org> | 2019-06-08 10:14:08 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2019-06-08 10:14:08 +0000 |
| commit | 09b367b39eaa2e2f96055fcf6b5d5d268f2622e9 (patch) | |
| tree | 8fe2f26418db85ebf32d28873f3645cb63dc69b0 /editors | |
| parent | 04b5400a5949db59d24bb2d4b87029fcd5b76120 (diff) | |
| download | pkgsrc-09b367b39eaa2e2f96055fcf6b5d5d268f2622e9.tar.gz | |
editors/emacs-snapshot: fix indentation and variable alignment
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs-snapshot/Makefile.common | 12 | ||||
| -rw-r--r-- | editors/emacs-snapshot/options.mk | 34 |
2 files changed, 23 insertions, 23 deletions
diff --git a/editors/emacs-snapshot/Makefile.common b/editors/emacs-snapshot/Makefile.common index 94952d9cdcf..fdd05b67529 100644 --- a/editors/emacs-snapshot/Makefile.common +++ b/editors/emacs-snapshot/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.69 2016/12/31 14:16:14 wiz Exp $ +# $NetBSD: Makefile.common,v 1.70 2019/06/08 10:14:08 rillig Exp $ # # used by editors/emacs-snapshot/Makefile @@ -22,13 +22,13 @@ CONFLICTS+= emacs-nox11-[0-9]* SETGIDGAME= yes MAKE_JOBS_SAFE= no -GNU_CONFIGURE= yes -INFO_FILES= yes +GNU_CONFIGURE= yes +INFO_FILES= yes WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/:S/.orig//} -CONFIGURE_ARGS+= --srcdir=${WRKSRC:Q} -CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} -CONFIGURE_ARGS+= --with-gameuser=${GAMEOWN:Q} +CONFIGURE_ARGS+= --srcdir=${WRKSRC} +CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --with-gameuser=${GAMEOWN} BUILD_TARGET= bootstrap BUILD_DEFS+= VARBASE diff --git a/editors/emacs-snapshot/options.mk b/editors/emacs-snapshot/options.mk index a95d4b800d2..fe1f78d4611 100644 --- a/editors/emacs-snapshot/options.mk +++ b/editors/emacs-snapshot/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.11 2015/10/14 20:17:24 wiz Exp $ +# $NetBSD: options.mk,v 1.12 2019/06/08 10:14:08 rillig Exp $ # ### Set options @@ -6,15 +6,15 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.emacs 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 +PKG_OPTIONS_OPTIONAL_GROUPS+= window-system +PKG_OPTIONS_GROUP.window-system= x11 nextstep # tempted to have 'nox11' :-) -PKG_OPTIONS_OPTIONAL_GROUPS+= toolkit +PKG_OPTIONS_OPTIONAL_GROUPS+= toolkit # --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 +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. @@ -26,40 +26,40 @@ PKG_SUGGESTED_OPTIONS= dbus gconf gnutls imagemagick svg xaw3d xft2 xml x11 ### ### Support D-BUS ### -. if !empty(PKG_OPTIONS:Mdbus) +.if !empty(PKG_OPTIONS:Mdbus) .include "../../sysutils/dbus/buildlink3.mk" -. else +.else CONFIGURE_ARGS+= --without-dbus -. endif +.endif ### ### Support XML2 ### -. if !empty(PKG_OPTIONS:Mxml) +.if !empty(PKG_OPTIONS:Mxml) USE_TOOLS+= pkg-config BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.17 .include "../../textproc/libxml2/buildlink3.mk" -. else +.else CONFIGURE_ARGS+= --without-xml2 -. endif +.endif ### ### Support gnutls ### -. if !empty(PKG_OPTIONS:Mgnutls) +.if !empty(PKG_OPTIONS:Mgnutls) .include "../../security/gnutls/buildlink3.mk" -. else +.else CONFIGURE_ARGS+= --without-gnutls -. endif +.endif ### ### Support ImageMagick ### -. if !empty(PKG_OPTIONS:Mimagemagick) +.if !empty(PKG_OPTIONS:Mimagemagick) .include "../../graphics/ImageMagick/buildlink3.mk" -. else +.else CONFIGURE_ARGS+= --without-imagemagick -. endif +.endif ### ### Check non nextstep (implies x11) options --------------------- |