Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Omnibus lint pass for SPDX warnings - packages starting with T
@ 2021-05-30  3:50 heliocat
  2021-05-30  7:33 ` [PR PATCH] [Updated] " heliocat
  2021-06-10  7:49 ` heliocat
  0 siblings, 2 replies; 3+ messages in thread
From: heliocat @ 2021-05-30  3:50 UTC (permalink / raw)
  To: ml

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

There is a new pull request by heliocat against master on the void-packages repository

https://github.com/heliocat/void-packages lint_t
https://github.com/void-linux/void-packages/pull/31214

Omnibus lint pass for SPDX warnings - packages starting with T
<!-- 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, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


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

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

From 0631f7f6b8ee15aadb569540cf7186589025d6e5 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 14 May 2021 09:40:17 -0700
Subject: [PATCH 01/27] tanidvr: fix license, other lint

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

diff --git a/srcpkgs/tanidvr/template b/srcpkgs/tanidvr/template
index 7381995de7e4..1394333c1722 100644
--- a/srcpkgs/tanidvr/template
+++ b/srcpkgs/tanidvr/template
@@ -1,12 +1,12 @@
 # Template file for 'tanidvr'
-pkgname="tanidvr"
-version="1.4.1"
-revision=1
+pkgname=tanidvr
+version=1.4.1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-short_desc="A tool for DVRs and IP cameras based on the DVR-IP protocol"
+short_desc="Tool for DVRs and IP cameras based on the DVR-IP protocol"
 maintainer="ymoon <ymoon@hyenas.tech>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://tanidvr.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum="7c0d17c1dd75b3e3b05108451f9d77222dd8938fbf96e1467c3a48dbd9b7bbc9"

From 46bb8e0c56ba30d3de15a9d4e57e7c0e2591e4d3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 14 May 2021 10:55:09 -0700
Subject: [PATCH 02/27] tcc: fix license, http->https

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

diff --git a/srcpkgs/tcc/template b/srcpkgs/tcc/template
index 5d2da178af70..9281ebb41dc7 100644
--- a/srcpkgs/tcc/template
+++ b/srcpkgs/tcc/template
@@ -3,7 +3,7 @@ pkgname=tcc
 _distver=0.9.27
 _voidver=20191027.1
 version=${_distver}.${_voidver}
-revision=1
+revision=2
 _gitrev=a4997bf3d952f904bce824ee3e8f3e12e8524071
 wrksrc=tinycc-${_gitrev:0:7}
 build_style=configure
@@ -12,8 +12,8 @@ make_check_target="test"
 hostmakedepends="perl"
 short_desc="Tiny C Compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://bellard.org/tcc/"
+license="LGPL-2.1-or-later"
+homepage="https://bellard.org/tcc/"
 distfiles="http://repo.or.cz/tinycc.git/snapshot/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=24b34f5ff46694cc3da7db5df6f6180e8cba908e6e3691577f01dd17f4f1a6b4
 nopie=yes

From 9a0e5ef39e7d7b6ca10c9c4a5271db06371f3e34 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 00:14:52 -0700
Subject: [PATCH 03/27] tc-play: fix license, vsed

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

diff --git a/srcpkgs/tc-play/template b/srcpkgs/tc-play/template
index 0f49755ebaf9..c8ec5a85d506 100644
--- a/srcpkgs/tc-play/template
+++ b/srcpkgs/tc-play/template
@@ -1,7 +1,7 @@
 # Template file for 'tc-play'
 pkgname=tc-play
 version=3.3
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="-f Makefile.classic PBKDF_BACKEND=gcrypt"
 make_build_target="tcplay"
@@ -10,14 +10,15 @@ make_install_target="install_program"
 makedepends="device-mapper-devel libuuid-devel libgcrypt-devel"
 short_desc="Free and simple TrueCrypt implementation based on dm-crypt"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="BSD-2-clause"
+license="BSD-2-Clause"
 homepage="https://github.com/bwalex/tc-play"
 distfiles="https://github.com/bwalex/${pkgname}/archive/v${version}.tar.gz"
 checksum=ad53cd814a23b4f61a1b2b6dc2539624ffb550504c400c45cbd8cd1da4c7d90a
 
 pre_build() {
-	sed -i Makefile.classic -e"s; -o tcplay; ${LDFLAGS}&;"
+	vsed -i Makefile.classic -e"s; -o tcplay; ${LDFLAGS}&;"
 }
+
 post_install() {
 	vlicense LICENSE
 }

From fc98247c90cfc13ea5efc17c29f558d64acec318 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 00:17:23 -0700
Subject: [PATCH 04/27] teensy_loader_cli: fix license, http->https

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

diff --git a/srcpkgs/teensy_loader_cli/template b/srcpkgs/teensy_loader_cli/template
index 267415fa1561..3360c03fd888 100644
--- a/srcpkgs/teensy_loader_cli/template
+++ b/srcpkgs/teensy_loader_cli/template
@@ -1,14 +1,14 @@
 # Template file for 'teensy_loader_cli'
 pkgname=teensy_loader_cli
 version=2.1
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_target=teensy_loader_cli
 makedepends="libusb-compat-devel"
 short_desc="Command line Teensy Loader"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
-license="GPL-3"
-homepage="http://www.pjrc.com/teensy/loader_cli.html"
+license="GPL-3-only"
+homepage="https://www.pjrc.com/teensy/loader_cli.html"
 distfiles="https://github.com/PaulStoffregen/teensy_loader_cli/archive/${version}.tar.gz"
 checksum=5c36fe45b9a3a71ac38848b076cd692bf7ca8826a69941c249daac3a1d95e388
 

From 9737af7c88da70ab791f94b5045b6e6076101202 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 00:21:59 -0700
Subject: [PATCH 05/27] teeworlds: fix license

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

diff --git a/srcpkgs/teeworlds/template b/srcpkgs/teeworlds/template
index 268c85e43ac8..8177724af1fb 100644
--- a/srcpkgs/teeworlds/template
+++ b/srcpkgs/teeworlds/template
@@ -1,12 +1,12 @@
 # Template file for 'teeworlds'
 pkgname=teeworlds
 version=0.7.5
-revision=1
+revision=2
 hostmakedepends="bam python pkg-config"
 makedepends="zlib-devel SDL2-devel glu-devel freetype-devel"
 short_desc="Retro multiplayer shooter"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="custom"
+license="custom:Zlib-like"
 homepage="https://www.teeworlds.com"
 distfiles="https://github.com/teeworlds/teeworlds/archive/${version}.tar.gz"
 checksum=6e67846b38750d2a372d7835fa3775db016458a20a85aa52f1c758102ddd4abe

From a8fe7272771cc73ef02cc4979fbf927ef69f6177 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 00:26:31 -0700
Subject: [PATCH 06/27] telepathy-gabble: fix license, http->https, verify
 python2

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

diff --git a/srcpkgs/telepathy-gabble/template b/srcpkgs/telepathy-gabble/template
index 7156a96738a9..23cc05bec9ef 100644
--- a/srcpkgs/telepathy-gabble/template
+++ b/srcpkgs/telepathy-gabble/template
@@ -1,7 +1,7 @@
 # Template file for 'telepathy-gabble'
 pkgname=telepathy-gabble
 version=0.18.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt
  --enable-handle-leak-debug --disable-debug --disable-static"
@@ -12,10 +12,10 @@ makedepends="glib-devel dbus-glib-devel libxml2-devel gupnp-igd-devel
 depends="telepathy-glib>=0.21 ca-certificates"
 short_desc="Jabber/XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://telepathy.freedesktop.org"
+license="LGPL-2.1-or-later"
+homepage="https://telepathy.freedesktop.org"
 distfiles="$homepage/releases/$pkgname/$pkgname-$version.tar.gz"
 checksum=115c91572c72d4a40f0b25b606167b4f2f09441dc7bf1036ccbb1450f1a4969c
-python_version=2 #unverified
+python_version=2
 nocross=yes
 lib32disabled=yes

From 42816825d448f7b96c7aa0abd653ef08498532e5 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 14:54:54 -0700
Subject: [PATCH 07/27] ternimal: fix license, other lint

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

diff --git a/srcpkgs/ternimal/template b/srcpkgs/ternimal/template
index 0d703f919b2e..6e48ab3191e2 100644
--- a/srcpkgs/ternimal/template
+++ b/srcpkgs/ternimal/template
@@ -1,12 +1,12 @@
 # Template file for 'ternimal'
 pkgname=ternimal
 version=0.1.0
-revision=1
+revision=2
 hostmakedepends="rust"
-maintainer="Orphaned <orphan@voidlinux.org>"
 short_desc="Simulate a lifeform in the terminal"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-only"
 homepage="https://github.com/p-e-w/ternimal"
-license="GPL-3"
 distfiles="https://github.com/p-e-w/ternimal/archive/v${version}.tar.gz"
 checksum=4d37f49a35de5ac23d88a61180d663ba3c2da089418818a588de31f9e920f8d6
 

From c3af6987116e564968d7a21fae425525014decce Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:13:11 -0700
Subject: [PATCH 08/27] tesseract: fix license, release version marker, vsed

---
 srcpkgs/tesseract/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/tesseract/template b/srcpkgs/tesseract/template
index 5eca40635fd4..3c972c712f48 100644
--- a/srcpkgs/tesseract/template
+++ b/srcpkgs/tesseract/template
@@ -1,26 +1,27 @@
 # Template file for 'tesseract'
 pkgname=tesseract
 version=1
-revision=4
+revision=5
+_release="2014_05_12"
 wrksrc="$pkgname"
 hostmakedepends="pkg-config ImageMagick"
 makedepends="SDL2_image-devel SDL2_mixer-devel MesaLib-devel libpng-devel zlib-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="FPS game focused on instagib deathmatch and capture-the-flag gameplay"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="zlib"
+license="Zlib"
 homepage="http://tesseract.gg/"
-distfiles="http://download.tuxfamily.org/tesseract/tesseract_2014_05_12_first_edition_linux.tar.xz"
+distfiles="http://download.tuxfamily.org/tesseract/tesseract_${_release}_first_edition_linux.tar.xz"
 checksum=8d6e07dd154a40a3f593e52289335c036f06cf90a0ebc400c4650adb3395a0f4
 
 pre_build() {
 	for dim in 16 32 48 64 128 256 512; do
 		convert -resize "${dim}x${dim}" media/interface/cube.png "${pkgname}${dim}.png"
 	done
-	sed -i src/Makefile \
+	vsed -i src/Makefile \
 		-e"s;-o tess_client;${LDFLAGS} &;" \
 		-e"s;-o tess_server;${LDFLAGS} &;"
-	sed -i src/enet/Makefile \
+	vsed -i src/enet/Makefile \
 		-e"s;^\(CFLAGS=\).*;\1${CFLAGS};"
 }
 do_build() {

From 2096521385c1dbbcbbddf3ac67d04aa1313e4eba Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:19:18 -0700
Subject: [PATCH 09/27] testdisk: fix license, http->https

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

diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index a7d635ddb7eb..754e90273be9 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
 # Template file for 'testdisk'
 pkgname=testdisk
 version=7.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--without-ewf --enable-sudo"
 makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
@@ -9,7 +9,7 @@ makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
 depends="sudo"
 short_desc="Powerful free data recovery software"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="http://www.cgsecurity.org/"
-distfiles="http://www.cgsecurity.org/$pkgname-$version.tar.bz2"
+license="GPL-2.0-or-later"
+homepage="https://www.cgsecurity.org/"
+distfiles="https://www.cgsecurity.org/$pkgname-$version.tar.bz2"
 checksum=1413c47569e48c5b22653b943d48136cb228abcbd6f03da109c4df63382190fe

From b9d450d2173ccaee3d5438883aed910a54deece4 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:25:01 -0700
Subject: [PATCH 10/27] texlive2014-bin: fix license, other lint

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

diff --git a/srcpkgs/texlive2014-bin/template b/srcpkgs/texlive2014-bin/template
index 4e5b199b04f3..ebd5321c56e8 100644
--- a/srcpkgs/texlive2014-bin/template
+++ b/srcpkgs/texlive2014-bin/template
@@ -1,19 +1,19 @@
 # Template file for 'texlive2014-bin'
 pkgname=texlive2014-bin
 version=2014
-revision=9
+revision=10
 archs="x86_64* i686 aarch64 arm*"
 create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
  zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
  ghostscript xz"
-provides="tex-${version}_1"
 short_desc="TeX Live Binary distribution through tl-install"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later, LPPL-1.3c"
 homepage="http://tug.org/texlive/"
 distfiles="ftp://ftp.tug.org/texlive/historic/${version}/tlnet-final/install-tl-unx.tar.gz"
 checksum=051e6425d604767eb12289c67c87ccdb1af0750b0b1d22383fd9387926234217
+provides="tex-${version}_1"
 
 # Package build options
 build_options="basic small medium full"

From 16fd982b99685e2fb1c9536137e46edebaf29d07 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:34:56 -0700
Subject: [PATCH 11/27] texlive2016-bin: fix license, template layout

---
 srcpkgs/texlive2016-bin/template | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/texlive2016-bin/template b/srcpkgs/texlive2016-bin/template
index 6f2ed09c3669..02468263a397 100644
--- a/srcpkgs/texlive2016-bin/template
+++ b/srcpkgs/texlive2016-bin/template
@@ -1,19 +1,19 @@
-# Template file for 'texlive-bin'
+# Template file for 'texlive2016-bin'
 pkgname=texlive2016-bin
 version=2016
-revision=3
+revision=4
 archs="x86_64* i686 aarch64 arm*"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="http://tug.org/texlive/"
-license="GPL-2"
-short_desc="TeX Live Binary distribution through tl-install"
+create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
  zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
  ghostscript xz"
-provides="tex-${version}_1"
+short_desc="TeX Live Binary distribution through tl-install"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later, LPPL-1.3c"
+homepage="http://tug.org/texlive/"
 distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
 checksum=a0559306f4ef1903b92c829a11177dcbf3b85ddb9c6b512a80791e2c543f7d95
-create_wrksrc=yes
+provides="tex-${version}_1"
 
 # Package build options
 build_options="basic small medium full"
@@ -23,12 +23,12 @@ desc_option_small="Install TeXLive using scheme-small"
 desc_option_medium="Install TeXLive using scheme-medium"
 desc_option_full="Install TeXLive using scheme-full"
 
-pre_install(){
+pre_install() {
 	rm -rf ${wrksrc}/install-tl*/tlpkg/installer/xz \
 		${wrksrc}/install-tl*/tlpkg/installer/wget
 }
 
-do_install(){
+do_install() {
 	vmkdir opt/texlive${version}-installer
 	vcopy "install-tl-*/*" /opt/texlive${version}-installer
 	vinstall ${FILESDIR}/void.profile 644 opt/texlive${version}-installer

From d8c1a721c38a28802ce33cc57d5f217f2f330bb3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:38:12 -0700
Subject: [PATCH 12/27] texlive2017-bin: fix license, template layout

---
 srcpkgs/texlive2017-bin/template | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/texlive2017-bin/template b/srcpkgs/texlive2017-bin/template
index 2dd12a23e45c..bcc741140008 100644
--- a/srcpkgs/texlive2017-bin/template
+++ b/srcpkgs/texlive2017-bin/template
@@ -1,19 +1,19 @@
-# Template file for 'texlive-bin'
+# Template file for 'texlive2017-bin'
 pkgname=texlive2017-bin
 version=2017
-revision=4
+revision=5
 archs="x86_64* i686 aarch64 arm*"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="http://tug.org/texlive/"
-license="GPL-2"
-short_desc="TeX Live Binary distribution through tl-install"
+create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
  zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
  ghostscript xz"
-provides="tex-${version}_1"
+short_desc="TeX Live Binary distribution through tl-install"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later, LPPL-1.3c"
+homepage="http://tug.org/texlive/"
 distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
 checksum=d4e07ed15dace1ea7fabe6d225ca45ba51f1cb7783e17850bc9fe3b890239d6d
-create_wrksrc=yes
+provides="tex-${version}_1"
 
 # Package build options
 build_options="basic small medium full"
@@ -23,12 +23,12 @@ desc_option_small="Install TeXLive using scheme-small"
 desc_option_medium="Install TeXLive using scheme-medium"
 desc_option_full="Install TeXLive using scheme-full"
 
-pre_install(){
+pre_install() {
 	rm -rf ${wrksrc}/install-tl*/tlpkg/installer/xz \
 		${wrksrc}/install-tl*/tlpkg/installer/wget
 }
 
-do_install(){
+do_install() {
 	vmkdir opt/texlive${version}-installer
 	vcopy "install-tl-*/*" /opt/texlive${version}-installer
 	vinstall ${FILESDIR}/void.profile 644 opt/texlive${version}-installer

From 5f53482f39ae67550538610b550a61ff59cb3d5e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:40:06 -0700
Subject: [PATCH 13/27] texlive2018-bin: fix license, template layout

---
 srcpkgs/texlive2018-bin/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/texlive2018-bin/template b/srcpkgs/texlive2018-bin/template
index 9fec7b8246c7..5f94dea2a144 100644
--- a/srcpkgs/texlive2018-bin/template
+++ b/srcpkgs/texlive2018-bin/template
@@ -1,19 +1,19 @@
-# Template file for 'texlive-bin'
+# Template file for 'texlive2018-bin'
 pkgname=texlive2018-bin
 version=2018
-revision=3
+revision=4
 archs="x86_64* i686 aarch64 arm*"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="http://tug.org/texlive/"
-license="GPL-2"
-short_desc="TeX Live Binary distribution through tl-install"
+create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
  zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
  ghostscript xz"
-provides="tex-${version}_1"
+short_desc="TeX Live Binary distribution through tl-install"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later, LPPL-1.3c"
+homepage="http://tug.org/texlive/"
 distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
 checksum=82c13110852af162c4c5ef1579fa2f4f51c2040850ec02fb7f97497da45eb446
-create_wrksrc=yes
+provides="tex-${version}_1"
 
 # Package build options
 build_options="basic small medium full"

From 9550af17322377fc93c107e6f0ffea220e647392 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:41:57 -0700
Subject: [PATCH 14/27] texlive2019-bin: fix license, template layout

---
 srcpkgs/texlive2019-bin/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/texlive2019-bin/template b/srcpkgs/texlive2019-bin/template
index fc0553b08029..7c729aeb3ade 100644
--- a/srcpkgs/texlive2019-bin/template
+++ b/srcpkgs/texlive2019-bin/template
@@ -1,19 +1,19 @@
 # Template file for 'texlive2019-bin'
 pkgname=texlive2019-bin
 version=2019
-revision=3
+revision=4
 archs="x86_64* i686 aarch64 arm*"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="http://tug.org/texlive/"
-license="GPL-2"
-short_desc="TeX Live Binary distribution through tl-install"
+create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
  zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
  ghostscript xz"
-provides="tex-${version}_1"
+short_desc="TeX Live Binary distribution through tl-install"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later, LPPL-1.3c"
+homepage="http://tug.org/texlive/"
 distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
 checksum=44aa41b5783e345b7021387f19ac9637ff1ce5406a59754230c666642dfe7750
-create_wrksrc=yes
+provides="tex-${version}_1"
 
 # Package build options
 build_options="basic small medium full"

From a6c52a9bc50d0c05a1ea2ef23e204dcc061bbbca Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:44:04 -0700
Subject: [PATCH 15/27] texlive2020-bin: fix license, template layout

---
 srcpkgs/texlive2020-bin/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/texlive2020-bin/template b/srcpkgs/texlive2020-bin/template
index 939f8a2964cb..a6ad08f92236 100644
--- a/srcpkgs/texlive2020-bin/template
+++ b/srcpkgs/texlive2020-bin/template
@@ -1,18 +1,18 @@
 # Template file for 'texlive2020-bin'
 pkgname=texlive2020-bin
 version=2020
-revision=4
+revision=5
 archs="x86_64* i686 aarch64 arm*"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="http://tug.org/texlive/"
-license="GPL-2"
-short_desc="TeX Live Binary distribution through tl-install"
+create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
  zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
  ghostscript xz"
+short_desc="TeX Live Binary distribution through tl-install"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later, LPPL-1.3c"
+homepage="http://tug.org/texlive/"
 distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
 checksum=7c90a50e55533d57170cbc7c0370a010019946eb18570282948e1af6f809382d
-create_wrksrc=yes
 
 # Package build options
 build_options="basic small medium full"

From ea749e23594bad54c4dd07275ef9a0c161e9aaa3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:45:56 -0700
Subject: [PATCH 16/27] thingylaunch: fix license

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

diff --git a/srcpkgs/thingylaunch/template b/srcpkgs/thingylaunch/template
index 5e862376125b..b91a40b01dc6 100644
--- a/srcpkgs/thingylaunch/template
+++ b/srcpkgs/thingylaunch/template
@@ -1,14 +1,14 @@
 # Template file for 'thingylaunch'
 pkgname=thingylaunch
 version=2.0.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUSE_XCB=ON"
 hostmakedepends="pkg-config"
 makedepends="xcb-util-wm-devel xcb-util-keysyms-devel"
 short_desc="X11 application launcher with tab-completion, history, and bookmarks"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+license="BSD-2-Clause"
 homepage="https://gahr.ch/thingylaunch/"
 distfiles="https://github.com/gahr/${pkgname}/archive/${version}.tar.gz"
 checksum=4d9cc6b826bddb3d02836f721316bfc24c2b31f75c9c2d5077ae162eb3d60b60

From 2e3d86b1a159317f61831b5c5811d79e995c5906 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:47:50 -0700
Subject: [PATCH 17/27] tinyxml: fix license, description, layout

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

diff --git a/srcpkgs/tinyxml/template b/srcpkgs/tinyxml/template
index 29c19bb162d8..c6a0a9199c07 100644
--- a/srcpkgs/tinyxml/template
+++ b/srcpkgs/tinyxml/template
@@ -1,12 +1,12 @@
 # Template file for 'tinyxml'
 pkgname=tinyxml
 version=2.6.2
-revision=10
+revision=11
 wrksrc="${pkgname}"
-short_desc="A simple, small, C++ XML parser"
+short_desc="Simple, small, C++ XML parser"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="Zlib"
 homepage="http://www.grinninglizard.com/tinyxml/"
-license="zlib"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}_2_6_2.tar.gz"
 checksum=15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062645593
 

From bfb063c63a5d95a864e371ebda85feddf6b075d5 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:51:51 -0700
Subject: [PATCH 18/27] tif22pnm: fix license

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

diff --git a/srcpkgs/tif22pnm/template b/srcpkgs/tif22pnm/template
index 0a49a2d969df..fb04e836aceb 100644
--- a/srcpkgs/tif22pnm/template
+++ b/srcpkgs/tif22pnm/template
@@ -1,14 +1,14 @@
 # Template file for 'tif22pnm'
 pkgname=tif22pnm
 version=2014.01.09.1
-revision=1
+revision=2
 _githash="22217c1a3ea355a899e9c7c79903488ca13d1dfe"
 wrksrc="tif22pnm-${_githash}"
 hostmakedepends="pkg-config"
 makedepends="libpng-devel tiff-devel"
 short_desc="TIFF-to-PNM converter and png22pnm, a PNG-to-PNM converter"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/pts/tif22pnm"
 distfiles="https://github.com/pts/tif22pnm/archive/${_githash}.tar.gz"
 checksum=1ffd4bb69724e48ce7a6064fa0801a52043dd2b61f414cebd1803d0cd520a6a2

From fe23cc5a727e1071827e08be94c8a13a4c0a1969 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:57:36 -0700
Subject: [PATCH 19/27] tiptop: fix license, layout, vsed

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

diff --git a/srcpkgs/tiptop/template b/srcpkgs/tiptop/template
index 87f76780a85b..140198908629 100644
--- a/srcpkgs/tiptop/template
+++ b/srcpkgs/tiptop/template
@@ -1,20 +1,20 @@
 # Template file for 'tiptop'
 pkgname=tiptop
 version=2.3.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="flex"
-CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libxml2"
 makedepends="ncurses-devel libxml2-devel"
 short_desc="Performance monitoring tool using hardware counters"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://tiptop.gforge.inria.fr/"
 distfiles="http://tiptop.gforge.inria.fr/releases/${pkgname}-${version}.tar.gz"
 checksum=51c4449c95bba34f16b429729c2f58431490665d8093efaa8643b2e1d1084182
+CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libxml2"
 
 post_extract() {
-	sed -i "s/\`uname -m\`/$XBPS_TARGET_MACHINE/" configure
+	vsed -i "s/\`uname -m\`/$XBPS_TARGET_MACHINE/" configure
 }
 
 post_install() {

From e4b2a9c0f5c3c918193248f9c5ead3fc8f9a49a0 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:58:01 -0700
Subject: [PATCH 20/27] tnftp: fix license

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

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index c0b75c164f25..c2c9dfd4e2c8 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,13 +1,13 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="BSD"
+license="BSD-4-Clause"
 homepage="http://netbsd.gw.com/cgi-bin/man-cgi?ftp"
 distfiles="ftp://ftp.netbsd.org/pub/NetBSD/misc/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=ba4a92b693d04179664524eef0801c8eed4447941c9855f377f98f119f221c03

From ffca8c4a6f081c2e6bd8ccef23d5730c0f624f69 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 16:55:45 -0700
Subject: [PATCH 21/27] tolua: fix license

The license is very poorly defined here. The only place that makes any
comment towards that is the luadist dist.info file. My guess is the
intent is for a CC0 or Public Domain type licensing but they didn't say
so explicitly.
---
 srcpkgs/tolua/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tolua/template b/srcpkgs/tolua/template
index aa0288305255..358c52e3ada1 100644
--- a/srcpkgs/tolua/template
+++ b/srcpkgs/tolua/template
@@ -1,13 +1,13 @@
 # Template file for 'tolua'
 pkgname=tolua
 version=5.2.0
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="lua52-devel"
-short_desc="A tool that greatly simplifies the integration of C/C++ code with Lua"
+short_desc="Tool that greatly simplifies the integration of C/C++ code with Lua"
 maintainer="Antonio Malcolm <antonio@antoniomalcolm.com>"
-license="GPL-2"
+license="custom:as-is"
 homepage="https://github.com/LuaDist/tolua"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=121ae6b6e1fb86d064e5994be5ef43ee2e20d2602f40e6ba48fa9de867ffc3d5
@@ -15,6 +15,11 @@ checksum=121ae6b6e1fb86d064e5994be5ef43ee2e20d2602f40e6ba48fa9de867ffc3d5
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2 -fPIC"
 nopie=yes
 
+post_install() {
+	grep license dist.info > license.txt
+	vlicense license.txt
+}
+
 tolua-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 39bd5cf1270a9c1ceb01c9263c501cf3b4ec6f7c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 16:59:36 -0700
Subject: [PATCH 22/27] tpm-tools: fix license

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

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index c581d1653452..696aec5ae43c 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,14 +1,14 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=7
+revision=8
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
 makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
-license="CPL"
+license="CPL-1.0"
 homepage="http://trousers.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/trousers/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=9cb714e2650826e2e932f65bc0ba9d61b927dc5fea47f2c2a2b64f0fdfcbfa68

From d41c89900ee686621a4a41a870ae363aa01e042c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 17:01:57 -0700
Subject: [PATCH 23/27] tp_smapi-dkms: fix license, layout

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

diff --git a/srcpkgs/tp_smapi-dkms/template b/srcpkgs/tp_smapi-dkms/template
index 4a711af14eca..0ef1ac8f7b47 100644
--- a/srcpkgs/tp_smapi-dkms/template
+++ b/srcpkgs/tp_smapi-dkms/template
@@ -1,12 +1,12 @@
 # Template file for 'tp_smapi-dkms'
 pkgname=tp_smapi-dkms
 version=0.43
-revision=1
-wrksrc=tp_smapi-${version}
+revision=2
 archs="i686* x86_64*"
+wrksrc=tp_smapi-${version}
 short_desc="IBM ThinkPad hardware functions driver"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.thinkwiki.org/wiki/Tp_smapi"
 distfiles="https://github.com/evgeni/tp_smapi/releases/download/tp-smapi%2F${version}/tp_smapi-${version}.tgz"
 checksum=bcef9cd045d52a74d719b2a67ac4f5324994a856f123c0fbc55f1d769d367110

From 0926be72a2480dd64167cf950bd91690065da369 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 17:07:33 -0700
Subject: [PATCH 24/27] tracebox: fix license, layout, description

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

diff --git a/srcpkgs/tracebox/template b/srcpkgs/tracebox/template
index b76bb0123c88..5cf656b50641 100644
--- a/srcpkgs/tracebox/template
+++ b/srcpkgs/tracebox/template
@@ -1,18 +1,17 @@
 # Template file for 'tracebox'
 pkgname=tracebox
 version=0.4.4
-revision=4
+revision=5
 _click_ver=2.0.1
 _crafter_git=3db70ab6fd62ade25de7328aaf8e9ba92696c92e
 _crafter_ver=0.3.3git
-build_style=gnu-configure
 archs="i686 x86_64"
+build_style=gnu-configure
 hostmakedepends="automake pkg-config libtool unzip"
 makedepends="libpcap-devel json-c-devel lua53-devel"
-short_desc="A middlebox detection tool"
+short_desc="Middlebox detection tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-nocross=yes
+license="GPL-2.0-only"
 homepage="http://www.tracebox.org/"
 distfiles="
  https://github.com/tracebox/tracebox/archive/v${version}.tar.gz>tracebox-${version}.tar.gz
@@ -22,6 +21,7 @@ checksum="
  d212f02c6dfee51ab198413a7a53547fc2b5fe139efb3ebf082f1729c2d18f9f
  4e48591cb385000ee8daedf3cc18d4b00a9c5a142cc001e0780f0c7ebd713764
  d3a182a06b86a0bff7f9f5792876f8da9db9dd7936f36ef1b40770c400f43b97"
+nocross=yes
 
 CXXFLAGS="-DHAVE_LUA_PUSHGLOBALTABLE=1"
 

From f87504e989b573c6232464e4b6d8d96187b987f0 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 17:10:40 -0700
Subject: [PATCH 25/27] traceroute: fix license

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

diff --git a/srcpkgs/traceroute/template b/srcpkgs/traceroute/template
index f92c929c300f..73e12c1c4c90 100644
--- a/srcpkgs/traceroute/template
+++ b/srcpkgs/traceroute/template
@@ -1,10 +1,10 @@
 # Template file for 'traceroute'
 pkgname=traceroute
 version=2.1.0
-revision=3
+revision=4
 short_desc="Traces the route taken by packets over an IPv4/IPv6 network"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://traceroute.sourceforge.net"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname-$version.tar.gz"
 checksum=3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6

From 7dd1214cac409dda87b5d443682738a0159e20dc Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 17:15:32 -0700
Subject: [PATCH 26/27] trn: fix license

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

diff --git a/srcpkgs/trn/template b/srcpkgs/trn/template
index 749675e0486c..c2a7873df584 100644
--- a/srcpkgs/trn/template
+++ b/srcpkgs/trn/template
@@ -1,7 +1,7 @@
 # Template file for 'trn'
 pkgname=trn
 version=4.0test77
-revision=6
+revision=7
 wrksrc=$pkgname-${version/test/-test}
 build_style=gnu-makefile
 hostmakedepends="groff bison"
@@ -9,7 +9,7 @@ makedepends="ncurses-devel gettext-devel libnsl-devel"
 depends="virtual?smtp-server"
 short_desc="Text-based threaded Usenet newsreader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="custom"
+license="custom:freeware"
 homepage="http://trn.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}4/${wrksrc}.tar.gz"
 checksum=9ab0430244903ad86ed74fcc2fdc39dc043d23968888e071313050a967b8a6ff
@@ -35,4 +35,3 @@ do_install() {
 		mansrc=${DESTDIR}/usr/share/man/man1
 	vlicense LICENSE
 }
-

From 83dde4d2c3e736f096be500e6cc7fc2e5a497707 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 20:44:54 -0700
Subject: [PATCH 27/27] twoftpd: fix license, distfiles, mark as nocross, vsed

---
 srcpkgs/twoftpd/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/twoftpd/template b/srcpkgs/twoftpd/template
index ad63211f5758..92a8cc4b9f1a 100644
--- a/srcpkgs/twoftpd/template
+++ b/srcpkgs/twoftpd/template
@@ -1,18 +1,19 @@
 # Template file for 'twoftpd'
 pkgname=twoftpd
 version=1.43
-revision=4
+revision=5
 build_style=gnu-makefile
-depends="sv-helper ucspi-tcp"
 makedepends="bglibs-devel cvm-devel"
+depends="sv-helper ucspi-tcp"
 short_desc="Simple secure efficient FTP server"
 maintainer="bougyman <bougyman@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://untroubled.org/twoftpd/"
-distfiles="http://untroubled.org/twoftpd/twoftpd-1.43.tar.gz"
+distfiles="http://untroubled.org/twoftpd/twoftpd-${version}.tar.gz"
 checksum=ed77d2f3020bdbbe1a0a7d9a84780f3525431300e5000901e95a982873e24dc3
 system_accounts="ftp"
 ftp_pgroup="nogroup"
+nocross="deps are nocross"
 
 pre_build() {
 	echo '/usr/bin' > conf-bin
@@ -20,14 +21,13 @@ pre_build() {
 	echo '/usr/include' > conf-include
 	echo '/usr/lib' > conf-lib
 	echo "$CC $LDFLAGS" > conf-ld
-	sed -e 's|/usr/local/include|/usr/include|' -e "s|gcc|$CC $CFLAGS|" \
+	vsed -e 's|/usr/local/include|/usr/include|' -e "s|gcc|$CC $CFLAGS|" \
 		-i conf-cc
 }
 
 do_install() {
 	make install install_prefix=${DESTDIR}
 	vsv twoftpd-anon
-	vlicense COPYING
 	vdoc README
 	vdoc NEWS
 	vdoc ANNOUNCEMENT

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Updated] Omnibus lint pass for SPDX warnings - packages starting with T
  2021-05-30  3:50 [PR PATCH] Omnibus lint pass for SPDX warnings - packages starting with T heliocat
@ 2021-05-30  7:33 ` heliocat
  2021-06-10  7:49 ` heliocat
  1 sibling, 0 replies; 3+ messages in thread
From: heliocat @ 2021-05-30  7:33 UTC (permalink / raw)
  To: ml

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

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

https://github.com/heliocat/void-packages lint_t
https://github.com/void-linux/void-packages/pull/31214

Omnibus lint pass for SPDX warnings - packages starting with T
<!-- 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, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


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

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

From 0631f7f6b8ee15aadb569540cf7186589025d6e5 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 14 May 2021 09:40:17 -0700
Subject: [PATCH 01/26] tanidvr: fix license, other lint

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

diff --git a/srcpkgs/tanidvr/template b/srcpkgs/tanidvr/template
index 7381995de7e4..1394333c1722 100644
--- a/srcpkgs/tanidvr/template
+++ b/srcpkgs/tanidvr/template
@@ -1,12 +1,12 @@
 # Template file for 'tanidvr'
-pkgname="tanidvr"
-version="1.4.1"
-revision=1
+pkgname=tanidvr
+version=1.4.1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-short_desc="A tool for DVRs and IP cameras based on the DVR-IP protocol"
+short_desc="Tool for DVRs and IP cameras based on the DVR-IP protocol"
 maintainer="ymoon <ymoon@hyenas.tech>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://tanidvr.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum="7c0d17c1dd75b3e3b05108451f9d77222dd8938fbf96e1467c3a48dbd9b7bbc9"

From 596d0854bb7be863c3a6f1e8e0c9266df55c1ca7 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 00:14:52 -0700
Subject: [PATCH 02/26] tc-play: fix license, vsed

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

diff --git a/srcpkgs/tc-play/template b/srcpkgs/tc-play/template
index 0f49755ebaf9..c8ec5a85d506 100644
--- a/srcpkgs/tc-play/template
+++ b/srcpkgs/tc-play/template
@@ -1,7 +1,7 @@
 # Template file for 'tc-play'
 pkgname=tc-play
 version=3.3
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="-f Makefile.classic PBKDF_BACKEND=gcrypt"
 make_build_target="tcplay"
@@ -10,14 +10,15 @@ make_install_target="install_program"
 makedepends="device-mapper-devel libuuid-devel libgcrypt-devel"
 short_desc="Free and simple TrueCrypt implementation based on dm-crypt"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="BSD-2-clause"
+license="BSD-2-Clause"
 homepage="https://github.com/bwalex/tc-play"
 distfiles="https://github.com/bwalex/${pkgname}/archive/v${version}.tar.gz"
 checksum=ad53cd814a23b4f61a1b2b6dc2539624ffb550504c400c45cbd8cd1da4c7d90a
 
 pre_build() {
-	sed -i Makefile.classic -e"s; -o tcplay; ${LDFLAGS}&;"
+	vsed -i Makefile.classic -e"s; -o tcplay; ${LDFLAGS}&;"
 }
+
 post_install() {
 	vlicense LICENSE
 }

From 09069c4f2b95105a133f869f53201f66ca18d1c7 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 00:17:23 -0700
Subject: [PATCH 03/26] teensy_loader_cli: fix license, http->https

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

diff --git a/srcpkgs/teensy_loader_cli/template b/srcpkgs/teensy_loader_cli/template
index 267415fa1561..28d93a5e5c05 100644
--- a/srcpkgs/teensy_loader_cli/template
+++ b/srcpkgs/teensy_loader_cli/template
@@ -1,14 +1,14 @@
 # Template file for 'teensy_loader_cli'
 pkgname=teensy_loader_cli
 version=2.1
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_target=teensy_loader_cli
 makedepends="libusb-compat-devel"
 short_desc="Command line Teensy Loader"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
-license="GPL-3"
-homepage="http://www.pjrc.com/teensy/loader_cli.html"
+license="GPL-3.0-only"
+homepage="https://www.pjrc.com/teensy/loader_cli.html"
 distfiles="https://github.com/PaulStoffregen/teensy_loader_cli/archive/${version}.tar.gz"
 checksum=5c36fe45b9a3a71ac38848b076cd692bf7ca8826a69941c249daac3a1d95e388
 

From e76e03b936a1725c4cfc4e6dda0c1ecb45c774b3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 00:21:59 -0700
Subject: [PATCH 04/26] teeworlds: fix license

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

diff --git a/srcpkgs/teeworlds/template b/srcpkgs/teeworlds/template
index 268c85e43ac8..8177724af1fb 100644
--- a/srcpkgs/teeworlds/template
+++ b/srcpkgs/teeworlds/template
@@ -1,12 +1,12 @@
 # Template file for 'teeworlds'
 pkgname=teeworlds
 version=0.7.5
-revision=1
+revision=2
 hostmakedepends="bam python pkg-config"
 makedepends="zlib-devel SDL2-devel glu-devel freetype-devel"
 short_desc="Retro multiplayer shooter"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="custom"
+license="custom:Zlib-like"
 homepage="https://www.teeworlds.com"
 distfiles="https://github.com/teeworlds/teeworlds/archive/${version}.tar.gz"
 checksum=6e67846b38750d2a372d7835fa3775db016458a20a85aa52f1c758102ddd4abe

From 2e6be12eb76386a7bd6e793ef0c70f765cc2d27e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 00:26:31 -0700
Subject: [PATCH 05/26] telepathy-gabble: fix license, http->https, verify
 python2

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

diff --git a/srcpkgs/telepathy-gabble/template b/srcpkgs/telepathy-gabble/template
index 7156a96738a9..23cc05bec9ef 100644
--- a/srcpkgs/telepathy-gabble/template
+++ b/srcpkgs/telepathy-gabble/template
@@ -1,7 +1,7 @@
 # Template file for 'telepathy-gabble'
 pkgname=telepathy-gabble
 version=0.18.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt
  --enable-handle-leak-debug --disable-debug --disable-static"
@@ -12,10 +12,10 @@ makedepends="glib-devel dbus-glib-devel libxml2-devel gupnp-igd-devel
 depends="telepathy-glib>=0.21 ca-certificates"
 short_desc="Jabber/XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://telepathy.freedesktop.org"
+license="LGPL-2.1-or-later"
+homepage="https://telepathy.freedesktop.org"
 distfiles="$homepage/releases/$pkgname/$pkgname-$version.tar.gz"
 checksum=115c91572c72d4a40f0b25b606167b4f2f09441dc7bf1036ccbb1450f1a4969c
-python_version=2 #unverified
+python_version=2
 nocross=yes
 lib32disabled=yes

From ab687454ae9105f5a76b574ab0edb58fdcd0683c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 14:54:54 -0700
Subject: [PATCH 06/26] ternimal: fix license, other lint

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

diff --git a/srcpkgs/ternimal/template b/srcpkgs/ternimal/template
index 0d703f919b2e..6e48ab3191e2 100644
--- a/srcpkgs/ternimal/template
+++ b/srcpkgs/ternimal/template
@@ -1,12 +1,12 @@
 # Template file for 'ternimal'
 pkgname=ternimal
 version=0.1.0
-revision=1
+revision=2
 hostmakedepends="rust"
-maintainer="Orphaned <orphan@voidlinux.org>"
 short_desc="Simulate a lifeform in the terminal"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-only"
 homepage="https://github.com/p-e-w/ternimal"
-license="GPL-3"
 distfiles="https://github.com/p-e-w/ternimal/archive/v${version}.tar.gz"
 checksum=4d37f49a35de5ac23d88a61180d663ba3c2da089418818a588de31f9e920f8d6
 

From 91ee5a2457032a47cb69a465693ff366a454c829 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:13:11 -0700
Subject: [PATCH 07/26] tesseract: fix license, release version marker, vsed

---
 srcpkgs/tesseract/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/tesseract/template b/srcpkgs/tesseract/template
index 5eca40635fd4..3c972c712f48 100644
--- a/srcpkgs/tesseract/template
+++ b/srcpkgs/tesseract/template
@@ -1,26 +1,27 @@
 # Template file for 'tesseract'
 pkgname=tesseract
 version=1
-revision=4
+revision=5
+_release="2014_05_12"
 wrksrc="$pkgname"
 hostmakedepends="pkg-config ImageMagick"
 makedepends="SDL2_image-devel SDL2_mixer-devel MesaLib-devel libpng-devel zlib-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="FPS game focused on instagib deathmatch and capture-the-flag gameplay"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="zlib"
+license="Zlib"
 homepage="http://tesseract.gg/"
-distfiles="http://download.tuxfamily.org/tesseract/tesseract_2014_05_12_first_edition_linux.tar.xz"
+distfiles="http://download.tuxfamily.org/tesseract/tesseract_${_release}_first_edition_linux.tar.xz"
 checksum=8d6e07dd154a40a3f593e52289335c036f06cf90a0ebc400c4650adb3395a0f4
 
 pre_build() {
 	for dim in 16 32 48 64 128 256 512; do
 		convert -resize "${dim}x${dim}" media/interface/cube.png "${pkgname}${dim}.png"
 	done
-	sed -i src/Makefile \
+	vsed -i src/Makefile \
 		-e"s;-o tess_client;${LDFLAGS} &;" \
 		-e"s;-o tess_server;${LDFLAGS} &;"
-	sed -i src/enet/Makefile \
+	vsed -i src/enet/Makefile \
 		-e"s;^\(CFLAGS=\).*;\1${CFLAGS};"
 }
 do_build() {

From 129686c07b931ff920da5a6a86c21d07c2a09dba Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:19:18 -0700
Subject: [PATCH 08/26] testdisk: fix license, http->https

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

diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index a7d635ddb7eb..754e90273be9 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
 # Template file for 'testdisk'
 pkgname=testdisk
 version=7.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--without-ewf --enable-sudo"
 makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
@@ -9,7 +9,7 @@ makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
 depends="sudo"
 short_desc="Powerful free data recovery software"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="http://www.cgsecurity.org/"
-distfiles="http://www.cgsecurity.org/$pkgname-$version.tar.bz2"
+license="GPL-2.0-or-later"
+homepage="https://www.cgsecurity.org/"
+distfiles="https://www.cgsecurity.org/$pkgname-$version.tar.bz2"
 checksum=1413c47569e48c5b22653b943d48136cb228abcbd6f03da109c4df63382190fe

From e60c371abd17b48d9e9e3132310354d630f606c2 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:25:01 -0700
Subject: [PATCH 09/26] texlive2014-bin: fix license, other lint

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

diff --git a/srcpkgs/texlive2014-bin/template b/srcpkgs/texlive2014-bin/template
index 4e5b199b04f3..ebd5321c56e8 100644
--- a/srcpkgs/texlive2014-bin/template
+++ b/srcpkgs/texlive2014-bin/template
@@ -1,19 +1,19 @@
 # Template file for 'texlive2014-bin'
 pkgname=texlive2014-bin
 version=2014
-revision=9
+revision=10
 archs="x86_64* i686 aarch64 arm*"
 create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
  zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
  ghostscript xz"
-provides="tex-${version}_1"
 short_desc="TeX Live Binary distribution through tl-install"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later, LPPL-1.3c"
 homepage="http://tug.org/texlive/"
 distfiles="ftp://ftp.tug.org/texlive/historic/${version}/tlnet-final/install-tl-unx.tar.gz"
 checksum=051e6425d604767eb12289c67c87ccdb1af0750b0b1d22383fd9387926234217
+provides="tex-${version}_1"
 
 # Package build options
 build_options="basic small medium full"

From 1b5aa05d57821222ae21fa2f694d80ee69e1ddbf Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:34:56 -0700
Subject: [PATCH 10/26] texlive2016-bin: fix license, template layout

---
 srcpkgs/texlive2016-bin/template | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/texlive2016-bin/template b/srcpkgs/texlive2016-bin/template
index 6f2ed09c3669..02468263a397 100644
--- a/srcpkgs/texlive2016-bin/template
+++ b/srcpkgs/texlive2016-bin/template
@@ -1,19 +1,19 @@
-# Template file for 'texlive-bin'
+# Template file for 'texlive2016-bin'
 pkgname=texlive2016-bin
 version=2016
-revision=3
+revision=4
 archs="x86_64* i686 aarch64 arm*"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="http://tug.org/texlive/"
-license="GPL-2"
-short_desc="TeX Live Binary distribution through tl-install"
+create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
  zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
  ghostscript xz"
-provides="tex-${version}_1"
+short_desc="TeX Live Binary distribution through tl-install"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later, LPPL-1.3c"
+homepage="http://tug.org/texlive/"
 distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
 checksum=a0559306f4ef1903b92c829a11177dcbf3b85ddb9c6b512a80791e2c543f7d95
-create_wrksrc=yes
+provides="tex-${version}_1"
 
 # Package build options
 build_options="basic small medium full"
@@ -23,12 +23,12 @@ desc_option_small="Install TeXLive using scheme-small"
 desc_option_medium="Install TeXLive using scheme-medium"
 desc_option_full="Install TeXLive using scheme-full"
 
-pre_install(){
+pre_install() {
 	rm -rf ${wrksrc}/install-tl*/tlpkg/installer/xz \
 		${wrksrc}/install-tl*/tlpkg/installer/wget
 }
 
-do_install(){
+do_install() {
 	vmkdir opt/texlive${version}-installer
 	vcopy "install-tl-*/*" /opt/texlive${version}-installer
 	vinstall ${FILESDIR}/void.profile 644 opt/texlive${version}-installer

From 4fb0ab8d2a2abc279f8c49006556206920e9e1d7 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:38:12 -0700
Subject: [PATCH 11/26] texlive2017-bin: fix license, template layout

---
 srcpkgs/texlive2017-bin/template | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/texlive2017-bin/template b/srcpkgs/texlive2017-bin/template
index 2dd12a23e45c..bcc741140008 100644
--- a/srcpkgs/texlive2017-bin/template
+++ b/srcpkgs/texlive2017-bin/template
@@ -1,19 +1,19 @@
-# Template file for 'texlive-bin'
+# Template file for 'texlive2017-bin'
 pkgname=texlive2017-bin
 version=2017
-revision=4
+revision=5
 archs="x86_64* i686 aarch64 arm*"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="http://tug.org/texlive/"
-license="GPL-2"
-short_desc="TeX Live Binary distribution through tl-install"
+create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
  zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
  ghostscript xz"
-provides="tex-${version}_1"
+short_desc="TeX Live Binary distribution through tl-install"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later, LPPL-1.3c"
+homepage="http://tug.org/texlive/"
 distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
 checksum=d4e07ed15dace1ea7fabe6d225ca45ba51f1cb7783e17850bc9fe3b890239d6d
-create_wrksrc=yes
+provides="tex-${version}_1"
 
 # Package build options
 build_options="basic small medium full"
@@ -23,12 +23,12 @@ desc_option_small="Install TeXLive using scheme-small"
 desc_option_medium="Install TeXLive using scheme-medium"
 desc_option_full="Install TeXLive using scheme-full"
 
-pre_install(){
+pre_install() {
 	rm -rf ${wrksrc}/install-tl*/tlpkg/installer/xz \
 		${wrksrc}/install-tl*/tlpkg/installer/wget
 }
 
-do_install(){
+do_install() {
 	vmkdir opt/texlive${version}-installer
 	vcopy "install-tl-*/*" /opt/texlive${version}-installer
 	vinstall ${FILESDIR}/void.profile 644 opt/texlive${version}-installer

From e0897349c18deb5a61fe0277192cdb4eea3a5551 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:40:06 -0700
Subject: [PATCH 12/26] texlive2018-bin: fix license, template layout

---
 srcpkgs/texlive2018-bin/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/texlive2018-bin/template b/srcpkgs/texlive2018-bin/template
index 9fec7b8246c7..5f94dea2a144 100644
--- a/srcpkgs/texlive2018-bin/template
+++ b/srcpkgs/texlive2018-bin/template
@@ -1,19 +1,19 @@
-# Template file for 'texlive-bin'
+# Template file for 'texlive2018-bin'
 pkgname=texlive2018-bin
 version=2018
-revision=3
+revision=4
 archs="x86_64* i686 aarch64 arm*"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="http://tug.org/texlive/"
-license="GPL-2"
-short_desc="TeX Live Binary distribution through tl-install"
+create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
  zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
  ghostscript xz"
-provides="tex-${version}_1"
+short_desc="TeX Live Binary distribution through tl-install"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later, LPPL-1.3c"
+homepage="http://tug.org/texlive/"
 distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
 checksum=82c13110852af162c4c5ef1579fa2f4f51c2040850ec02fb7f97497da45eb446
-create_wrksrc=yes
+provides="tex-${version}_1"
 
 # Package build options
 build_options="basic small medium full"

From c7b11fc7a0b081a8005492c8d71865320ba4ee17 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:41:57 -0700
Subject: [PATCH 13/26] texlive2019-bin: fix license, template layout

---
 srcpkgs/texlive2019-bin/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/texlive2019-bin/template b/srcpkgs/texlive2019-bin/template
index fc0553b08029..7c729aeb3ade 100644
--- a/srcpkgs/texlive2019-bin/template
+++ b/srcpkgs/texlive2019-bin/template
@@ -1,19 +1,19 @@
 # Template file for 'texlive2019-bin'
 pkgname=texlive2019-bin
 version=2019
-revision=3
+revision=4
 archs="x86_64* i686 aarch64 arm*"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="http://tug.org/texlive/"
-license="GPL-2"
-short_desc="TeX Live Binary distribution through tl-install"
+create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
  zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
  ghostscript xz"
-provides="tex-${version}_1"
+short_desc="TeX Live Binary distribution through tl-install"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later, LPPL-1.3c"
+homepage="http://tug.org/texlive/"
 distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
 checksum=44aa41b5783e345b7021387f19ac9637ff1ce5406a59754230c666642dfe7750
-create_wrksrc=yes
+provides="tex-${version}_1"
 
 # Package build options
 build_options="basic small medium full"

From aafd78e6c9005cab26787de07b1012390c59110b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:44:04 -0700
Subject: [PATCH 14/26] texlive2020-bin: fix license, template layout

---
 srcpkgs/texlive2020-bin/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/texlive2020-bin/template b/srcpkgs/texlive2020-bin/template
index 939f8a2964cb..a6ad08f92236 100644
--- a/srcpkgs/texlive2020-bin/template
+++ b/srcpkgs/texlive2020-bin/template
@@ -1,18 +1,18 @@
 # Template file for 'texlive2020-bin'
 pkgname=texlive2020-bin
 version=2020
-revision=4
+revision=5
 archs="x86_64* i686 aarch64 arm*"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="http://tug.org/texlive/"
-license="GPL-2"
-short_desc="TeX Live Binary distribution through tl-install"
+create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
  zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
  ghostscript xz"
+short_desc="TeX Live Binary distribution through tl-install"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later, LPPL-1.3c"
+homepage="http://tug.org/texlive/"
 distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
 checksum=7c90a50e55533d57170cbc7c0370a010019946eb18570282948e1af6f809382d
-create_wrksrc=yes
 
 # Package build options
 build_options="basic small medium full"

From 090c4980db622ece0468e0aebb03348929a9fbf2 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:45:56 -0700
Subject: [PATCH 15/26] thingylaunch: fix license

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

diff --git a/srcpkgs/thingylaunch/template b/srcpkgs/thingylaunch/template
index 5e862376125b..b91a40b01dc6 100644
--- a/srcpkgs/thingylaunch/template
+++ b/srcpkgs/thingylaunch/template
@@ -1,14 +1,14 @@
 # Template file for 'thingylaunch'
 pkgname=thingylaunch
 version=2.0.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUSE_XCB=ON"
 hostmakedepends="pkg-config"
 makedepends="xcb-util-wm-devel xcb-util-keysyms-devel"
 short_desc="X11 application launcher with tab-completion, history, and bookmarks"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+license="BSD-2-Clause"
 homepage="https://gahr.ch/thingylaunch/"
 distfiles="https://github.com/gahr/${pkgname}/archive/${version}.tar.gz"
 checksum=4d9cc6b826bddb3d02836f721316bfc24c2b31f75c9c2d5077ae162eb3d60b60

From 3e614951e2cae40d2c8a04d57af639d1d2aed06c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:47:50 -0700
Subject: [PATCH 16/26] tinyxml: fix license, description, layout

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

diff --git a/srcpkgs/tinyxml/template b/srcpkgs/tinyxml/template
index 29c19bb162d8..c6a0a9199c07 100644
--- a/srcpkgs/tinyxml/template
+++ b/srcpkgs/tinyxml/template
@@ -1,12 +1,12 @@
 # Template file for 'tinyxml'
 pkgname=tinyxml
 version=2.6.2
-revision=10
+revision=11
 wrksrc="${pkgname}"
-short_desc="A simple, small, C++ XML parser"
+short_desc="Simple, small, C++ XML parser"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="Zlib"
 homepage="http://www.grinninglizard.com/tinyxml/"
-license="zlib"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}_2_6_2.tar.gz"
 checksum=15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062645593
 

From 05fcf9aa8d9bb490179cb61799cffa6f349c4357 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:51:51 -0700
Subject: [PATCH 17/26] tif22pnm: fix license

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

diff --git a/srcpkgs/tif22pnm/template b/srcpkgs/tif22pnm/template
index 0a49a2d969df..fb04e836aceb 100644
--- a/srcpkgs/tif22pnm/template
+++ b/srcpkgs/tif22pnm/template
@@ -1,14 +1,14 @@
 # Template file for 'tif22pnm'
 pkgname=tif22pnm
 version=2014.01.09.1
-revision=1
+revision=2
 _githash="22217c1a3ea355a899e9c7c79903488ca13d1dfe"
 wrksrc="tif22pnm-${_githash}"
 hostmakedepends="pkg-config"
 makedepends="libpng-devel tiff-devel"
 short_desc="TIFF-to-PNM converter and png22pnm, a PNG-to-PNM converter"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/pts/tif22pnm"
 distfiles="https://github.com/pts/tif22pnm/archive/${_githash}.tar.gz"
 checksum=1ffd4bb69724e48ce7a6064fa0801a52043dd2b61f414cebd1803d0cd520a6a2

From ddb7919461910418e07ec2c5b673a01548551593 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:57:36 -0700
Subject: [PATCH 18/26] tiptop: fix license, layout, vsed

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

diff --git a/srcpkgs/tiptop/template b/srcpkgs/tiptop/template
index 87f76780a85b..140198908629 100644
--- a/srcpkgs/tiptop/template
+++ b/srcpkgs/tiptop/template
@@ -1,20 +1,20 @@
 # Template file for 'tiptop'
 pkgname=tiptop
 version=2.3.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="flex"
-CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libxml2"
 makedepends="ncurses-devel libxml2-devel"
 short_desc="Performance monitoring tool using hardware counters"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://tiptop.gforge.inria.fr/"
 distfiles="http://tiptop.gforge.inria.fr/releases/${pkgname}-${version}.tar.gz"
 checksum=51c4449c95bba34f16b429729c2f58431490665d8093efaa8643b2e1d1084182
+CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libxml2"
 
 post_extract() {
-	sed -i "s/\`uname -m\`/$XBPS_TARGET_MACHINE/" configure
+	vsed -i "s/\`uname -m\`/$XBPS_TARGET_MACHINE/" configure
 }
 
 post_install() {

From fc40315ab007fa2524c3826412e84c25ce9fa474 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:58:01 -0700
Subject: [PATCH 19/26] tnftp: fix license

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

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index c0b75c164f25..c2c9dfd4e2c8 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,13 +1,13 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="BSD"
+license="BSD-4-Clause"
 homepage="http://netbsd.gw.com/cgi-bin/man-cgi?ftp"
 distfiles="ftp://ftp.netbsd.org/pub/NetBSD/misc/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=ba4a92b693d04179664524eef0801c8eed4447941c9855f377f98f119f221c03

From 5200b727ea1751e640c89b222ca09013973df19b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 16:55:45 -0700
Subject: [PATCH 20/26] tolua: fix license

The license is very poorly defined here. The only place that makes any
comment towards that is the luadist dist.info file. My guess is the
intent is for a CC0 or Public Domain type licensing but they didn't say
so explicitly.
---
 srcpkgs/tolua/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tolua/template b/srcpkgs/tolua/template
index aa0288305255..358c52e3ada1 100644
--- a/srcpkgs/tolua/template
+++ b/srcpkgs/tolua/template
@@ -1,13 +1,13 @@
 # Template file for 'tolua'
 pkgname=tolua
 version=5.2.0
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="lua52-devel"
-short_desc="A tool that greatly simplifies the integration of C/C++ code with Lua"
+short_desc="Tool that greatly simplifies the integration of C/C++ code with Lua"
 maintainer="Antonio Malcolm <antonio@antoniomalcolm.com>"
-license="GPL-2"
+license="custom:as-is"
 homepage="https://github.com/LuaDist/tolua"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=121ae6b6e1fb86d064e5994be5ef43ee2e20d2602f40e6ba48fa9de867ffc3d5
@@ -15,6 +15,11 @@ checksum=121ae6b6e1fb86d064e5994be5ef43ee2e20d2602f40e6ba48fa9de867ffc3d5
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2 -fPIC"
 nopie=yes
 
+post_install() {
+	grep license dist.info > license.txt
+	vlicense license.txt
+}
+
 tolua-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 7d2f32e7e87fdeab5cfa58ff8957a859a64b3d52 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 16:59:36 -0700
Subject: [PATCH 21/26] tpm-tools: fix license

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

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index c581d1653452..696aec5ae43c 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,14 +1,14 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=7
+revision=8
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
 makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
-license="CPL"
+license="CPL-1.0"
 homepage="http://trousers.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/trousers/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=9cb714e2650826e2e932f65bc0ba9d61b927dc5fea47f2c2a2b64f0fdfcbfa68

From f18a0af3363882d64c753d1f3d20cc9e44394aca Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 17:01:57 -0700
Subject: [PATCH 22/26] tp_smapi-dkms: fix license, layout

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

diff --git a/srcpkgs/tp_smapi-dkms/template b/srcpkgs/tp_smapi-dkms/template
index 4a711af14eca..0ef1ac8f7b47 100644
--- a/srcpkgs/tp_smapi-dkms/template
+++ b/srcpkgs/tp_smapi-dkms/template
@@ -1,12 +1,12 @@
 # Template file for 'tp_smapi-dkms'
 pkgname=tp_smapi-dkms
 version=0.43
-revision=1
-wrksrc=tp_smapi-${version}
+revision=2
 archs="i686* x86_64*"
+wrksrc=tp_smapi-${version}
 short_desc="IBM ThinkPad hardware functions driver"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.thinkwiki.org/wiki/Tp_smapi"
 distfiles="https://github.com/evgeni/tp_smapi/releases/download/tp-smapi%2F${version}/tp_smapi-${version}.tgz"
 checksum=bcef9cd045d52a74d719b2a67ac4f5324994a856f123c0fbc55f1d769d367110

From a7c0353cab5e221360cc405b8d6096b9b271b7bf Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 17:07:33 -0700
Subject: [PATCH 23/26] tracebox: fix license, layout, description

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

diff --git a/srcpkgs/tracebox/template b/srcpkgs/tracebox/template
index b76bb0123c88..5cf656b50641 100644
--- a/srcpkgs/tracebox/template
+++ b/srcpkgs/tracebox/template
@@ -1,18 +1,17 @@
 # Template file for 'tracebox'
 pkgname=tracebox
 version=0.4.4
-revision=4
+revision=5
 _click_ver=2.0.1
 _crafter_git=3db70ab6fd62ade25de7328aaf8e9ba92696c92e
 _crafter_ver=0.3.3git
-build_style=gnu-configure
 archs="i686 x86_64"
+build_style=gnu-configure
 hostmakedepends="automake pkg-config libtool unzip"
 makedepends="libpcap-devel json-c-devel lua53-devel"
-short_desc="A middlebox detection tool"
+short_desc="Middlebox detection tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-nocross=yes
+license="GPL-2.0-only"
 homepage="http://www.tracebox.org/"
 distfiles="
  https://github.com/tracebox/tracebox/archive/v${version}.tar.gz>tracebox-${version}.tar.gz
@@ -22,6 +21,7 @@ checksum="
  d212f02c6dfee51ab198413a7a53547fc2b5fe139efb3ebf082f1729c2d18f9f
  4e48591cb385000ee8daedf3cc18d4b00a9c5a142cc001e0780f0c7ebd713764
  d3a182a06b86a0bff7f9f5792876f8da9db9dd7936f36ef1b40770c400f43b97"
+nocross=yes
 
 CXXFLAGS="-DHAVE_LUA_PUSHGLOBALTABLE=1"
 

From bea45fb50724ba3df0310f48d11ffa2892a4ccb1 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 17:10:40 -0700
Subject: [PATCH 24/26] traceroute: fix license

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

diff --git a/srcpkgs/traceroute/template b/srcpkgs/traceroute/template
index f92c929c300f..73e12c1c4c90 100644
--- a/srcpkgs/traceroute/template
+++ b/srcpkgs/traceroute/template
@@ -1,10 +1,10 @@
 # Template file for 'traceroute'
 pkgname=traceroute
 version=2.1.0
-revision=3
+revision=4
 short_desc="Traces the route taken by packets over an IPv4/IPv6 network"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://traceroute.sourceforge.net"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname-$version.tar.gz"
 checksum=3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6

From 7d934549d8200cf306d0043887f710dd12a8714c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 17:15:32 -0700
Subject: [PATCH 25/26] trn: fix license

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

diff --git a/srcpkgs/trn/template b/srcpkgs/trn/template
index 749675e0486c..c2a7873df584 100644
--- a/srcpkgs/trn/template
+++ b/srcpkgs/trn/template
@@ -1,7 +1,7 @@
 # Template file for 'trn'
 pkgname=trn
 version=4.0test77
-revision=6
+revision=7
 wrksrc=$pkgname-${version/test/-test}
 build_style=gnu-makefile
 hostmakedepends="groff bison"
@@ -9,7 +9,7 @@ makedepends="ncurses-devel gettext-devel libnsl-devel"
 depends="virtual?smtp-server"
 short_desc="Text-based threaded Usenet newsreader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="custom"
+license="custom:freeware"
 homepage="http://trn.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}4/${wrksrc}.tar.gz"
 checksum=9ab0430244903ad86ed74fcc2fdc39dc043d23968888e071313050a967b8a6ff
@@ -35,4 +35,3 @@ do_install() {
 		mansrc=${DESTDIR}/usr/share/man/man1
 	vlicense LICENSE
 }
-

From da989e531570af3957d276270a546cc11e2513d2 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 20:44:54 -0700
Subject: [PATCH 26/26] twoftpd: fix license, distfiles, mark as nocross, vsed

---
 srcpkgs/twoftpd/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/twoftpd/template b/srcpkgs/twoftpd/template
index ad63211f5758..92a8cc4b9f1a 100644
--- a/srcpkgs/twoftpd/template
+++ b/srcpkgs/twoftpd/template
@@ -1,18 +1,19 @@
 # Template file for 'twoftpd'
 pkgname=twoftpd
 version=1.43
-revision=4
+revision=5
 build_style=gnu-makefile
-depends="sv-helper ucspi-tcp"
 makedepends="bglibs-devel cvm-devel"
+depends="sv-helper ucspi-tcp"
 short_desc="Simple secure efficient FTP server"
 maintainer="bougyman <bougyman@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://untroubled.org/twoftpd/"
-distfiles="http://untroubled.org/twoftpd/twoftpd-1.43.tar.gz"
+distfiles="http://untroubled.org/twoftpd/twoftpd-${version}.tar.gz"
 checksum=ed77d2f3020bdbbe1a0a7d9a84780f3525431300e5000901e95a982873e24dc3
 system_accounts="ftp"
 ftp_pgroup="nogroup"
+nocross="deps are nocross"
 
 pre_build() {
 	echo '/usr/bin' > conf-bin
@@ -20,14 +21,13 @@ pre_build() {
 	echo '/usr/include' > conf-include
 	echo '/usr/lib' > conf-lib
 	echo "$CC $LDFLAGS" > conf-ld
-	sed -e 's|/usr/local/include|/usr/include|' -e "s|gcc|$CC $CFLAGS|" \
+	vsed -e 's|/usr/local/include|/usr/include|' -e "s|gcc|$CC $CFLAGS|" \
 		-i conf-cc
 }
 
 do_install() {
 	make install install_prefix=${DESTDIR}
 	vsv twoftpd-anon
-	vlicense COPYING
 	vdoc README
 	vdoc NEWS
 	vdoc ANNOUNCEMENT

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Updated] Omnibus lint pass for SPDX warnings - packages starting with T
  2021-05-30  3:50 [PR PATCH] Omnibus lint pass for SPDX warnings - packages starting with T heliocat
  2021-05-30  7:33 ` [PR PATCH] [Updated] " heliocat
@ 2021-06-10  7:49 ` heliocat
  1 sibling, 0 replies; 3+ messages in thread
From: heliocat @ 2021-06-10  7:49 UTC (permalink / raw)
  To: ml

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

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

https://github.com/heliocat/void-packages lint_t
https://github.com/void-linux/void-packages/pull/31214

Omnibus lint pass for SPDX warnings - packages starting with T
<!-- 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, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


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

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

From 8d73596fd893d7c61adff5f379e39e4fa5dbb43f Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 14 May 2021 09:40:17 -0700
Subject: [PATCH 01/26] tanidvr: fix license, other lint

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

diff --git a/srcpkgs/tanidvr/template b/srcpkgs/tanidvr/template
index 7381995de7e4..1394333c1722 100644
--- a/srcpkgs/tanidvr/template
+++ b/srcpkgs/tanidvr/template
@@ -1,12 +1,12 @@
 # Template file for 'tanidvr'
-pkgname="tanidvr"
-version="1.4.1"
-revision=1
+pkgname=tanidvr
+version=1.4.1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-short_desc="A tool for DVRs and IP cameras based on the DVR-IP protocol"
+short_desc="Tool for DVRs and IP cameras based on the DVR-IP protocol"
 maintainer="ymoon <ymoon@hyenas.tech>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://tanidvr.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum="7c0d17c1dd75b3e3b05108451f9d77222dd8938fbf96e1467c3a48dbd9b7bbc9"

From 8d27e8852df0d5c3b4ad9c61da6511154e05d015 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 00:14:52 -0700
Subject: [PATCH 02/26] tc-play: fix license, vsed

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

diff --git a/srcpkgs/tc-play/template b/srcpkgs/tc-play/template
index 0f49755ebaf9..c8ec5a85d506 100644
--- a/srcpkgs/tc-play/template
+++ b/srcpkgs/tc-play/template
@@ -1,7 +1,7 @@
 # Template file for 'tc-play'
 pkgname=tc-play
 version=3.3
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="-f Makefile.classic PBKDF_BACKEND=gcrypt"
 make_build_target="tcplay"
@@ -10,14 +10,15 @@ make_install_target="install_program"
 makedepends="device-mapper-devel libuuid-devel libgcrypt-devel"
 short_desc="Free and simple TrueCrypt implementation based on dm-crypt"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="BSD-2-clause"
+license="BSD-2-Clause"
 homepage="https://github.com/bwalex/tc-play"
 distfiles="https://github.com/bwalex/${pkgname}/archive/v${version}.tar.gz"
 checksum=ad53cd814a23b4f61a1b2b6dc2539624ffb550504c400c45cbd8cd1da4c7d90a
 
 pre_build() {
-	sed -i Makefile.classic -e"s; -o tcplay; ${LDFLAGS}&;"
+	vsed -i Makefile.classic -e"s; -o tcplay; ${LDFLAGS}&;"
 }
+
 post_install() {
 	vlicense LICENSE
 }

From 9f7d91c11e93fc1ff97a726b728ceda469d4713b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 00:17:23 -0700
Subject: [PATCH 03/26] teensy_loader_cli: fix license, http->https

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

diff --git a/srcpkgs/teensy_loader_cli/template b/srcpkgs/teensy_loader_cli/template
index 267415fa1561..28d93a5e5c05 100644
--- a/srcpkgs/teensy_loader_cli/template
+++ b/srcpkgs/teensy_loader_cli/template
@@ -1,14 +1,14 @@
 # Template file for 'teensy_loader_cli'
 pkgname=teensy_loader_cli
 version=2.1
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_target=teensy_loader_cli
 makedepends="libusb-compat-devel"
 short_desc="Command line Teensy Loader"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
-license="GPL-3"
-homepage="http://www.pjrc.com/teensy/loader_cli.html"
+license="GPL-3.0-only"
+homepage="https://www.pjrc.com/teensy/loader_cli.html"
 distfiles="https://github.com/PaulStoffregen/teensy_loader_cli/archive/${version}.tar.gz"
 checksum=5c36fe45b9a3a71ac38848b076cd692bf7ca8826a69941c249daac3a1d95e388
 

From c194b18c3595d93c599520924f0ca020803a49f0 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 00:21:59 -0700
Subject: [PATCH 04/26] teeworlds: fix license

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

diff --git a/srcpkgs/teeworlds/template b/srcpkgs/teeworlds/template
index 268c85e43ac8..8177724af1fb 100644
--- a/srcpkgs/teeworlds/template
+++ b/srcpkgs/teeworlds/template
@@ -1,12 +1,12 @@
 # Template file for 'teeworlds'
 pkgname=teeworlds
 version=0.7.5
-revision=1
+revision=2
 hostmakedepends="bam python pkg-config"
 makedepends="zlib-devel SDL2-devel glu-devel freetype-devel"
 short_desc="Retro multiplayer shooter"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="custom"
+license="custom:Zlib-like"
 homepage="https://www.teeworlds.com"
 distfiles="https://github.com/teeworlds/teeworlds/archive/${version}.tar.gz"
 checksum=6e67846b38750d2a372d7835fa3775db016458a20a85aa52f1c758102ddd4abe

From 6a3f9507d7a4e119240e52c698f23e2267d356f1 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 00:26:31 -0700
Subject: [PATCH 05/26] telepathy-gabble: fix license, http->https, verify
 python2

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

diff --git a/srcpkgs/telepathy-gabble/template b/srcpkgs/telepathy-gabble/template
index 7156a96738a9..23cc05bec9ef 100644
--- a/srcpkgs/telepathy-gabble/template
+++ b/srcpkgs/telepathy-gabble/template
@@ -1,7 +1,7 @@
 # Template file for 'telepathy-gabble'
 pkgname=telepathy-gabble
 version=0.18.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt
  --enable-handle-leak-debug --disable-debug --disable-static"
@@ -12,10 +12,10 @@ makedepends="glib-devel dbus-glib-devel libxml2-devel gupnp-igd-devel
 depends="telepathy-glib>=0.21 ca-certificates"
 short_desc="Jabber/XMPP connection manager for Telepathy"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://telepathy.freedesktop.org"
+license="LGPL-2.1-or-later"
+homepage="https://telepathy.freedesktop.org"
 distfiles="$homepage/releases/$pkgname/$pkgname-$version.tar.gz"
 checksum=115c91572c72d4a40f0b25b606167b4f2f09441dc7bf1036ccbb1450f1a4969c
-python_version=2 #unverified
+python_version=2
 nocross=yes
 lib32disabled=yes

From 7e91700ee0f507d2a18ae9672b577205920879ee Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 14:54:54 -0700
Subject: [PATCH 06/26] ternimal: fix license, other lint

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

diff --git a/srcpkgs/ternimal/template b/srcpkgs/ternimal/template
index 0d703f919b2e..6e48ab3191e2 100644
--- a/srcpkgs/ternimal/template
+++ b/srcpkgs/ternimal/template
@@ -1,12 +1,12 @@
 # Template file for 'ternimal'
 pkgname=ternimal
 version=0.1.0
-revision=1
+revision=2
 hostmakedepends="rust"
-maintainer="Orphaned <orphan@voidlinux.org>"
 short_desc="Simulate a lifeform in the terminal"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-only"
 homepage="https://github.com/p-e-w/ternimal"
-license="GPL-3"
 distfiles="https://github.com/p-e-w/ternimal/archive/v${version}.tar.gz"
 checksum=4d37f49a35de5ac23d88a61180d663ba3c2da089418818a588de31f9e920f8d6
 

From 1817dfded73af139eab0d7a1d38514cb2492e067 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:13:11 -0700
Subject: [PATCH 07/26] tesseract: fix license, release version marker, vsed

---
 srcpkgs/tesseract/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/tesseract/template b/srcpkgs/tesseract/template
index 5eca40635fd4..3c972c712f48 100644
--- a/srcpkgs/tesseract/template
+++ b/srcpkgs/tesseract/template
@@ -1,26 +1,27 @@
 # Template file for 'tesseract'
 pkgname=tesseract
 version=1
-revision=4
+revision=5
+_release="2014_05_12"
 wrksrc="$pkgname"
 hostmakedepends="pkg-config ImageMagick"
 makedepends="SDL2_image-devel SDL2_mixer-devel MesaLib-devel libpng-devel zlib-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="FPS game focused on instagib deathmatch and capture-the-flag gameplay"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="zlib"
+license="Zlib"
 homepage="http://tesseract.gg/"
-distfiles="http://download.tuxfamily.org/tesseract/tesseract_2014_05_12_first_edition_linux.tar.xz"
+distfiles="http://download.tuxfamily.org/tesseract/tesseract_${_release}_first_edition_linux.tar.xz"
 checksum=8d6e07dd154a40a3f593e52289335c036f06cf90a0ebc400c4650adb3395a0f4
 
 pre_build() {
 	for dim in 16 32 48 64 128 256 512; do
 		convert -resize "${dim}x${dim}" media/interface/cube.png "${pkgname}${dim}.png"
 	done
-	sed -i src/Makefile \
+	vsed -i src/Makefile \
 		-e"s;-o tess_client;${LDFLAGS} &;" \
 		-e"s;-o tess_server;${LDFLAGS} &;"
-	sed -i src/enet/Makefile \
+	vsed -i src/enet/Makefile \
 		-e"s;^\(CFLAGS=\).*;\1${CFLAGS};"
 }
 do_build() {

From 017124108256eac65a0e61bd18229e31e2253fee Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:19:18 -0700
Subject: [PATCH 08/26] testdisk: fix license, http->https

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

diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index a7d635ddb7eb..754e90273be9 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
 # Template file for 'testdisk'
 pkgname=testdisk
 version=7.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--without-ewf --enable-sudo"
 makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
@@ -9,7 +9,7 @@ makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
 depends="sudo"
 short_desc="Powerful free data recovery software"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="http://www.cgsecurity.org/"
-distfiles="http://www.cgsecurity.org/$pkgname-$version.tar.bz2"
+license="GPL-2.0-or-later"
+homepage="https://www.cgsecurity.org/"
+distfiles="https://www.cgsecurity.org/$pkgname-$version.tar.bz2"
 checksum=1413c47569e48c5b22653b943d48136cb228abcbd6f03da109c4df63382190fe

From c62fc7b8e95db694d9fd7c99efc22cde4989ca04 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:25:01 -0700
Subject: [PATCH 09/26] texlive2014-bin: fix license, other lint

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

diff --git a/srcpkgs/texlive2014-bin/template b/srcpkgs/texlive2014-bin/template
index 4e5b199b04f3..ebd5321c56e8 100644
--- a/srcpkgs/texlive2014-bin/template
+++ b/srcpkgs/texlive2014-bin/template
@@ -1,19 +1,19 @@
 # Template file for 'texlive2014-bin'
 pkgname=texlive2014-bin
 version=2014
-revision=9
+revision=10
 archs="x86_64* i686 aarch64 arm*"
 create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
  zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
  ghostscript xz"
-provides="tex-${version}_1"
 short_desc="TeX Live Binary distribution through tl-install"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later, LPPL-1.3c"
 homepage="http://tug.org/texlive/"
 distfiles="ftp://ftp.tug.org/texlive/historic/${version}/tlnet-final/install-tl-unx.tar.gz"
 checksum=051e6425d604767eb12289c67c87ccdb1af0750b0b1d22383fd9387926234217
+provides="tex-${version}_1"
 
 # Package build options
 build_options="basic small medium full"

From 57c68f50504efab2d84cf994a24555ea752a1326 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:34:56 -0700
Subject: [PATCH 10/26] texlive2016-bin: fix license, template layout

---
 srcpkgs/texlive2016-bin/template | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/texlive2016-bin/template b/srcpkgs/texlive2016-bin/template
index 6f2ed09c3669..02468263a397 100644
--- a/srcpkgs/texlive2016-bin/template
+++ b/srcpkgs/texlive2016-bin/template
@@ -1,19 +1,19 @@
-# Template file for 'texlive-bin'
+# Template file for 'texlive2016-bin'
 pkgname=texlive2016-bin
 version=2016
-revision=3
+revision=4
 archs="x86_64* i686 aarch64 arm*"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="http://tug.org/texlive/"
-license="GPL-2"
-short_desc="TeX Live Binary distribution through tl-install"
+create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
  zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
  ghostscript xz"
-provides="tex-${version}_1"
+short_desc="TeX Live Binary distribution through tl-install"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later, LPPL-1.3c"
+homepage="http://tug.org/texlive/"
 distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
 checksum=a0559306f4ef1903b92c829a11177dcbf3b85ddb9c6b512a80791e2c543f7d95
-create_wrksrc=yes
+provides="tex-${version}_1"
 
 # Package build options
 build_options="basic small medium full"
@@ -23,12 +23,12 @@ desc_option_small="Install TeXLive using scheme-small"
 desc_option_medium="Install TeXLive using scheme-medium"
 desc_option_full="Install TeXLive using scheme-full"
 
-pre_install(){
+pre_install() {
 	rm -rf ${wrksrc}/install-tl*/tlpkg/installer/xz \
 		${wrksrc}/install-tl*/tlpkg/installer/wget
 }
 
-do_install(){
+do_install() {
 	vmkdir opt/texlive${version}-installer
 	vcopy "install-tl-*/*" /opt/texlive${version}-installer
 	vinstall ${FILESDIR}/void.profile 644 opt/texlive${version}-installer

From 8c77a3086e6d7cb4fa018ccfbbe3926bef502902 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:38:12 -0700
Subject: [PATCH 11/26] texlive2017-bin: fix license, template layout

---
 srcpkgs/texlive2017-bin/template | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/texlive2017-bin/template b/srcpkgs/texlive2017-bin/template
index 2dd12a23e45c..bcc741140008 100644
--- a/srcpkgs/texlive2017-bin/template
+++ b/srcpkgs/texlive2017-bin/template
@@ -1,19 +1,19 @@
-# Template file for 'texlive-bin'
+# Template file for 'texlive2017-bin'
 pkgname=texlive2017-bin
 version=2017
-revision=4
+revision=5
 archs="x86_64* i686 aarch64 arm*"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="http://tug.org/texlive/"
-license="GPL-2"
-short_desc="TeX Live Binary distribution through tl-install"
+create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
  zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
  ghostscript xz"
-provides="tex-${version}_1"
+short_desc="TeX Live Binary distribution through tl-install"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later, LPPL-1.3c"
+homepage="http://tug.org/texlive/"
 distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
 checksum=d4e07ed15dace1ea7fabe6d225ca45ba51f1cb7783e17850bc9fe3b890239d6d
-create_wrksrc=yes
+provides="tex-${version}_1"
 
 # Package build options
 build_options="basic small medium full"
@@ -23,12 +23,12 @@ desc_option_small="Install TeXLive using scheme-small"
 desc_option_medium="Install TeXLive using scheme-medium"
 desc_option_full="Install TeXLive using scheme-full"
 
-pre_install(){
+pre_install() {
 	rm -rf ${wrksrc}/install-tl*/tlpkg/installer/xz \
 		${wrksrc}/install-tl*/tlpkg/installer/wget
 }
 
-do_install(){
+do_install() {
 	vmkdir opt/texlive${version}-installer
 	vcopy "install-tl-*/*" /opt/texlive${version}-installer
 	vinstall ${FILESDIR}/void.profile 644 opt/texlive${version}-installer

From 12be3c978d6803dc383415beeb83094aa4bdada9 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:40:06 -0700
Subject: [PATCH 12/26] texlive2018-bin: fix license, template layout

---
 srcpkgs/texlive2018-bin/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/texlive2018-bin/template b/srcpkgs/texlive2018-bin/template
index 9fec7b8246c7..5f94dea2a144 100644
--- a/srcpkgs/texlive2018-bin/template
+++ b/srcpkgs/texlive2018-bin/template
@@ -1,19 +1,19 @@
-# Template file for 'texlive-bin'
+# Template file for 'texlive2018-bin'
 pkgname=texlive2018-bin
 version=2018
-revision=3
+revision=4
 archs="x86_64* i686 aarch64 arm*"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="http://tug.org/texlive/"
-license="GPL-2"
-short_desc="TeX Live Binary distribution through tl-install"
+create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
  zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
  ghostscript xz"
-provides="tex-${version}_1"
+short_desc="TeX Live Binary distribution through tl-install"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later, LPPL-1.3c"
+homepage="http://tug.org/texlive/"
 distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
 checksum=82c13110852af162c4c5ef1579fa2f4f51c2040850ec02fb7f97497da45eb446
-create_wrksrc=yes
+provides="tex-${version}_1"
 
 # Package build options
 build_options="basic small medium full"

From 6375dd027c699a61ab70f55a9dfc60676799ec8a Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:41:57 -0700
Subject: [PATCH 13/26] texlive2019-bin: fix license, template layout

---
 srcpkgs/texlive2019-bin/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/texlive2019-bin/template b/srcpkgs/texlive2019-bin/template
index fc0553b08029..7c729aeb3ade 100644
--- a/srcpkgs/texlive2019-bin/template
+++ b/srcpkgs/texlive2019-bin/template
@@ -1,19 +1,19 @@
 # Template file for 'texlive2019-bin'
 pkgname=texlive2019-bin
 version=2019
-revision=3
+revision=4
 archs="x86_64* i686 aarch64 arm*"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="http://tug.org/texlive/"
-license="GPL-2"
-short_desc="TeX Live Binary distribution through tl-install"
+create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
  zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
  ghostscript xz"
-provides="tex-${version}_1"
+short_desc="TeX Live Binary distribution through tl-install"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later, LPPL-1.3c"
+homepage="http://tug.org/texlive/"
 distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
 checksum=44aa41b5783e345b7021387f19ac9637ff1ce5406a59754230c666642dfe7750
-create_wrksrc=yes
+provides="tex-${version}_1"
 
 # Package build options
 build_options="basic small medium full"

From 034d229570210b35dc9bcb0f2a974ead4d72c78b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:44:04 -0700
Subject: [PATCH 14/26] texlive2020-bin: fix license, template layout

---
 srcpkgs/texlive2020-bin/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/texlive2020-bin/template b/srcpkgs/texlive2020-bin/template
index 939f8a2964cb..a6ad08f92236 100644
--- a/srcpkgs/texlive2020-bin/template
+++ b/srcpkgs/texlive2020-bin/template
@@ -1,18 +1,18 @@
 # Template file for 'texlive2020-bin'
 pkgname=texlive2020-bin
 version=2020
-revision=4
+revision=5
 archs="x86_64* i686 aarch64 arm*"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="http://tug.org/texlive/"
-license="GPL-2"
-short_desc="TeX Live Binary distribution through tl-install"
+create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
  zziplib libpng libjpeg-turbo freetype icu harfbuzz wget perl
  ghostscript xz"
+short_desc="TeX Live Binary distribution through tl-install"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later, LPPL-1.3c"
+homepage="http://tug.org/texlive/"
 distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
 checksum=7c90a50e55533d57170cbc7c0370a010019946eb18570282948e1af6f809382d
-create_wrksrc=yes
 
 # Package build options
 build_options="basic small medium full"

From 9a235dd3e77c550fa71526c7f3e34a5128962442 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:45:56 -0700
Subject: [PATCH 15/26] thingylaunch: fix license

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

diff --git a/srcpkgs/thingylaunch/template b/srcpkgs/thingylaunch/template
index 5e862376125b..b91a40b01dc6 100644
--- a/srcpkgs/thingylaunch/template
+++ b/srcpkgs/thingylaunch/template
@@ -1,14 +1,14 @@
 # Template file for 'thingylaunch'
 pkgname=thingylaunch
 version=2.0.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUSE_XCB=ON"
 hostmakedepends="pkg-config"
 makedepends="xcb-util-wm-devel xcb-util-keysyms-devel"
 short_desc="X11 application launcher with tab-completion, history, and bookmarks"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+license="BSD-2-Clause"
 homepage="https://gahr.ch/thingylaunch/"
 distfiles="https://github.com/gahr/${pkgname}/archive/${version}.tar.gz"
 checksum=4d9cc6b826bddb3d02836f721316bfc24c2b31f75c9c2d5077ae162eb3d60b60

From e5fbbcf40c15c8877397fce025baec2eb69e7df4 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:47:50 -0700
Subject: [PATCH 16/26] tinyxml: fix license, description, layout

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

diff --git a/srcpkgs/tinyxml/template b/srcpkgs/tinyxml/template
index 29c19bb162d8..c6a0a9199c07 100644
--- a/srcpkgs/tinyxml/template
+++ b/srcpkgs/tinyxml/template
@@ -1,12 +1,12 @@
 # Template file for 'tinyxml'
 pkgname=tinyxml
 version=2.6.2
-revision=10
+revision=11
 wrksrc="${pkgname}"
-short_desc="A simple, small, C++ XML parser"
+short_desc="Simple, small, C++ XML parser"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="Zlib"
 homepage="http://www.grinninglizard.com/tinyxml/"
-license="zlib"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}_2_6_2.tar.gz"
 checksum=15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062645593
 

From 04d056a41f2577e18e38dd71e6d6bbfd08f66137 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:51:51 -0700
Subject: [PATCH 17/26] tif22pnm: fix license

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

diff --git a/srcpkgs/tif22pnm/template b/srcpkgs/tif22pnm/template
index 0a49a2d969df..fb04e836aceb 100644
--- a/srcpkgs/tif22pnm/template
+++ b/srcpkgs/tif22pnm/template
@@ -1,14 +1,14 @@
 # Template file for 'tif22pnm'
 pkgname=tif22pnm
 version=2014.01.09.1
-revision=1
+revision=2
 _githash="22217c1a3ea355a899e9c7c79903488ca13d1dfe"
 wrksrc="tif22pnm-${_githash}"
 hostmakedepends="pkg-config"
 makedepends="libpng-devel tiff-devel"
 short_desc="TIFF-to-PNM converter and png22pnm, a PNG-to-PNM converter"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/pts/tif22pnm"
 distfiles="https://github.com/pts/tif22pnm/archive/${_githash}.tar.gz"
 checksum=1ffd4bb69724e48ce7a6064fa0801a52043dd2b61f414cebd1803d0cd520a6a2

From 7f1f900644ecbd208c33c83d650c611b328bd40b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:57:36 -0700
Subject: [PATCH 18/26] tiptop: fix license, layout, vsed

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

diff --git a/srcpkgs/tiptop/template b/srcpkgs/tiptop/template
index 87f76780a85b..140198908629 100644
--- a/srcpkgs/tiptop/template
+++ b/srcpkgs/tiptop/template
@@ -1,20 +1,20 @@
 # Template file for 'tiptop'
 pkgname=tiptop
 version=2.3.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="flex"
-CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libxml2"
 makedepends="ncurses-devel libxml2-devel"
 short_desc="Performance monitoring tool using hardware counters"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://tiptop.gforge.inria.fr/"
 distfiles="http://tiptop.gforge.inria.fr/releases/${pkgname}-${version}.tar.gz"
 checksum=51c4449c95bba34f16b429729c2f58431490665d8093efaa8643b2e1d1084182
+CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libxml2"
 
 post_extract() {
-	sed -i "s/\`uname -m\`/$XBPS_TARGET_MACHINE/" configure
+	vsed -i "s/\`uname -m\`/$XBPS_TARGET_MACHINE/" configure
 }
 
 post_install() {

From 92ed781f54b696dec34465053cc79c7822ab36cb Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 28 May 2021 15:58:01 -0700
Subject: [PATCH 19/26] tnftp: fix license

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

diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index c0b75c164f25..c2c9dfd4e2c8 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,13 +1,13 @@
 # Template file for 'tnftp'
 pkgname=tnftp
 version=20200705
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 makedepends="openssl-devel ncurses-devel"
 short_desc="NetBSD enhanced ftp client"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="BSD"
+license="BSD-4-Clause"
 homepage="http://netbsd.gw.com/cgi-bin/man-cgi?ftp"
 distfiles="ftp://ftp.netbsd.org/pub/NetBSD/misc/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=ba4a92b693d04179664524eef0801c8eed4447941c9855f377f98f119f221c03

From ff7ee10c3a0823bb38fabdf85d6ed72ac7f28e57 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 16:55:45 -0700
Subject: [PATCH 20/26] tolua: fix license

The license is very poorly defined here. The only place that makes any
comment towards that is the luadist dist.info file. My guess is the
intent is for a CC0 or Public Domain type licensing but they didn't say
so explicitly.
---
 srcpkgs/tolua/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tolua/template b/srcpkgs/tolua/template
index aa0288305255..358c52e3ada1 100644
--- a/srcpkgs/tolua/template
+++ b/srcpkgs/tolua/template
@@ -1,13 +1,13 @@
 # Template file for 'tolua'
 pkgname=tolua
 version=5.2.0
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="lua52-devel"
-short_desc="A tool that greatly simplifies the integration of C/C++ code with Lua"
+short_desc="Tool that greatly simplifies the integration of C/C++ code with Lua"
 maintainer="Antonio Malcolm <antonio@antoniomalcolm.com>"
-license="GPL-2"
+license="custom:as-is"
 homepage="https://github.com/LuaDist/tolua"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=121ae6b6e1fb86d064e5994be5ef43ee2e20d2602f40e6ba48fa9de867ffc3d5
@@ -15,6 +15,11 @@ checksum=121ae6b6e1fb86d064e5994be5ef43ee2e20d2602f40e6ba48fa9de867ffc3d5
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2 -fPIC"
 nopie=yes
 
+post_install() {
+	grep license dist.info > license.txt
+	vlicense license.txt
+}
+
 tolua-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 29b3ecd47caec9dbeda28428001233bcba26077e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 16:59:36 -0700
Subject: [PATCH 21/26] tpm-tools: fix license

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

diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index c581d1653452..696aec5ae43c 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,14 +1,14 @@
 # Template file for 'tpm-tools'
 pkgname=tpm-tools
 version=1.3.9.1
-revision=7
+revision=8
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="perl" # wants pod2man
 makedepends="openssl-devel trousers-devel"
 short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
-license="CPL"
+license="CPL-1.0"
 homepage="http://trousers.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/trousers/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=9cb714e2650826e2e932f65bc0ba9d61b927dc5fea47f2c2a2b64f0fdfcbfa68

From b743eb7b2bbb8cb711583b1f24c3f56f9eaca645 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 17:01:57 -0700
Subject: [PATCH 22/26] tp_smapi-dkms: fix license, layout

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

diff --git a/srcpkgs/tp_smapi-dkms/template b/srcpkgs/tp_smapi-dkms/template
index 4a711af14eca..0ef1ac8f7b47 100644
--- a/srcpkgs/tp_smapi-dkms/template
+++ b/srcpkgs/tp_smapi-dkms/template
@@ -1,12 +1,12 @@
 # Template file for 'tp_smapi-dkms'
 pkgname=tp_smapi-dkms
 version=0.43
-revision=1
-wrksrc=tp_smapi-${version}
+revision=2
 archs="i686* x86_64*"
+wrksrc=tp_smapi-${version}
 short_desc="IBM ThinkPad hardware functions driver"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.thinkwiki.org/wiki/Tp_smapi"
 distfiles="https://github.com/evgeni/tp_smapi/releases/download/tp-smapi%2F${version}/tp_smapi-${version}.tgz"
 checksum=bcef9cd045d52a74d719b2a67ac4f5324994a856f123c0fbc55f1d769d367110

From 152fc36006daf1505ab842a398aff87a1afef700 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 17:07:33 -0700
Subject: [PATCH 23/26] tracebox: fix license, layout, description

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

diff --git a/srcpkgs/tracebox/template b/srcpkgs/tracebox/template
index b76bb0123c88..5cf656b50641 100644
--- a/srcpkgs/tracebox/template
+++ b/srcpkgs/tracebox/template
@@ -1,18 +1,17 @@
 # Template file for 'tracebox'
 pkgname=tracebox
 version=0.4.4
-revision=4
+revision=5
 _click_ver=2.0.1
 _crafter_git=3db70ab6fd62ade25de7328aaf8e9ba92696c92e
 _crafter_ver=0.3.3git
-build_style=gnu-configure
 archs="i686 x86_64"
+build_style=gnu-configure
 hostmakedepends="automake pkg-config libtool unzip"
 makedepends="libpcap-devel json-c-devel lua53-devel"
-short_desc="A middlebox detection tool"
+short_desc="Middlebox detection tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-nocross=yes
+license="GPL-2.0-only"
 homepage="http://www.tracebox.org/"
 distfiles="
  https://github.com/tracebox/tracebox/archive/v${version}.tar.gz>tracebox-${version}.tar.gz
@@ -22,6 +21,7 @@ checksum="
  d212f02c6dfee51ab198413a7a53547fc2b5fe139efb3ebf082f1729c2d18f9f
  4e48591cb385000ee8daedf3cc18d4b00a9c5a142cc001e0780f0c7ebd713764
  d3a182a06b86a0bff7f9f5792876f8da9db9dd7936f36ef1b40770c400f43b97"
+nocross=yes
 
 CXXFLAGS="-DHAVE_LUA_PUSHGLOBALTABLE=1"
 

From 079e9156133bf87fc843924f16da5f8f634535bd Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 17:10:40 -0700
Subject: [PATCH 24/26] traceroute: fix license

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

diff --git a/srcpkgs/traceroute/template b/srcpkgs/traceroute/template
index f92c929c300f..73e12c1c4c90 100644
--- a/srcpkgs/traceroute/template
+++ b/srcpkgs/traceroute/template
@@ -1,10 +1,10 @@
 # Template file for 'traceroute'
 pkgname=traceroute
 version=2.1.0
-revision=3
+revision=4
 short_desc="Traces the route taken by packets over an IPv4/IPv6 network"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://traceroute.sourceforge.net"
 distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname-$version.tar.gz"
 checksum=3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6

From 4223d50388c9d9fa5cedcaecab4f5b5d0da97388 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 17:15:32 -0700
Subject: [PATCH 25/26] trn: fix license

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

diff --git a/srcpkgs/trn/template b/srcpkgs/trn/template
index 749675e0486c..c2a7873df584 100644
--- a/srcpkgs/trn/template
+++ b/srcpkgs/trn/template
@@ -1,7 +1,7 @@
 # Template file for 'trn'
 pkgname=trn
 version=4.0test77
-revision=6
+revision=7
 wrksrc=$pkgname-${version/test/-test}
 build_style=gnu-makefile
 hostmakedepends="groff bison"
@@ -9,7 +9,7 @@ makedepends="ncurses-devel gettext-devel libnsl-devel"
 depends="virtual?smtp-server"
 short_desc="Text-based threaded Usenet newsreader"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="custom"
+license="custom:freeware"
 homepage="http://trn.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}4/${wrksrc}.tar.gz"
 checksum=9ab0430244903ad86ed74fcc2fdc39dc043d23968888e071313050a967b8a6ff
@@ -35,4 +35,3 @@ do_install() {
 		mansrc=${DESTDIR}/usr/share/man/man1
 	vlicense LICENSE
 }
-

From 80b32930e9492a851a97f8fc09fde1f8c442235b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 29 May 2021 20:44:54 -0700
Subject: [PATCH 26/26] twoftpd: fix license, distfiles, mark as nocross, vsed

---
 srcpkgs/twoftpd/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/twoftpd/template b/srcpkgs/twoftpd/template
index ad63211f5758..92a8cc4b9f1a 100644
--- a/srcpkgs/twoftpd/template
+++ b/srcpkgs/twoftpd/template
@@ -1,18 +1,19 @@
 # Template file for 'twoftpd'
 pkgname=twoftpd
 version=1.43
-revision=4
+revision=5
 build_style=gnu-makefile
-depends="sv-helper ucspi-tcp"
 makedepends="bglibs-devel cvm-devel"
+depends="sv-helper ucspi-tcp"
 short_desc="Simple secure efficient FTP server"
 maintainer="bougyman <bougyman@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://untroubled.org/twoftpd/"
-distfiles="http://untroubled.org/twoftpd/twoftpd-1.43.tar.gz"
+distfiles="http://untroubled.org/twoftpd/twoftpd-${version}.tar.gz"
 checksum=ed77d2f3020bdbbe1a0a7d9a84780f3525431300e5000901e95a982873e24dc3
 system_accounts="ftp"
 ftp_pgroup="nogroup"
+nocross="deps are nocross"
 
 pre_build() {
 	echo '/usr/bin' > conf-bin
@@ -20,14 +21,13 @@ pre_build() {
 	echo '/usr/include' > conf-include
 	echo '/usr/lib' > conf-lib
 	echo "$CC $LDFLAGS" > conf-ld
-	sed -e 's|/usr/local/include|/usr/include|' -e "s|gcc|$CC $CFLAGS|" \
+	vsed -e 's|/usr/local/include|/usr/include|' -e "s|gcc|$CC $CFLAGS|" \
 		-i conf-cc
 }
 
 do_install() {
 	make install install_prefix=${DESTDIR}
 	vsv twoftpd-anon
-	vlicense COPYING
 	vdoc README
 	vdoc NEWS
 	vdoc ANNOUNCEMENT

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-06-10  7:49 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-30  3:50 [PR PATCH] Omnibus lint pass for SPDX warnings - packages starting with T heliocat
2021-05-30  7:33 ` [PR PATCH] [Updated] " heliocat
2021-06-10  7:49 ` heliocat

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ http://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git