From 6d1fd2d1883d7190c5c4b9914595ae2728b66931 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Tue, 30 Mar 2021 23:26:44 -0700 Subject: [PATCH 1/4] fastjar: fix license --- srcpkgs/fastjar/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fastjar/template b/srcpkgs/fastjar/template index 8cf752699d20..6eab069f60ef 100644 --- a/srcpkgs/fastjar/template +++ b/srcpkgs/fastjar/template @@ -1,12 +1,12 @@ # Template file for 'fastjar' pkgname=fastjar version=0.98 -revision=2 +revision=3 build_style=gnu-configure makedepends="zlib-devel" short_desc="C implementation of Oracle's jar utility" maintainer="Enno Boland " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://savannah.nongnu.org/projects/fastjar" distfiles="http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${version}.tar.gz" checksum=f156abc5de8658f22ee8f08d7a72c88f9409ebd8c7933e9466b0842afeb2f145 From d7e18b4e72e8f94fa591e6ccc60125d211c3b1ae Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Tue, 30 Mar 2021 23:30:41 -0700 Subject: [PATCH 2/4] fbset: fix license --- srcpkgs/fbset/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fbset/template b/srcpkgs/fbset/template index 05b2c28c27dc..22c51fae0eb7 100644 --- a/srcpkgs/fbset/template +++ b/srcpkgs/fbset/template @@ -1,13 +1,13 @@ # Template file for 'fbset' pkgname=fbset version=2.1 -revision=5 +revision=6 conf_files="/etc/fb.modes" hostmakedepends="flex" makedepends="libfl-devel" short_desc="Framebuffer device maintenance program" maintainer="Orphaned " -license="GPL-2" +license="GPL-2.0-only" homepage="http://users.telenet.be/geertu/Linux/fbdev/" distfiles="${DEBIAN_SITE}/main/f/fbset/fbset_${version}.orig.tar.gz" checksum=517fa062d7b2d367f931a1c6ebb2bef84907077f0ce3f0c899e34490bbea9338 From 3291028ef82275fc8097530481472a4bf02a9e3a Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Tue, 30 Mar 2021 23:53:10 -0700 Subject: [PATCH 3/4] fcron: fix license --- srcpkgs/fcron/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcron/template b/srcpkgs/fcron/template index 231dd79c02b9..11efd44b0bbd 100644 --- a/srcpkgs/fcron/template +++ b/srcpkgs/fcron/template @@ -1,7 +1,7 @@ # Template file for 'fcron' pkgname=fcron version=3.3.0 -revision=4 +revision=5 build_style=gnu-configure configure_args=" --sysconfdir=/etc/fcron @@ -27,7 +27,7 @@ makedepends="pam-devel readline-devel" depends="run-parts" short_desc="Feature-rich cron implementation" maintainer="Andrea Brancaleoni " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://fcron.free.fr" distfiles="$homepage/archives/$pkgname-$version.src.tar.gz" checksum=9aead33a0926e2eec123698c502114c6d67b483fe1ec232969fae6809b0bab60 From 81a3004729e25fa863c198ac00802f49acf9b064 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Wed, 31 Mar 2021 19:52:34 -0700 Subject: [PATCH 4/4] flac: fix license, take maintainership --- srcpkgs/flac/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template index 1644c37e086e..bf46f559a656 100644 --- a/srcpkgs/flac/template +++ b/srcpkgs/flac/template @@ -1,19 +1,19 @@ # Template file for 'flac' pkgname=flac version=1.3.3 -revision=2 -patch_args="-Np1" +revision=3 build_style=gnu-configure configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin ---with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests" + --with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests" hostmakedepends="pkg-config nasm" makedepends="libogg-devel" short_desc="Free Lossless Audio Codec" -maintainer="Orphaned " +maintainer="Colin Booth " +license="BSD-3-Clause, GPL-2.0-or-later" homepage="http://flac.sourceforge.net/" -license="BSD-3-Clause, GPL-2" distfiles="https://downloads.xiph.org/releases/flac/flac-${version}.tar.xz" checksum=213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 +patch_args="-Np1" # TODO: make into options case "$XBPS_TARGET_MACHINE" in