From 7a1f32a40ad08186ddf2feb6c719207d9aeb22e0 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 20 Mar 2022 16:09:47 -0400 Subject: [PATCH 01/16] xbps-triggers: add openjdk-profile trigger This removes the need for each openjdk package to provide their own /etc/profile.d entry, and fixes the conflict caused by each providing their own. --- Manual.md | 8 +++++ srcpkgs/xbps-triggers/files/openjdk-profile | 39 +++++++++++++++++++++ srcpkgs/xbps-triggers/template | 2 +- 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100755 srcpkgs/xbps-triggers/files/openjdk-profile diff --git a/Manual.md b/Manual.md index 8ec755499bbe..e1d71fdee883 100644 --- a/Manual.md +++ b/Manual.md @@ -62,6 +62,7 @@ packages for XBPS, the `Void Linux` native packaging system. * [kernel-hooks](#triggers_kernel_hooks) * [mimedb](#triggers_mimedb) * [mkdirs](#triggers_mkdirs) + * [openjdk-profile](#triggers_openjdk_profile) * [pango-modules](#triggers_pango_module) * [pycompile](#triggers_pycompile) * [register-shell](#triggers_register_shell) @@ -1997,6 +1998,13 @@ During removal it will delete the directory using `rmdir`. To include this trigger use the `make_dirs` variable, as the trigger won't do anything unless it is defined. + +#### openjdk-profile + +The openjdk-profile trigger is responsible for creating an entry in /etc/profile.d that +sets the `JAVA_HOME` environment variable to the currently-selected alternative for +`/usr/bin/java` on installation. This trigger must be manually requested. + #### pango-modules diff --git a/srcpkgs/xbps-triggers/files/openjdk-profile b/srcpkgs/xbps-triggers/files/openjdk-profile new file mode 100755 index 000000000000..007d9cd9eedf --- /dev/null +++ b/srcpkgs/xbps-triggers/files/openjdk-profile @@ -0,0 +1,39 @@ +#!/bin/sh +# +# Adds an entry to /etc/profile.d for setting $JAVA_HOME. +# +# Arguments: $ACTION = [run/targets] +# $TARGET = [post-install/pre-remove] +# $PKGNAME +# $VERSION +# $UPDATE = [yes/no] +# +ACTION="$1" +TARGET="$2" +PKGNAME="$3" +VERSION="$4" +UPDATE="$5" + +jdkprofile=etc/profile.d/openjdk.sh + +case "$ACTION" in +targets) + echo "post-install" + ;; +run) + [ -f "$jdkprofile" ] && exit 0 + + cat > "$jdkprofile" <<'EOF' +if _java_bin=$(readlink -e /usr/bin/java); then + _java_bin="${_java_bin%/bin/java}" + [ -d "${_java_bin}" ] && export JAVA_HOME="${JAVA_HOME:=${_java_bin}}" +fi +unset _java_bin +EOF + ;; +*) + exit 1 + ;; +esac + +exit 0 diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template index 5de97d53c210..b1e4f34a4dde 100644 --- a/srcpkgs/xbps-triggers/template +++ b/srcpkgs/xbps-triggers/template @@ -1,6 +1,6 @@ # Template file for 'xbps-triggers' pkgname=xbps-triggers -version=0.121 +version=0.122 revision=1 bootstrap=yes short_desc="XBPS triggers for Void Linux" From aa005c48c655df6390a713a06f46117b57af6a08 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 20 Mar 2022 16:12:02 -0400 Subject: [PATCH 02/16] openjdk8: move /etc/profile.d/10-openjdk*.sh to trigger --- srcpkgs/openjdk8/template | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template index c10b5216435b..d37e6e11cbfd 100644 --- a/srcpkgs/openjdk8/template +++ b/srcpkgs/openjdk8/template @@ -4,7 +4,7 @@ # TODO: config files? pkgname=openjdk8 version=8u272b02 -revision=1 +revision=2 _jdk_update=272 _jdk_update="${version#*u}" _jdk_update="${_jdk_update%b*}" @@ -236,6 +236,8 @@ openjdk8-jre_package() { shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so" short_desc+=" - runtime components" provides="java-runtime-${version}_1" + depends="xbps-triggers>=0.122_1" + triggers="openjdk-profile" alternatives=" java:/usr/bin/java:/${_final_jdk_home}/jre/bin/java java:/usr/bin/jjs:/${_final_jdk_home}/jre/bin/jjs @@ -251,10 +253,6 @@ openjdk8-jre_package() { " pkg_install() { vmove ${_final_jdk_home}/jre - vmkdir etc/profile.d - cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk8.sh < Date: Sun, 20 Mar 2022 16:12:04 -0400 Subject: [PATCH 03/16] openjdk11: move /etc/profile.d/10-openjdk*.sh to trigger --- srcpkgs/openjdk11/template | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template index bd38c0c5c010..40eac75d8a32 100644 --- a/srcpkgs/openjdk11/template +++ b/srcpkgs/openjdk11/template @@ -1,7 +1,7 @@ # Template file for 'openjdk11' pkgname=openjdk11 version=11.0.12+5 -revision=2 +revision=3 _java_ver="${version%%.*}" _openjdk_version="openjdk-${_java_ver}" wrksrc="jdk${_java_ver}u-jdk-${version}" @@ -31,7 +31,7 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel fontconfig-devel zlib-devel lcms2-devel" -depends="fontconfig" +depends="fontconfig xbps-triggers>=0.122_1" short_desc="OpenJDK Java Development Kit" maintainer="Kyle Nusbaum " license="GPL-2.0-only WITH Classpath-exception-2.0" @@ -40,6 +40,7 @@ distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk- checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559 provides="java-environment-${version}_1 java-runtime-${version}_1" shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so" +triggers="openjdk-profile" # Build is still parallel, but don't use -jN. disable_parallel_build=yes @@ -158,10 +159,6 @@ do_install() { mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/lib/security/ chmod -R ugo+rw ./ca rm -Rf ./ca - vmkdir etc/profile.d - cat >>${DESTDIR}/etc/profile.d/10_openjdk11.sh < Date: Sun, 20 Mar 2022 16:12:05 -0400 Subject: [PATCH 04/16] openjdk17: move /etc/profile.d/10-openjdk*.sh to trigger also fix version for xlint --- srcpkgs/openjdk17/template | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template index 43f72e4d65c0..024f33f6ee8b 100644 --- a/srcpkgs/openjdk17/template +++ b/srcpkgs/openjdk17/template @@ -1,15 +1,12 @@ # Template file for 'openjdk17' -_java_ver=17 -_java_min_ver=0 -_java_sec_ver=3 -_jdk_update=1 -_jdk_home="usr/lib/jvm/openjdk${_java_ver}" -_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}" - pkgname=openjdk17 -version="${_base_version}+${_jdk_update}" -revision=1 -wrksrc="jdk${_java_ver}u-jdk-${_base_version}-${_jdk_update}" +version=17.0.3+1 +revision=2 +_java_ver="${version%%.*}" +_jdk_update="${version#*+}" +_base_version="${version%+*}" +_jdk_home="usr/lib/jvm/openjdk${_java_ver}" +wrksrc="jdk${_java_ver}u-jdk-${version/+/-}" build_style=gnu-configure configure_args="--disable-warnings-as-errors --enable-unlimited-crypto @@ -38,7 +35,6 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel fontconfig-devel zlib-devel lcms2-devel" depends="${pkgname}-jre-${version}_${revision}" -provides="java-environment-${version}_1" short_desc="OpenJDK Java Development Kit (version ${_java_ver})" maintainer="classabbyamp " license="GPL-2.0-only WITH Classpath-exception-2.0" @@ -47,6 +43,7 @@ distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.ta https://github.com/google/googletest/archive/refs/tags/release-1.8.1.tar.gz" checksum="0fac6d90091fc16678a14349e578f6c1cf29738d55508f9f723fbb69469f6867 9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c" +provides="java-environment-${version}_1" # Build is still parallel, but don't use -jN. disable_parallel_build=yes @@ -182,6 +179,8 @@ openjdk17-jre_package() { shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so" short_desc+=" - runtime components" provides="java-runtime-${version}_1" + depends="xbps-triggers>=0.122_1" + triggers="openjdk-profile" alternatives=" java:/usr/bin/java:/${_jdk_home}/bin/java java:/usr/bin/jfr:/${_jdk_home}/bin/jfr @@ -197,11 +196,6 @@ openjdk17-jre_package() { vmove $_jdk_home/$f done - vmkdir etc/profile.d - cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk17.sh <<-EOF -export JAVA_HOME=\${JAVA_HOME=/$_jdk_home} -EOF - vlicense ASSEMBLY_EXCEPTION vlicense LICENSE } From ff98aecd013a8cb4fb7abfbea6bb7632d50668cc Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:32 -0400 Subject: [PATCH 05/16] apache-fop: fix name of etc/profile.d/10_openjdk*.sh in template --- srcpkgs/apache-fop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/apache-fop/template b/srcpkgs/apache-fop/template index 96ab59bce8b3..3b7c917a7c09 100644 --- a/srcpkgs/apache-fop/template +++ b/srcpkgs/apache-fop/template @@ -1,7 +1,7 @@ # Template file for 'apache-fop' pkgname=apache-fop version=2.5 -revision=2 +revision=3 wrksrc="fop-${version}" build_wrksrc="fop" hostmakedepends="openjdk8 apache-ant" @@ -18,7 +18,7 @@ conf_files="/etc/fop.conf" do_build() { . /etc/profile.d/apache-ant.sh - . /etc/profile.d/10_openjdk8.sh + . /etc/profile.d/openjdk.sh ant package } do_install() { From 9ad2ddd772f2150acffcb139efcfcb5e0882c5fc Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:35 -0400 Subject: [PATCH 06/16] apache-maven: fix name of etc/profile.d/10_openjdk*.sh in template --- srcpkgs/apache-maven/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/apache-maven/template b/srcpkgs/apache-maven/template index c9603329c2cd..cc1e3e561634 100644 --- a/srcpkgs/apache-maven/template +++ b/srcpkgs/apache-maven/template @@ -1,7 +1,7 @@ # Template file for 'apache-maven' pkgname=apache-maven version=3.6.3 -revision=2 +revision=3 hostmakedepends="openjdk8" depends="virtual?java-environment which" short_desc="Software project management and comprehension tool" @@ -15,7 +15,7 @@ checksum="7c1c990ba64dd4f88688120cc2ec93bf33dd500d2a62ae5cd57bd4b7f6335c07 replaces="apache-maven-bin>=0" do_build() { - source /etc/profile.d/10_openjdk8.sh + source /etc/profile.d/openjdk.sh ./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/lib/${pkgname} } From 2722cfbe2586577ff697f17d2c4e9bdcd0dc82f4 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:36 -0400 Subject: [PATCH 07/16] arduino: fix name of etc/profile.d/10_openjdk*.sh in template --- srcpkgs/arduino/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/arduino/template b/srcpkgs/arduino/template index 5d6531ec93fc..c2c08996fc4b 100644 --- a/srcpkgs/arduino/template +++ b/srcpkgs/arduino/template @@ -1,7 +1,7 @@ # Template file for 'arduino' pkgname=arduino version=1.8.13 -revision=1 +revision=2 archs="x86_64* i686* aarch64* arm*" wrksrc=$pkgname-$version create_wrksrc=yes @@ -27,7 +27,7 @@ fi do_build() { . /etc/profile.d/apache-ant.sh - . /etc/profile.d/10_openjdk8.sh + . /etc/profile.d/openjdk.sh export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/lib/jvm/java-1.8-openjdk/include/linux" export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/lib/jvm/java-1.8-openjdk/include" From 8bb8d31eb74e6d610a291057eb958a4cf530ac40 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:37 -0400 Subject: [PATCH 08/16] bibletime: fix name of etc/profile.d/10_openjdk*.sh in template --- srcpkgs/bibletime/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bibletime/template b/srcpkgs/bibletime/template index 559755a9dd6f..af3301e02365 100644 --- a/srcpkgs/bibletime/template +++ b/srcpkgs/bibletime/template @@ -4,7 +4,7 @@ # to start. pkgname=bibletime version=3.0 -revision=2 +revision=3 build_style=cmake configure_args="-DBT_DOCBOOK_XSL_HTML_CHUNK_XSL=/usr/share/xsl/docbook/html/chunk.xsl -DBT_DOCBOOK_XSL_PDF_DOCBOOK_XSL=/usr/share/xsl/docbook/fo/docbook.xsl" @@ -20,7 +20,7 @@ distfiles="https://github.com/bibletime/bibletime/releases/download/v${version}/ checksum=d6beef62ad44b255e3dc4c5e89214bf01a0e85c9136073b0be12fca3d2b22622 pre_build() { - . /etc/profile.d/10_openjdk11.sh + . /etc/profile.d/openjdk.sh if [ "$XBPS_WORDSIZE" = "32" ]; then export _JAVA_OPTIONS="-Xmx1024m" fi From 0c4e840ea217ed14f2293ab7742b70c2cd414fd6 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:37 -0400 Subject: [PATCH 09/16] davmail: fix name of etc/profile.d/10_openjdk*.sh in template --- srcpkgs/davmail/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/davmail/template b/srcpkgs/davmail/template index 0482c0dce531..b739bf6b8bb6 100644 --- a/srcpkgs/davmail/template +++ b/srcpkgs/davmail/template @@ -1,7 +1,7 @@ # Template file for 'davmail' pkgname=davmail version=5.5.1 -revision=2 +revision=3 _commit=3299 wrksrc=davmail-src-${version}-${_commit} hostmakedepends="openjdk8 apache-ant" @@ -13,7 +13,7 @@ distfiles="${SOURCEFORGE_SITE}/davmail/davmail-src-${version}-${_commit}.tgz" checksum=63e14eeda3fed2a1a5c55f864a8832f8842d597e797ca1e8874c9b66b811f508 do_build() { - . /etc/profile.d/10_openjdk8.sh + . /etc/profile.d/openjdk.sh . /etc/profile.d/apache-ant.sh ant jar From 45bae670533ef10bc7b52761f963812aab232a62 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:38 -0400 Subject: [PATCH 10/16] freeplane: fix name of etc/profile.d/10_openjdk*.sh in template --- srcpkgs/freeplane/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template index 2e7adb76ea4a..fa4eeb5e80ba 100644 --- a/srcpkgs/freeplane/template +++ b/srcpkgs/freeplane/template @@ -1,7 +1,7 @@ # Template file for 'freeplane' pkgname=freeplane version=1.9.12 -revision=1 +revision=2 wrksrc="freeplane-release-${version}" hostmakedepends="apache-ant openjdk8 unzip gradle" depends="virtual?java-runtime" @@ -23,7 +23,7 @@ esac do_build() { . /etc/profile.d/apache-ant.sh - . /etc/profile.d/10_openjdk8.sh + . /etc/profile.d/openjdk.sh gradle format_translation binZip -x test } From d31f4bdc40a8c0d382e5fed1de7c912f2720f1e2 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:38 -0400 Subject: [PATCH 11/16] freerouting: fix name of etc/profile.d/10_openjdk*.sh in template --- srcpkgs/freerouting/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/freerouting/template b/srcpkgs/freerouting/template index f643eabdb6fe..bfde02fc9e29 100644 --- a/srcpkgs/freerouting/template +++ b/srcpkgs/freerouting/template @@ -1,7 +1,7 @@ # Template file for 'freerouting' pkgname=freerouting version=1.4.5.1 -revision=1 +revision=2 hostmakedepends="dos2unix gradle openjdk11" depends="openjdk11" short_desc="Advanced PCB autorouter" @@ -21,7 +21,7 @@ post_extract() { } do_build() { - . /etc/profile.d/10_openjdk11.sh + . /etc/profile.d/openjdk.sh gradle assemble } From b6b7a022d09ae3029de6daab65c2ca762e635f65 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:39 -0400 Subject: [PATCH 12/16] java-commons-io: fix name of etc/profile.d/10_openjdk*.sh in template --- srcpkgs/java-commons-io/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/java-commons-io/template b/srcpkgs/java-commons-io/template index e91dcc87b8b5..5b8413e2a03d 100644 --- a/srcpkgs/java-commons-io/template +++ b/srcpkgs/java-commons-io/template @@ -2,7 +2,7 @@ _origname=commons-io pkgname=java-commons-io version=2.6 -revision=2 +revision=3 wrksrc="${_origname}-${version}-src" hostmakedepends="openjdk8 apache-maven which" depends="virtual?java-runtime" @@ -19,7 +19,7 @@ case "$XBPS_MACHINE" in esac do_build() { - source /etc/profile.d/10_openjdk8.sh + source /etc/profile.d/openjdk.sh mvn package -Dmaven.test.skip=true } From 08ab2bc011f9416396b6fe7a46d7df2a54fabe29 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:39 -0400 Subject: [PATCH 13/16] jedit: fix name of /etc/profile.d/10_openjdk*.sh, hard-code openjdk11 --- srcpkgs/jedit/files/jedit | 4 +--- srcpkgs/jedit/template | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/srcpkgs/jedit/files/jedit b/srcpkgs/jedit/files/jedit index 622bb9171864..706d2f8dd45c 100644 --- a/srcpkgs/jedit/files/jedit +++ b/srcpkgs/jedit/files/jedit @@ -1,10 +1,8 @@ #!/bin/sh # openjdk11 is required -. /etc/profile.d/10_openjdk11.sh - # default to gtk3, use antialiased fonts -exec "${JAVA_HOME}/bin/java" \ +exec "/usr/lib/jvm/openjdk11/bin/java" \ -Djdk.gtk.version=3 \ -Dawt.useSystemAAFontSettings=on \ -Dswing.aatext=true \ diff --git a/srcpkgs/jedit/template b/srcpkgs/jedit/template index cf7ac8cdd201..19ca4ac3df1f 100644 --- a/srcpkgs/jedit/template +++ b/srcpkgs/jedit/template @@ -1,7 +1,7 @@ # Template file for 'jedit' pkgname=jedit version=5.6.0 -revision=1 +revision=2 wrksrc=jEdit hostmakedepends="apache-ant openjdk11 docbook-xsl" depends="openjdk11 desktop-file-utils" @@ -19,7 +19,7 @@ post_patch() { do_build() { . /etc/profile.d/apache-ant.sh - . /etc/profile.d/10_openjdk11.sh + . /etc/profile.d/openjdk.sh ant -propertyfile ${FILESDIR}/build.properties build ant -propertyfile ${FILESDIR}/build.properties docs-html From 17f5e74a1aaf9d18bcb22b95381b8fe5c3b8e093 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:40 -0400 Subject: [PATCH 14/16] kodi: fix name of etc/profile.d/10_openjdk*.sh in template --- srcpkgs/kodi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index a31240ff2766..dd3747cbf7f3 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -1,7 +1,7 @@ # Template file for 'kodi' pkgname=kodi version=19.0 -revision=4 +revision=5 _codename="Matrix" wrksrc="xbmc-${version}-${_codename}" build_style=cmake @@ -109,7 +109,7 @@ pre_configure() { xargs sed -i -e "s;-isystem;-I;g" fi - . /etc/profile.d/10_openjdk11.sh + . /etc/profile.d/openjdk.sh if [ "$CROSS_BUILD" ]; then for i in JsonSchemaBuilder TexturePacker; do From d462dd7837607505b47c9a6d5ea2daa4429d6ad5 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:40 -0400 Subject: [PATCH 15/16] lightzone: fix name of etc/profile.d/10_openjdk*.sh in template --- srcpkgs/lightzone/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lightzone/template b/srcpkgs/lightzone/template index 13242f01cc77..261626fb9dff 100644 --- a/srcpkgs/lightzone/template +++ b/srcpkgs/lightzone/template @@ -1,7 +1,7 @@ # Template file for 'lightzone' pkgname=lightzone version=4.2.2 -revision=1 +revision=2 _ivy_version=2.4.0 wrksrc=LightZone-${version} hostmakedepends="automake git openjdk11 apache-ant javahelp2 rsync pkg-config" @@ -29,7 +29,7 @@ do_build() { vsed -i lightcrafts/jnisrc/tiff/GNUmakefile \ -e "s;\./configure;& --host=${XBPS_MACHINE%-musl};" - . /etc/profile.d/10_openjdk11.sh + . /etc/profile.d/openjdk.sh cd linux TARGET=${XBPS_TARGET_MACHINE%-musl} ant jar } From 1f199793f23a148c8488b2b8574c57e7d967aa1d Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 2 Apr 2022 22:28:44 -0400 Subject: [PATCH 16/16] plantuml: fix name of etc/profile.d/10_openjdk*.sh in template --- srcpkgs/plantuml/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template index fff4ec18b203..85259ce2ca6b 100644 --- a/srcpkgs/plantuml/template +++ b/srcpkgs/plantuml/template @@ -2,7 +2,7 @@ pkgname=plantuml reverts="8047_1 8053_1 8059_1" version=1.2021.14 -revision=1 +revision=2 create_wrksrc=yes hostmakedepends="apache-ant openjdk8" depends="virtual?java-environment graphviz" @@ -14,7 +14,7 @@ distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz" checksum=468aeaaea0742d8312d0f2f709df140e599967d8284fc0555f842fd0a6fe6941 do_build() { - . /etc/profile.d/10_openjdk8.sh + . /etc/profile.d/openjdk.sh . /etc/profile.d/apache-ant.sh ant mv ${pkgname}.jar ${pkgname}-${version}.jar