CVS commit: pkgsrc/lang

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Sep 22 14:47:01 UTC 2019

Modified Files:
        pkgsrc/lang/openjdk7: Makefile
        pkgsrc/lang/openjdk8: Makefile

Log Message:
openjdk*: use ${JAVA_NAME} where applicable


To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 pkgsrc/lang/openjdk7/Makefile
cvs rdiff -u -r1.83 -r1.84 pkgsrc/lang/openjdk8/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/openjdk7/Makefile
diff -u pkgsrc/lang/openjdk7/Makefile:1.136 pkgsrc/lang/openjdk7/Makefile:1.137
--- pkgsrc/lang/openjdk7/Makefile:1.136 Sun Jul 21 22:25:14 2019
+++ pkgsrc/lang/openjdk7/Makefile       Sun Sep 22 14:47:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.136 2019/07/21 22:25:14 wiz Exp $
+# $NetBSD: Makefile,v 1.137 2019/09/22 14:47:00 tnn Exp $
 
 JDK_MICRO=     141
 DISTNAME=      openjdk-1.7.${JDK_MICRO}-20170813
@@ -23,11 +23,11 @@ JAVA_HOME=  ${PREFIX}/java/${JAVA_NAME}
 JAVA_WRAPPERS= jar java javac javadoc javah javap jcmd jhat jps jstack \
                keytool orbd policytool rmid rmiregistry servertool tnameserv
 
-NOT_PAX_MPROTECT_SAFE+=        java/openjdk7/bin/[a-ik-z]*
-NOT_PAX_MPROTECT_SAFE+=        java/openjdk7/bin/j[b-z]*
-NOT_PAX_MPROTECT_SAFE+=        java/openjdk7/bin/jar*
-NOT_PAX_MPROTECT_SAFE+=        java/openjdk7/bin/java
-NOT_PAX_MPROTECT_SAFE+=        java/openjdk7/bin/java[a-z]*
+NOT_PAX_MPROTECT_SAFE+=        java/${JAVA_NAME}/bin/[a-ik-z]*
+NOT_PAX_MPROTECT_SAFE+=        java/${JAVA_NAME}/bin/j[b-z]*
+NOT_PAX_MPROTECT_SAFE+=        java/${JAVA_NAME}/bin/jar*
+NOT_PAX_MPROTECT_SAFE+=        java/${JAVA_NAME}/bin/java
+NOT_PAX_MPROTECT_SAFE+=        java/${JAVA_NAME}/bin/java[a-z]*
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -55,9 +55,9 @@ USE_TOOLS+=           gmake pax unzip:run zip:run
 UNLIMIT_RESOURCES=     datasize stacksize
 WRKSRC=                        ${WRKDIR}/openjdk
 PLIST_SRC+=            ${PLIST_SRC_DFLT}
-CHECK_SHLIBS_SKIP=     java/openjdk7/jre/lib/${LIBDIR_ARCH}/libfontmanager.so
-CHECK_SHLIBS_SKIP+=    java/openjdk7/jre/lib/${LIBDIR_ARCH}/libjawt.so
-CHECK_SHLIBS_SKIP+=    java/openjdk7/jre/lib/${LIBDIR_ARCH}/libsunec.so
+CHECK_SHLIBS_SKIP=     java/${JAVA_NAME}/jre/lib/${LIBDIR_ARCH}/libfontmanager.so
+CHECK_SHLIBS_SKIP+=    java/${JAVA_NAME}/jre/lib/${LIBDIR_ARCH}/libjawt.so
+CHECK_SHLIBS_SKIP+=    java/${JAVA_NAME}/jre/lib/${LIBDIR_ARCH}/libsunec.so
 
 BUILDLINK_PASSTHRU_DIRS+=      ${ALT_BOOTDIR}
 PREPEND_PATH+=                 ${ALT_BOOTDIR}/bin
@@ -93,7 +93,7 @@ LIBDIR_ARCH=  ${MACHINE_ARCH:S/x86_64/amd
 BUILDDIR=      ${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH}
 LD_LIBRARY_PATH=       ${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/jli:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/server
 MAKE_ENV+=     LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
-BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/openjdk7/jre/lib/${LIBDIR_ARCH}
+BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/${JAVA_NAME}/jre/lib/${LIBDIR_ARCH}
 
 PLIST_SUBST+=  ARCH=${LIBDIR_ARCH}
 PLIST_SUBST+=  LOWER_OPSYS=${LOWER_OPSYS}

Index: pkgsrc/lang/openjdk8/Makefile
diff -u pkgsrc/lang/openjdk8/Makefile:1.83 pkgsrc/lang/openjdk8/Makefile:1.84
--- pkgsrc/lang/openjdk8/Makefile:1.83  Fri Aug 23 18:52:23 2019
+++ pkgsrc/lang/openjdk8/Makefile       Sun Sep 22 14:47:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2019/08/23 18:52:23 tnn Exp $
+# $NetBSD: Makefile,v 1.84 2019/09/22 14:47:00 tnn Exp $
 
 DISTNAME=      openjdk-jdk8u-${GITHUB_TAG}
 PKGNAME=       openjdk8-1.8.${GITHUB_TAG:C/.*u([0-9]+).*/\1/}
@@ -38,7 +38,7 @@ USE_LANGUAGES=                c c++
 USE_TOOLS+=            bash gmake pax pkg-config unzip:run zip:run
 UNLIMIT_RESOURCES=     datasize stacksize
 PLIST_SRC+=            ${PLIST_SRC_DFLT}
-CHECK_SHLIBS_SKIP+=    java/openjdk8/jre/lib/${LIBDIR_ARCH}/libinstrument.so
+CHECK_SHLIBS_SKIP+=    java/${JAVA_NAME}/jre/lib/${LIBDIR_ARCH}/libinstrument.so
 
 BUILDLINK_PASSTHRU_DIRS+=      ${ALT_BOOTDIR}
 PREPEND_PATH+=                 ${ALT_BOOTDIR}/bin
@@ -66,12 +66,12 @@ CONFIGURE_ARGS+=    --with-extra-ldflags=${
 
 CHECK_PORTABILITY_SKIP+=       hotspot/test/runtime/*/*.sh
 
-NOT_PAX_MPROTECT_SAFE+= java/openjdk8/bin/[a-ik-z]*
-NOT_PAX_MPROTECT_SAFE+= java/openjdk8/bin/j[b-z]*
-NOT_PAX_MPROTECT_SAFE+= java/openjdk8/bin/jar*
-NOT_PAX_MPROTECT_SAFE+= java/openjdk8/bin/java
-NOT_PAX_MPROTECT_SAFE+= java/openjdk8/bin/java[a-z]*
-NOT_PAX_MPROTECT_SAFE+= java/openjdk8/jre/bin/*
+NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/[a-ik-z]*
+NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/j[b-z]*
+NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/jar*
+NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/java
+NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/java[a-z]*
+NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/jre/bin/*
 
 # Avoid build errors when JAVA_HOME and CLASSPATH are defined by user.
 MAKE_ENV+=     JAVA_HOME=
@@ -86,7 +86,7 @@ CONFIGURE_ENV+=       LD_LIBRARY_PATH=${LD_LIB
 MAKE_ENV+=     LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
 CONFIGURE_ENV+=        LFLAGS=${LDFLAGS:Q}
 MAKE_ENV+=     LFLAGS=${LDFLAGS:Q}
-BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/openjdk8/jre/lib/${LIBDIR_ARCH}
+BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/${JAVA_NAME}/jre/lib/${LIBDIR_ARCH}
 
 PLIST_SUBST+=  ARCH=${LIBDIR_ARCH}
 PLIST_SUBST+=  LOWER_OPSYS=${LOWER_OPSYS:S/sunos/solaris/}