Re: [PR PATCH] [Updated] Lint pass 3 of many for SPDX errors, covers most packages starting with "C"

[heliocat <heliocat@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1635 bytes --]

There is an updated pull request by heliocat against master on the void-packages repository

https://github.com/heliocat/void-packages lint_c
https://github.com/void-linux/void-packages/pull/29785

Lint pass 3 of many for SPDX errors, covers most packages starting with "C"
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl



A patch file from https://github.com/void-linux/void-packages/pull/29785.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lint_c-29785.patch --]
[-- Type: text/x-diff, Size: 25245 bytes --]

From 4c3b72a4798e61b4e4eea193c0c29fade3d12d8a Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:10:59 -0700
Subject: [PATCH 01/23] cachefilesd: fix license

---
 srcpkgs/cachefilesd/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cachefilesd/template b/srcpkgs/cachefilesd/template
index 67b75a779d34..c5404531c466 100644
--- a/srcpkgs/cachefilesd/template
+++ b/srcpkgs/cachefilesd/template
@@ -1,19 +1,19 @@
 # Template file for 'cachefilesd'
 pkgname=cachefilesd
 version=0.10.10
-revision=1
+revision=2
 build_style=gnu-makefile
+make_install_args="SBINDIR=/usr/bin BINDIR=/usr/bin"
 short_desc="Userspace daemon acting as a backend for FS-Cache"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://people.redhat.com/~dhowells/fscache/"
 distfiles="http://people.redhat.com/~dhowells/fscache/${pkgname}-${version}.tar.bz2"
-checksum=0d0309851efabd02b7c849f73535b8ad3f831570e83e4f65e42354da18e11a02
-make_install_args="SBINDIR=/usr/bin BINDIR=/usr/bin"
 conf_files="/etc/cachefilesd.conf"
+checksum=0d0309851efabd02b7c849f73535b8ad3f831570e83e4f65e42354da18e11a02
 
 do_configure() {
-	sed -i "s#/sbin/#/usr/bin/#g" cachefilesd.c
+	vsed -i "s#/sbin/#/usr/bin/#g" cachefilesd.c
 }
 
 post_install() {

From 5937cd611b14f334638f49a7ba1be295579b7df3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:21:18 -0700
Subject: [PATCH 02/23] cairo-dock-plugins: fix license

---
 srcpkgs/cairo-dock-plugins/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cairo-dock-plugins/template b/srcpkgs/cairo-dock-plugins/template
index 1086ee328e40..7069ed9ed64d 100644
--- a/srcpkgs/cairo-dock-plugins/template
+++ b/srcpkgs/cairo-dock-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'cairo-dock-plugins'
 pkgname=cairo-dock-plugins
 version=3.4.1
-revision=13
+revision=14
 build_style=cmake
 hostmakedepends="gettext pkg-config"
 makedepends="alsa-lib-devel fftw-devel pulseaudio-devel libexif-devel
@@ -10,7 +10,7 @@ makedepends="alsa-lib-devel fftw-devel pulseaudio-devel libexif-devel
 depends="cairo-dock>=${version} upower"
 short_desc="Plugins for cairo-dock"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://launchpad.net/cairo-dock"
 distfiles="http://launchpad.net/cairo-dock-plug-ins/${version%.?}/${version}/+download/cairo-dock-plug-ins-${version}.tar.gz"
 checksum=e09b8e600398749d1f74b26e645b477a1844a3eea02fcadd6877935da3f8639e
@@ -32,7 +32,6 @@ pre_configure() {
 
 cairo-dock-plugins-python3_package() {
 	depends="python3 ${sourcepkg}>=${version}_${revision}"
-	pycompile_module="CDBashApplet.py CairoDock.py CDApplet.py"
 	short_desc+=" - python3 bindings"
 	pkg_install() {
 		vmove ${py3_sitelib}

From 3191cddd26e4db1c1e095a416b1210d57a1f1a9c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:25:36 -0700
Subject: [PATCH 03/23] canto-curses: fix license

---
 srcpkgs/canto-curses/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/canto-curses/template b/srcpkgs/canto-curses/template
index 841369c23e86..b67f9f284f5b 100644
--- a/srcpkgs/canto-curses/template
+++ b/srcpkgs/canto-curses/template
@@ -1,16 +1,15 @@
 # Template file for 'canto-curses'
 pkgname=canto-curses
 version=0.9.9
-revision=6
+revision=7
 build_style=python3-module
+pycompile_dirs="/usr/lib/canto/plugins"
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel ncurses-devel readline-devel"
 depends="canto-next"
-pycompile_module="canto_curses"
-pycompile_dirs="/usr/lib/canto/plugins"
-short_desc="An ncurses frontend for canto-next Atom/RSS feed reader"
+short_desc="Ncurses frontend for canto-next Atom/RSS feed reader"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://codezen.org/canto-ng/"
 distfiles="https://github.com/themoken/${pkgname}/archive/v${version}.tar.gz"
 checksum=88db1e4ac71f13f02ffb076a33b290e6c343da669dc54ea771af705b21ea6452

From fd15afeda829a007d22e56b25962455dbc7f0f8e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:28:45 -0700
Subject: [PATCH 04/23] canto-next: fix license

---
 srcpkgs/canto-next/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/canto-next/template b/srcpkgs/canto-next/template
index 03eb9deb18eb..8fd497829427 100644
--- a/srcpkgs/canto-next/template
+++ b/srcpkgs/canto-next/template
@@ -1,15 +1,14 @@
 # Template file for 'canto-next'
 pkgname=canto-next
 version=0.9.7
-revision=4
+revision=5
 build_style=python3-module
+pycompile_dirs="/usr/lib/canto/plugins"
 hostmakedepends="python3-setuptools"
 depends="python3-feedparser"
-pycompile_module="canto_next"
-pycompile_dirs="/usr/lib/canto/plugins"
 short_desc="Quick and concise Atom/RSS feed reader daemon"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://codezen.org/canto-ng/"
 distfiles="https://github.com/themoken/${pkgname}/archive/v${version}.tar.gz"
 checksum=222d0382c145f81010653fbe1006f61455ed0aeb6c3940145524e633e3567ad5

From 4aa25b4b1496298109a57da3255486f934f01506 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:30:34 -0700
Subject: [PATCH 05/23] cbp2make: fix license

---
 srcpkgs/cbp2make/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbp2make/template b/srcpkgs/cbp2make/template
index 30f0e69093d9..4b8736ff6351 100644
--- a/srcpkgs/cbp2make/template
+++ b/srcpkgs/cbp2make/template
@@ -1,12 +1,12 @@
 # Template file for 'cbp2make'
 pkgname=cbp2make
 version=147
-revision=1
+revision=2
 wrksrc="$pkgname-stl-rev${version}-all"
 hostmakedepends="doxygen p7zip"
 short_desc="Makefile generation tool for Code::Blocks IDE"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://sourceforge.net/projects/cbp2make/"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/cbp2make-stl-rev${version}-all.tar.7z"
 checksum=1b211abb8de00dc3048fccad6ebd076ab03dcb9f672cdff379de33a1346ed129

From 5df67d1cb5fd2381604f71f54f3f783a07c39026 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:40:08 -0700
Subject: [PATCH 06/23] ccextractor: fix license

---
 srcpkgs/ccextractor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index c766b264779e..d4bdf07d6f76 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,7 +1,7 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
 version=0.88
-revision=1
+revision=2
 build_wrksrc="linux"
 build_style=gnu-configure
 configure_args="--enable-ocr --enable-hardsubx"
@@ -9,7 +9,7 @@ hostmakedepends="automake pkg-config"
 makedepends="leptonica-devel tesseract-ocr-devel ffmpeg-devel"
 short_desc="Extract subtitles from video streams"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"

From 852ef51a59b9a58e1413c51bcba592de10e37a7b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:47:43 -0700
Subject: [PATCH 07/23] cdb: fix license

---
 srcpkgs/cdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cdb/template b/srcpkgs/cdb/template
index 213b1d1a245a..c95afff379bb 100644
--- a/srcpkgs/cdb/template
+++ b/srcpkgs/cdb/template
@@ -1,11 +1,11 @@
 # Template file for 'cdb'
 pkgname=cdb
 version=0.75
-revision=4
+revision=5
 build_style=gnu-makefile
 short_desc="Constant database utilities"
 maintainer="Lain <lain@waifu.club>"
-license="Public domain"
+license="Public Domain"
 homepage="http://cr.yp.to/cdb.html"
 distfiles="http://cr.yp.to/cdb/cdb-${version}.tar.gz"
 checksum="1919577799a50c080a8a05a1cbfa5fa7e7abc823d8d7df2eeb181e624b7952c5"

From 64026f621b1046c7a9ed827df04cab8c1c3deba5 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:56:07 -0700
Subject: [PATCH 08/23] cdecl: fix license

---
 srcpkgs/cdecl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cdecl/template b/srcpkgs/cdecl/template
index e4bd82933f81..e120ca3af500 100644
--- a/srcpkgs/cdecl/template
+++ b/srcpkgs/cdecl/template
@@ -1,7 +1,7 @@
 # Template file for 'cdecl'
 pkgname=cdecl
 version=2.5
-revision=5
+revision=6
 wrksrc="${pkgname}-blocks-${version}"
 build_style=gnu-makefile
 make_build_args="-e"
@@ -9,8 +9,8 @@ hostmakedepends="flex"
 makedepends="readline-devel"
 short_desc="Compose C and C++ type declarations"
 maintainer="beefcurtains <beefcurtains@voidlinux.org>"
-license="GPL-3"
-homepage="http://${pkgname}.org/"
+license="Public Domain"
+homepage="http://cdecl.org/"
 distfiles="${homepage}files/${wrksrc}.tar.gz"
 checksum=9ee6402be7e4f5bb5e6ee60c6b9ea3862935bf070e6cecd0ab0842305406f3ac
 CFLAGS="-DUSE_READLINE"

From 615c3e427379bcbe405d053543150fd9acc794aa Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:56:50 -0700
Subject: [PATCH 09/23] cdrdao: fix license

---
 srcpkgs/cdrdao/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cdrdao/template b/srcpkgs/cdrdao/template
index e2b43bf855fc..f8fae75ab2b3 100644
--- a/srcpkgs/cdrdao/template
+++ b/srcpkgs/cdrdao/template
@@ -1,13 +1,13 @@
 # Template file for 'cdrdao'
 pkgname=cdrdao
 version=1.2.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="lame-devel libao-devel libmad-devel libvorbis-devel"
 short_desc="Records audio or data CD-Rs in disk-at-once (DAO) mode"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2..0-or-later"
+license="GPL-2.0-or-later"
 homepage="http://cdrdao.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/cdrdao/${version}/cdrdao-${version}.tar.bz2"
 checksum=358d9cb83370ceaecdc60564cbf14c2ea2636eac60a966e2461c011ba09853b4

From b49001d19cd2e02ea21f3f7038ac15ea1fc1285e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 08:23:27 -0700
Subject: [PATCH 10/23] chmlib: fix license

---
 srcpkgs/chmlib/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/chmlib/template b/srcpkgs/chmlib/template
index 7f2eb56ab4a2..a573c27d1499 100644
--- a/srcpkgs/chmlib/template
+++ b/srcpkgs/chmlib/template
@@ -1,12 +1,12 @@
 # Template file for 'chmlib'
 pkgname=chmlib
 version=0.40
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-examples"
 short_desc="Utilities for dealing with Microsoft ITSS/CHM format files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="http://www.jedrea.com/chmlib/"
 distfiles="http://www.jedrea.com/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=3449d64b0cf71578b2c7e3ddc048d4af3661f44a83941ea074a7813f3a59ffa3
@@ -26,4 +26,3 @@ libchmlib-devel_package() {
 		vmove usr/lib/*.so
 	}
 }
-

From 1c03200c2f584b969ab67f36dea8c63af1c280c7 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 08:32:34 -0700
Subject: [PATCH 11/23] chntpw: fix license

---
 srcpkgs/chntpw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 75289c85961f..7ccac88fe06d 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -1,12 +1,12 @@
 # Template file for 'chntpw'
 pkgname=chntpw
 version=140201
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="unzip"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-only, LGPL-2.1-only"
 homepage="http://pogostick.net/~pnh/ntpasswd/"
 distfiles="http://pogostick.net/~pnh/ntpasswd/${pkgname}-source-${version}.zip"
 checksum=96e20905443e24cba2f21e51162df71dd993a1c02bfa12b1be2d0801a4ee2ccc

From 0fc8b490e4a2900ab92be49db457dddee586d923 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 08:57:43 -0700
Subject: [PATCH 12/23] cksfv: fix license

---
 srcpkgs/cksfv/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cksfv/template b/srcpkgs/cksfv/template
index 864fe357e126..78f61f3f2579 100644
--- a/srcpkgs/cksfv/template
+++ b/srcpkgs/cksfv/template
@@ -1,11 +1,12 @@
+# Template file for 'cksfv'
 pkgname=cksfv
 version=1.3.14
-revision=2
+revision=3
 build_style=configure
+short_desc="SFV checksum utility (simple file verification)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://zakalwe.fi/~shd/foss/cksfv/"
-short_desc="SFV checksum utility (simple file verification)"
 distfiles="http://zakalwe.fi/~shd/foss/cksfv/files/${pkgname}-${version}.tar.gz"
 checksum=010facce85b317b7b9f952c84cd59ce03476a2b685db33a49b6ea0d1b38378ea
 

From 89cd8ff473472a3a0e0ceefb42e977dce66a19fa Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 09:09:09 -0700
Subject: [PATCH 13/23] clustalw: fix license

---
 srcpkgs/clustalw/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/clustalw/template b/srcpkgs/clustalw/template
index 77fb0be93c62..5c048024e402 100644
--- a/srcpkgs/clustalw/template
+++ b/srcpkgs/clustalw/template
@@ -1,12 +1,11 @@
 # Template file for 'clustalw'
 pkgname=clustalw
 version=2.1
-revision=1
+revision=2
 build_style=gnu-configure
 short_desc="Bioinformatics program for multiple sequence alignment"
 maintainer="Simon Whelan <si.whelan@gmail.com>"
-license="LGPL-v3"
+license="LGPL-3.0-or-later"
 homepage="http://clustal.org"
-distfiles="http://www.clustal.org/download/current/clustalw-2.1.tar.gz"
+distfiles="http://www.clustal.org/download/current/clustalw-${version}.tar.gz"
 checksum=e052059b87abfd8c9e695c280bfba86a65899138c82abccd5b00478a80f49486
-

From a84ac71568aec75ab300e63611d0dd56d9a01f6e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 10:36:36 -0700
Subject: [PATCH 14/23] connman-ncurses: fix license

---
 srcpkgs/connman-ncurses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/connman-ncurses/template b/srcpkgs/connman-ncurses/template
index 8ba2028a5f28..5fd4b33b08fc 100644
--- a/srcpkgs/connman-ncurses/template
+++ b/srcpkgs/connman-ncurses/template
@@ -1,7 +1,7 @@
 # Template file for 'connman-ncurses'
 pkgname=connman-ncurses
 version=1.0
-revision=4
+revision=5
 wrksrc="connman-json-client-${version}"
 build_style=gnu-configure
 hostmakedepends="automake autoconf pkg-config json-c-devel ncurses-devel dbus-devel"
@@ -9,7 +9,7 @@ makedepends="json-c-devel ncurses-devel dbus-devel"
 depends="dbus connman"
 short_desc="Simple ncurses-based UI for ConnMan"
 maintainer="Sergei Akhmatdinov <sakhmatd@riseup.net>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/eurogiciel-oss/connman-json-client"
 distfiles="https://github.com/eurogiciel-oss/connman-json-client/archive/v${version}.tar.gz"
 checksum=724604787b51cd3bd2ba5d2291f5f2efe0558a1ec78d92d3c92ebc78f6c63219

From 9077843f0d57e8266605709498de606909dbdee6 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 10:36:44 -0700
Subject: [PATCH 15/23] connman-ui: fix license

---
 srcpkgs/connman-ui/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/connman-ui/template b/srcpkgs/connman-ui/template
index fdd0fa5d20c0..8aaafad5b55a 100644
--- a/srcpkgs/connman-ui/template
+++ b/srcpkgs/connman-ui/template
@@ -1,15 +1,15 @@
 # Template file for 'connman-ui'
 pkgname=connman-ui
 version=0.0.20150622
-revision=2
+revision=3
 _gitrev=fce0af94e121bde77c7fa2ebd6a319f0180c5516
 wrksrc=${pkgname}-${_gitrev}
 build_style=gnu-configure
 hostmakedepends="automake libtool intltool glib-devel pkg-config"
 makedepends="dbus-devel glib-devel gtk+3-devel"
-short_desc="A full-featured GTK based trayicon UI for ConnMan"
+short_desc="Full-featured GTK based trayicon UI for ConnMan"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/tbursztyka/connman-ui"
 distfiles="${homepage}/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=12ac39f1d4c9e3f54ede6c1d1ebc2dbd6d31cdb74516cb5080f9860499d0a1ee

From ee59265d5bbf015a11b2093565682d6c03e578c8 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 11:28:42 -0700
Subject: [PATCH 16/23] cparser: fix license

---
 srcpkgs/cparser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cparser/template b/srcpkgs/cparser/template
index d77478ac42a3..d56c074d648c 100644
--- a/srcpkgs/cparser/template
+++ b/srcpkgs/cparser/template
@@ -1,13 +1,13 @@
 # Template file for 'cparser'
 pkgname=cparser
 version=1.22.0
-revision=2
+revision=3
 wrksrc="cparser-cparser-${version}"
 makedepends="libfirm-devel"
 depends="gcc"
 short_desc="C99 parser (with GNU extensions) and libfirm frontend"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://libfirm.org/"
 distfiles="https://github.com/MatzeB/cparser/archive/cparser-${version}.tar.gz"
 checksum=0965aa23d8ed7d4cce309806fec2d2c18ad20a74a084340baed0dc874b24175b

From 985f1cd357c5773fc1d5b58e0bdc5fd398146b49 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 23:31:09 -0700
Subject: [PATCH 17/23] cppdb: fix license

---
 srcpkgs/cppdb/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cppdb/template b/srcpkgs/cppdb/template
index cf5194e6f507..d09016575384 100644
--- a/srcpkgs/cppdb/template
+++ b/srcpkgs/cppdb/template
@@ -1,16 +1,19 @@
 # Template file for 'cppdb'
 pkgname=cppdb
 version=0.3.1
-revision=1
+revision=2
 build_style=cmake
 makedepends="libpqxx-devel"
 short_desc="SQL Connectivity Library"
 maintainer="Asaf Ohayon <asaf@sysbind.co.il>"
-license="LGPL-3"
+license="MIT"
 homepage="http://cppcms.com/sql/cppdb/"
 distfiles="${SOURCEFORGE_SITE}/cppcms/cppdb/${version}/cppdb-${version}.tar.bz2"
 checksum=d60eef5a732d8f84ef5e4a2845a8cefc543a6c75bf3782589c2cf6aa150b992e
 
+post_install() {
+	vlicense MIT.txt LICENSE
+}
 
 cppdb-devel_package() {
 	short_desc+=" - development files"

From 84425c1ca1b65de6e319b0eb0b6d397d9ddd455e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 23:34:47 -0700
Subject: [PATCH 18/23] cproto: fix license

---
 srcpkgs/cproto/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cproto/template b/srcpkgs/cproto/template
index df279033a6ee..7c1e844d2b85 100644
--- a/srcpkgs/cproto/template
+++ b/srcpkgs/cproto/template
@@ -1,12 +1,12 @@
 # Template file for 'cproto'
 pkgname=cproto
 version=4.7o
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="flex"
 short_desc="Generates function prototypes and variable declarations from C code"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public domain"
+license="Public Domain"
 homepage="http://invisible-island.net/cproto/cproto.html"
 distfiles="ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz"
 checksum=c76b0b72064e59709459bb7d75d6ec929f77ce5ae7f2610d169ba0fa20ccb44f

From 2777b20237785dc9478d8f2c1319f97cea8b6809 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 27 Mar 2021 10:11:24 -0700
Subject: [PATCH 19/23] cpufrequtils: fix license

---
 srcpkgs/cpufrequtils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpufrequtils/template b/srcpkgs/cpufrequtils/template
index 77c7d335a91d..f29bb4155f6c 100644
--- a/srcpkgs/cpufrequtils/template
+++ b/srcpkgs/cpufrequtils/template
@@ -1,7 +1,7 @@
 # Template file for 'cpufrequtils'
 pkgname=cpufrequtils
 version=008
-revision=12
+revision=13
 _commit=a2f0c39d5f21596bb9f5223e895c0ff210b265d0
 wrksrc="${pkgname}-${_commit}"
 build_style=gnu-makefile
@@ -10,7 +10,7 @@ make_install_args="mandir=/usr/share/man"
 hostmakedepends="gettext"
 short_desc="Userspace tools for the Linux kernel cpufreq subsystem"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpufrequtils.git"
 distfiles="${homepage}/snapshot/${pkgname}-${_commit}.tar.gz"
 checksum=53b0fd1092e2053d31f4707ae0485f0d09b7faafcfac0e53da06c28ecfe23c95

From 118817002d846c1cc2f9c4359669400ec240811a Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 27 Mar 2021 10:15:48 -0700
Subject: [PATCH 20/23] cpulimit: fix license

---
 srcpkgs/cpulimit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpulimit/template b/srcpkgs/cpulimit/template
index 4857387f4e81..9fbf6eccf66c 100644
--- a/srcpkgs/cpulimit/template
+++ b/srcpkgs/cpulimit/template
@@ -1,11 +1,11 @@
 # Template file for 'cpulimit'
 pkgname=cpulimit
 version=0.2
-revision=2
+revision=3
 build_style=gnu-makefile
 short_desc="Tool to limit the CPU usage of a process"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/opsengine/cpulimit"
 distfiles="https://github.com/opsengine/${pkgname}/archive/v${version}.tar.gz"
 checksum=64312f9ac569ddcadb615593cd002c94b76e93a0d4625d3ce1abb49e08e2c2da

From 10642fbb34765e147ab910f09575056e4da7177e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 27 Mar 2021 10:24:24 -0700
Subject: [PATCH 21/23] crack-attack: fix license

---
 srcpkgs/crack-attack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crack-attack/template b/srcpkgs/crack-attack/template
index 422e369b84c6..df266ded665a 100644
--- a/srcpkgs/crack-attack/template
+++ b/srcpkgs/crack-attack/template
@@ -1,7 +1,7 @@
 # Template file for 'crack-attack'
 pkgname=crack-attack
 version=1.1.14
-revision=9
+revision=10
 wrksrc="$pkgname-$version"
 create_wrksrc=yes
 build_wrksrc="$wrksrc"
@@ -13,7 +13,7 @@ makedepends="gtk+-devel SDL_mixer-devel libfreeglut-devel glu-devel
 depends="desktop-file-utils"
 short_desc="Tetris Attack clone"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2.0-or-later,custom"
+license="GPL-2.0-or-later, custom:music-sound-copyright"
 homepage="http://www.nongnu.org/crack-attack/"
 distfiles="http://kojipkgs.fedoraproject.org/packages/${pkgname}/${version}/28.fc21/src/${pkgname}-${version}-28.fc21.src.rpm"
 checksum=6fb2ad5a1dcdc590fcbeb4d1925a7e55f1af27780a5550cded280475d2c08b1d

From 78a7785db21b474b3f6ef6f718943d09e8611e61 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 27 Mar 2021 10:27:10 -0700
Subject: [PATCH 22/23] crossguid: fix license

---
 srcpkgs/crossguid/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/crossguid/template b/srcpkgs/crossguid/template
index 135e8d404035..c846590103fa 100644
--- a/srcpkgs/crossguid/template
+++ b/srcpkgs/crossguid/template
@@ -1,15 +1,15 @@
 # Template file for 'crossguid'
 pkgname=crossguid
 version=0.2.2
-revision=1
+revision=2
+build_style=cmake
+makedepends="libuuid-devel"
 short_desc="Lightweight cross platform C++ GUID/UUID library (git $_gitshort)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3"
+license="MIT"
 homepage="https://github.com/graeme-hill/crossguid"
 distfiles="$homepage/archive/v$version.tar.gz"
-makedepends="libuuid-devel"
 checksum=48321928473c682b0cdc7e17bbd3390f79f4b98ab22fef3b81a852dda81fd195
-build_style=cmake
 
 do_install() {
 	vlicense LICENSE

From 9098b0d744ca71625fbef0c3c91e01fcede6fc56 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 27 Mar 2021 10:42:18 -0700
Subject: [PATCH 23/23] cvm: fix license

---
 srcpkgs/cvm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cvm/template b/srcpkgs/cvm/template
index ecee255ba856..06ef23cc8002 100644
--- a/srcpkgs/cvm/template
+++ b/srcpkgs/cvm/template
@@ -1,13 +1,13 @@
 # Template file for 'cvm'
 pkgname=cvm
 version=0.97
-revision=2
+revision=3
 build_style=gnu-makefile
-makedepends="bglibs-devel"
 hostmakedepends="libtool"
+makedepends="bglibs-devel"
 short_desc="Credential Validation Modules"
 maintainer="bougyman <bougyman@voidlinux.org>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="http://untroubled.org/cvm/"
 distfiles="http://untroubled.org/cvm/cvm-${version}.tar.gz"
 checksum=82e7751d63cc2ae91457e28b5326885beb1d082d4f0695f4fdaac5ffa70a0c47