pkgsrc-Changes archive

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

CVS commit: pkgsrc/lang/oracle-jdk17



Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Dec  6 12:00:39 UTC 2022

Modified Files:
        pkgsrc/lang/oracle-jdk17: Makefile

Log Message:
oracle-jdk17: Revert OPSYSVARS change.

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


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/oracle-jdk17/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/oracle-jdk17/Makefile
diff -u pkgsrc/lang/oracle-jdk17/Makefile:1.5 pkgsrc/lang/oracle-jdk17/Makefile:1.6
--- pkgsrc/lang/oracle-jdk17/Makefile:1.5       Fri Dec  2 11:39:20 2022
+++ pkgsrc/lang/oracle-jdk17/Makefile   Tue Dec  6 12:00:39 2022
@@ -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 @@ DISTFILES+=  jdk-${PKGVERSION_NOREV}_maco
 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