diff options
author | rillig <rillig@pkgsrc.org> | 2019-11-03 19:03:56 +0000 |
---|---|---|
committer | rillig <rillig@pkgsrc.org> | 2019-11-03 19:03:56 +0000 |
commit | f3e75ceb4c3556df6213bde475948b339e473145 (patch) | |
tree | b3b17a0eba0ed16bdb945808e31f63568deae484 /lang/oracle-jre8 | |
parent | ad8095b0a5c5b758e832cddea87cfb29097177bd (diff) | |
download | pkgsrc-f3e75ceb4c3556df6213bde475948b339e473145.tar.gz |
lang: align variable assignments
pkglint -Wall -F --only aligned --only indent -r
No manual corrections.
Diffstat (limited to 'lang/oracle-jre8')
-rw-r--r-- | lang/oracle-jre8/Makefile | 18 | ||||
-rw-r--r-- | lang/oracle-jre8/Makefile.common | 12 | ||||
-rw-r--r-- | lang/oracle-jre8/builtin.mk | 10 |
3 files changed, 20 insertions, 20 deletions
diff --git a/lang/oracle-jre8/Makefile b/lang/oracle-jre8/Makefile index 03a12fcba53..10450f7d472 100644 --- a/lang/oracle-jre8/Makefile +++ b/lang/oracle-jre8/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2017/12/13 09:34:48 jperkin Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/03 19:04:04 rillig Exp $ # Note: Regen distinfo with PKG_OPTIONS.oracle-jre8+=oracle-jre-jce # Note: Update DOWNLOAD_NAME when you update the JRE version @@ -33,7 +33,7 @@ WRKSRC= ${WRKDIR}/jre1.8.0_${UPDATE_NUMBER}.jre/Contents/Home WRKSRC= ${WRKDIR}/jre1.8.0_${UPDATE_NUMBER} .endif -SFILES_MK=sfiles-${DIST_OS}-${EMUL_ARCH}.mk +SFILES_MK= sfiles-${DIST_OS}-${EMUL_ARCH}.mk .sinclude "${SFILES_MK}" @@ -69,9 +69,9 @@ DISTFILES+= jre-8u${UPDATE_NUMBER}-macosx-x64.tar.gz DISTFILES+= jre-8u${UPDATE_NUMBER}-solaris-x64.tar.gz FETCH_MESSAGE= "You must fetch the following files to generate distinfo:" FETCH_MESSAGE+= "" -.for file in ${DISTFILES} +. for file in ${DISTFILES} FETCH_MESSAGE+= " ${file}" -.endfor +. endfor FETCH_MESSAGE+= "" FETCH_MESSAGE+= "from:" FETCH_MESSAGE+= " ${DOWNLOAD}" @@ -94,11 +94,11 @@ PKG_FAIL_REASON+= "${X11_LIB} does not exist. Please install the" \ "X11 library packages for your system." . endif . else -. include "../../x11/libX11/buildlink3.mk" -. include "../../x11/libXext/buildlink3.mk" -. include "../../x11/libXi/buildlink3.mk" -. include "../../x11/libXt/buildlink3.mk" -. include "../../x11/libXtst/buildlink3.mk" +. include "../../x11/libX11/buildlink3.mk" +. include "../../x11/libXext/buildlink3.mk" +. include "../../x11/libXi/buildlink3.mk" +. include "../../x11/libXt/buildlink3.mk" +. include "../../x11/libXtst/buildlink3.mk" X11_LIBDIR= ${X11BASE}/lib . endif diff --git a/lang/oracle-jre8/Makefile.common b/lang/oracle-jre8/Makefile.common index 4c3a6f2e330..d34401bd4be 100644 --- a/lang/oracle-jre8/Makefile.common +++ b/lang/oracle-jre8/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.17 2019/07/10 10:37:13 nia Exp $ +# $NetBSD: Makefile.common,v 1.18 2019/11/03 19:04:04 rillig Exp $ # used by lang/oracle-jre8/Makefile # used by lang/oracle-jdk8/Makefile @@ -10,11 +10,11 @@ HOMEPAGE= https://www.oracle.com/technetwork/java/index.html DOWNLOAD= https://www.oracle.com/technetwork/java/javase/downloads/index-jsp-138363.html ARCHIVE= https://www.oracle.com/technetwork/java/javase/archive-139210.html -RESTRICTED= Redistribution of repackaged binaries not permitted -NO_SRC_ON_CDROM=${RESTRICTED} -NO_SRC_ON_FTP= ${RESTRICTED} -NO_BIN_ON_CDROM=${RESTRICTED} -NO_BIN_ON_FTP= ${RESTRICTED} +RESTRICTED= Redistribution of repackaged binaries not permitted +NO_SRC_ON_CDROM= ${RESTRICTED} +NO_SRC_ON_FTP= ${RESTRICTED} +NO_BIN_ON_CDROM= ${RESTRICTED} +NO_BIN_ON_FTP= ${RESTRICTED} EMUL_PLATFORMS= darwin-x86_64 linux-i386 linux-x86_64 solaris-x86_64 diff --git a/lang/oracle-jre8/builtin.mk b/lang/oracle-jre8/builtin.mk index 3b28a65ce0f..8d169ccacd4 100644 --- a/lang/oracle-jre8/builtin.mk +++ b/lang/oracle-jre8/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2015/05/30 09:49:43 ryoon Exp $ +# $NetBSD: builtin.mk,v 1.2 2019/11/03 19:04:04 rillig Exp $ BUILTIN_PKG:= oracle-jre8 @@ -38,7 +38,7 @@ IS_BUILTIN.oracle-jre8= yes IS_BUILTIN.oracle-jre8= no . endif .endif -MAKEVARS+= IS_BUILTIN.oracle-jre8 +MAKEVARS+= IS_BUILTIN.oracle-jre8 ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -48,8 +48,8 @@ MAKEVARS+= IS_BUILTIN.oracle-jre8 !empty(IS_BUILTIN.oracle-jre8:M[yY][eE][sS]) && \ empty(JAVAVM8:M__nonexistent__) -BUILTIN_VERSION.oracle-jre8!= ${JAVAVM8:Q}/bin/java -version 2>&1 | \ - ${AWK} -F \" '{print $$2; exit}' | \ +BUILTIN_VERSION.oracle-jre8!= ${JAVAVM8:Q}/bin/java -version 2>&1 | \ + ${AWK} -F \" '{print $$2; exit}' | \ ${AWK} '{sub(/^1\./,"");sub(/_/,".");print $$1}' BUILTIN_PKG.oracle-jre8= oracle-jre8-${BUILTIN_VERSION.oracle-jre8} @@ -81,7 +81,7 @@ USE_BUILTIN.oracle-jre8!= \ . endif . endif # PREFER.oracle-jre8 .endif -MAKEVARS+= USE_BUILTIN.oracle-jre8 +MAKEVARS+= USE_BUILTIN.oracle-jre8 ### ### The section below only applies if we are not including this file |