From e3d4deeb2738386bed94cd91a2ae61bd62b6a8ab Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Mon, 28 Jun 2021 09:16:45 -0700 Subject: [PATCH] vkeybd: fix license, update homepage, template layout sgn: rewrite template Close: #31694 --- srcpkgs/vkeybd/template | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/srcpkgs/vkeybd/template b/srcpkgs/vkeybd/template index 2b282440fdd..e53246ba3b8 100644 --- a/srcpkgs/vkeybd/template +++ b/srcpkgs/vkeybd/template @@ -1,25 +1,30 @@ # Template file for 'vkeybd' pkgname=vkeybd version=0.1.18d -revision=1 +revision=2 wrksrc=$pkgname hostmakedepends="tcl" makedepends="alsa-lib-devel tk-devel" -short_desc="A virtual MIDI keyboard for X" +short_desc="Virtual MIDI keyboard for X" maintainer="Casper Ti. Vector " -license="GPL-2" -homepage="http://www.alsa-project.org/~iwai/alsa.html" +license="GPL-2.0-or-later" +homepage="https://github.com/tiwai/vkeybd" distfiles="http://ftp.suse.com/pub/people/tiwai/$pkgname/$pkgname-$version.tar.bz2" checksum=aa683ed57592489e05fdd898368abe3ee245a4d5829385cfe5edb81764590704 -configure_args="PREFIX=/usr USE_ALSA=1 USE_AWE=0 USE_MIDI=0" + +_run_make() { + local TCL_VERSION + TCL_VERSION=$(echo 'puts [info tclversion]' | tclsh) + make CC="$CC" COPTFLAGS="$CFLAGS" DESTDIR=${DESTDIR} \ + PREFIX=/usr USE_ALSA=1 USE_AWE=0 USE_MIDI=0 \ + TCL_VERSION=${TCL_VERSION} "$@" +} do_build() { - echo 'puts [info tclversion]' | tclsh > tcl-ver - export configure_args+=" TCL_VERSION=\"$(cat tcl-ver)\"" - make CC="$CC" COPTFLAGS="$CFLAGS" ${configure_args} ${makejobs} + _run_make ${makejobs} } do_install() { - make ${configure_args} DESTDIR="$DESTDIR" install-all + _run_make DESTDIR=${DESTDIR} install-all vdoc README }