lang: align variable assignments

pkglint -Wall -F --only aligned --only indent -r

No manual corrections.

3 files changed, 28 insertions, 28 deletions

diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile
index dbd5b499d8a..69a9ad3b732 100644
--- a/lang/openjdk8/Makefile
+++ b/lang/openjdk8/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.86 2019/11/02 21:31:14 tnn Exp $
+# $NetBSD: Makefile,v 1.87 2019/11/03 19:04:04 rillig Exp $
 
 DISTNAME=	openjdk-jdk8u-${GITHUB_TAG}
 PKGNAME=	openjdk8-1.8.${GITHUB_TAG:C/.*u([0-9]+).*/\1/}
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=battleblow/}
 MASTER_SITES+=	${MASTER_SITE_LOCAL:=openjdk7/}	# for bootstrap kits
-GITHUB_PROJECT= openjdk-jdk8u
-GITHUB_TAG=     jdk8u232-b09.1
+GITHUB_PROJECT=	openjdk-jdk8u
+GITHUB_TAG=	jdk8u232-b09.1
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://openjdk.java.net/
@@ -66,26 +66,26 @@ CONFIGURE_ARGS+=	--with-extra-ldflags=${LDFLAGS:Q}
 
 CHECK_PORTABILITY_SKIP+=	hotspot/test/runtime/*/*.sh
 
-NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/[a-ik-z]*
-NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/j[b-z]*
-NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/jar*
-NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/java
-NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/java[a-z]*
-NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/jre/bin/*
+NOT_PAX_MPROTECT_SAFE+=	java/${JAVA_NAME}/bin/[a-ik-z]*
+NOT_PAX_MPROTECT_SAFE+=	java/${JAVA_NAME}/bin/j[b-z]*
+NOT_PAX_MPROTECT_SAFE+=	java/${JAVA_NAME}/bin/jar*
+NOT_PAX_MPROTECT_SAFE+=	java/${JAVA_NAME}/bin/java
+NOT_PAX_MPROTECT_SAFE+=	java/${JAVA_NAME}/bin/java[a-z]*
+NOT_PAX_MPROTECT_SAFE+=	java/${JAVA_NAME}/jre/bin/*
 
 # Avoid build errors when JAVA_HOME and CLASSPATH are defined by user.
 MAKE_ENV+=	JAVA_HOME=
 MAKE_ENV+=	CLASSPATH=
 
-BUILD_OPSYS=	${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/:S/Linux/linux/}
-BUILD_ARCH=	${MACHINE_ARCH:S/i386/x86/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/}
-LIBDIR_ARCH=	${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/}
-BUILDDIR=	${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH}-normal-${BUILD_VARIANT}-${BUILD_DEBUG_LEVEL}
-LD_LIBRARY_PATH=	${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/jli:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/server
-CONFIGURE_ENV+=	LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
-MAKE_ENV+=	LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
-CONFIGURE_ENV+=	LFLAGS=${LDFLAGS:Q}
-MAKE_ENV+=	LFLAGS=${LDFLAGS:Q}
+BUILD_OPSYS=			${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/:S/Linux/linux/}
+BUILD_ARCH=			${MACHINE_ARCH:S/i386/x86/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/}
+LIBDIR_ARCH=			${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/}
+BUILDDIR=			${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH}-normal-${BUILD_VARIANT}-${BUILD_DEBUG_LEVEL}
+LD_LIBRARY_PATH=		${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/jli:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/server
+CONFIGURE_ENV+=			LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
+MAKE_ENV+=			LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
+CONFIGURE_ENV+=			LFLAGS=${LDFLAGS:Q}
+MAKE_ENV+=			LFLAGS=${LDFLAGS:Q}
 BUILDLINK_PASSTHRU_RPATHDIRS+=	${PREFIX}/java/${JAVA_NAME}/jre/lib/${LIBDIR_ARCH}
 
 PLIST_SUBST+=	ARCH=${LIBDIR_ARCH}
diff --git a/lang/openjdk8/builtin.mk b/lang/openjdk8/builtin.mk
index 3c0a850ef88..214e48ed762 100644
--- a/lang/openjdk8/builtin.mk
+++ b/lang/openjdk8/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2018/01/02 00:17:35 rillig Exp $
+# $NetBSD: builtin.mk,v 1.4 2019/11/03 19:04:04 rillig Exp $
 
 BUILTIN_PKG:=	openjdk8
 
@@ -19,7 +19,7 @@ IS_BUILTIN.openjdk8=	yes
 IS_BUILTIN.openjdk8=	no
 .  endif
 .endif
-MAKEVARS+=	IS_BUILTIN.openjdk8
+MAKEVARS+=		IS_BUILTIN.openjdk8
 
 ###
 ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -28,9 +28,9 @@ MAKEVARS+=	IS_BUILTIN.openjdk8
 .if !defined(BUILTIN_PKG.openjdk8) && \
     !empty(IS_BUILTIN.openjdk8:M[yY][eE][sS])
 BUILTIN_VERSION.openjdk8!=	${OJDK8} -version 2>&1 | ${SED} -Ee 's:^[^0-9]*([0-9._]+)$$:\1:' -e 's/_/./g' -e 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\1.\2.\4/'
-BUILTIN_PKG.openjdk8=	openjdk8-${BUILTIN_VERSION.openjdk8}
+BUILTIN_PKG.openjdk8=		openjdk8-${BUILTIN_VERSION.openjdk8}
 .endif
-MAKEVARS+=	BUILTIN_PKG.openjdk8
+MAKEVARS+=			BUILTIN_PKG.openjdk8
 
 ###
 ### Determine whether we should use the built-in implementation if it
@@ -57,7 +57,7 @@ USE_BUILTIN.openjdk8!=							\
 .    endif
 .  endif
 .endif
-MAKEVARS+=	USE_BUILTIN.openjdk8
+MAKEVARS+=		USE_BUILTIN.openjdk8
 
 ###
 ### The section below only applies if we are not including this file
diff --git a/lang/openjdk8/hacks.mk b/lang/openjdk8/hacks.mk
index 5db671ba801..c183c1ea3b0 100644
--- a/lang/openjdk8/hacks.mk
+++ b/lang/openjdk8/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.7 2018/09/14 15:53:46 tnn Exp $
+# $NetBSD: hacks.mk,v 1.8 2019/11/03 19:04:04 rillig Exp $
 
 .if !defined(OPENJDK8_HACKS_MK)
 OPENJDK8_HACKS_MK=	# empty
@@ -23,22 +23,22 @@ VA_HACK_ARGS+=	-XX:CompressedClassSpaceSize=128M
 .PHONY: apply-va-hack
 apply-va-hack:
 	@${STEP_MSG} "Bulk build: reducing VA usage for tools in ${ALT_BOOTDIR}"
-.  for t in bin/java
+.for t in bin/java
 	@test -f ${ALT_BOOTDIR}/${t}.real ||	\
 		mv ${ALT_BOOTDIR}/${t} ${ALT_BOOTDIR}/${t}.real
 	@echo '#!/bin/sh' > ${ALT_BOOTDIR}/${t}	&& \
 	 echo 'exec ${ALT_BOOTDIR}/${t}.real ${VA_HACK_ARGS:M*} "$$@"' >> \
 		${ALT_BOOTDIR}/${t}	&& \
 	 chmod +x ${ALT_BOOTDIR}/${t}
-.  endfor
-.  for t in bin/jar bin/jarsigner bin/javac bin/javah bin/javap bin/keytool bin/native2ascii bin/rmic
+.endfor
+.for t in bin/jar bin/jarsigner bin/javac bin/javah bin/javap bin/keytool bin/native2ascii bin/rmic
 	@test -f ${ALT_BOOTDIR}/${t}.real ||	\
 		mv ${ALT_BOOTDIR}/${t} ${ALT_BOOTDIR}/${t}.real
 	@echo '#!/bin/sh' > ${ALT_BOOTDIR}/${t}	&& \
 	 echo 'exec ${ALT_BOOTDIR}/${t}.real ${VA_HACK_ARGS:C/^/-J/} "$$@"' >> \
 		${ALT_BOOTDIR}/${t}	&& \
 	 chmod +x ${ALT_BOOTDIR}/${t}
-.  endfor
+.endfor
 
 # Workaround incorrect constant folding of subnormals in javac when the FPU
 # does not handle subnormal arithmetic, like on ARM in Flush-to-zero mode.