wip/*: normalize indentation of variable assignments

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: wip/*: normalize indentation of variable assignments
From: Roland Illig <roland.illig%gmx.de@localhost>
Date: Sat, 25 May 2019 13:54:34 +0000
Module Name:	pkgsrc-wip
Committed By:	Roland Illig <roland.illig%gmx.de@localhost>
Pushed By:	rillig
Date:		Sat May 25 15:54:34 2019 +0200
Changeset:	18be71604861d01ee170d582f6ab33faff803ce1

Modified Files:
	MesaLib-dfbsd/Makefile
	MesaLib-dfbsd/builtin.mk
	MesaLib-dfbsd/options.mk
	go-sqlite3/buildlink3.mk
	heimdal/builtin.mk
	libdrm-dfbsd-meson/Makefile
	libdrm-dfbsd-meson/builtin.mk
	modular-xorg-server-dfbsd-meson/Makefile
	modular-xorg-server-dfbsd-meson/options.mk

Log Message:
wip/*: normalize indentation of variable assignments

pkglint -r -F --only "should be aligned"

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=18be71604861d01ee170d582f6ab33faff803ce1

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

diffstat:
 MesaLib-dfbsd/Makefile                     | 10 ++---
 MesaLib-dfbsd/builtin.mk                   |  4 +-
 MesaLib-dfbsd/options.mk                   |  8 ++--
 go-sqlite3/buildlink3.mk                   |  2 +-
 heimdal/builtin.mk                         |  4 +-
 libdrm-dfbsd-meson/Makefile                | 16 +++----
 libdrm-dfbsd-meson/builtin.mk              |  2 +-
 modular-xorg-server-dfbsd-meson/Makefile   |  6 +--
 modular-xorg-server-dfbsd-meson/options.mk | 68 +++++++++++++++---------------
 9 files changed, 60 insertions(+), 60 deletions(-)

diffs:
diff --git a/MesaLib-dfbsd/Makefile b/MesaLib-dfbsd/Makefile
index 1d3e083fd5..90e0e4cfb7 100644
--- a/MesaLib-dfbsd/Makefile
+++ b/MesaLib-dfbsd/Makefile
@@ -116,11 +116,11 @@ SUBST_SED.wrapper-bug+=		-e 's,libglapi_tmp_rename\.la,libglapi.la,g'
 SUBST_SED.wrapper-bug+=		-e 's,libglapi_tmp_rename_la,libglapi_la,g'
 
 # Replace /etc/drirc.d with ${PREFIX}/etc/drirc.d
-SUBST_CLASSES+=			drirc
-SUBST_STAGE.drirc=		pre-configure
-SUBST_MESSAGE.drirc=		Fixing hardcoded /etc/drirc.d references
-SUBST_FILES.drirc+=		src/util/xmlconfig.c
-SUBST_SED.drirc+=		 -e 's|/etc|${PREFIX}/etc|g'
+SUBST_CLASSES+=		drirc
+SUBST_STAGE.drirc=	pre-configure
+SUBST_MESSAGE.drirc=	Fixing hardcoded /etc/drirc.d references
+SUBST_FILES.drirc+=	src/util/xmlconfig.c
+SUBST_SED.drirc+=	-e 's|/etc|${PREFIX}/etc|g'
 
 CFLAGS.SunOS+=		-D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
 CXXFLAGS.SunOS+=	-Drestrict=__restrict__
diff --git a/MesaLib-dfbsd/builtin.mk b/MesaLib-dfbsd/builtin.mk
index f9bab9d959..71884e4b32 100644
--- a/MesaLib-dfbsd/builtin.mk
+++ b/MesaLib-dfbsd/builtin.mk
@@ -22,7 +22,7 @@ IS_BUILTIN.MesaLib=	yes
 IS_BUILTIN.MesaLib=	no
 .  endif
 .endif
-MAKEVARS+=	IS_BUILTIN.MesaLib
+MAKEVARS+=		IS_BUILTIN.MesaLib
 
 ###
 ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -67,7 +67,7 @@ USE_BUILTIN.MesaLib!=							\
 .    endif
 .  endif  # PREFER.MesaLib
 .endif
-MAKEVARS+=	USE_BUILTIN.MesaLib
+MAKEVARS+=		USE_BUILTIN.MesaLib
 
 ###
 ### The section below only applies if we are not including this file
diff --git a/MesaLib-dfbsd/options.mk b/MesaLib-dfbsd/options.mk
index 7f80b2ca17..80c71bb4b7 100644
--- a/MesaLib-dfbsd/options.mk
+++ b/MesaLib-dfbsd/options.mk
@@ -336,14 +336,14 @@ DRI_DRIVERS+=		nouveau
 
 .if ${OPSYS} == "Darwin"
 CONFIGURE_ARGS+=	--with-platforms=x11
-MESON_ARGS+=	-Dplatforms=x11
+MESON_ARGS+=		-Dplatforms=x11
 #.elif ${OPSYS} == "Linux"
 #.include "../../wip/wayland/buildlink3.mk"
 #CONFIGURE_ARGS+=	--with-platforms=x11,drm,wayland
 #PLIST.wayland=		yes
 .else
 CONFIGURE_ARGS+=	--with-platforms=x11,drm
-MESON_ARGS+=	-Dplatforms=x11,drm
+MESON_ARGS+=		-Dplatforms=x11,drm
 .endif
 
 .if !empty(PKG_OPTIONS:Mllvm)
@@ -372,10 +372,10 @@ MESON_ARGS+=	-Dgallium-vdpau=false
 # XA is useful for accelerating xf86-video-vmware
 .if !empty(PKG_OPTIONS:Mxa)
 CONFIGURE_ARGS+=	--enable-xa
-MESON_ARGS+=	-Dgallium-xa=true
+MESON_ARGS+=		-Dgallium-xa=true
 PLIST.xatracker=	yes
 .else
-MESON_ARGS+=	-Dgallium-xa=false
+MESON_ARGS+=		-Dgallium-xa=false
 .endif
 
 # AMD Radeon r300
diff --git a/go-sqlite3/buildlink3.mk b/go-sqlite3/buildlink3.mk
index 027c079355..440d35f559 100644
--- a/go-sqlite3/buildlink3.mk
+++ b/go-sqlite3/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	go-sqlite3
 GO_SQLITE3_BUILDLINK3_MK:=
 
 BUILDLINK_CONTENTS_FILTER.go-sqlite3=	${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-sqlite3?=		build
+BUILDLINK_DEPMETHOD.go-sqlite3?=	build
 
 BUILDLINK_API_DEPENDS.go-sqlite3+=	go-sqlite3>=1.10.0
 BUILDLINK_PKGSRCDIR.go-sqlite3?=	../../wip/go-sqlite3
diff --git a/heimdal/builtin.mk b/heimdal/builtin.mk
index 7f34ea6bca..a275789aff 100644
--- a/heimdal/builtin.mk
+++ b/heimdal/builtin.mk
@@ -30,8 +30,8 @@ MAKEVARS+=		IS_BUILTIN.heimdal
 .if !defined(BUILTIN_PKG.heimdal) && \
     !empty(IS_BUILTIN.heimdal:M[yY][eE][sS])
 .  if empty(SH_KRB5_CONFIG:M__nonexistent__)
-BUILTIN_VERSION.heimdal!=	${SH_KRB5_CONFIG} --version |		\
-				${AWK} '{ print $$2; exit }'
+BUILTIN_VERSION.heimdal!= \
+	${SH_KRB5_CONFIG} --version | ${AWK} '{ print $$2; exit }'
 .  else
 #
 # heimdal<=0.6.x doesn't have a method of checking files to discover
diff --git a/libdrm-dfbsd-meson/Makefile b/libdrm-dfbsd-meson/Makefile
index 6a4b78f555..4b9bc28419 100644
--- a/libdrm-dfbsd-meson/Makefile
+++ b/libdrm-dfbsd-meson/Makefile
@@ -93,8 +93,8 @@ CONFIGURE_ARGS+=	PTHREADSTUBS_CFLAGS=-I${PREFIX}/include \
 			PTHREADSTUBS_LIBS=-L${PREFIX}/lib
 CONFIGURE_ARGS+=	--disable-manpages
 CONFIGURE_ARGS+=	--disable-valgrind
-MESON_ARGS+=	-Dman-pages=false
-MESON_ARGS+=	-Dvalgrind=false
+MESON_ARGS+=		-Dman-pages=false
+MESON_ARGS+=		-Dvalgrind=false
 
 LDFLAGS.NetBSD+=	-lpci
 
@@ -125,22 +125,22 @@ PKG_SUGGESTED_OPTIONS+=	invert_atomic_add_unless
 # PKG_SUGGESTED_OPTIONS+=	libkms
 # .endif
 
-PKG_SUPPORTED_OPTIONS+= strict_xsrc_netbsd
+PKG_SUPPORTED_OPTIONS+=	strict_xsrc_netbsd
 .if ${OPSYS} == "NetBSD"
-PKG_SUGGESTED_OPTIONS+= strict_xsrc_netbsd
+PKG_SUGGESTED_OPTIONS+=	strict_xsrc_netbsd
 .endif
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=	libkms	
+PLIST_VARS+=		libkms	
 .if !empty(PKG_OPTIONS:Mlibkms)
 PKGCONFIG_OVERRIDE+=	libkms.pc.in
-PLIST.libkms=	yes
+PLIST.libkms=		yes
 CONFIGURE_ARGS+=	--enable-libkms
-MESON_ARGS+=	-Dlibkms=true
+MESON_ARGS+=		-Dlibkms=true
 .else
 CONFIGURE_ARGS+=	--disable-libkms
-MESON_ARGS+=	-Dlibkms=false
+MESON_ARGS+=		-Dlibkms=false
 .endif
 
 .if !empty(PKG_OPTIONS:Minvert_atomic_add_unless)
diff --git a/libdrm-dfbsd-meson/builtin.mk b/libdrm-dfbsd-meson/builtin.mk
index ffe2489949..f1ee32ffef 100644
--- a/libdrm-dfbsd-meson/builtin.mk
+++ b/libdrm-dfbsd-meson/builtin.mk
@@ -1,6 +1,6 @@
 # $NetBSD: builtin.mk,v 1.4 2018/06/01 15:05:43 maya Exp $
 
-BUILTIN_PKG:=	libdrm
+BUILTIN_PKG:=		libdrm
 .for pcfile in libdrm libdrm_amdgpu libdrm_intel libdrm_nouveau libdrm_radeon
 PKGCONFIG_FILE.libdrm+=	${X11BASE}/lib/pkgconfig/${pcfile}.pc
 PKGCONFIG_FILE.libdrm+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/${pcfile}.pc
diff --git a/modular-xorg-server-dfbsd-meson/Makefile b/modular-xorg-server-dfbsd-meson/Makefile
index 3d91f220e5..3decf2b4bc 100644
--- a/modular-xorg-server-dfbsd-meson/Makefile
+++ b/modular-xorg-server-dfbsd-meson/Makefile
@@ -20,10 +20,10 @@ CONFIGURE_ARGS+=	--enable-xorg
 CONFIGURE_ARGS+=	--disable-xephyr
 CONFIGURE_ARGS+=	--disable-kdrive
 CONFIGURE_ARGS.SunOS+=	--disable-input-thread
-MESON_ARGS+=	-Dxorg=true
-MESON_ARGS+=	-Dxephyr=false
+MESON_ARGS+=		-Dxorg=true
+MESON_ARGS+=		-Dxephyr=false
 .if ${OPSYS} == "SunOS"
-MESON_ARGS+=	-Dinput_thread=false
+MESON_ARGS+=		-Dinput_thread=false
 .endif
 
 .include "options.mk"
diff --git a/modular-xorg-server-dfbsd-meson/options.mk b/modular-xorg-server-dfbsd-meson/options.mk
index 2cf2e8ec50..c713c959ad 100644
--- a/modular-xorg-server-dfbsd-meson/options.mk
+++ b/modular-xorg-server-dfbsd-meson/options.mk
@@ -8,30 +8,30 @@ PKG_SUPPORTED_OPTIONS+=	dri
 PKG_SUGGESTED_OPTIONS+=	dri
 .endif
 
-PKG_SUPPORTED_OPTIONS+= devd
-PKG_SUPPORTED_OPTIONS+= xkb_evdev
+PKG_SUPPORTED_OPTIONS+=	devd
+PKG_SUPPORTED_OPTIONS+=	xkb_evdev
 
-PKG_SUPPORTED_OPTIONS+= revert_flink
-PKG_SUPPORTED_OPTIONS+= revert_randr_lease
-PKG_SUPPORTED_OPTIONS+= add_scfb_driver
-PKG_SUPPORTED_OPTIONS+= add_modesetting_driver
+PKG_SUPPORTED_OPTIONS+=	revert_flink
+PKG_SUPPORTED_OPTIONS+=	revert_randr_lease
+PKG_SUPPORTED_OPTIONS+=	add_scfb_driver
+PKG_SUPPORTED_OPTIONS+=	add_modesetting_driver
 
-PKG_SUPPORTED_OPTIONS+= allow_unprivileged
+PKG_SUPPORTED_OPTIONS+=	allow_unprivileged
 PKG_SUPPORTED_OPTIONS+=	otherid_xsrc_netbsd
-PKG_SUPPORTED_OPTIONS+= strict_xsrc_netbsd
+PKG_SUPPORTED_OPTIONS+=	strict_xsrc_netbsd
 
-PKG_SUPPORTED_OPTIONS+= modesetting_on_intel
-PKG_SUPPORTED_OPTIONS+= try_dev_wskbd
+PKG_SUPPORTED_OPTIONS+=	modesetting_on_intel
+PKG_SUPPORTED_OPTIONS+=	try_dev_wskbd
 
-PKG_SUPPORTED_OPTIONS+= fallback_not_wsdisplay
-PKG_SUPPORTED_OPTIONS+= kbd_by_masking_bits
-PKG_SUPPORTED_OPTIONS+= usl_vt_switching
-PKG_SUPPORTED_OPTIONS+= openbsd_more_calls
-PKG_SUPPORTED_OPTIONS+= randr_backlight
-PKG_SUPPORTED_OPTIONS+= ws_drivers_openbsd
+PKG_SUPPORTED_OPTIONS+=	fallback_not_wsdisplay
+PKG_SUPPORTED_OPTIONS+=	kbd_by_masking_bits
+PKG_SUPPORTED_OPTIONS+=	usl_vt_switching
+PKG_SUPPORTED_OPTIONS+=	openbsd_more_calls
+PKG_SUPPORTED_OPTIONS+=	randr_backlight
+PKG_SUPPORTED_OPTIONS+=	ws_drivers_openbsd
 
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+= devd
+PKG_SUGGESTED_OPTIONS+=	devd
 .endif
 
 .if ${OPSYS} == "DragonFly"
@@ -41,12 +41,12 @@ PKG_SUGGESTED_OPTIONS+=	revert_randr_lease
 
 # Add scfb driver in xf86AutoConfig.c
 .if ${OPSYS} == "FreeBSD"
-PKG_SUGGESTED_OPTIONS+= add_scfb_driver
+PKG_SUGGESTED_OPTIONS+=	add_scfb_driver
 .endif
 
 # Add modesetting driver in xf86AutoConfig.c
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+= add_modesetting_driver
+PKG_SUGGESTED_OPTIONS+=	add_modesetting_driver
 .endif
 
 .if ${OPSYS} == "NetBSD"
@@ -54,17 +54,17 @@ PKG_SUGGESTED_OPTIONS+=	allow_unprivileged
 .endif
 
 .if ${OPSYS} == "NetBSD"
-PKG_SUGGESTED_OPTIONS+= otherid_xsrc_netbsd
+PKG_SUGGESTED_OPTIONS+=	otherid_xsrc_netbsd
 .endif
 
 .if ${OPSYS} == "NetBSD"
-PKG_SUGGESTED_OPTIONS+= strict_xsrc_netbsd
+PKG_SUGGESTED_OPTIONS+=	strict_xsrc_netbsd
 .endif
 
 # Patch from OpenBSD to aggressively use the modesetting driver on intel integrated graphics
 # .if ${OPSYS} == "OpenBSD" || ${OPSYS} == "NetBSD"
 .if ${OPSYS} == "OpenBSD"
-PKG_SUGGESTED_OPTIONS+= modesetting_on_intel
+PKG_SUGGESTED_OPTIONS+=	modesetting_on_intel
 .endif
 
 # From NetBSD 1.20.4 but extended to amd64 and i386
@@ -74,31 +74,31 @@ PKG_SUGGESTED_OPTIONS+= modesetting_on_intel
 
 # From OpenBSD 6.5 xenocara xserver 1.19.6
 .if ${OPSYS} == "OpenBSD"
-PKG_SUGGESTED_OPTIONS+= fallback_not_wsdisplay
+PKG_SUGGESTED_OPTIONS+=	fallback_not_wsdisplay
 .endif
 
 .if ${OPSYS} == "OpenBSD"
-PKG_SUGGESTED_OPTIONS+= kbd_by_masking_bits
+PKG_SUGGESTED_OPTIONS+=	kbd_by_masking_bits
 .endif
 
 # Implement VT switching based on the USL compat interface
 .if ${OPSYS} == "OpenBSD"
-PKG_SUGGESTED_OPTIONS+= usl_vt_switching
+PKG_SUGGESTED_OPTIONS+=	usl_vt_switching
 .endif
 
 .if ${OPSYS} == "OpenBSD"
-PKG_SUGGESTED_OPTIONS+= openbsd_more_calls
+PKG_SUGGESTED_OPTIONS+=	openbsd_more_calls
 .endif
 
 # From OpenBSD 6.5 xenocara xserver 1.19.6
 .if ${OPSYS} == "OpenBSD"
-PKG_SUGGESTED_OPTIONS+= randr_backlight
+PKG_SUGGESTED_OPTIONS+=	randr_backlight
 .endif
 
 # From OpenBSD 6.5 xenocara xserver 1.19.6
 # .if ${OPSYS} == "OpenBSD" || ${OPSYS} == "NetBSD"
 .if ${OPSYS} == "OpenBSD"
-PKG_SUGGESTED_OPTIONS+= ws_drivers_openbsd
+PKG_SUGGESTED_OPTIONS+=	ws_drivers_openbsd
 .endif
 
 .include "../../mk/bsd.options.mk"
@@ -181,7 +181,7 @@ CONFIGURE_ARGS+=	--without-dtrace
 # SUBST_MESSAGE.devd_dix=		Patching include/dix-config.h for devd 
 # SUBST_FILES.devd_dix+=		include/dix-config.h	
 # SUBST_SED.devd_dix+=		-e 's|/\* \#undef CONFIG_UDEV \*/|\#define CONFIG_DEVD 1 |'
-CPPFLAGS+=			-DCONFIG_DEVD=1
+CPPFLAGS+=	-DCONFIG_DEVD=1
 MESON_ARGS+=	-Ddevd=true
 .endif
 
@@ -198,11 +198,11 @@ CPPFLAGS+=	-DREVERT_FLINK
 .if !empty(PKG_OPTIONS:Mrevert_randr_lease)
 CPPFLAGS+=	-DREVERT_RANDR_LEASE
 
-SUBST_CLASSES+=			lease
-SUBST_STAGE.lease=		post-configure
-SUBST_MESSAGE.lease=		Removing definition of XF86_LEASE_VERSION	
-SUBST_FILES.lease+=		hw/xfree86/modes/xf86Crtc.h
-SUBST_SED.lease+=		 -e 's|XF86_LEASE_VERSION|REVERT_XF86_LEASE_VERSION|g'
+SUBST_CLASSES+=		lease
+SUBST_STAGE.lease=	post-configure
+SUBST_MESSAGE.lease=	Removing definition of XF86_LEASE_VERSION	
+SUBST_FILES.lease+=	hw/xfree86/modes/xf86Crtc.h
+SUBST_SED.lease+=	-e 's|XF86_LEASE_VERSION|REVERT_XF86_LEASE_VERSION|g'
 .endif
 
 .if !empty(PKG_OPTIONS:Madd_scfb_driver)
Prev by Date: wip/*: replace SUBST_SED with SUBST_VARS
Next by Date: wip/spice-gtk: import spice-gtk-0.37
Previous by Thread: wip/*: replace SUBST_SED with SUBST_VARS
Next by Thread: wip/spice-gtk: import spice-gtk-0.37
Indexes:
Home | Main Index | Thread Index | Old Index