pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/oracle-jdk17 oracle-jdk17: Revert OPSYSVARS change.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/46f43d82c0a8
branches:  trunk
changeset: 389577:46f43d82c0a8
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Dec 06 12:00:39 2022 +0000

description:
oracle-jdk17: Revert OPSYSVARS change.

It doesn't work as intended, appending to WRKSRC rather than setting it.

diffstat:

 lang/oracle-jdk17/Makefile |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (24 lines):

diff -r 03b43bf3e027 -r 46f43d82c0a8 lang/oracle-jdk17/Makefile
--- a/lang/oracle-jdk17/Makefile        Tue Dec 06 12:00:13 2022 +0000
+++ b/lang/oracle-jdk17/Makefile        Tue Dec 06 12:00:39 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/12/02 11:39:20 jperkin Exp $
+# $NetBSD: Makefile,v 1.6 2022/12/06 12:00:39 jperkin Exp $
 
 PKGNAME=       oracle-jdk17-17.0.5
 CATEGORIES=    lang java
@@ -40,9 +40,11 @@
 NOT_FOR_PLATFORM+=     ${MACHINE_PLATFORM}
 .endif
 
-OPSYSVARS+=    WRKSRC
-WRKSRC.Darwin= ${WRKDIR}/jdk-${PKGVERSION_NOREV}.jdk/Contents/Home
-WRKSRC.*=      ${WRKDIR}/jdk-${PKGVERSION_NOREV}
+.if ${OPSYS} == "Darwin"
+WRKSRC=                ${WRKDIR}/jdk-${PKGVERSION_NOREV}.jdk/Contents/Home
+.else
+WRKSRC=                ${WRKDIR}/jdk-${PKGVERSION_NOREV}
+.endif
 
 # Contains pre-built binaries
 CHECK_RELRO_SUPPORTED= no



Home | Main Index | Thread Index | Old Index