Re: [PR PATCH] [Updated] Omnibus lint pass for SPDX warnings - most packages starting with P

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

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

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

https://github.com/heliocat/void-packages lint_p
https://github.com/void-linux/void-packages/pull/30791

Omnibus lint pass for SPDX warnings - most packages starting with P
Does not include python-* or perl-*, those were fixed elsewhere. Also, P had a surprisingly large number of failures and otherwise broken packages.

#### 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/30791.patch is attached

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

From 7de5d5bf6f5ae43e85a43a7ac073f85d70621e5d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 9 May 2021 12:44:28 -0700
Subject: [PATCH 01/17] p0f: fix license, http->https, description

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

diff --git a/srcpkgs/p0f/template b/srcpkgs/p0f/template
index d01c611a3571..f86009c4fd2b 100644
--- a/srcpkgs/p0f/template
+++ b/srcpkgs/p0f/template
@@ -1,17 +1,17 @@
 # Template file for 'p0f'
 pkgname=p0f
 version=3.09b
-revision=2
+revision=3
 makedepends="libpcap-devel"
-short_desc="A passive OS fingerprinting tool"
+short_desc="Passive OS fingerprinting tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://lcamtuf.coredump.cx/p0f3"
-distfiles="http://lcamtuf.coredump.cx/p0f3/releases/${pkgname}-${version}.tgz"
+license="LGPL-2.1-only"
+homepage="https://lcamtuf.coredump.cx/p0f3"
+distfiles="https://lcamtuf.coredump.cx/p0f3/releases/${pkgname}-${version}.tgz"
 checksum=543b68638e739be5c3e818c3958c3b124ac0ccb8be62ba274b4241dbdec00e7f
 
 do_configure() {
-	sed -i "s!\"p0f.fp!\"/usr/share/${pkgname}/p0f.fp!" config.h
+	vsed -i "s!\"p0f.fp!\"/usr/share/${pkgname}/p0f.fp!" config.h
 }
 
 do_build() {

From deb04c236a501fb532b163b52bf9330fa48477bf Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 9 May 2021 12:47:53 -0700
Subject: [PATCH 02/17] paperkey: fix license, http->https

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

diff --git a/srcpkgs/paperkey/template b/srcpkgs/paperkey/template
index d019aacf5175..fd8a24a54882 100644
--- a/srcpkgs/paperkey/template
+++ b/srcpkgs/paperkey/template
@@ -1,11 +1,11 @@
 # Template file for 'paperkey'
 pkgname=paperkey
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 short_desc="OpenPGP key archiver"
 maintainer="Pulux <pulux@pf4sh.de>"
-license="GPL-2"
-homepage="http://www.jabberwocky.com/software/paperkey/"
-distfiles="http://www.jabberwocky.com/software/paperkey/${pkgname}-${version}.tar.gz"
+license="GPL-2.0-or-later"
+homepage="https://www.jabberwocky.com/software/paperkey/"
+distfiles="https://www.jabberwocky.com/software/paperkey/${pkgname}-${version}.tar.gz"
 checksum=a245fd13271a8d2afa03dde979af3a29eb3d4ebb1fbcad4a9b52cf67a27d05f7

From 18574ee36f76b19a3167afa26ff9cf587c508420 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 9 May 2021 13:29:22 -0700
Subject: [PATCH 03/17] pchar: fix license

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

diff --git a/srcpkgs/pchar/template b/srcpkgs/pchar/template
index da229e4e94c8..fe8a7d641809 100644
--- a/srcpkgs/pchar/template
+++ b/srcpkgs/pchar/template
@@ -1,11 +1,11 @@
 # Template file for 'pchar'
 pkgname=pchar
 version=1.5
-revision=4
+revision=5
 build_style=gnu-configure
 short_desc="Perform network measurements along an Internet path"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="custom"
+license="custom:Unlicense-like"
 homepage="http://www.kitchenlab.org/www/bmah/Software/pchar/"
 distfiles="http://www.kitchenlab.org/www/bmah/Software/pchar/${pkgname}-${version}.tar.gz"
 checksum=7019297084f1000557a019501532ecae67772851717329cc02227f5c17e36d27

From e43ae471cffedc3ad9a6c763e6e45593313c803f Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 9 May 2021 13:34:04 -0700
Subject: [PATCH 04/17] pdmenu: fix license

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

diff --git a/srcpkgs/pdmenu/template b/srcpkgs/pdmenu/template
index 68c4de92c568..6085c59a548b 100644
--- a/srcpkgs/pdmenu/template
+++ b/srcpkgs/pdmenu/template
@@ -1,14 +1,14 @@
 # Template file for 'pdmenu'
 pkgname=pdmenu
 version=1.3.4
-revision=3
+revision=4
 wrksrc="${pkgname}"
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="slang-devel"
 short_desc="Full screen menuing system for Unix"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://joeyh.name/code/pdmenu/"
 distfiles="http://http.debian.net/debian/pool/main/p/pdmenu/${pkgname}_${version}.tar.gz"
 checksum=302aa81b8868133ff5a0f3e3e897f71d425bc628c0d7439addb623f12c277bea

From 9e2bc40b508ece7f75e9049b7671e2fab3a79d87 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 9 May 2021 13:36:13 -0700
Subject: [PATCH 05/17] pen: fix license

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

diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index d55a7f21272e..2b57f2281ab1 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,13 +1,13 @@
 # Template file for 'pen'
 pkgname=pen
 version=0.34.1
-revision=6
+revision=7
 build_style=gnu-configure
-makedepends="geoip-devel openssl-devel"
 configure_args="--with-docdir=/usr/share/doc/pen"
+makedepends="geoip-devel openssl-devel"
 short_desc="Load balancer for simple TCP/UDP based protocols"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://siag.nu/pen"
 distfiles="http://siag.nu/pub/pen/pen-${version}.tar.gz"
 checksum=2b640795029df9d1672e17202c109cc5d42538f6754a6070dc27da640881e864

From 14196912274abfaac9f9995d42e2633f46b3037d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 9 May 2021 13:39:34 -0700
Subject: [PATCH 06/17] pidgin-window-merge: fix license

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

diff --git a/srcpkgs/pidgin-window-merge/template b/srcpkgs/pidgin-window-merge/template
index 4253ba116c92..16e3a2f89541 100644
--- a/srcpkgs/pidgin-window-merge/template
+++ b/srcpkgs/pidgin-window-merge/template
@@ -1,14 +1,14 @@
 # Template file for 'pidgin-window-merge'
 pkgname=pidgin-window-merge
 version=0.3
-revision=1
+revision=2
+wrksrc="window_merge-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="pidgin-devel"
 short_desc="Pidgin plugin that merges the Buddy List and the conversation windows"
 maintainer="chinarulezzz <s.alex08@mail.ru>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://github.com/dm0-/window_merge"
 distfiles="https://github.com/downloads/dm0-/window_merge/window_merge-${version}.tar.gz"
 checksum=e890c829f8f074ca0bbf32a0bd3c9b8008802f2795d6f40a19756379e2ce6531
-wrksrc="window_merge-${version}"

From 01384dd7cd0b39b4a0ccccbf382fe51cdaec0561 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 9 May 2021 13:48:47 -0700
Subject: [PATCH 07/17] pilot-link: fix license, update homepage and distfile
 source, use vsed

---
 srcpkgs/pilot-link/template | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/pilot-link/template b/srcpkgs/pilot-link/template
index 5b83232cef8c..a850244829a7 100644
--- a/srcpkgs/pilot-link/template
+++ b/srcpkgs/pilot-link/template
@@ -1,7 +1,7 @@
 # Template file for 'pilot-link'
 pkgname=pilot-link
 version=0.12.5
-revision=2
+revision=3
 build_style=gnu-configure
 # XXX: Add perl bindings --with-perl and fix bindings/Perl/Makefile
 configure_args="--enable-conduits --enable-libusb --enable-threads --disable-static
@@ -12,12 +12,10 @@ makedepends="libbluetooth-devel libusb-devel libpng-devel popt-devel
 depends="tk"
 short_desc="Suite of tools to connect your Palm or PalmOS® handheld"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="http://www.pilot-link.org/"
-# Main site is unreachable (no address record).
-#distfiles="http://downloads.pilot-link.org/${pkgname}-${version}.tar.bz2"
-distfiles="https://mirrors.slackware.com/slackware/slackware-14.1/source/l/pilot-link/pilot-link-${version}.tar.bz2"
-checksum=d3f99ec04016b38995fb370265200254710318105c792c017d3aaccfb97a84b2
+license="GPL-2.0-or-later, LGPL-2.0-or-later"
+homepage="https://github.com/jichu4n/pilot-link"
+distfiles="https://github.com/jichu4n/pilot-link/archive/refs/tags/${version}.tar.gz"
+checksum=daf1facbd2da5fbf2f77dd85b0108710dfd87545eeae1271650f5d62070a1a16
 
 # Avoid error because of deprecation
 CFLAGS="-Wno-deprecated-declarations"
@@ -31,7 +29,7 @@ post_configure() {
 	# --disable-compile-error does not seem to work so patch Makefiles
 	find -name Makefile -exec sed -i "{}" -e "s;-Werror;-Wno-error;g" \;
 	# Fix wrong perl Config.pm path
-	sed -i bindings/Perl/Makefile \
+	vsed -i bindings/Perl/Makefile \
 		-e "s;/usr/lib/perl/5.10/Config.pm;/usr/lib/perl5/core_perl/Config.pm;"
 }
 

From e178a58172e30af6369ad61001a278d1cef81169 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 9 May 2021 13:51:30 -0700
Subject: [PATCH 08/17] pkg-config: fix license, homepage

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

diff --git a/srcpkgs/pkg-config/template b/srcpkgs/pkg-config/template
index 1fde5b9b67fb..6cf76b8c8f40 100644
--- a/srcpkgs/pkg-config/template
+++ b/srcpkgs/pkg-config/template
@@ -1,14 +1,14 @@
 # Template file for 'pkg-config'
 pkgname=pkg-config
 version=0.29.2
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="--with-internal-glib --disable-host-tool"
 short_desc="System for managing library compile/link flags"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
-homepage="http://pkgconfig.freedesktop.org/wiki/"
+license="GPL-2.0-or-later"
+homepage="http://pkgconfig.freedesktop.org/"
 distfiles="http://pkgconfig.freedesktop.org/releases/${pkgname}-${version}.tar.gz"
 checksum=6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591
 alternatives="

From f07b1d422ab276719c13d79e9171ca4472d5ce83 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 9 May 2021 22:11:14 -0700
Subject: [PATCH 09/17] playitslowly: fix license

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

diff --git a/srcpkgs/playitslowly/template b/srcpkgs/playitslowly/template
index 52cbd9870c13..d898db8aa100 100644
--- a/srcpkgs/playitslowly/template
+++ b/srcpkgs/playitslowly/template
@@ -1,14 +1,14 @@
 # Template file for 'playitslowly'
 pkgname=playitslowly
 version=1.5.1
-revision=3
+revision=4
 build_style=python3-module
 hostmakedepends="python3"
 depends="python3 python3-gobject gtk+3 gstreamer1 gst-plugins-base1 gst-plugins-good1
  gst-plugins-bad1 gst-libav"
 short_desc="Play back audio files at a different speed or pitch"
 maintainer="Michael Straube <straubem@gmx.de>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://29a.ch/playitslowly"
 distfiles="https://29a.ch/playitslowly/${pkgname}-${version}.tar.gz"
 checksum=7dfe3da5417971183a13002d1e4ba4f30770baaf1ae3f9ef0ac66a6727f476aa

From dd89b3c0a5af9633e0ca97ff03280f3c39bdcfc3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 9 May 2021 22:16:45 -0700
Subject: [PATCH 10/17] pmidi: fix license, http->https

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

diff --git a/srcpkgs/pmidi/template b/srcpkgs/pmidi/template
index e9c6318511d6..00de58bfc112 100644
--- a/srcpkgs/pmidi/template
+++ b/srcpkgs/pmidi/template
@@ -1,12 +1,12 @@
 # Template file for 'pmidi'
 pkgname=pmidi
 version=1.7.1
-revision=1
+revision=2
 build_style=gnu-configure
 makedepends="alsa-lib-devel"
 short_desc="Command line midi player for ALSA"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
-license="GPL-2"
-homepage="http://www.parabola.me.uk/alsa/pmidi.html"
+license="GPL-2.0-only"
+homepage="https://www.parabola.me.uk/alsa/pmidi.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.gz"
 checksum=a500d9e41235ea741ffccce9541df9f74318663a62ec18d8081eb1119cd93514

From 3962bb428d3c7b93af3aab85b5f82b4f4b1ef0aa Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 9 May 2021 22:21:13 -0700
Subject: [PATCH 11/17] pngcrush: fix license, http->https, other lint

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

diff --git a/srcpkgs/pngcrush/template b/srcpkgs/pngcrush/template
index a7cde90a9bb4..e6b0fe8c59b1 100644
--- a/srcpkgs/pngcrush/template
+++ b/srcpkgs/pngcrush/template
@@ -1,14 +1,14 @@
 # Template file for 'pngcrush'
 pkgname=pngcrush
 version=1.8.13
-revision=2
-build_style=gnu-makefile
+revision=3
 wrksrc=${pkgname}-${version}-nolib
+build_style=gnu-makefile
 makedepends="libpng-devel"
 short_desc="Tool for optimizing the compression of PNG files"
 maintainer="Duncaen <duncaen@voidlinux.org>"
-license="zlib"
-homepage="http://pmt.sourceforge.net/pngcrush"
+license="Libpng"
+homepage="https://pmt.sourceforge.net/pngcrush"
 distfiles="${SOURCEFORGE_SITE}/pmt/${pkgname}-${version}-nolib.tar.xz"
 checksum=3b4eac8c5c69fe0894ad63534acedf6375b420f7038f7fc003346dd352618350
 

From ce5e657ea5cbcf0a8ca90e4ef35e9da69c6785fb Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 9 May 2021 22:26:54 -0700
Subject: [PATCH 12/17] pnmixer: fix license

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

diff --git a/srcpkgs/pnmixer/template b/srcpkgs/pnmixer/template
index b00c032ca7f2..501686b1faa7 100644
--- a/srcpkgs/pnmixer/template
+++ b/srcpkgs/pnmixer/template
@@ -1,13 +1,13 @@
 # Template file for 'pnmixer'
 pkgname=pnmixer
 version=0.7.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config intltool automake glib-devel"
 makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Volume mixer for the system tray"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="GPL-3"
+license="GPL-3.0-only"
 homepage="https://github.com/nicklan/pnmixer"
 distfiles="https://github.com/nicklan/pnmixer/archive/v${version}.tar.gz"
 checksum=433487da386396f8d39244395220992ff73fe5191d0226febaead403a0cd6f2c

From affce5d21d50d83d420195248039640d5068806f Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 9 May 2021 22:42:30 -0700
Subject: [PATCH 13/17] polyglot: fix license

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

diff --git a/srcpkgs/polyglot/template b/srcpkgs/polyglot/template
index 2dc50876f4d7..8f529cd7f31a 100644
--- a/srcpkgs/polyglot/template
+++ b/srcpkgs/polyglot/template
@@ -1,12 +1,12 @@
 # Template file for 'polyglot'
 pkgname=polyglot
 version=2.0.4
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}.orig"
 build_style=gnu-configure
 short_desc="Winboard chess protocol to UCI protocol adapter"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://packages.debian.org/sid/polyglot"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=fa43f80d7f956bdf986649d3ff1e487e1c8682a19b30011a55baa89633e3d23d

From b6a2abb4957655142dc8a94115a806078afbe735 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 9 May 2021 22:49:33 -0700
Subject: [PATCH 14/17] potrace: fix license, other lint

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

diff --git a/srcpkgs/potrace/template b/srcpkgs/potrace/template
index 1f7f82686221..d38e2e0d1b52 100644
--- a/srcpkgs/potrace/template
+++ b/srcpkgs/potrace/template
@@ -1,13 +1,13 @@
 # Template file for 'potrace'
 pkgname=potrace
 version=1.16
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="zlib-devel"
 configure_args="--with-libpotrace"
+makedepends="zlib-devel"
 short_desc="Transforming bitmaps into vector graphics"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://potrace.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=be8248a17dedd6ccbaab2fcc45835bb0502d062e40fbded3bc56028ce5eb7acc

From db0856fc16b3974a3bac217df4622cba88bd28c6 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 10 May 2021 20:21:59 -0700
Subject: [PATCH 15/17] premake4: fix license, other lint

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

diff --git a/srcpkgs/premake4/template b/srcpkgs/premake4/template
index 3ef49d0e3ca1..059b4ba15170 100644
--- a/srcpkgs/premake4/template
+++ b/srcpkgs/premake4/template
@@ -1,14 +1,14 @@
 # Template file for 'premake4'
 pkgname=premake4
 version=4.4beta5
-revision=3
+revision=4
 wrksrc=premake-${version/beta/-beta}
-hostmakedepends="unzip"
 build_style=gnu-makefile
 make_build_args="config=release -C build/gmake.unix"
+hostmakedepends="unzip"
 short_desc="Cross-platform, open-source build system"
 maintainer="Tai Chi Minh Ralph Eastwood <tcmreastwood@gmail.com>"
-license="3-clause-BSD"
+license="BSD-3-Clause"
 homepage="https://premake.github.io/"
 distfiles="${SOURCEFORGE_SITE}/project/premake/Premake/${version/beta*}/premake-${version/beta/-beta}-src.zip"
 checksum=0fa1ed02c5229d931e87995123cdb11d44fcc8bd99bba8e8bb1bbc0aaa798161

From d21dd6beba74658f57ecda7c6b7da761d1004812 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 10 May 2021 21:43:42 -0700
Subject: [PATCH 16/17] psutils: fix license, other lint

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

diff --git a/srcpkgs/psutils/template b/srcpkgs/psutils/template
index d377334ebb6a..1fd991af285f 100644
--- a/srcpkgs/psutils/template
+++ b/srcpkgs/psutils/template
@@ -1,15 +1,15 @@
 # Template file for 'psutils'
-pkgname="psutils"
-version="p17"
-revision=4
-short_desc="Set of utilities to manipulate PostScript files"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="AJCD-License"
+pkgname=psutils
+version=p17
+revision=5
+wrksrc="psutils"
 hostmakedepends="perl"
 makedepends="ghostscript"
 depends="ghostscript"
+short_desc="Set of utilities to manipulate PostScript files"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="psutils"
 homepage="http://knackered.org/angus/psutils/"
-wrksrc="psutils"
 distfiles="ftp://ftp.knackered.org/pub/psutils/${pkgname}-${version}.tar.gz"
 checksum="3853eb79584ba8fbe27a815425b65a9f7f15b258e0d43a05a856bdb75d588ae4"
 patch_args="-Np1"

From e2a69cc32b49e97b9fe37b103df8ed57509c7138 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 10 May 2021 22:06:32 -0700
Subject: [PATCH 17/17] pwgen: fix license

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

diff --git a/srcpkgs/pwgen/template b/srcpkgs/pwgen/template
index ad2594fe5c7b..9af820b74256 100644
--- a/srcpkgs/pwgen/template
+++ b/srcpkgs/pwgen/template
@@ -1,11 +1,11 @@
 # Template file for 'pwgen'
 pkgname=pwgen
 version=2.08
-revision=1
+revision=2
 build_style=gnu-configure
 short_desc="Password Generator"
 maintainer="Duncaen <duncaen@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://pwgen.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=dab03dd30ad5a58e578c5581241a6e87e184a18eb2c3b2e0fffa8a9cf105c97b