Mon Mar 13 09:32:25 2023 UTC ()
oracle-jre8: Support all distinfo targets.


(jperkin)
diff -r1.6 -r1.7 pkgsrc/lang/oracle-jre8/Makefile
cvs diff -r1.6 -r1.7 pkgsrc/lang/oracle-jre8/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/oracle-jre8/Makefile 2019/11/03 19:04:04 1.6
+++ pkgsrc/lang/oracle-jre8/Makefile 2023/03/13 09:32:25 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.6 2019/11/03 19:04:04 rillig Exp $ 1# $NetBSD: Makefile,v 1.7 2023/03/13 09:32:25 jperkin Exp $
2 2
3# Note: Regen distinfo with PKG_OPTIONS.oracle-jre8+=oracle-jre-jce 3# Note: Regen distinfo with PKG_OPTIONS.oracle-jre8+=oracle-jre-jce
4# Note: Update DOWNLOAD_NAME when you update the JRE version 4# Note: Update DOWNLOAD_NAME when you update the JRE version
5# Note: This needs to be kept in sync with the oracle-jdk8 package 5# Note: This needs to be kept in sync with the oracle-jdk8 package
6# Note: If you make makesum, make sure that you include both archs in distinfo 6# Note: If you make makesum, make sure that you include both archs in distinfo
7 7
8DISTNAME= jre-8u${UPDATE_NUMBER}-${DIST_OS}-${DIST_ARCH} 8DISTNAME= jre-8u${UPDATE_NUMBER}-${DIST_OS}-${DIST_ARCH}
9PKGNAME= oracle-jre8-8.0.${UPDATE_NUMBER} 9PKGNAME= oracle-jre8-8.0.${UPDATE_NUMBER}
10MASTER_SITES= # empty 10MASTER_SITES= # empty
11 11
12LICENSE= oracle-binary-code-license 12LICENSE= oracle-binary-code-license
13 13
14DOWNLOAD_NAME= Java Runtime Environment (JRE) 8u${UPDATE_NUMBER} 14DOWNLOAD_NAME= Java Runtime Environment (JRE) 8u${UPDATE_NUMBER}
@@ -51,27 +51,27 @@ PKG_SUPPORTED_OPTIONS= oracle-jre-jce @@ -51,27 +51,27 @@ PKG_SUPPORTED_OPTIONS= oracle-jre-jce
51PLIST_SRC= PLIST.${DIST_OS}-${EMUL_ARCH} 51PLIST_SRC= PLIST.${DIST_OS}-${EMUL_ARCH}
52 52
53PLIST_VARS+= jce native 53PLIST_VARS+= jce native
54.if !empty(PKG_OPTIONS:Moracle-jre-jce) 54.if !empty(PKG_OPTIONS:Moracle-jre-jce)
55DISTFILES= ${DISTNAME}${EXTRACT_SUFX} jce_policy-8.zip 55DISTFILES= ${DISTNAME}${EXTRACT_SUFX} jce_policy-8.zip
56.endif 56.endif
57.if !empty(PKG_OPTIONS:Moracle-jre-jce) 57.if !empty(PKG_OPTIONS:Moracle-jre-jce)
58PLIST.jce= yes 58PLIST.jce= yes
59FETCH_MESSAGE+= "" 59FETCH_MESSAGE+= ""
60FETCH_MESSAGE+= "As oracle-jre-jce is enabled jce_policy-8.zip from http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html is also needed" 60FETCH_MESSAGE+= "As oracle-jre-jce is enabled jce_policy-8.zip from http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html is also needed"
61.endif 61.endif
62 62
63# Simplify distinfo generation 63# Simplify distinfo generation
64.if make(distinfo) 64.if make(distinfo) || make (makesum) || make(mdi)
65DISTFILES= jce_policy-8.zip 65DISTFILES= jce_policy-8.zip
66DISTFILES+= jre-8u${UPDATE_NUMBER}-linux-i586.tar.gz 66DISTFILES+= jre-8u${UPDATE_NUMBER}-linux-i586.tar.gz
67DISTFILES+= jre-8u${UPDATE_NUMBER}-linux-x64.tar.gz 67DISTFILES+= jre-8u${UPDATE_NUMBER}-linux-x64.tar.gz
68DISTFILES+= jre-8u${UPDATE_NUMBER}-macosx-x64.tar.gz 68DISTFILES+= jre-8u${UPDATE_NUMBER}-macosx-x64.tar.gz
69DISTFILES+= jre-8u${UPDATE_NUMBER}-solaris-x64.tar.gz 69DISTFILES+= jre-8u${UPDATE_NUMBER}-solaris-x64.tar.gz
70FETCH_MESSAGE= "You must fetch the following files to generate distinfo:" 70FETCH_MESSAGE= "You must fetch the following files to generate distinfo:"
71FETCH_MESSAGE+= "" 71FETCH_MESSAGE+= ""
72. for file in ${DISTFILES} 72. for file in ${DISTFILES}
73FETCH_MESSAGE+= " ${file}" 73FETCH_MESSAGE+= " ${file}"
74. endfor 74. endfor
75FETCH_MESSAGE+= "" 75FETCH_MESSAGE+= ""
76FETCH_MESSAGE+= "from:" 76FETCH_MESSAGE+= "from:"
77FETCH_MESSAGE+= " ${DOWNLOAD}" 77FETCH_MESSAGE+= " ${DOWNLOAD}"