From 8e3e3b53bf808bb2b8ba86f18bf16c8fb43d67e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 28 Nov 2020 18:20:26 +0700 Subject: [PATCH] marvin: update to 20.20.0. --- srcpkgs/marvin/template | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/srcpkgs/marvin/template b/srcpkgs/marvin/template index d99c334ca34..1803c8586d5 100644 --- a/srcpkgs/marvin/template +++ b/srcpkgs/marvin/template @@ -1,23 +1,38 @@ -# Template for Marvin +# Template file for 'marvin' pkgname=marvin -version=18.20.0 -revision=2 -archs=noarch -maintainer="Brenton Horne " -homepage="https://chemaxon.com/products/marvin" -license="marvin" -depends="virtual?java-environment" +version=20.20.0 +revision=1 +depends="openjdk11" short_desc="Skeletal structure drawing program by ChemAxon" +maintainer="Brenton Horne " +license="custom:Marvin" +_filename="marvin_linux_${version%.*}_openjdk11.deb" +homepage="https://chemaxon.com/products/marvin" +distfiles="https://dl.chemaxon.com/marvin/${version}/${_filename}" +checksum=b8afb058331a5ec19bce11def803aeab1eff6f7ebc7abee7fa844ce3f72fe411 repository=nonfree restricted=yes nostrip=yes -_filename="marvin_linux_${version%.*}.deb" -distfiles="https://dl.chemaxon.com/marvin/${version}/${_filename}" -checksum=bbb25cbd8307f1f081136397c9f82be114426b96f973b8079980c46e6d62aadc do_extract() { bsdtar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_filename} - tar xf data.tar.gz + bsdtar xf data.tar.gz +} + +do_patch() { + local _file + rm -rf opt/chemaxon/marvinsuite/jre + rm -rf opt/chemaxon/marvinsuite/legal/OpenJDK11 + for _file in cxcalc cxtrain evaluate msketch mview + do + vsed -i -e '/^# INSTALL4J_JAVA_HOME_OVERRIDE=/{ + s,#,,; + s,=.*,=/usr/lib/jvm/openjdk11, + }' opt/chemaxon/marvinsuite/bin/$_file + done + vsed -i -e 's,JAVACMD="java",JAVACMD=/usr/lib/jvm/openjdk11/bin/java,' \ + -e 's,which java,: "${JAVA_HOME:=/usr/lib/jvm/openjdk11}",' \ + opt/chemaxon/marvinsuite/bin/molconvert } do_install() { @@ -30,4 +45,5 @@ do_install() { ln -sf /opt/chemaxon/marvinsuite/MarvinSketch ${DESTDIR}/usr/bin/ ln -sf /opt/chemaxon/marvinsuite/MarvinView ${DESTDIR}/usr/bin/ + vlicense opt/chemaxon/marvinsuite/EULA.txt }