CVS commit: pkgsrc/editors/emacs-snapshot

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Jun  8 10:14:08 UTC 2019

Modified Files:
        pkgsrc/editors/emacs-snapshot: Makefile.common options.mk

Log Message:
editors/emacs-snapshot: fix indentation and variable alignment


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/editors/emacs-snapshot/Makefile.common
cvs rdiff -u -r1.11 -r1.12 pkgsrc/editors/emacs-snapshot/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/emacs-snapshot/Makefile.common
diff -u pkgsrc/editors/emacs-snapshot/Makefile.common:1.69 pkgsrc/editors/emacs-snapshot/Makefile.common:1.70
--- pkgsrc/editors/emacs-snapshot/Makefile.common:1.69  Sat Dec 31 14:16:14 2016
+++ pkgsrc/editors/emacs-snapshot/Makefile.common       Sat Jun  8 10:14:08 2019
@@ -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

Index: pkgsrc/editors/emacs-snapshot/options.mk
diff -u pkgsrc/editors/emacs-snapshot/options.mk:1.11 pkgsrc/editors/emacs-snapshot/options.mk:1.12
--- pkgsrc/editors/emacs-snapshot/options.mk:1.11       Wed Oct 14 20:17:24 2015
+++ pkgsrc/editors/emacs-snapshot/options.mk    Sat Jun  8 10:14:08 2019
@@ -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
 ###
 ### 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  ---------------------