Mon Mar 13 09:31:48 2023 UTC ()
oracle-jdk8: Support all distinfo targets.


(jperkin)
diff -r1.10 -r1.11 pkgsrc/lang/oracle-jdk8/Makefile
cvs diff -r1.10 -r1.11 pkgsrc/lang/oracle-jdk8/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/oracle-jdk8/Makefile 2020/05/29 10:57:22 1.10
+++ pkgsrc/lang/oracle-jdk8/Makefile 2023/03/13 09:31:48 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.10 2020/05/29 10:57:22 abs Exp $ 1# $NetBSD: Makefile,v 1.11 2023/03/13 09:31:48 jperkin Exp $
2 2
3# Note: This must be kept in sync with the oracle-jre8 package 3# Note: This must be kept in sync with the oracle-jre8 package
4# Note: make sure you include sums for both the x86_64 and the x86_32 4# Note: make sure you include sums for both the x86_64 and the x86_32
5# in distinfo (make makesum will eat one of them) 5# in distinfo (make makesum will eat one of them)
6 6
7DISTNAME= jdk-8u${UPDATE_NUMBER}-${DIST_OS}-${DIST_ARCH} 7DISTNAME= jdk-8u${UPDATE_NUMBER}-${DIST_OS}-${DIST_ARCH}
8PKGNAME= oracle-jdk8-8.0.${UPDATE_NUMBER} 8PKGNAME= oracle-jdk8-8.0.${UPDATE_NUMBER}
9PKGREVISION= 1 9PKGREVISION= 1
10MASTER_SITES= # empty 10MASTER_SITES= # empty
11 11
12LICENSE= oracle-binary-code-license 12LICENSE= oracle-binary-code-license
13 13
14DOWNLOAD_NAME= Java Development Kit (JDK) 8u${UPDATE_NUMBER} 14DOWNLOAD_NAME= Java Development Kit (JDK) 8u${UPDATE_NUMBER}
@@ -17,27 +17,27 @@ DEPENDS+= ${PKGNAME_NOREV:S/jdk/jre/}*:. @@ -17,27 +17,27 @@ DEPENDS+= ${PKGNAME_NOREV:S/jdk/jre/}*:.
17 17
18WRKSRC= ${WRKDIR}/jdk1.8.0_${UPDATE_NUMBER} 18WRKSRC= ${WRKDIR}/jdk1.8.0_${UPDATE_NUMBER}
19JAVA_WRAPPERS= appletviewer apt extcheck idlj jar jarsigner \ 19JAVA_WRAPPERS= appletviewer apt extcheck idlj jar jarsigner \
20 javac javadoc javah javap jcmd jdb jhat rmic serialver jmap jps 20 javac javadoc javah javap jcmd jdb jhat rmic serialver jmap jps
21 21
22MAKE_JOBS_SAFE= no 22MAKE_JOBS_SAFE= no
23 23
24.include "../../lang/oracle-jre8/Makefile.common" 24.include "../../lang/oracle-jre8/Makefile.common"
25 25
26PLIST_SRC= PLIST.${DIST_OS}-${EMUL_ARCH} 26PLIST_SRC= PLIST.${DIST_OS}-${EMUL_ARCH}
27PLIST_SUBST+= JAVA_ARCH="${JAVA_ARCH}" 27PLIST_SUBST+= JAVA_ARCH="${JAVA_ARCH}"
28 28
29# Simplify distinfo generation 29# Simplify distinfo generation
30.if make(distinfo) 30.if make(distinfo) || make (makesum) || make(mdi)
31DISTFILES= jdk-8u${UPDATE_NUMBER}-linux-i586.tar.gz 31DISTFILES= jdk-8u${UPDATE_NUMBER}-linux-i586.tar.gz
32DISTFILES+= jdk-8u${UPDATE_NUMBER}-linux-x64.tar.gz 32DISTFILES+= jdk-8u${UPDATE_NUMBER}-linux-x64.tar.gz
33DISTFILES+= jdk-8u${UPDATE_NUMBER}-solaris-x64.tar.gz 33DISTFILES+= jdk-8u${UPDATE_NUMBER}-solaris-x64.tar.gz
34FETCH_MESSAGE= "You must fetch the following files to generate distinfo:" 34FETCH_MESSAGE= "You must fetch the following files to generate distinfo:"
35FETCH_MESSAGE+= "" 35FETCH_MESSAGE+= ""
36. for file in ${DISTFILES} 36. for file in ${DISTFILES}
37FETCH_MESSAGE+= " ${file}" 37FETCH_MESSAGE+= " ${file}"
38. endfor 38. endfor
39FETCH_MESSAGE+= "" 39FETCH_MESSAGE+= ""
40FETCH_MESSAGE+= "from:" 40FETCH_MESSAGE+= "from:"
41FETCH_MESSAGE+= " ${DOWNLOAD}" 41FETCH_MESSAGE+= " ${DOWNLOAD}"
42FETCH_MESSAGE+= " or ${ARCHIVE}" 42FETCH_MESSAGE+= " or ${ARCHIVE}"
43.endif 43.endif