Github messages for voidlinux
 help / color / mirror / Atom feed
* Re: [PR PATCH] [Updated] replace ${pkgname} with pkgname in homepage variable
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-16844@inbox.vuxu.org>
  2020-01-23 13:44 ` [PR PATCH] [Updated] replace ${pkgname} with pkgname in homepage variable voidlinux-github
@ 2020-01-23 14:30 ` voidlinux-github
  2020-01-23 15:07 ` voidlinux-github
  2020-03-04  9:42 ` [PR PATCH] [Closed]: " teldra
  3 siblings, 0 replies; 4+ messages in thread
From: voidlinux-github @ 2020-01-23 14:30 UTC (permalink / raw)
  To: ml

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

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

https://github.com/teldra/void-packages replace_pkgname_in_homepagevar
https://github.com/void-linux/void-packages/pull/16844

replace ${pkgname} with pkgname in homepage variable


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

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

From 334141a9cf319208ae528d0ce8660f2bb44634c7 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 26 Nov 2019 19:29:47 +0100
Subject: [PATCH] replace ${pkgname} with pkgname in homepage variable

---
 srcpkgs/Maelstrom/template                  |  4 ++--
 srcpkgs/SDL_ttf/template                    |  4 ++--
 srcpkgs/TwitchNotifier/template             |  6 +++---
 srcpkgs/alacritty/template                  |  2 +-
 srcpkgs/autorunner/template                 |  2 +-
 srcpkgs/badvpn/template                     | 11 ++++++++---
 srcpkgs/bc/template                         |  2 +-
 srcpkgs/bemenu/template                     |  2 +-
 srcpkgs/buku_run/template                   |  3 +--
 srcpkgs/cairo-dock/template                 |  6 +++---
 srcpkgs/cdecl/template                      | 13 +++++++------
 srcpkgs/editorconfig-core-lua/template      |  4 ++--
 srcpkgs/faba-icon-theme/template            |  2 +-
 srcpkgs/ffmpegthumbnailer/template          |  2 +-
 srcpkgs/flann/template                      |  6 +++---
 srcpkgs/fstrcmp/template                    |  2 +-
 srcpkgs/gatling/template                    |  9 ++++-----
 srcpkgs/gengetopt/template                  |  2 +-
 srcpkgs/gettext-stub/template               |  2 +-
 srcpkgs/git-cal/template                    |  2 +-
 srcpkgs/guile/template                      |  4 ++--
 srcpkgs/icecat/template                     |  2 +-
 srcpkgs/ii/template                         |  2 +-
 srcpkgs/libdaemon/template                  |  2 +-
 srcpkgs/libgit2-glib/template               |  2 +-
 srcpkgs/libinput-gestures/template          |  2 +-
 srcpkgs/libmaxminddb/template               |  4 ++--
 srcpkgs/libnih/template                     |  2 +-
 srcpkgs/libopenraw/template                 |  2 +-
 srcpkgs/libsexy/template                    |  4 ++--
 srcpkgs/libskk/template                     |  2 +-
 srcpkgs/libtorrent/template                 |  2 +-
 srcpkgs/mb2md/template                      | 11 ++++++++---
 srcpkgs/opentyrian/template                 |  4 ++--
 srcpkgs/pantheon-agent-polkit/template      |  2 +-
 srcpkgs/paper-icon-theme/template           |  6 +++---
 srcpkgs/pass-git-helper/template            |  2 +-
 srcpkgs/pdfcrack/template                   |  2 +-
 srcpkgs/pgpdump/template                    |  4 ++--
 srcpkgs/pkcs11-helper/template              |  2 +-
 srcpkgs/rrdtool/template                    |  2 +-
 srcpkgs/rtv/template                        |  3 +--
 srcpkgs/rwc/template                        |  2 +-
 srcpkgs/s6-dns/template                     |  2 +-
 srcpkgs/s6-linux-utils/template             |  2 +-
 srcpkgs/s6-networking/template              |  2 +-
 srcpkgs/s6-portable-utils/template          |  2 +-
 srcpkgs/sandy/template                      |  4 ++--
 srcpkgs/sassc/template                      |  2 +-
 srcpkgs/sic/template                        |  2 +-
 srcpkgs/sniproxy/template                   |  7 ++++---
 srcpkgs/steamos-compositor/template         |  4 ++--
 srcpkgs/switchboard-plug-bluetooth/template |  2 +-
 srcpkgs/switchboard-plug-network/template   |  2 +-
 srcpkgs/switchboard-plug-printers/template  |  2 +-
 srcpkgs/tpacpi-bat/template                 |  2 +-
 srcpkgs/ueberzug/template                   |  6 +-----
 srcpkgs/ulatencyd/template                  |  5 ++---
 srcpkgs/xcruiser/template                   |  4 ++--
 59 files changed, 105 insertions(+), 101 deletions(-)

diff --git a/srcpkgs/Maelstrom/template b/srcpkgs/Maelstrom/template
index 7b857125bd9..6966b077547 100644
--- a/srcpkgs/Maelstrom/template
+++ b/srcpkgs/Maelstrom/template
@@ -8,8 +8,8 @@ hostmakedepends="automake libtool SDL_net-devel"
 makedepends="SDL_net-devel"
 short_desc="Guide your ship through the Maelstrom asteroid belt"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
-homepage="https://www.libsdl.org/projects/${pkgname}/"
+license="GPL-2.0-only"
+homepage="https://www.libsdl.org/projects/Maelstrom/"
 distfiles="${homepage}/src/${pkgname}-${version}.tar.gz"
 checksum=342557bcc89eea57af4272778d3511be95fe46cf75e291298a15caa49a2f0e29
 
diff --git a/srcpkgs/SDL_ttf/template b/srcpkgs/SDL_ttf/template
index 294116bd0a7..5776115a5b6 100644
--- a/srcpkgs/SDL_ttf/template
+++ b/srcpkgs/SDL_ttf/template
@@ -8,8 +8,8 @@ hostmakedepends="pkg-config"
 makedepends="freetype-devel SDL-devel libSM-devel"
 short_desc="Use TrueType fonts in your SDL applications"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://www.libsdl.org/projects/${pkgname}"
+license="LGPL-2.1-or-later"
+homepage="http://www.libsdl.org/projects/SDL_ttf"
 distfiles="${homepage}/release/${pkgname}-${version}.tar.gz"
 checksum=724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7
 
diff --git a/srcpkgs/TwitchNotifier/template b/srcpkgs/TwitchNotifier/template
index 3bbba11db49..44862b77e52 100644
--- a/srcpkgs/TwitchNotifier/template
+++ b/srcpkgs/TwitchNotifier/template
@@ -2,14 +2,14 @@
 pkgname=TwitchNotifier
 version=0.5
 revision=2
+archs=noarch
 build_style=python3-module
 hostmakedepends="python3-devel"
 makedepends="python3-devel"
 depends="python3-gobject python3-requests libnotify"
-archs=noarch
 short_desc="Daemon that notifies you about your followed channels on Twitch.TV"
 maintainer="Giedrius Statkevičius <giedriuswork@gmail.com>"
-license="GPL-3"
-homepage="https://github.com/GiedriusS/${pkgname}"
+license="GPL-3.0-only"
+homepage="https://github.com/GiedriusS/TwitchNotifier"
 distfiles="https://github.com/GiedriusS/${pkgname}/archive/${version}.tar.gz"
 checksum=42087644c22ecae9268880b38786c9920deec4cd91b08f1377189ee94dfea406
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index a401d4ca0e4..2b276d73a4f 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -9,7 +9,7 @@ depends="libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
-homepage="https://github.com/jwilm/${pkgname}"
+homepage="https://github.com/jwilm/alacritty"
 changelog="https://raw.githubusercontent.com/jwilm/${pkgname}/v${version}/CHANGELOG.md"
 distfiles="https://github.com/jwilm/${pkgname}/archive/v${version}.tar.gz"
 checksum=ee807f03a4014e7f989cf649a7c8209c0c5f57297812a39f4b163f9580b9a539
diff --git a/srcpkgs/autorunner/template b/srcpkgs/autorunner/template
index 91bb4914adc..f58ee3b1d45 100644
--- a/srcpkgs/autorunner/template
+++ b/srcpkgs/autorunner/template
@@ -6,7 +6,7 @@ conf_files="/etc/autorunner.config"
 short_desc="Autostart helper for Desktops"
 maintainer="teldra <teldra@rotce.de>"
 license="MIT"
-homepage="https://github.com/cytopia/${pkgname}"
+homepage="https://github.com/cytopia/autorunner"
 distfiles="https://github.com/cytopia/${pkgname}/archive/v${version}.tar.gz"
 checksum=e6542e807b84204978d393bf978222daa284414949627c89c4c535d86e8d6759
 
diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index b62d13f208f..b81fc53b353 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,16 +1,21 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=11
+revision=12
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="libressl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD"
-homepage="https://github.com/ambrop72/$pkgname"
+license="BSD-3-Clause"
+homepage="https://github.com/ambrop72/badvpn"
 distfiles="https://github.com/ambrop72/$pkgname/archive/${version}.tar.gz"
 checksum=bfd4bbfebd7274bcec792558c9a2fd60e39cd92e04673825ade5d04154766109
+
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args="-DBUILD_NCD=0" ;;
 esac
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/bc/template b/srcpkgs/bc/template
index 943925a6f43..f1b81a07daa 100644
--- a/srcpkgs/bc/template
+++ b/srcpkgs/bc/template
@@ -9,7 +9,7 @@ makedepends="readline-devel"
 short_desc="Arbitrary precision numeric processing language"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="http://www.gnu.org/software/${pkgname}/"
+homepage="http://www.gnu.org/software/bc/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a
 alternatives="
diff --git a/srcpkgs/bemenu/template b/srcpkgs/bemenu/template
index 219fcea6742..8d1772eec97 100644
--- a/srcpkgs/bemenu/template
+++ b/srcpkgs/bemenu/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel cairo-devel pango-devel
 short_desc="Dynamic menu library and client program inspired by dmenu"
 maintainer="Issam Maghni <me@concati.me>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
-homepage="https://github.com/Cloudef/${pkgname}"
+homepage="https://github.com/Cloudef/bemenu"
 distfiles="https://github.com/Cloudef/bemenu/archive/${version}.tar.gz"
 checksum=a57ae85ca14b4adb6c32bc40138d49ec51dd2e2b0d211557c8f92489f4c3fb84
 
diff --git a/srcpkgs/buku_run/template b/srcpkgs/buku_run/template
index a353c85bcd3..44491567ec1 100644
--- a/srcpkgs/buku_run/template
+++ b/srcpkgs/buku_run/template
@@ -8,7 +8,7 @@ depends="rofi gawk sed buku bash"
 short_desc="Rofi frontend for buku bookmarks manager"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"
-homepage="https://github.com/carnager/${pkgname}"
+homepage="https://github.com/carnager/buku_run"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=065b1bcd3000138a23f57b4a394d780e1b16a95d1593bf85d9f657457832bc35
 
@@ -18,4 +18,3 @@ do_install() {
 	vsconf config.buku
 	vconf config.buku buku_run.config
 }
-
diff --git a/srcpkgs/cairo-dock/template b/srcpkgs/cairo-dock/template
index 5d17b73f43e..6bc8cf13ff4 100644
--- a/srcpkgs/cairo-dock/template
+++ b/srcpkgs/cairo-dock/template
@@ -2,7 +2,6 @@
 pkgname=cairo-dock
 version=3.4.1
 revision=1
-lib32disabled=yes
 build_style=cmake
 configure_args="-Denable-desktop-manager=ON"
 hostmakedepends="pkg-config"
@@ -10,10 +9,11 @@ makedepends="libcurl-devel dbus-glib-devel libXtst-devel gtk+3-devel librsvg-dev
 depends="desktop-file-utils"
 short_desc="Light eye-candy fully themable animated dock"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://launchpad.net/${pkgname}"
+license="GPL-3.0-or-later"
+homepage="https://launchpad.net/cairo-dock"
 distfiles="http://launchpad.net/${pkgname}-core/${version%.?}/${version}/+download/${pkgname}-${version}.tar.gz"
 checksum=dcadbbe089487f22b112f25a91d1c966275b245f248f950c6987de787eb95137
+lib32disabled=yes
 
 CFLAGS="-D_BSD_SOURCE"
 CXXFLAGS="-D_BSD_SOURCE"
diff --git a/srcpkgs/cdecl/template b/srcpkgs/cdecl/template
index e4bd82933f8..96439d5357b 100644
--- a/srcpkgs/cdecl/template
+++ b/srcpkgs/cdecl/template
@@ -1,24 +1,21 @@
 # Template file for 'cdecl'
 pkgname=cdecl
 version=2.5
-revision=5
+revision=6
 wrksrc="${pkgname}-blocks-${version}"
 build_style=gnu-makefile
 make_build_args="-e"
 hostmakedepends="flex"
-makedepends="readline-devel"
 short_desc="Compose C and C++ type declarations"
 maintainer="beefcurtains <beefcurtains@voidlinux.org>"
-license="GPL-3"
-homepage="http://${pkgname}.org/"
+license="custom: Public Domain"
+homepage="http://cdecl.org/"
 distfiles="${homepage}files/${wrksrc}.tar.gz"
 checksum=9ee6402be7e4f5bb5e6ee60c6b9ea3862935bf070e6cecd0ab0842305406f3ac
-CFLAGS="-DUSE_READLINE"
 
 pre_build() {
 	flex -l -o cdlex.c cdlex.l
 	sed -i 's/getline/cdgetline/' cdecl.c
-	export LIBS="$LDFLAGS -lreadline"
 }
 
 do_install() {
@@ -27,3 +24,7 @@ do_install() {
 	vman cdecl.1
 	vman c++decl.1
 }
+
+post_install() {
+	vlicense README
+}
diff --git a/srcpkgs/editorconfig-core-lua/template b/srcpkgs/editorconfig-core-lua/template
index 864017d3066..c97e272d2e1 100644
--- a/srcpkgs/editorconfig-core-lua/template
+++ b/srcpkgs/editorconfig-core-lua/template
@@ -1,4 +1,4 @@
-# Template file for 'editorconfig-lua'
+# Template file for 'editorconfig-core-lua'
 pkgname=editorconfig-core-lua
 version=0.2.0
 revision=1
@@ -7,7 +7,7 @@ makedepends="editorconfig-devel lua-devel"
 short_desc="EditorConfig core library written in Lua"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="BSD-2-Clause"
-homepage="https://github.com/editorconfig/${pkgname}"
+homepage="https://github.com/editorconfig/editorconfig-core-lua"
 distfiles="https://github.com/editorconfig/${pkgname}/archive/v${version}.tar.gz"
 checksum=cce8fc6a02d41a665bee098b275026ab9b9043f97c553a3019ade650779b13a0
 
diff --git a/srcpkgs/faba-icon-theme/template b/srcpkgs/faba-icon-theme/template
index 7624d10a4db..c8e56bd1917 100644
--- a/srcpkgs/faba-icon-theme/template
+++ b/srcpkgs/faba-icon-theme/template
@@ -7,6 +7,6 @@ build_style=meson
 short_desc="Sexy, modern FreeDesktop icon set with Tango and elementary influences"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="CC-BY-SA-4.0"
-homepage="https://github.com/snwh/${pkgname}"
+homepage="https://github.com/snwh/faba-icon-theme"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=c87ce7dae8df6b25228297baa1be96cfad06c5c109ff60fedf1f0343bb0196a2
diff --git a/srcpkgs/ffmpegthumbnailer/template b/srcpkgs/ffmpegthumbnailer/template
index ab627032c2e..fb74deecc0a 100644
--- a/srcpkgs/ffmpegthumbnailer/template
+++ b/srcpkgs/ffmpegthumbnailer/template
@@ -9,7 +9,7 @@ depends="ffmpeg"
 short_desc="Lightweight video thumbnailer"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
-homepage="https://github.com/dirkvdb/${pkgname}"
+homepage="https://github.com/dirkvdb/ffmpegthumbnailer"
 distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.bz2"
 checksum=1cb24059c38223f657b300c84dd80491b7040d4b69471c4fea69be862bc99b5b
 
diff --git a/srcpkgs/flann/template b/srcpkgs/flann/template
index 055c935a0cb..b67aea38033 100644
--- a/srcpkgs/flann/template
+++ b/srcpkgs/flann/template
@@ -2,15 +2,15 @@
 pkgname=flann
 version=1.9.1
 revision=4
-patch_args="-Np1"
 build_style=cmake
 makedepends="gtest-devel hdf5-devel"
 short_desc="Fast library for approximate nearest neighbors"
 maintainer="Florian Eich <flrn@nrmncr.net>"
-license="BSD"
-homepage="http://www.cs.ubc.ca/research/${pkgname}/"
+license="BSD-3-Clause"
+homepage="http://www.cs.ubc.ca/research/flann/"
 distfiles="https://github.com/mariusmuja/${pkgname}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=b23b5f4e71139faa3bcb39e6bbcc76967fbaf308c4ee9d4f5bfbeceaa76cc5d3
+patch_args="-Np1"
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/fstrcmp/template b/srcpkgs/fstrcmp/template
index 81d92c58d9e..da11d1037df 100644
--- a/srcpkgs/fstrcmp/template
+++ b/srcpkgs/fstrcmp/template
@@ -11,7 +11,7 @@ makedepends="libtool"
 short_desc="Fuzzy comparison of strings"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="http://${pkgname}.sourceforge.net/"
+homepage="http://fstrcmp.sourceforge.net/"
 distfiles="http://${pkgname}.sourceforge.net/${pkgname}-${version}.tar.gz"
 checksum=e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476
 
diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index ea214a6edba..dde7afeea4a 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -3,18 +3,17 @@ pkgname=gatling
 version=0.15
 revision=8
 build_style=gnu-makefile
+make_build_target="gatling dl getlinks"
+make_install_args="prefix=/usr MANDIR=/usr/share/man"
 makedepends="libowfat libressl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
-homepage="http://www.fefe.de/$pkgname/"
+license="GPL-2.0-only"
+homepage="http://www.fefe.de/gatling/"
 distfiles="https://www.fefe.de/gatling/$pkgname-$version.tar.xz"
 checksum=6fa329d0ced0c80deb8dde5460e9d9e984bee94f265043d7fdec0e253dce9aa4
-make_build_target="gatling dl getlinks"
-make_install_args="prefix=/usr MANDIR=/usr/share/man"
 CFLAGS+=" -std=c99 -I${XBPS_CROSS_BASE}/usr/include/libowfat"
 
 pre_install() {
 	vmkdir usr/share/man/man1
 }
-
diff --git a/srcpkgs/gengetopt/template b/srcpkgs/gengetopt/template
index b1af950036e..f794acef7c1 100644
--- a/srcpkgs/gengetopt/template
+++ b/srcpkgs/gengetopt/template
@@ -8,7 +8,7 @@ makedepends="libfl-devel"
 short_desc="Tool to write cli option parsing code for C programs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="http://www.gnu.org/software/${pkgname}"
+homepage="http://www.gnu.org/software/gengetopt"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=b941aec9011864978dd7fdeb052b1943535824169d2aa2b0e7eae9ab807584ac
 disable_parallel_build=yes
diff --git a/srcpkgs/gettext-stub/template b/srcpkgs/gettext-stub/template
index 0f1e6813da4..4076eb40147 100644
--- a/srcpkgs/gettext-stub/template
+++ b/srcpkgs/gettext-stub/template
@@ -6,7 +6,7 @@ wrksrc=${pkgname}
 short_desc="Gettext little stub"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="WTFPL"
-homepage="http://penma.de/code/${pkgname}/"
+homepage="http://penma.de/code/gettext-stub/"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=04af6ee6720c9a90b51f9e420e1b2e75e3ddaba23a30263bf6e10739d8e8f994
 
diff --git a/srcpkgs/git-cal/template b/srcpkgs/git-cal/template
index 1e4c4299b59..dd44d25aac8 100644
--- a/srcpkgs/git-cal/template
+++ b/srcpkgs/git-cal/template
@@ -10,7 +10,7 @@ depends="perl"
 short_desc="GitHub like contributions calendar on terminal"
 maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="MIT"
-homepage="https://github.com/k4rthik/${pkgname}"
+homepage="https://github.com/k4rthik/git-cal"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=783fa73197b349a51d90670480a750b063c97e5779a5231fe046315af0a946cd
 
diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index ce953960d23..dd49e746e84 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -7,10 +7,10 @@ configure_args="--disable-static --disable-error-on-warning"
 hostmakedepends="pkg-config"
 makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
  libunistring-devel readline-devel"
-short_desc="A portable, embeddable Scheme implementation written in C"
+short_desc="Portable, embeddable Scheme implementation written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
-homepage="http://www.gnu.org/software/${pkgname}"
+homepage="http://www.gnu.org/software/guile"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8aeb2f353881282fe01694cce76bb72f7ffdd296a12c7a1a39255c27b0dfe5f1
 subpackages="libguile guile-devel"
diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template
index bb193245d63..cc8730e6da2 100644
--- a/srcpkgs/icecat/template
+++ b/srcpkgs/icecat/template
@@ -15,7 +15,7 @@ depends="desktop-file-utils hicolor-icon-theme nss>=3.19"
 short_desc="GNU version of the Firefox browser"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MPL-1.1, GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://www.gnu.org/software/${pkgname}/"
+homepage="https://www.gnu.org/software/icecat/"
 distfiles="${GNU_SITE}/${pkgname}/${version}/${pkgname}-${version}-gnu1.tar.bz2"
 checksum=6873d55b13e2d95ede3bf5bb59769179e91b1c4e05d8538d1576f18c9a6bb827
 lib32disabled=yes
diff --git a/srcpkgs/ii/template b/srcpkgs/ii/template
index 13a7ef62682..5bc44f4be50 100644
--- a/srcpkgs/ii/template
+++ b/srcpkgs/ii/template
@@ -7,7 +7,7 @@ make_build_args="INCLUDES=-I. LIBS="
 short_desc="Minimalist FIFO IRC client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://tools.suckless.org/${pkgname}"
+homepage="http://tools.suckless.org/ii"
 distfiles="http://dl.suckless.org/tools/${pkgname}-${version}.tar.gz"
 checksum=b9d9e1eae25e63071960e921af8b217ab1abe64210bd290994aca178a8dc68d2
 
diff --git a/srcpkgs/libdaemon/template b/srcpkgs/libdaemon/template
index 07fe35eaeea..41acb0f2c4c 100644
--- a/srcpkgs/libdaemon/template
+++ b/srcpkgs/libdaemon/template
@@ -7,7 +7,7 @@ configure_args="--disable-static --disable-lynx"
 short_desc="Lightweight C library that eases the writing of UNIX daemons"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
-homepage="http://0pointer.de/lennart/projects/$pkgname"
+homepage="http://0pointer.de/lennart/projects/libdaemon"
 distfiles="http://pkgs.fedoraproject.org/repo/pkgs/libdaemon/libdaemon-${version}.tar.gz/509dc27107c21bcd9fbf2f95f5669563/libdaemon-${version}.tar.gz"
 checksum=fd23eb5f6f986dcc7e708307355ba3289abe03cc381fc47a80bca4a50aa6b834
 
diff --git a/srcpkgs/libgit2-glib/template b/srcpkgs/libgit2-glib/template
index ce68cb35d66..e52855c1350 100644
--- a/srcpkgs/libgit2-glib/template
+++ b/srcpkgs/libgit2-glib/template
@@ -11,7 +11,7 @@ makedepends="libglib-devel libgit2-devel python-gobject-devel"
 short_desc="Glib wrapper library around libgit2"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
-homepage="https://github.com/GNOME/${pkgname}"
+homepage="https://github.com/GNOME/libgit2-glib"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=c9dd1333ae664f21cec05196cd052169fcd819d6ad8e40e3b9914ef240801408
 
diff --git a/srcpkgs/libinput-gestures/template b/srcpkgs/libinput-gestures/template
index 7439479767b..22e945b851b 100644
--- a/srcpkgs/libinput-gestures/template
+++ b/srcpkgs/libinput-gestures/template
@@ -7,7 +7,7 @@ depends="python3 libinput xdotool wmctrl hicolor-icon-theme"
 short_desc="Action gestures on your touchpad using libinput"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/bulletmark/${pkgname}"
+homepage="https://github.com/bulletmark/libinput-gestures"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=79db6dc3b17286fd6d3ef1f38bd6fa6be291ea09ae6eefe5b5c5cefe0becd92c
 conf_files="/etc/libinput-gestures.conf"
diff --git a/srcpkgs/libmaxminddb/template b/srcpkgs/libmaxminddb/template
index 1bf9f18a1f1..3c97e1c665b 100644
--- a/srcpkgs/libmaxminddb/template
+++ b/srcpkgs/libmaxminddb/template
@@ -3,10 +3,10 @@ pkgname=libmaxminddb
 version=1.3.2
 revision=1
 build_style=gnu-configure
-short_desc="A library for working with MaxMind DB files"
+short_desc="Library for working with MaxMind DB files"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="Apache-2.0"
-homepage="https://maxmind.github.io/${pkgname}/"
+homepage="https://maxmind.github.io/libmaxminddb/"
 distfiles="https://github.com/maxmind/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz"
 checksum=e6f881aa6bd8cfa154a44d965450620df1f714c6dc9dd9971ad98f6e04f6c0f0
 
diff --git a/srcpkgs/libnih/template b/srcpkgs/libnih/template
index 2e269931498..d19427f60cf 100644
--- a/srcpkgs/libnih/template
+++ b/srcpkgs/libnih/template
@@ -11,7 +11,7 @@ makedepends="dbus-devel expat-devel"
 short_desc="Small library for C application development"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
-homepage="https://github.com/keybuk/${pkgname}"
+homepage="https://github.com/keybuk/libnih"
 distfiles="${homepage}/archive/${_commit}.tar.gz"
 checksum=bd1ce78c9e4808fd02e06edaf581eb2b70fa43d7baae051848dfdbaf5b4d1a1c
 
diff --git a/srcpkgs/libopenraw/template b/srcpkgs/libopenraw/template
index 14af5153b38..2042b464cb5 100644
--- a/srcpkgs/libopenraw/template
+++ b/srcpkgs/libopenraw/template
@@ -10,7 +10,7 @@ short_desc="Library for camera RAW files decoding"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-3.0-or-later"
 #changelog="https://raw.githubusercontent.com/hfiguiere/libopenraw/master/NEWS"
-homepage="https://${pkgname}.freedesktop.org/wiki/"
+homepage="https://libopenraw.freedesktop.org/wiki/"
 distfiles="https://${pkgname}.freedesktop.org/download/${pkgname}-${version}.tar.bz2"
 checksum=6405634f555849eb01cb028e2a63936e7b841151ea2a1571ac5b5b10431cfab9
 
diff --git a/srcpkgs/libsexy/template b/srcpkgs/libsexy/template
index a185fc28ffe..80a71a83eaf 100644
--- a/srcpkgs/libsexy/template
+++ b/srcpkgs/libsexy/template
@@ -8,8 +8,8 @@ hostmakedepends="pkg-config glib-devel"
 makedepends="iso-codes gtk+-devel libxml2-devel"
 short_desc="Collection of additional GTK+ widgets"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://releases.chipx86.com/$pkgname"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
+homepage="http://releases.chipx86.com/libsexy"
 distfiles="http://releases.chipx86.com/$pkgname/$pkgname/$pkgname-$version.tar.gz"
 checksum=8c4101a8cda5fccbba85ba1a15f46f2cf75deaa8b3c525ce5b135b9e1a8fe49e
 
diff --git a/srcpkgs/libskk/template b/srcpkgs/libskk/template
index 452406a9901..88cee68bce3 100644
--- a/srcpkgs/libskk/template
+++ b/srcpkgs/libskk/template
@@ -10,7 +10,7 @@ makedepends="json-glib-devel libgee08-devel libxkbcommon-devel"
 short_desc="Japanese SKK input method library"
 maintainer="Satoshi Amemiya <amemiya@protonmail.com>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/ueno/${pkgname}"
+homepage="https://github.com/ueno/libskk"
 distfiles="https://github.com/ueno/${pkgname}/archive/${version}.tar.gz"
 checksum=a298e9726b784dd9a6ce8dcb76ff8fbe633037756795d75cfd77d3aeab4f50ed
 
diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index 9408171f3e8..ecd72b51077 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -10,7 +10,7 @@ makedepends="libcppunit-devel libressl-devel zlib-devel"
 short_desc="BitTorrent library written in C++"
 maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://github.com/rakshasa/${pkgname}"
+homepage="https://github.com/rakshasa/libtorrent"
 distfiles="https://github.com/rakshasa/${pkgname}/archive/v${version}.tar.gz"
 checksum=0f6c2e7ffd3a1723ab47fdac785ec40f85c0a5b5a42c1d002272205b988be722
 
diff --git a/srcpkgs/mb2md/template b/srcpkgs/mb2md/template
index 2fc5c5062d8..33c3b3f18cd 100644
--- a/srcpkgs/mb2md/template
+++ b/srcpkgs/mb2md/template
@@ -1,17 +1,22 @@
 # Template file for 'mb2md'
 pkgname=mb2md
 version=3.20
-revision=2
+revision=3
 archs=noarch
 create_wrksrc=yes
 depends="perl-TimeDate"
 short_desc="Convert mbox mailboxes into maildir mailboxes"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
-license="Public Domain"
-homepage="http://batleth.sapienti-sat.org/projects/${pkgname}"
+license="custom: Public Domain"
+homepage="http://batleth.sapienti-sat.org/projects/mb2md"
 distfiles="${homepage}/${pkgname}-${version}.pl.gz"
 checksum=af45a9b5413a9fe49be0092e560485bf17efc50a4eb4a90744e380c4869f732f
 
 do_install() {
+	sed -n 7,12p mb2md-${version}.pl > license
 	vbin mb2md-${version}.pl mb2md
 }
+
+post_install() {
+	vlicense license
+}
diff --git a/srcpkgs/opentyrian/template b/srcpkgs/opentyrian/template
index 92a1ef220b5..93f06d1ef30 100644
--- a/srcpkgs/opentyrian/template
+++ b/srcpkgs/opentyrian/template
@@ -9,8 +9,8 @@ makedepends="SDL_net-devel"
 depends="${pkgname}-data"
 short_desc="OSS port of the DOS shoot-em-up Tyrian"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
-homepage="https://bitbucket.org/${pkgname}/${pkgname}/wiki/Home"
+license="LGPL-2.0-or-later"
+homepage="https://bitbucket.org/opentyrian/opentyrian/wiki/Home"
 distfiles="http://www.camanis.net/${pkgname}/releases/${pkgname}-${version}-src.tar.gz
  http://camanis.net/tyrian/tyrian${_dataver}.zip"
 checksum="f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f
diff --git a/srcpkgs/pantheon-agent-polkit/template b/srcpkgs/pantheon-agent-polkit/template
index b6398c6fd4f..2b7f61e621c 100644
--- a/srcpkgs/pantheon-agent-polkit/template
+++ b/srcpkgs/pantheon-agent-polkit/template
@@ -8,6 +8,6 @@ makedepends="gtk+3-devel polkit-devel"
 short_desc="Pantheon Polkit Agent"
 maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="LGPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
+homepage="https://github.com/elementary/pantheon-agent-polkit"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=3a6849230b489da2f0327bce530c545dc4f6686a0a73db5c77202566214c5ec9
diff --git a/srcpkgs/paper-icon-theme/template b/srcpkgs/paper-icon-theme/template
index dabaa3d7ec0..c26685202a1 100644
--- a/srcpkgs/paper-icon-theme/template
+++ b/srcpkgs/paper-icon-theme/template
@@ -2,12 +2,12 @@
 pkgname=paper-icon-theme
 version=1.5.0
 revision=1
-wrksrc="${pkgname}-v.${version}"
 archs=noarch
+wrksrc="${pkgname}-v.${version}"
 build_style=meson
-short_desc="A modern freedesktop icon theme"
+short_desc="Modern freedesktop icon theme"
 maintainer="travankor <travankor@tuta.io>"
 license="CC-BY-SA-4.0"
-homepage="https://github.com/snwh/${pkgname}"
+homepage="https://github.com/snwh/paper-icon-theme"
 distfiles="${homepage}/archive/v.${version}.tar.gz"
 checksum=62f21dfe95ece481e5c635480f32347f1ad27ea66b2ef0526fe799090b298ece
diff --git a/srcpkgs/pass-git-helper/template b/srcpkgs/pass-git-helper/template
index 6d7f25bd8a7..e9222fcbef6 100644
--- a/srcpkgs/pass-git-helper/template
+++ b/srcpkgs/pass-git-helper/template
@@ -9,6 +9,6 @@ depends="pass python3-xdg"
 short_desc="Git credential helper interfacing with pass"
 maintainer="teldra <teldra@rotce.de>"
 license="LGPL-3.0-or-later"
-homepage="https://github.com/languitar/${pkgname}"
+homepage="https://github.com/languitar/pass-git-helper"
 distfiles="https://github.com/languitar/${pkgname}/archive/v${version}.tar.gz"
 checksum=85c9e2f1f544227da9129503d91ce5d502be127c83ad24cbc6dc8ba3ab746b8e
diff --git a/srcpkgs/pdfcrack/template b/srcpkgs/pdfcrack/template
index 76a85706054..2223e8c89f2 100644
--- a/srcpkgs/pdfcrack/template
+++ b/srcpkgs/pdfcrack/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 short_desc="PDF password recovery tool"
 maintainer="misuchiru03 <misuchiru03+void@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://sourceforge.net/projects/${pkgname}"
+homepage="https://sourceforge.net/projects/pdfcrack"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8223aec52a2ae36f9a10a731513461458874f1fd8d803e4a04910d9dbf1cba0c
 
diff --git a/srcpkgs/pgpdump/template b/srcpkgs/pgpdump/template
index d1bfda21975..bb66b1335fc 100644
--- a/srcpkgs/pgpdump/template
+++ b/srcpkgs/pgpdump/template
@@ -3,11 +3,11 @@ pkgname=pgpdump
 version=0.33
 revision=1
 build_style=gnu-configure
-short_desc="A PGP packet visualizer"
+short_desc="PGP packet visualizer"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-3-Clause"
 #changelog="https://raw.githubusercontent.com/kazu-yamamoto/pgpdump/master/CHANGES"
-homepage="https://github.com/kazu-yamamoto/${pkgname}"
+homepage="https://github.com/kazu-yamamoto/pgpdump"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=fe580ef43f651da59816c70f38f177ea4fa769d64e3d6883a9d1f661bb0a6952
 
diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index 36daa9c936b..f64b6f9c717 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -10,7 +10,7 @@ makedepends="libressl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"
-homepage="https://github.com/OpenSC/${pkgname}/wiki"
+homepage="https://github.com/OpenSC/pkcs11-helper/wiki"
 distfiles="https://github.com/OpenSC/${pkgname}/archive/${pkgname}-${version}.tar.gz"
 checksum=fbcec9dd15a71d6ef22b09f63934c66d7d0292fefbaf3a60703ee4a9a73bf6a5
 build_options="threading"
diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index b858a42f99c..bf022762774 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -13,7 +13,7 @@ depends="dejavu-fonts-ttf"
 short_desc="Data logging and graphing system for time series data"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://oss.oetiker.ch/${pkgname}"
+homepage="http://oss.oetiker.ch/rrdtool"
 distfiles="http://oss.oetiker.ch/${pkgname}/pub/${pkgname}-${version}.tar.gz"
 checksum=a199faeb7eff7cafc46fac253e682d833d08932f3db93a550a4a5af180ca58db
 nocross=yes
diff --git a/srcpkgs/rtv/template b/srcpkgs/rtv/template
index 3a67da91e61..6c1a2c053ed 100644
--- a/srcpkgs/rtv/template
+++ b/srcpkgs/rtv/template
@@ -4,14 +4,13 @@ version=1.27.0
 revision=3
 archs=noarch
 build_style=python3-module
-pycompile_module="rtv"
 hostmakedepends="python3-setuptools"
 depends="ncurses python3-BeautifulSoup4 python3-decorator python3-kitchen
  python3-requests python3-six"
 short_desc="Simple terminal viewer for Reddit (Reddit Terminal Viewer)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="https://github.com/michael-lazar/${pkgname}"
+homepage="https://github.com/michael-lazar/rtv"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=c57a6cbb2525160b6aaa9180aec0293962b6969675f8ac0f2cfacff3cbd00d7c
 
diff --git a/srcpkgs/rwc/template b/srcpkgs/rwc/template
index 4c2bf3a6a34..195ea73fba2 100644
--- a/srcpkgs/rwc/template
+++ b/srcpkgs/rwc/template
@@ -6,6 +6,6 @@ build_style=gnu-makefile
 short_desc="Report when files change"
 maintainer="Anachron <Anachron14@gmx.de>"
 license="CC0-1.0"
-homepage="https://github.com/leahneukirchen/${pkgname}"
+homepage="https://github.com/leahneukirchen/rwc"
 distfiles="https://github.com/leahneukirchen/${pkgname}/archive/v${version}.tar.gz"
 checksum="6b1136aba4c857beccca5811615d20184c9aded39150b77c5da0f6e176f53bf0"
diff --git a/srcpkgs/s6-dns/template b/srcpkgs/s6-dns/template
index 34c8a05edf6..e4f62ab9266 100644
--- a/srcpkgs/s6-dns/template
+++ b/srcpkgs/s6-dns/template
@@ -10,7 +10,7 @@ makedepends="execline-devel skalibs-devel"
 short_desc="Suite of DNS client programs and libraries for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="ISC"
-homepage="https://skarnet.org/software/${pkgname}/"
+homepage="https://skarnet.org/software/s6-dns/"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=415e3e8a8baaa39b3eac57eef8b3023d63bcdb33d9f9b03bcb298fd940589132
 
diff --git a/srcpkgs/s6-linux-utils/template b/srcpkgs/s6-linux-utils/template
index 9d10a3e4ab1..0a4b19a2b74 100644
--- a/srcpkgs/s6-linux-utils/template
+++ b/srcpkgs/s6-linux-utils/template
@@ -10,7 +10,7 @@ makedepends="skalibs-devel"
 short_desc="Minimalistic Linux-specific system utilities (s6-chroot, s6-mount etc.)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
-homepage="https://skarnet.org/software/${pkgname}/"
+homepage="https://skarnet.org/software/s6-linux-utils/"
 changelog="https://skarnet.org/software/s6-linux-utils/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=25f61961f3247b9a833536ebd1e19f3b024fa095fce30f93d82fdfd4e015dc02
diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 7fedc8b0ebd..f1b2b413670 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -10,7 +10,7 @@ makedepends="execline-devel libressl-devel skalibs-devel s6-devel s6-dns-devel"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="ISC"
-homepage="https://skarnet.org/software/${pkgname}/"
+homepage="https://skarnet.org/software/s6-networking/"
 changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=9d411b5f742529be8e14da0a21635fcc304a4d7ac05fe0e45cf2355e5e3cf188
diff --git a/srcpkgs/s6-portable-utils/template b/srcpkgs/s6-portable-utils/template
index d1ff97c9ca2..de73fa1dfcf 100644
--- a/srcpkgs/s6-portable-utils/template
+++ b/srcpkgs/s6-portable-utils/template
@@ -10,7 +10,7 @@ makedepends="skalibs-devel"
 short_desc="Tiny portable generic utilities (s6-cat, s6-chmod, etc.)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
-homepage="https://skarnet.org/software/${pkgname}/"
+homepage="https://skarnet.org/software/s6-portable-utils/"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=1e473224350c6ebedd7adf162b68303e2e0a32ca2e99d7afee7573d9e78f931c
 
diff --git a/srcpkgs/sandy/template b/srcpkgs/sandy/template
index 26575518f15..b1ec1a37a66 100644
--- a/srcpkgs/sandy/template
+++ b/srcpkgs/sandy/template
@@ -5,10 +5,10 @@ revision=4
 build_style=gnu-makefile
 make_build_args="INCS=-I. LIBS=-lncurses"
 makedepends="ncurses-devel"
-short_desc="A simple ncurses text editor"
+short_desc="Simple ncurses text editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://tools.suckless.org/${pkgname}"
+homepage="http://tools.suckless.org/sandy"
 distfiles="${SOURCEFORGE_SITE}/sandyeditor/files/${pkgname}-${version}.tar.gz"
 checksum=3c51a891efa2ec9e2aa6ae3c1aa290beaf8075dae9abb9a46b5a7d619cb2fb67
 replaces="sandy-git>=0"
diff --git a/srcpkgs/sassc/template b/srcpkgs/sassc/template
index 91054ca2595..0dd6c0c8671 100644
--- a/srcpkgs/sassc/template
+++ b/srcpkgs/sassc/template
@@ -8,7 +8,7 @@ makedepends="libsass-devel"
 short_desc="C/C++ wrapper for sass"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
-homepage="https://github.com/sass/$pkgname"
+homepage="https://github.com/sass/sassc"
 distfiles="$homepage/archive/$version.tar.gz"
 checksum=8cee391c49a102b4464f86fc40c4ceac3a2ada52a89c4c933d8348e3e4542a60
 
diff --git a/srcpkgs/sic/template b/srcpkgs/sic/template
index 3269fe5c85d..0cbeacc6455 100644
--- a/srcpkgs/sic/template
+++ b/srcpkgs/sic/template
@@ -7,7 +7,7 @@ make_build_args="INCS=-I. LIBS="
 short_desc="Simple irc client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://tools.suckless.org/${pkgname}"
+homepage="http://tools.suckless.org/sic"
 distfiles="http://dl.suckless.org/tools/${pkgname}-${version}.tar.gz"
 checksum=ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185
 replaces="sic-git>=0"
diff --git a/srcpkgs/sniproxy/template b/srcpkgs/sniproxy/template
index 25eaee470c6..df480920eb2 100644
--- a/srcpkgs/sniproxy/template
+++ b/srcpkgs/sniproxy/template
@@ -1,14 +1,14 @@
 # Template file for 'sniproxy'
 pkgname=sniproxy
 version=0.6.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool autoconf pkg-config udns-devel gettext-devel"
 makedepends="libev-devel pcre-devel"
 short_desc="Proxies incoming HTTP and TLS connections based on the hostname"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3"
-homepage="https://github.com/dlundquist/${pkgname}"
+license="BSD-2-Clause"
+homepage="https://github.com/dlundquist/sniproxy"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=d73c77a9fa8199ae7ac551c0332d3e0a3ff234623f53d65369a8fa560d9880e2
 
@@ -20,4 +20,5 @@ pre_configure() {
 
 post_install() {
 	vconf $pkgname.conf
+	vlicense COPYING
 }
diff --git a/srcpkgs/steamos-compositor/template b/srcpkgs/steamos-compositor/template
index 8d7fd6a81c2..f98277edbde 100644
--- a/srcpkgs/steamos-compositor/template
+++ b/srcpkgs/steamos-compositor/template
@@ -7,10 +7,10 @@ hostmakedepends="automake pkg-config"
 makedepends="libXxf86vm-devel libXrender-devel libXcomposite-devel
  libXdamage-devel libXpm-devel libSM-devel MesaLib-devel
  SDL_image-devel eudev-libudev-devel"
-short_desc="The SteamOS Compositor"
+short_desc="SteamOS Compositor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="http://repo.steampowered.com/steamos/pool/main/s/${pkgname}"
+homepage="http://repo.steampowered.com/steamos/pool/main/s/steamos-compositor"
 distfiles="${homepage}/${pkgname}_${version}.tar.xz"
 checksum=fd260a7c361f59d90d76b8e52b584433ea96f6d6903c05234547ba3679fd1526
 
diff --git a/srcpkgs/switchboard-plug-bluetooth/template b/srcpkgs/switchboard-plug-bluetooth/template
index 518a7f59040..0642b277e2b 100644
--- a/srcpkgs/switchboard-plug-bluetooth/template
+++ b/srcpkgs/switchboard-plug-bluetooth/template
@@ -8,6 +8,6 @@ makedepends="switchboard-devel granite-devel gtk+3-devel"
 short_desc="Switchboard Bluetooth Plug"
 maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
+homepage="https://github.com/elementary/switchboard-plug-bluetooth"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=ffeb4cdb53696b241e203f4e0920bb90c05fd77b99a05bd9483cb4c8367f1000
diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index cb3351e34d5..f656baff3ba 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -9,6 +9,6 @@ makedepends="switchboard-devel granite-devel gtk+3-devel
 short_desc="Switchboard Network Plug"
 maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
+homepage="https://github.com/elementary/switchboard-plug-network"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=0b039bcb2a33fbdc8364da865c3abebb825e0d36ab89a2bf4589704722f76bba
diff --git a/srcpkgs/switchboard-plug-printers/template b/srcpkgs/switchboard-plug-printers/template
index 2ab9621523a..2d5355dfec6 100644
--- a/srcpkgs/switchboard-plug-printers/template
+++ b/srcpkgs/switchboard-plug-printers/template
@@ -9,6 +9,6 @@ depends="cups-pk-helper"
 short_desc="Switchboard Printers Plug"
 maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
+homepage="https://github.com/elementary/switchboard-plug-printers"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=fe2c748e3737c3304ea8613d43d5ba8596f95499a65b8d13f93c4f702901f442
diff --git a/srcpkgs/tpacpi-bat/template b/srcpkgs/tpacpi-bat/template
index 59b39817b20..31e5b41bf68 100644
--- a/srcpkgs/tpacpi-bat/template
+++ b/srcpkgs/tpacpi-bat/template
@@ -7,7 +7,7 @@ depends="acpi_call-dkms perl"
 short_desc="ThinkPad ACPI Battery Util using acpi_call"
 maintainer="Daniel A. Maierhofer <git@damadmai.at>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/teleshoes/$pkgname"
+homepage="https://github.com/teleshoes/tpacpi-bat"
 distfiles="$homepage/archive/v$version.tar.gz"
 checksum=017084cc82061ebf2837373adb516f1fd1beb78694bbef257a1d112d6081d9d6
 
diff --git a/srcpkgs/ueberzug/template b/srcpkgs/ueberzug/template
index dfa1ab29d96..8e8c1e36b98 100644
--- a/srcpkgs/ueberzug/template
+++ b/srcpkgs/ueberzug/template
@@ -9,10 +9,6 @@ depends="python3-xlib python3-pillow-simd python3-docopt python3-psutil python3-
 short_desc="Command line util which allows drawing images on terminals"
 maintainer="mustaqim <mustaqim@pm.me>"
 license="GPL-3.0-only"
-homepage="https://github.com/seebye/${pkgname}"
+homepage="https://github.com/seebye/ueberzug"
 distfiles="https://github.com/seebye/ueberzug/archive/${version}.tar.gz"
 checksum=99044941373d73d2caf0e12f42b5e635702ffac271b844b3b3ccdfbafaee417d
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/ulatencyd/template b/srcpkgs/ulatencyd/template
index f76ea1f3ebc..981b69cc43e 100644
--- a/srcpkgs/ulatencyd/template
+++ b/srcpkgs/ulatencyd/template
@@ -8,11 +8,10 @@ build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="procps-ng-devel glib-devel dbus-glib-devel lua51-devel libxcb-devel"
 depends="luaposix51 ConsoleKit2"
-nopie=yes
 short_desc="Daemon to minimize latency on a linux system using cgroups"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
-homepage="https://github.com/poelzi/${pkgname}"
+license="GPL-3.0-or-later"
+homepage="https://github.com/poelzi/ulatencyd"
 distfiles="${homepage}/archive/${version}-${_subrelease}.tar.gz"
 checksum=efaf0cf814ef36b9d63f6a588482a2f1ac435163ff5e9d8d20ce07de58efbf2e
 broken="missing symbols in procps-ng (user_from_uid, group_from_gid)"
diff --git a/srcpkgs/xcruiser/template b/srcpkgs/xcruiser/template
index 53a58e45772..7324dfe9a08 100644
--- a/srcpkgs/xcruiser/template
+++ b/srcpkgs/xcruiser/template
@@ -7,10 +7,10 @@ makedepends="libXaw-devel"
 short_desc="Filesystem visualization utility"
 maintainer="beefcurtains <beefcurtains@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://${pkgname}.sourceforge.net/"
+homepage="http://xcruiser.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
 checksum=917b68dc06389bfcdde742f0798f61cdeaea2ae3c6567960c33f7634d4861ce5
-LIBS="-lXaw -lXmu -lXt -lX11 -lm"
+export LIBS="-lXaw -lXmu -lXt -lX11 -lm"
 
 pre_build() {
 	local sources

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

* Re: [PR PATCH] [Updated] replace ${pkgname} with pkgname in homepage variable
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-16844@inbox.vuxu.org>
  2020-01-23 13:44 ` [PR PATCH] [Updated] replace ${pkgname} with pkgname in homepage variable voidlinux-github
  2020-01-23 14:30 ` voidlinux-github
@ 2020-01-23 15:07 ` voidlinux-github
  2020-03-04  9:42 ` [PR PATCH] [Closed]: " teldra
  3 siblings, 0 replies; 4+ messages in thread
From: voidlinux-github @ 2020-01-23 15:07 UTC (permalink / raw)
  To: ml

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

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

https://github.com/teldra/void-packages replace_pkgname_in_homepagevar
https://github.com/void-linux/void-packages/pull/16844

replace ${pkgname} with pkgname in homepage variable


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

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

From 624d26b1bcd47c04e3b1cadad98f5b5ca849df31 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 26 Nov 2019 19:29:47 +0100
Subject: [PATCH] replace ${pkgname} with pkgname in homepage variable

---
 srcpkgs/Maelstrom/template                  |  4 ++--
 srcpkgs/SDL_ttf/template                    |  4 ++--
 srcpkgs/TwitchNotifier/template             |  6 +++---
 srcpkgs/alacritty/template                  |  2 +-
 srcpkgs/autorunner/template                 |  2 +-
 srcpkgs/badvpn/template                     | 11 ++++++++---
 srcpkgs/bc/template                         |  2 +-
 srcpkgs/bemenu/template                     |  2 +-
 srcpkgs/buku_run/template                   |  3 +--
 srcpkgs/cairo-dock/template                 |  6 +++---
 srcpkgs/cdecl/template                      | 13 +++++++------
 srcpkgs/editorconfig-core-lua/template      |  4 ++--
 srcpkgs/faba-icon-theme/template            |  2 +-
 srcpkgs/ffmpegthumbnailer/template          |  2 +-
 srcpkgs/flann/template                      |  6 +++---
 srcpkgs/fstrcmp/template                    |  2 +-
 srcpkgs/gatling/template                    |  9 ++++-----
 srcpkgs/gengetopt/template                  |  2 +-
 srcpkgs/gettext-stub/template               |  2 +-
 srcpkgs/git-cal/template                    |  2 +-
 srcpkgs/guile/template                      |  4 ++--
 srcpkgs/icecat/template                     |  2 +-
 srcpkgs/ii/template                         |  2 +-
 srcpkgs/libdaemon/template                  |  2 +-
 srcpkgs/libgit2-glib/template               |  2 +-
 srcpkgs/libinput-gestures/template          |  2 +-
 srcpkgs/libmaxminddb/template               |  4 ++--
 srcpkgs/libnih/template                     |  2 +-
 srcpkgs/libopenraw/template                 |  2 +-
 srcpkgs/libsexy/template                    |  4 ++--
 srcpkgs/libskk/template                     |  2 +-
 srcpkgs/libtorrent/template                 |  2 +-
 srcpkgs/mb2md/template                      | 11 ++++++++---
 srcpkgs/opentyrian/template                 |  4 ++--
 srcpkgs/pantheon-agent-polkit/template      |  2 +-
 srcpkgs/paper-icon-theme/template           |  6 +++---
 srcpkgs/pass-git-helper/template            |  2 +-
 srcpkgs/pdfcrack/template                   |  2 +-
 srcpkgs/pgpdump/template                    |  4 ++--
 srcpkgs/pkcs11-helper/template              |  2 +-
 srcpkgs/rtv/template                        |  3 +--
 srcpkgs/rwc/template                        |  2 +-
 srcpkgs/s6-dns/template                     |  2 +-
 srcpkgs/s6-linux-utils/template             |  2 +-
 srcpkgs/s6-networking/template              |  2 +-
 srcpkgs/s6-portable-utils/template          |  2 +-
 srcpkgs/sandy/template                      |  4 ++--
 srcpkgs/sassc/template                      |  2 +-
 srcpkgs/sic/template                        |  2 +-
 srcpkgs/sniproxy/template                   |  7 ++++---
 srcpkgs/steamos-compositor/template         |  4 ++--
 srcpkgs/switchboard-plug-bluetooth/template |  2 +-
 srcpkgs/switchboard-plug-network/template   |  2 +-
 srcpkgs/switchboard-plug-printers/template  |  2 +-
 srcpkgs/tpacpi-bat/template                 |  2 +-
 srcpkgs/ueberzug/template                   |  6 +-----
 srcpkgs/ulatencyd/template                  |  5 ++---
 srcpkgs/xcruiser/template                   |  4 ++--
 58 files changed, 104 insertions(+), 100 deletions(-)

diff --git a/srcpkgs/Maelstrom/template b/srcpkgs/Maelstrom/template
index 7b857125bd9..6966b077547 100644
--- a/srcpkgs/Maelstrom/template
+++ b/srcpkgs/Maelstrom/template
@@ -8,8 +8,8 @@ hostmakedepends="automake libtool SDL_net-devel"
 makedepends="SDL_net-devel"
 short_desc="Guide your ship through the Maelstrom asteroid belt"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
-homepage="https://www.libsdl.org/projects/${pkgname}/"
+license="GPL-2.0-only"
+homepage="https://www.libsdl.org/projects/Maelstrom/"
 distfiles="${homepage}/src/${pkgname}-${version}.tar.gz"
 checksum=342557bcc89eea57af4272778d3511be95fe46cf75e291298a15caa49a2f0e29
 
diff --git a/srcpkgs/SDL_ttf/template b/srcpkgs/SDL_ttf/template
index 294116bd0a7..5776115a5b6 100644
--- a/srcpkgs/SDL_ttf/template
+++ b/srcpkgs/SDL_ttf/template
@@ -8,8 +8,8 @@ hostmakedepends="pkg-config"
 makedepends="freetype-devel SDL-devel libSM-devel"
 short_desc="Use TrueType fonts in your SDL applications"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://www.libsdl.org/projects/${pkgname}"
+license="LGPL-2.1-or-later"
+homepage="http://www.libsdl.org/projects/SDL_ttf"
 distfiles="${homepage}/release/${pkgname}-${version}.tar.gz"
 checksum=724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7
 
diff --git a/srcpkgs/TwitchNotifier/template b/srcpkgs/TwitchNotifier/template
index 3bbba11db49..44862b77e52 100644
--- a/srcpkgs/TwitchNotifier/template
+++ b/srcpkgs/TwitchNotifier/template
@@ -2,14 +2,14 @@
 pkgname=TwitchNotifier
 version=0.5
 revision=2
+archs=noarch
 build_style=python3-module
 hostmakedepends="python3-devel"
 makedepends="python3-devel"
 depends="python3-gobject python3-requests libnotify"
-archs=noarch
 short_desc="Daemon that notifies you about your followed channels on Twitch.TV"
 maintainer="Giedrius Statkevičius <giedriuswork@gmail.com>"
-license="GPL-3"
-homepage="https://github.com/GiedriusS/${pkgname}"
+license="GPL-3.0-only"
+homepage="https://github.com/GiedriusS/TwitchNotifier"
 distfiles="https://github.com/GiedriusS/${pkgname}/archive/${version}.tar.gz"
 checksum=42087644c22ecae9268880b38786c9920deec4cd91b08f1377189ee94dfea406
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index a401d4ca0e4..2b276d73a4f 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -9,7 +9,7 @@ depends="libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
-homepage="https://github.com/jwilm/${pkgname}"
+homepage="https://github.com/jwilm/alacritty"
 changelog="https://raw.githubusercontent.com/jwilm/${pkgname}/v${version}/CHANGELOG.md"
 distfiles="https://github.com/jwilm/${pkgname}/archive/v${version}.tar.gz"
 checksum=ee807f03a4014e7f989cf649a7c8209c0c5f57297812a39f4b163f9580b9a539
diff --git a/srcpkgs/autorunner/template b/srcpkgs/autorunner/template
index 91bb4914adc..f58ee3b1d45 100644
--- a/srcpkgs/autorunner/template
+++ b/srcpkgs/autorunner/template
@@ -6,7 +6,7 @@ conf_files="/etc/autorunner.config"
 short_desc="Autostart helper for Desktops"
 maintainer="teldra <teldra@rotce.de>"
 license="MIT"
-homepage="https://github.com/cytopia/${pkgname}"
+homepage="https://github.com/cytopia/autorunner"
 distfiles="https://github.com/cytopia/${pkgname}/archive/v${version}.tar.gz"
 checksum=e6542e807b84204978d393bf978222daa284414949627c89c4c535d86e8d6759
 
diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index b62d13f208f..b81fc53b353 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,16 +1,21 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=11
+revision=12
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="libressl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD"
-homepage="https://github.com/ambrop72/$pkgname"
+license="BSD-3-Clause"
+homepage="https://github.com/ambrop72/badvpn"
 distfiles="https://github.com/ambrop72/$pkgname/archive/${version}.tar.gz"
 checksum=bfd4bbfebd7274bcec792558c9a2fd60e39cd92e04673825ade5d04154766109
+
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args="-DBUILD_NCD=0" ;;
 esac
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/bc/template b/srcpkgs/bc/template
index 943925a6f43..f1b81a07daa 100644
--- a/srcpkgs/bc/template
+++ b/srcpkgs/bc/template
@@ -9,7 +9,7 @@ makedepends="readline-devel"
 short_desc="Arbitrary precision numeric processing language"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="http://www.gnu.org/software/${pkgname}/"
+homepage="http://www.gnu.org/software/bc/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a
 alternatives="
diff --git a/srcpkgs/bemenu/template b/srcpkgs/bemenu/template
index 219fcea6742..8d1772eec97 100644
--- a/srcpkgs/bemenu/template
+++ b/srcpkgs/bemenu/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel cairo-devel pango-devel
 short_desc="Dynamic menu library and client program inspired by dmenu"
 maintainer="Issam Maghni <me@concati.me>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
-homepage="https://github.com/Cloudef/${pkgname}"
+homepage="https://github.com/Cloudef/bemenu"
 distfiles="https://github.com/Cloudef/bemenu/archive/${version}.tar.gz"
 checksum=a57ae85ca14b4adb6c32bc40138d49ec51dd2e2b0d211557c8f92489f4c3fb84
 
diff --git a/srcpkgs/buku_run/template b/srcpkgs/buku_run/template
index a353c85bcd3..44491567ec1 100644
--- a/srcpkgs/buku_run/template
+++ b/srcpkgs/buku_run/template
@@ -8,7 +8,7 @@ depends="rofi gawk sed buku bash"
 short_desc="Rofi frontend for buku bookmarks manager"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"
-homepage="https://github.com/carnager/${pkgname}"
+homepage="https://github.com/carnager/buku_run"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=065b1bcd3000138a23f57b4a394d780e1b16a95d1593bf85d9f657457832bc35
 
@@ -18,4 +18,3 @@ do_install() {
 	vsconf config.buku
 	vconf config.buku buku_run.config
 }
-
diff --git a/srcpkgs/cairo-dock/template b/srcpkgs/cairo-dock/template
index 5d17b73f43e..6bc8cf13ff4 100644
--- a/srcpkgs/cairo-dock/template
+++ b/srcpkgs/cairo-dock/template
@@ -2,7 +2,6 @@
 pkgname=cairo-dock
 version=3.4.1
 revision=1
-lib32disabled=yes
 build_style=cmake
 configure_args="-Denable-desktop-manager=ON"
 hostmakedepends="pkg-config"
@@ -10,10 +9,11 @@ makedepends="libcurl-devel dbus-glib-devel libXtst-devel gtk+3-devel librsvg-dev
 depends="desktop-file-utils"
 short_desc="Light eye-candy fully themable animated dock"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://launchpad.net/${pkgname}"
+license="GPL-3.0-or-later"
+homepage="https://launchpad.net/cairo-dock"
 distfiles="http://launchpad.net/${pkgname}-core/${version%.?}/${version}/+download/${pkgname}-${version}.tar.gz"
 checksum=dcadbbe089487f22b112f25a91d1c966275b245f248f950c6987de787eb95137
+lib32disabled=yes
 
 CFLAGS="-D_BSD_SOURCE"
 CXXFLAGS="-D_BSD_SOURCE"
diff --git a/srcpkgs/cdecl/template b/srcpkgs/cdecl/template
index e4bd82933f8..96439d5357b 100644
--- a/srcpkgs/cdecl/template
+++ b/srcpkgs/cdecl/template
@@ -1,24 +1,21 @@
 # Template file for 'cdecl'
 pkgname=cdecl
 version=2.5
-revision=5
+revision=6
 wrksrc="${pkgname}-blocks-${version}"
 build_style=gnu-makefile
 make_build_args="-e"
 hostmakedepends="flex"
-makedepends="readline-devel"
 short_desc="Compose C and C++ type declarations"
 maintainer="beefcurtains <beefcurtains@voidlinux.org>"
-license="GPL-3"
-homepage="http://${pkgname}.org/"
+license="custom: Public Domain"
+homepage="http://cdecl.org/"
 distfiles="${homepage}files/${wrksrc}.tar.gz"
 checksum=9ee6402be7e4f5bb5e6ee60c6b9ea3862935bf070e6cecd0ab0842305406f3ac
-CFLAGS="-DUSE_READLINE"
 
 pre_build() {
 	flex -l -o cdlex.c cdlex.l
 	sed -i 's/getline/cdgetline/' cdecl.c
-	export LIBS="$LDFLAGS -lreadline"
 }
 
 do_install() {
@@ -27,3 +24,7 @@ do_install() {
 	vman cdecl.1
 	vman c++decl.1
 }
+
+post_install() {
+	vlicense README
+}
diff --git a/srcpkgs/editorconfig-core-lua/template b/srcpkgs/editorconfig-core-lua/template
index 864017d3066..c97e272d2e1 100644
--- a/srcpkgs/editorconfig-core-lua/template
+++ b/srcpkgs/editorconfig-core-lua/template
@@ -1,4 +1,4 @@
-# Template file for 'editorconfig-lua'
+# Template file for 'editorconfig-core-lua'
 pkgname=editorconfig-core-lua
 version=0.2.0
 revision=1
@@ -7,7 +7,7 @@ makedepends="editorconfig-devel lua-devel"
 short_desc="EditorConfig core library written in Lua"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="BSD-2-Clause"
-homepage="https://github.com/editorconfig/${pkgname}"
+homepage="https://github.com/editorconfig/editorconfig-core-lua"
 distfiles="https://github.com/editorconfig/${pkgname}/archive/v${version}.tar.gz"
 checksum=cce8fc6a02d41a665bee098b275026ab9b9043f97c553a3019ade650779b13a0
 
diff --git a/srcpkgs/faba-icon-theme/template b/srcpkgs/faba-icon-theme/template
index 7624d10a4db..c8e56bd1917 100644
--- a/srcpkgs/faba-icon-theme/template
+++ b/srcpkgs/faba-icon-theme/template
@@ -7,6 +7,6 @@ build_style=meson
 short_desc="Sexy, modern FreeDesktop icon set with Tango and elementary influences"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="CC-BY-SA-4.0"
-homepage="https://github.com/snwh/${pkgname}"
+homepage="https://github.com/snwh/faba-icon-theme"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=c87ce7dae8df6b25228297baa1be96cfad06c5c109ff60fedf1f0343bb0196a2
diff --git a/srcpkgs/ffmpegthumbnailer/template b/srcpkgs/ffmpegthumbnailer/template
index ab627032c2e..fb74deecc0a 100644
--- a/srcpkgs/ffmpegthumbnailer/template
+++ b/srcpkgs/ffmpegthumbnailer/template
@@ -9,7 +9,7 @@ depends="ffmpeg"
 short_desc="Lightweight video thumbnailer"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
-homepage="https://github.com/dirkvdb/${pkgname}"
+homepage="https://github.com/dirkvdb/ffmpegthumbnailer"
 distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.bz2"
 checksum=1cb24059c38223f657b300c84dd80491b7040d4b69471c4fea69be862bc99b5b
 
diff --git a/srcpkgs/flann/template b/srcpkgs/flann/template
index 055c935a0cb..b67aea38033 100644
--- a/srcpkgs/flann/template
+++ b/srcpkgs/flann/template
@@ -2,15 +2,15 @@
 pkgname=flann
 version=1.9.1
 revision=4
-patch_args="-Np1"
 build_style=cmake
 makedepends="gtest-devel hdf5-devel"
 short_desc="Fast library for approximate nearest neighbors"
 maintainer="Florian Eich <flrn@nrmncr.net>"
-license="BSD"
-homepage="http://www.cs.ubc.ca/research/${pkgname}/"
+license="BSD-3-Clause"
+homepage="http://www.cs.ubc.ca/research/flann/"
 distfiles="https://github.com/mariusmuja/${pkgname}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=b23b5f4e71139faa3bcb39e6bbcc76967fbaf308c4ee9d4f5bfbeceaa76cc5d3
+patch_args="-Np1"
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/fstrcmp/template b/srcpkgs/fstrcmp/template
index 81d92c58d9e..da11d1037df 100644
--- a/srcpkgs/fstrcmp/template
+++ b/srcpkgs/fstrcmp/template
@@ -11,7 +11,7 @@ makedepends="libtool"
 short_desc="Fuzzy comparison of strings"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="http://${pkgname}.sourceforge.net/"
+homepage="http://fstrcmp.sourceforge.net/"
 distfiles="http://${pkgname}.sourceforge.net/${pkgname}-${version}.tar.gz"
 checksum=e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476
 
diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index ea214a6edba..dde7afeea4a 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -3,18 +3,17 @@ pkgname=gatling
 version=0.15
 revision=8
 build_style=gnu-makefile
+make_build_target="gatling dl getlinks"
+make_install_args="prefix=/usr MANDIR=/usr/share/man"
 makedepends="libowfat libressl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
-homepage="http://www.fefe.de/$pkgname/"
+license="GPL-2.0-only"
+homepage="http://www.fefe.de/gatling/"
 distfiles="https://www.fefe.de/gatling/$pkgname-$version.tar.xz"
 checksum=6fa329d0ced0c80deb8dde5460e9d9e984bee94f265043d7fdec0e253dce9aa4
-make_build_target="gatling dl getlinks"
-make_install_args="prefix=/usr MANDIR=/usr/share/man"
 CFLAGS+=" -std=c99 -I${XBPS_CROSS_BASE}/usr/include/libowfat"
 
 pre_install() {
 	vmkdir usr/share/man/man1
 }
-
diff --git a/srcpkgs/gengetopt/template b/srcpkgs/gengetopt/template
index b1af950036e..f794acef7c1 100644
--- a/srcpkgs/gengetopt/template
+++ b/srcpkgs/gengetopt/template
@@ -8,7 +8,7 @@ makedepends="libfl-devel"
 short_desc="Tool to write cli option parsing code for C programs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="http://www.gnu.org/software/${pkgname}"
+homepage="http://www.gnu.org/software/gengetopt"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=b941aec9011864978dd7fdeb052b1943535824169d2aa2b0e7eae9ab807584ac
 disable_parallel_build=yes
diff --git a/srcpkgs/gettext-stub/template b/srcpkgs/gettext-stub/template
index 0f1e6813da4..4076eb40147 100644
--- a/srcpkgs/gettext-stub/template
+++ b/srcpkgs/gettext-stub/template
@@ -6,7 +6,7 @@ wrksrc=${pkgname}
 short_desc="Gettext little stub"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="WTFPL"
-homepage="http://penma.de/code/${pkgname}/"
+homepage="http://penma.de/code/gettext-stub/"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=04af6ee6720c9a90b51f9e420e1b2e75e3ddaba23a30263bf6e10739d8e8f994
 
diff --git a/srcpkgs/git-cal/template b/srcpkgs/git-cal/template
index 1e4c4299b59..dd44d25aac8 100644
--- a/srcpkgs/git-cal/template
+++ b/srcpkgs/git-cal/template
@@ -10,7 +10,7 @@ depends="perl"
 short_desc="GitHub like contributions calendar on terminal"
 maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="MIT"
-homepage="https://github.com/k4rthik/${pkgname}"
+homepage="https://github.com/k4rthik/git-cal"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=783fa73197b349a51d90670480a750b063c97e5779a5231fe046315af0a946cd
 
diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index ce953960d23..dd49e746e84 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -7,10 +7,10 @@ configure_args="--disable-static --disable-error-on-warning"
 hostmakedepends="pkg-config"
 makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
  libunistring-devel readline-devel"
-short_desc="A portable, embeddable Scheme implementation written in C"
+short_desc="Portable, embeddable Scheme implementation written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
-homepage="http://www.gnu.org/software/${pkgname}"
+homepage="http://www.gnu.org/software/guile"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8aeb2f353881282fe01694cce76bb72f7ffdd296a12c7a1a39255c27b0dfe5f1
 subpackages="libguile guile-devel"
diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template
index bb193245d63..cc8730e6da2 100644
--- a/srcpkgs/icecat/template
+++ b/srcpkgs/icecat/template
@@ -15,7 +15,7 @@ depends="desktop-file-utils hicolor-icon-theme nss>=3.19"
 short_desc="GNU version of the Firefox browser"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MPL-1.1, GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://www.gnu.org/software/${pkgname}/"
+homepage="https://www.gnu.org/software/icecat/"
 distfiles="${GNU_SITE}/${pkgname}/${version}/${pkgname}-${version}-gnu1.tar.bz2"
 checksum=6873d55b13e2d95ede3bf5bb59769179e91b1c4e05d8538d1576f18c9a6bb827
 lib32disabled=yes
diff --git a/srcpkgs/ii/template b/srcpkgs/ii/template
index 13a7ef62682..5bc44f4be50 100644
--- a/srcpkgs/ii/template
+++ b/srcpkgs/ii/template
@@ -7,7 +7,7 @@ make_build_args="INCLUDES=-I. LIBS="
 short_desc="Minimalist FIFO IRC client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://tools.suckless.org/${pkgname}"
+homepage="http://tools.suckless.org/ii"
 distfiles="http://dl.suckless.org/tools/${pkgname}-${version}.tar.gz"
 checksum=b9d9e1eae25e63071960e921af8b217ab1abe64210bd290994aca178a8dc68d2
 
diff --git a/srcpkgs/libdaemon/template b/srcpkgs/libdaemon/template
index 07fe35eaeea..41acb0f2c4c 100644
--- a/srcpkgs/libdaemon/template
+++ b/srcpkgs/libdaemon/template
@@ -7,7 +7,7 @@ configure_args="--disable-static --disable-lynx"
 short_desc="Lightweight C library that eases the writing of UNIX daemons"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
-homepage="http://0pointer.de/lennart/projects/$pkgname"
+homepage="http://0pointer.de/lennart/projects/libdaemon"
 distfiles="http://pkgs.fedoraproject.org/repo/pkgs/libdaemon/libdaemon-${version}.tar.gz/509dc27107c21bcd9fbf2f95f5669563/libdaemon-${version}.tar.gz"
 checksum=fd23eb5f6f986dcc7e708307355ba3289abe03cc381fc47a80bca4a50aa6b834
 
diff --git a/srcpkgs/libgit2-glib/template b/srcpkgs/libgit2-glib/template
index ce68cb35d66..e52855c1350 100644
--- a/srcpkgs/libgit2-glib/template
+++ b/srcpkgs/libgit2-glib/template
@@ -11,7 +11,7 @@ makedepends="libglib-devel libgit2-devel python-gobject-devel"
 short_desc="Glib wrapper library around libgit2"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
-homepage="https://github.com/GNOME/${pkgname}"
+homepage="https://github.com/GNOME/libgit2-glib"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=c9dd1333ae664f21cec05196cd052169fcd819d6ad8e40e3b9914ef240801408
 
diff --git a/srcpkgs/libinput-gestures/template b/srcpkgs/libinput-gestures/template
index 7439479767b..22e945b851b 100644
--- a/srcpkgs/libinput-gestures/template
+++ b/srcpkgs/libinput-gestures/template
@@ -7,7 +7,7 @@ depends="python3 libinput xdotool wmctrl hicolor-icon-theme"
 short_desc="Action gestures on your touchpad using libinput"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/bulletmark/${pkgname}"
+homepage="https://github.com/bulletmark/libinput-gestures"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=79db6dc3b17286fd6d3ef1f38bd6fa6be291ea09ae6eefe5b5c5cefe0becd92c
 conf_files="/etc/libinput-gestures.conf"
diff --git a/srcpkgs/libmaxminddb/template b/srcpkgs/libmaxminddb/template
index 1bf9f18a1f1..3c97e1c665b 100644
--- a/srcpkgs/libmaxminddb/template
+++ b/srcpkgs/libmaxminddb/template
@@ -3,10 +3,10 @@ pkgname=libmaxminddb
 version=1.3.2
 revision=1
 build_style=gnu-configure
-short_desc="A library for working with MaxMind DB files"
+short_desc="Library for working with MaxMind DB files"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="Apache-2.0"
-homepage="https://maxmind.github.io/${pkgname}/"
+homepage="https://maxmind.github.io/libmaxminddb/"
 distfiles="https://github.com/maxmind/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz"
 checksum=e6f881aa6bd8cfa154a44d965450620df1f714c6dc9dd9971ad98f6e04f6c0f0
 
diff --git a/srcpkgs/libnih/template b/srcpkgs/libnih/template
index 2e269931498..d19427f60cf 100644
--- a/srcpkgs/libnih/template
+++ b/srcpkgs/libnih/template
@@ -11,7 +11,7 @@ makedepends="dbus-devel expat-devel"
 short_desc="Small library for C application development"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
-homepage="https://github.com/keybuk/${pkgname}"
+homepage="https://github.com/keybuk/libnih"
 distfiles="${homepage}/archive/${_commit}.tar.gz"
 checksum=bd1ce78c9e4808fd02e06edaf581eb2b70fa43d7baae051848dfdbaf5b4d1a1c
 
diff --git a/srcpkgs/libopenraw/template b/srcpkgs/libopenraw/template
index 14af5153b38..2042b464cb5 100644
--- a/srcpkgs/libopenraw/template
+++ b/srcpkgs/libopenraw/template
@@ -10,7 +10,7 @@ short_desc="Library for camera RAW files decoding"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-3.0-or-later"
 #changelog="https://raw.githubusercontent.com/hfiguiere/libopenraw/master/NEWS"
-homepage="https://${pkgname}.freedesktop.org/wiki/"
+homepage="https://libopenraw.freedesktop.org/wiki/"
 distfiles="https://${pkgname}.freedesktop.org/download/${pkgname}-${version}.tar.bz2"
 checksum=6405634f555849eb01cb028e2a63936e7b841151ea2a1571ac5b5b10431cfab9
 
diff --git a/srcpkgs/libsexy/template b/srcpkgs/libsexy/template
index a185fc28ffe..80a71a83eaf 100644
--- a/srcpkgs/libsexy/template
+++ b/srcpkgs/libsexy/template
@@ -8,8 +8,8 @@ hostmakedepends="pkg-config glib-devel"
 makedepends="iso-codes gtk+-devel libxml2-devel"
 short_desc="Collection of additional GTK+ widgets"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://releases.chipx86.com/$pkgname"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
+homepage="http://releases.chipx86.com/libsexy"
 distfiles="http://releases.chipx86.com/$pkgname/$pkgname/$pkgname-$version.tar.gz"
 checksum=8c4101a8cda5fccbba85ba1a15f46f2cf75deaa8b3c525ce5b135b9e1a8fe49e
 
diff --git a/srcpkgs/libskk/template b/srcpkgs/libskk/template
index 452406a9901..88cee68bce3 100644
--- a/srcpkgs/libskk/template
+++ b/srcpkgs/libskk/template
@@ -10,7 +10,7 @@ makedepends="json-glib-devel libgee08-devel libxkbcommon-devel"
 short_desc="Japanese SKK input method library"
 maintainer="Satoshi Amemiya <amemiya@protonmail.com>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/ueno/${pkgname}"
+homepage="https://github.com/ueno/libskk"
 distfiles="https://github.com/ueno/${pkgname}/archive/${version}.tar.gz"
 checksum=a298e9726b784dd9a6ce8dcb76ff8fbe633037756795d75cfd77d3aeab4f50ed
 
diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index 9408171f3e8..ecd72b51077 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -10,7 +10,7 @@ makedepends="libcppunit-devel libressl-devel zlib-devel"
 short_desc="BitTorrent library written in C++"
 maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://github.com/rakshasa/${pkgname}"
+homepage="https://github.com/rakshasa/libtorrent"
 distfiles="https://github.com/rakshasa/${pkgname}/archive/v${version}.tar.gz"
 checksum=0f6c2e7ffd3a1723ab47fdac785ec40f85c0a5b5a42c1d002272205b988be722
 
diff --git a/srcpkgs/mb2md/template b/srcpkgs/mb2md/template
index 2fc5c5062d8..33c3b3f18cd 100644
--- a/srcpkgs/mb2md/template
+++ b/srcpkgs/mb2md/template
@@ -1,17 +1,22 @@
 # Template file for 'mb2md'
 pkgname=mb2md
 version=3.20
-revision=2
+revision=3
 archs=noarch
 create_wrksrc=yes
 depends="perl-TimeDate"
 short_desc="Convert mbox mailboxes into maildir mailboxes"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
-license="Public Domain"
-homepage="http://batleth.sapienti-sat.org/projects/${pkgname}"
+license="custom: Public Domain"
+homepage="http://batleth.sapienti-sat.org/projects/mb2md"
 distfiles="${homepage}/${pkgname}-${version}.pl.gz"
 checksum=af45a9b5413a9fe49be0092e560485bf17efc50a4eb4a90744e380c4869f732f
 
 do_install() {
+	sed -n 7,12p mb2md-${version}.pl > license
 	vbin mb2md-${version}.pl mb2md
 }
+
+post_install() {
+	vlicense license
+}
diff --git a/srcpkgs/opentyrian/template b/srcpkgs/opentyrian/template
index 92a1ef220b5..93f06d1ef30 100644
--- a/srcpkgs/opentyrian/template
+++ b/srcpkgs/opentyrian/template
@@ -9,8 +9,8 @@ makedepends="SDL_net-devel"
 depends="${pkgname}-data"
 short_desc="OSS port of the DOS shoot-em-up Tyrian"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
-homepage="https://bitbucket.org/${pkgname}/${pkgname}/wiki/Home"
+license="LGPL-2.0-or-later"
+homepage="https://bitbucket.org/opentyrian/opentyrian/wiki/Home"
 distfiles="http://www.camanis.net/${pkgname}/releases/${pkgname}-${version}-src.tar.gz
  http://camanis.net/tyrian/tyrian${_dataver}.zip"
 checksum="f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f
diff --git a/srcpkgs/pantheon-agent-polkit/template b/srcpkgs/pantheon-agent-polkit/template
index b6398c6fd4f..2b7f61e621c 100644
--- a/srcpkgs/pantheon-agent-polkit/template
+++ b/srcpkgs/pantheon-agent-polkit/template
@@ -8,6 +8,6 @@ makedepends="gtk+3-devel polkit-devel"
 short_desc="Pantheon Polkit Agent"
 maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="LGPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
+homepage="https://github.com/elementary/pantheon-agent-polkit"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=3a6849230b489da2f0327bce530c545dc4f6686a0a73db5c77202566214c5ec9
diff --git a/srcpkgs/paper-icon-theme/template b/srcpkgs/paper-icon-theme/template
index dabaa3d7ec0..c26685202a1 100644
--- a/srcpkgs/paper-icon-theme/template
+++ b/srcpkgs/paper-icon-theme/template
@@ -2,12 +2,12 @@
 pkgname=paper-icon-theme
 version=1.5.0
 revision=1
-wrksrc="${pkgname}-v.${version}"
 archs=noarch
+wrksrc="${pkgname}-v.${version}"
 build_style=meson
-short_desc="A modern freedesktop icon theme"
+short_desc="Modern freedesktop icon theme"
 maintainer="travankor <travankor@tuta.io>"
 license="CC-BY-SA-4.0"
-homepage="https://github.com/snwh/${pkgname}"
+homepage="https://github.com/snwh/paper-icon-theme"
 distfiles="${homepage}/archive/v.${version}.tar.gz"
 checksum=62f21dfe95ece481e5c635480f32347f1ad27ea66b2ef0526fe799090b298ece
diff --git a/srcpkgs/pass-git-helper/template b/srcpkgs/pass-git-helper/template
index 6d7f25bd8a7..e9222fcbef6 100644
--- a/srcpkgs/pass-git-helper/template
+++ b/srcpkgs/pass-git-helper/template
@@ -9,6 +9,6 @@ depends="pass python3-xdg"
 short_desc="Git credential helper interfacing with pass"
 maintainer="teldra <teldra@rotce.de>"
 license="LGPL-3.0-or-later"
-homepage="https://github.com/languitar/${pkgname}"
+homepage="https://github.com/languitar/pass-git-helper"
 distfiles="https://github.com/languitar/${pkgname}/archive/v${version}.tar.gz"
 checksum=85c9e2f1f544227da9129503d91ce5d502be127c83ad24cbc6dc8ba3ab746b8e
diff --git a/srcpkgs/pdfcrack/template b/srcpkgs/pdfcrack/template
index 76a85706054..2223e8c89f2 100644
--- a/srcpkgs/pdfcrack/template
+++ b/srcpkgs/pdfcrack/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 short_desc="PDF password recovery tool"
 maintainer="misuchiru03 <misuchiru03+void@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://sourceforge.net/projects/${pkgname}"
+homepage="https://sourceforge.net/projects/pdfcrack"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8223aec52a2ae36f9a10a731513461458874f1fd8d803e4a04910d9dbf1cba0c
 
diff --git a/srcpkgs/pgpdump/template b/srcpkgs/pgpdump/template
index d1bfda21975..bb66b1335fc 100644
--- a/srcpkgs/pgpdump/template
+++ b/srcpkgs/pgpdump/template
@@ -3,11 +3,11 @@ pkgname=pgpdump
 version=0.33
 revision=1
 build_style=gnu-configure
-short_desc="A PGP packet visualizer"
+short_desc="PGP packet visualizer"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-3-Clause"
 #changelog="https://raw.githubusercontent.com/kazu-yamamoto/pgpdump/master/CHANGES"
-homepage="https://github.com/kazu-yamamoto/${pkgname}"
+homepage="https://github.com/kazu-yamamoto/pgpdump"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=fe580ef43f651da59816c70f38f177ea4fa769d64e3d6883a9d1f661bb0a6952
 
diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index 36daa9c936b..f64b6f9c717 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -10,7 +10,7 @@ makedepends="libressl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"
-homepage="https://github.com/OpenSC/${pkgname}/wiki"
+homepage="https://github.com/OpenSC/pkcs11-helper/wiki"
 distfiles="https://github.com/OpenSC/${pkgname}/archive/${pkgname}-${version}.tar.gz"
 checksum=fbcec9dd15a71d6ef22b09f63934c66d7d0292fefbaf3a60703ee4a9a73bf6a5
 build_options="threading"
diff --git a/srcpkgs/rtv/template b/srcpkgs/rtv/template
index 3a67da91e61..6c1a2c053ed 100644
--- a/srcpkgs/rtv/template
+++ b/srcpkgs/rtv/template
@@ -4,14 +4,13 @@ version=1.27.0
 revision=3
 archs=noarch
 build_style=python3-module
-pycompile_module="rtv"
 hostmakedepends="python3-setuptools"
 depends="ncurses python3-BeautifulSoup4 python3-decorator python3-kitchen
  python3-requests python3-six"
 short_desc="Simple terminal viewer for Reddit (Reddit Terminal Viewer)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="https://github.com/michael-lazar/${pkgname}"
+homepage="https://github.com/michael-lazar/rtv"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=c57a6cbb2525160b6aaa9180aec0293962b6969675f8ac0f2cfacff3cbd00d7c
 
diff --git a/srcpkgs/rwc/template b/srcpkgs/rwc/template
index 4c2bf3a6a34..195ea73fba2 100644
--- a/srcpkgs/rwc/template
+++ b/srcpkgs/rwc/template
@@ -6,6 +6,6 @@ build_style=gnu-makefile
 short_desc="Report when files change"
 maintainer="Anachron <Anachron14@gmx.de>"
 license="CC0-1.0"
-homepage="https://github.com/leahneukirchen/${pkgname}"
+homepage="https://github.com/leahneukirchen/rwc"
 distfiles="https://github.com/leahneukirchen/${pkgname}/archive/v${version}.tar.gz"
 checksum="6b1136aba4c857beccca5811615d20184c9aded39150b77c5da0f6e176f53bf0"
diff --git a/srcpkgs/s6-dns/template b/srcpkgs/s6-dns/template
index 34c8a05edf6..e4f62ab9266 100644
--- a/srcpkgs/s6-dns/template
+++ b/srcpkgs/s6-dns/template
@@ -10,7 +10,7 @@ makedepends="execline-devel skalibs-devel"
 short_desc="Suite of DNS client programs and libraries for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="ISC"
-homepage="https://skarnet.org/software/${pkgname}/"
+homepage="https://skarnet.org/software/s6-dns/"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=415e3e8a8baaa39b3eac57eef8b3023d63bcdb33d9f9b03bcb298fd940589132
 
diff --git a/srcpkgs/s6-linux-utils/template b/srcpkgs/s6-linux-utils/template
index 9d10a3e4ab1..0a4b19a2b74 100644
--- a/srcpkgs/s6-linux-utils/template
+++ b/srcpkgs/s6-linux-utils/template
@@ -10,7 +10,7 @@ makedepends="skalibs-devel"
 short_desc="Minimalistic Linux-specific system utilities (s6-chroot, s6-mount etc.)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
-homepage="https://skarnet.org/software/${pkgname}/"
+homepage="https://skarnet.org/software/s6-linux-utils/"
 changelog="https://skarnet.org/software/s6-linux-utils/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=25f61961f3247b9a833536ebd1e19f3b024fa095fce30f93d82fdfd4e015dc02
diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 7fedc8b0ebd..f1b2b413670 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -10,7 +10,7 @@ makedepends="execline-devel libressl-devel skalibs-devel s6-devel s6-dns-devel"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="ISC"
-homepage="https://skarnet.org/software/${pkgname}/"
+homepage="https://skarnet.org/software/s6-networking/"
 changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=9d411b5f742529be8e14da0a21635fcc304a4d7ac05fe0e45cf2355e5e3cf188
diff --git a/srcpkgs/s6-portable-utils/template b/srcpkgs/s6-portable-utils/template
index d1ff97c9ca2..de73fa1dfcf 100644
--- a/srcpkgs/s6-portable-utils/template
+++ b/srcpkgs/s6-portable-utils/template
@@ -10,7 +10,7 @@ makedepends="skalibs-devel"
 short_desc="Tiny portable generic utilities (s6-cat, s6-chmod, etc.)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
-homepage="https://skarnet.org/software/${pkgname}/"
+homepage="https://skarnet.org/software/s6-portable-utils/"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=1e473224350c6ebedd7adf162b68303e2e0a32ca2e99d7afee7573d9e78f931c
 
diff --git a/srcpkgs/sandy/template b/srcpkgs/sandy/template
index 26575518f15..b1ec1a37a66 100644
--- a/srcpkgs/sandy/template
+++ b/srcpkgs/sandy/template
@@ -5,10 +5,10 @@ revision=4
 build_style=gnu-makefile
 make_build_args="INCS=-I. LIBS=-lncurses"
 makedepends="ncurses-devel"
-short_desc="A simple ncurses text editor"
+short_desc="Simple ncurses text editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://tools.suckless.org/${pkgname}"
+homepage="http://tools.suckless.org/sandy"
 distfiles="${SOURCEFORGE_SITE}/sandyeditor/files/${pkgname}-${version}.tar.gz"
 checksum=3c51a891efa2ec9e2aa6ae3c1aa290beaf8075dae9abb9a46b5a7d619cb2fb67
 replaces="sandy-git>=0"
diff --git a/srcpkgs/sassc/template b/srcpkgs/sassc/template
index 91054ca2595..0dd6c0c8671 100644
--- a/srcpkgs/sassc/template
+++ b/srcpkgs/sassc/template
@@ -8,7 +8,7 @@ makedepends="libsass-devel"
 short_desc="C/C++ wrapper for sass"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
-homepage="https://github.com/sass/$pkgname"
+homepage="https://github.com/sass/sassc"
 distfiles="$homepage/archive/$version.tar.gz"
 checksum=8cee391c49a102b4464f86fc40c4ceac3a2ada52a89c4c933d8348e3e4542a60
 
diff --git a/srcpkgs/sic/template b/srcpkgs/sic/template
index 3269fe5c85d..0cbeacc6455 100644
--- a/srcpkgs/sic/template
+++ b/srcpkgs/sic/template
@@ -7,7 +7,7 @@ make_build_args="INCS=-I. LIBS="
 short_desc="Simple irc client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://tools.suckless.org/${pkgname}"
+homepage="http://tools.suckless.org/sic"
 distfiles="http://dl.suckless.org/tools/${pkgname}-${version}.tar.gz"
 checksum=ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185
 replaces="sic-git>=0"
diff --git a/srcpkgs/sniproxy/template b/srcpkgs/sniproxy/template
index 25eaee470c6..df480920eb2 100644
--- a/srcpkgs/sniproxy/template
+++ b/srcpkgs/sniproxy/template
@@ -1,14 +1,14 @@
 # Template file for 'sniproxy'
 pkgname=sniproxy
 version=0.6.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool autoconf pkg-config udns-devel gettext-devel"
 makedepends="libev-devel pcre-devel"
 short_desc="Proxies incoming HTTP and TLS connections based on the hostname"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3"
-homepage="https://github.com/dlundquist/${pkgname}"
+license="BSD-2-Clause"
+homepage="https://github.com/dlundquist/sniproxy"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=d73c77a9fa8199ae7ac551c0332d3e0a3ff234623f53d65369a8fa560d9880e2
 
@@ -20,4 +20,5 @@ pre_configure() {
 
 post_install() {
 	vconf $pkgname.conf
+	vlicense COPYING
 }
diff --git a/srcpkgs/steamos-compositor/template b/srcpkgs/steamos-compositor/template
index 8d7fd6a81c2..f98277edbde 100644
--- a/srcpkgs/steamos-compositor/template
+++ b/srcpkgs/steamos-compositor/template
@@ -7,10 +7,10 @@ hostmakedepends="automake pkg-config"
 makedepends="libXxf86vm-devel libXrender-devel libXcomposite-devel
  libXdamage-devel libXpm-devel libSM-devel MesaLib-devel
  SDL_image-devel eudev-libudev-devel"
-short_desc="The SteamOS Compositor"
+short_desc="SteamOS Compositor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="http://repo.steampowered.com/steamos/pool/main/s/${pkgname}"
+homepage="http://repo.steampowered.com/steamos/pool/main/s/steamos-compositor"
 distfiles="${homepage}/${pkgname}_${version}.tar.xz"
 checksum=fd260a7c361f59d90d76b8e52b584433ea96f6d6903c05234547ba3679fd1526
 
diff --git a/srcpkgs/switchboard-plug-bluetooth/template b/srcpkgs/switchboard-plug-bluetooth/template
index 518a7f59040..0642b277e2b 100644
--- a/srcpkgs/switchboard-plug-bluetooth/template
+++ b/srcpkgs/switchboard-plug-bluetooth/template
@@ -8,6 +8,6 @@ makedepends="switchboard-devel granite-devel gtk+3-devel"
 short_desc="Switchboard Bluetooth Plug"
 maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
+homepage="https://github.com/elementary/switchboard-plug-bluetooth"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=ffeb4cdb53696b241e203f4e0920bb90c05fd77b99a05bd9483cb4c8367f1000
diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index cb3351e34d5..f656baff3ba 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -9,6 +9,6 @@ makedepends="switchboard-devel granite-devel gtk+3-devel
 short_desc="Switchboard Network Plug"
 maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
+homepage="https://github.com/elementary/switchboard-plug-network"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=0b039bcb2a33fbdc8364da865c3abebb825e0d36ab89a2bf4589704722f76bba
diff --git a/srcpkgs/switchboard-plug-printers/template b/srcpkgs/switchboard-plug-printers/template
index 2ab9621523a..2d5355dfec6 100644
--- a/srcpkgs/switchboard-plug-printers/template
+++ b/srcpkgs/switchboard-plug-printers/template
@@ -9,6 +9,6 @@ depends="cups-pk-helper"
 short_desc="Switchboard Printers Plug"
 maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
+homepage="https://github.com/elementary/switchboard-plug-printers"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=fe2c748e3737c3304ea8613d43d5ba8596f95499a65b8d13f93c4f702901f442
diff --git a/srcpkgs/tpacpi-bat/template b/srcpkgs/tpacpi-bat/template
index 59b39817b20..31e5b41bf68 100644
--- a/srcpkgs/tpacpi-bat/template
+++ b/srcpkgs/tpacpi-bat/template
@@ -7,7 +7,7 @@ depends="acpi_call-dkms perl"
 short_desc="ThinkPad ACPI Battery Util using acpi_call"
 maintainer="Daniel A. Maierhofer <git@damadmai.at>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/teleshoes/$pkgname"
+homepage="https://github.com/teleshoes/tpacpi-bat"
 distfiles="$homepage/archive/v$version.tar.gz"
 checksum=017084cc82061ebf2837373adb516f1fd1beb78694bbef257a1d112d6081d9d6
 
diff --git a/srcpkgs/ueberzug/template b/srcpkgs/ueberzug/template
index dfa1ab29d96..8e8c1e36b98 100644
--- a/srcpkgs/ueberzug/template
+++ b/srcpkgs/ueberzug/template
@@ -9,10 +9,6 @@ depends="python3-xlib python3-pillow-simd python3-docopt python3-psutil python3-
 short_desc="Command line util which allows drawing images on terminals"
 maintainer="mustaqim <mustaqim@pm.me>"
 license="GPL-3.0-only"
-homepage="https://github.com/seebye/${pkgname}"
+homepage="https://github.com/seebye/ueberzug"
 distfiles="https://github.com/seebye/ueberzug/archive/${version}.tar.gz"
 checksum=99044941373d73d2caf0e12f42b5e635702ffac271b844b3b3ccdfbafaee417d
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/ulatencyd/template b/srcpkgs/ulatencyd/template
index f76ea1f3ebc..981b69cc43e 100644
--- a/srcpkgs/ulatencyd/template
+++ b/srcpkgs/ulatencyd/template
@@ -8,11 +8,10 @@ build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="procps-ng-devel glib-devel dbus-glib-devel lua51-devel libxcb-devel"
 depends="luaposix51 ConsoleKit2"
-nopie=yes
 short_desc="Daemon to minimize latency on a linux system using cgroups"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
-homepage="https://github.com/poelzi/${pkgname}"
+license="GPL-3.0-or-later"
+homepage="https://github.com/poelzi/ulatencyd"
 distfiles="${homepage}/archive/${version}-${_subrelease}.tar.gz"
 checksum=efaf0cf814ef36b9d63f6a588482a2f1ac435163ff5e9d8d20ce07de58efbf2e
 broken="missing symbols in procps-ng (user_from_uid, group_from_gid)"
diff --git a/srcpkgs/xcruiser/template b/srcpkgs/xcruiser/template
index 53a58e45772..7324dfe9a08 100644
--- a/srcpkgs/xcruiser/template
+++ b/srcpkgs/xcruiser/template
@@ -7,10 +7,10 @@ makedepends="libXaw-devel"
 short_desc="Filesystem visualization utility"
 maintainer="beefcurtains <beefcurtains@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://${pkgname}.sourceforge.net/"
+homepage="http://xcruiser.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
 checksum=917b68dc06389bfcdde742f0798f61cdeaea2ae3c6567960c33f7634d4861ce5
-LIBS="-lXaw -lXmu -lXt -lX11 -lm"
+export LIBS="-lXaw -lXmu -lXt -lX11 -lm"
 
 pre_build() {
 	local sources

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

* Re: [PR PATCH] [Closed]: replace ${pkgname} with pkgname in homepage variable
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-16844@inbox.vuxu.org>
                   ` (2 preceding siblings ...)
  2020-01-23 15:07 ` voidlinux-github
@ 2020-03-04  9:42 ` teldra
  3 siblings, 0 replies; 4+ messages in thread
From: teldra @ 2020-03-04  9:42 UTC (permalink / raw)
  To: ml

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

There's a closed pull request on the void-packages repository

replace ${pkgname} with pkgname in homepage variable
https://github.com/void-linux/void-packages/pull/16844

Description:


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

* Re: [PR PATCH] [Updated] replace ${pkgname} with pkgname in homepage variable
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-16844@inbox.vuxu.org>
@ 2020-01-23 13:44 ` voidlinux-github
  2020-01-23 14:30 ` voidlinux-github
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 4+ messages in thread
From: voidlinux-github @ 2020-01-23 13:44 UTC (permalink / raw)
  To: ml

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

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

https://github.com/teldra/void-packages replace_pkgname_in_homepagevar
https://github.com/void-linux/void-packages/pull/16844

replace ${pkgname} with pkgname in homepage variable


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

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

From bcea545ba160462eb1df09c9b8b398a7f4f44853 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 26 Nov 2019 19:29:47 +0100
Subject: [PATCH] replace ${pkgname} with pkgname in homepage variable

---
 srcpkgs/Maelstrom/template                  |  4 ++--
 srcpkgs/SDL_ttf/template                    |  4 ++--
 srcpkgs/TwitchNotifier/template             | 10 +++++++---
 srcpkgs/alacritty/template                  |  2 +-
 srcpkgs/autorunner/template                 |  2 +-
 srcpkgs/badvpn/template                     | 11 ++++++++---
 srcpkgs/bc/template                         |  2 +-
 srcpkgs/bemenu/template                     |  2 +-
 srcpkgs/buku_run/template                   |  3 +--
 srcpkgs/cairo-dock/template                 |  6 +++---
 srcpkgs/cdecl/template                      | 13 +++++++------
 srcpkgs/editorconfig-core-lua/template      |  4 ++--
 srcpkgs/faba-icon-theme/template            |  2 +-
 srcpkgs/ffmpegthumbnailer/template          |  2 +-
 srcpkgs/flann/template                      |  6 +++---
 srcpkgs/fstrcmp/template                    |  2 +-
 srcpkgs/gatling/template                    |  9 ++++-----
 srcpkgs/gengetopt/template                  |  2 +-
 srcpkgs/gettext-stub/template               |  2 +-
 srcpkgs/git-cal/template                    |  2 +-
 srcpkgs/guile/template                      |  4 ++--
 srcpkgs/icecat/template                     |  2 +-
 srcpkgs/ii/template                         |  2 +-
 srcpkgs/libdaemon/template                  |  2 +-
 srcpkgs/libgit2-glib/template               |  2 +-
 srcpkgs/libinput-gestures/template          |  2 +-
 srcpkgs/libmaxminddb/template               |  4 ++--
 srcpkgs/libnih/template                     |  2 +-
 srcpkgs/libopenraw/template                 |  2 +-
 srcpkgs/libsexy/template                    |  4 ++--
 srcpkgs/libskk/template                     |  2 +-
 srcpkgs/libtorrent/template                 |  2 +-
 srcpkgs/mb2md/template                      | 11 ++++++++---
 srcpkgs/opentyrian/template                 |  4 ++--
 srcpkgs/pantheon-agent-polkit/template      |  2 +-
 srcpkgs/paper-icon-theme/template           |  6 +++---
 srcpkgs/pass-git-helper/template            |  2 +-
 srcpkgs/pdfcrack/template                   |  2 +-
 srcpkgs/pgpdump/template                    |  4 ++--
 srcpkgs/pkcs11-helper/template              |  2 +-
 srcpkgs/rrdtool/template                    |  2 +-
 srcpkgs/rtv/template                        |  2 +-
 srcpkgs/rwc/template                        |  2 +-
 srcpkgs/s6-dns/template                     |  2 +-
 srcpkgs/s6-linux-utils/template             |  2 +-
 srcpkgs/s6-networking/template              |  2 +-
 srcpkgs/s6-portable-utils/template          |  2 +-
 srcpkgs/sandy/template                      |  4 ++--
 srcpkgs/sassc/template                      |  2 +-
 srcpkgs/sic/template                        |  2 +-
 srcpkgs/sniproxy/template                   |  7 ++++---
 srcpkgs/steamos-compositor/template         |  4 ++--
 srcpkgs/switchboard-plug-bluetooth/template |  2 +-
 srcpkgs/switchboard-plug-network/template   |  2 +-
 srcpkgs/switchboard-plug-printers/template  |  2 +-
 srcpkgs/tpacpi-bat/template                 |  2 +-
 srcpkgs/ueberzug/template                   |  6 +-----
 srcpkgs/ulatencyd/template                  |  5 ++---
 srcpkgs/xcruiser/template                   |  4 ++--
 59 files changed, 109 insertions(+), 100 deletions(-)

diff --git a/srcpkgs/Maelstrom/template b/srcpkgs/Maelstrom/template
index 7b857125bd9..6966b077547 100644
--- a/srcpkgs/Maelstrom/template
+++ b/srcpkgs/Maelstrom/template
@@ -8,8 +8,8 @@ hostmakedepends="automake libtool SDL_net-devel"
 makedepends="SDL_net-devel"
 short_desc="Guide your ship through the Maelstrom asteroid belt"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
-homepage="https://www.libsdl.org/projects/${pkgname}/"
+license="GPL-2.0-only"
+homepage="https://www.libsdl.org/projects/Maelstrom/"
 distfiles="${homepage}/src/${pkgname}-${version}.tar.gz"
 checksum=342557bcc89eea57af4272778d3511be95fe46cf75e291298a15caa49a2f0e29
 
diff --git a/srcpkgs/SDL_ttf/template b/srcpkgs/SDL_ttf/template
index 294116bd0a7..5776115a5b6 100644
--- a/srcpkgs/SDL_ttf/template
+++ b/srcpkgs/SDL_ttf/template
@@ -8,8 +8,8 @@ hostmakedepends="pkg-config"
 makedepends="freetype-devel SDL-devel libSM-devel"
 short_desc="Use TrueType fonts in your SDL applications"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://www.libsdl.org/projects/${pkgname}"
+license="LGPL-2.1-or-later"
+homepage="http://www.libsdl.org/projects/SDL_ttf"
 distfiles="${homepage}/release/${pkgname}-${version}.tar.gz"
 checksum=724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7
 
diff --git a/srcpkgs/TwitchNotifier/template b/srcpkgs/TwitchNotifier/template
index 3bbba11db49..80ec5a99511 100644
--- a/srcpkgs/TwitchNotifier/template
+++ b/srcpkgs/TwitchNotifier/template
@@ -1,15 +1,19 @@
 # Template file for 'TwitchNotifier'
 pkgname=TwitchNotifier
 version=0.5
+<<<<<<< HEAD
 revision=2
+=======
+revision=1
+archs=noarch
+>>>>>>> replace ${pkgname} with pkgname in homepage variable
 build_style=python3-module
 hostmakedepends="python3-devel"
 makedepends="python3-devel"
 depends="python3-gobject python3-requests libnotify"
-archs=noarch
 short_desc="Daemon that notifies you about your followed channels on Twitch.TV"
 maintainer="Giedrius Statkevičius <giedriuswork@gmail.com>"
-license="GPL-3"
-homepage="https://github.com/GiedriusS/${pkgname}"
+license="GPL-3.0-only"
+homepage="https://github.com/GiedriusS/TwitchNotifier"
 distfiles="https://github.com/GiedriusS/${pkgname}/archive/${version}.tar.gz"
 checksum=42087644c22ecae9268880b38786c9920deec4cd91b08f1377189ee94dfea406
diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index a401d4ca0e4..2b276d73a4f 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -9,7 +9,7 @@ depends="libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
 short_desc="Cross-platform, GPU-accelerated terminal emulator"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
-homepage="https://github.com/jwilm/${pkgname}"
+homepage="https://github.com/jwilm/alacritty"
 changelog="https://raw.githubusercontent.com/jwilm/${pkgname}/v${version}/CHANGELOG.md"
 distfiles="https://github.com/jwilm/${pkgname}/archive/v${version}.tar.gz"
 checksum=ee807f03a4014e7f989cf649a7c8209c0c5f57297812a39f4b163f9580b9a539
diff --git a/srcpkgs/autorunner/template b/srcpkgs/autorunner/template
index 91bb4914adc..f58ee3b1d45 100644
--- a/srcpkgs/autorunner/template
+++ b/srcpkgs/autorunner/template
@@ -6,7 +6,7 @@ conf_files="/etc/autorunner.config"
 short_desc="Autostart helper for Desktops"
 maintainer="teldra <teldra@rotce.de>"
 license="MIT"
-homepage="https://github.com/cytopia/${pkgname}"
+homepage="https://github.com/cytopia/autorunner"
 distfiles="https://github.com/cytopia/${pkgname}/archive/v${version}.tar.gz"
 checksum=e6542e807b84204978d393bf978222daa284414949627c89c4c535d86e8d6759
 
diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index b62d13f208f..b81fc53b353 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,16 +1,21 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=11
+revision=12
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="libressl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD"
-homepage="https://github.com/ambrop72/$pkgname"
+license="BSD-3-Clause"
+homepage="https://github.com/ambrop72/badvpn"
 distfiles="https://github.com/ambrop72/$pkgname/archive/${version}.tar.gz"
 checksum=bfd4bbfebd7274bcec792558c9a2fd60e39cd92e04673825ade5d04154766109
+
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args="-DBUILD_NCD=0" ;;
 esac
+
+post_install() {
+	vlicense COPYING
+}
diff --git a/srcpkgs/bc/template b/srcpkgs/bc/template
index 943925a6f43..f1b81a07daa 100644
--- a/srcpkgs/bc/template
+++ b/srcpkgs/bc/template
@@ -9,7 +9,7 @@ makedepends="readline-devel"
 short_desc="Arbitrary precision numeric processing language"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="http://www.gnu.org/software/${pkgname}/"
+homepage="http://www.gnu.org/software/bc/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a
 alternatives="
diff --git a/srcpkgs/bemenu/template b/srcpkgs/bemenu/template
index 219fcea6742..8d1772eec97 100644
--- a/srcpkgs/bemenu/template
+++ b/srcpkgs/bemenu/template
@@ -11,7 +11,7 @@ makedepends="ncurses-devel cairo-devel pango-devel
 short_desc="Dynamic menu library and client program inspired by dmenu"
 maintainer="Issam Maghni <me@concati.me>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
-homepage="https://github.com/Cloudef/${pkgname}"
+homepage="https://github.com/Cloudef/bemenu"
 distfiles="https://github.com/Cloudef/bemenu/archive/${version}.tar.gz"
 checksum=a57ae85ca14b4adb6c32bc40138d49ec51dd2e2b0d211557c8f92489f4c3fb84
 
diff --git a/srcpkgs/buku_run/template b/srcpkgs/buku_run/template
index a353c85bcd3..44491567ec1 100644
--- a/srcpkgs/buku_run/template
+++ b/srcpkgs/buku_run/template
@@ -8,7 +8,7 @@ depends="rofi gawk sed buku bash"
 short_desc="Rofi frontend for buku bookmarks manager"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"
-homepage="https://github.com/carnager/${pkgname}"
+homepage="https://github.com/carnager/buku_run"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=065b1bcd3000138a23f57b4a394d780e1b16a95d1593bf85d9f657457832bc35
 
@@ -18,4 +18,3 @@ do_install() {
 	vsconf config.buku
 	vconf config.buku buku_run.config
 }
-
diff --git a/srcpkgs/cairo-dock/template b/srcpkgs/cairo-dock/template
index 5d17b73f43e..6bc8cf13ff4 100644
--- a/srcpkgs/cairo-dock/template
+++ b/srcpkgs/cairo-dock/template
@@ -2,7 +2,6 @@
 pkgname=cairo-dock
 version=3.4.1
 revision=1
-lib32disabled=yes
 build_style=cmake
 configure_args="-Denable-desktop-manager=ON"
 hostmakedepends="pkg-config"
@@ -10,10 +9,11 @@ makedepends="libcurl-devel dbus-glib-devel libXtst-devel gtk+3-devel librsvg-dev
 depends="desktop-file-utils"
 short_desc="Light eye-candy fully themable animated dock"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://launchpad.net/${pkgname}"
+license="GPL-3.0-or-later"
+homepage="https://launchpad.net/cairo-dock"
 distfiles="http://launchpad.net/${pkgname}-core/${version%.?}/${version}/+download/${pkgname}-${version}.tar.gz"
 checksum=dcadbbe089487f22b112f25a91d1c966275b245f248f950c6987de787eb95137
+lib32disabled=yes
 
 CFLAGS="-D_BSD_SOURCE"
 CXXFLAGS="-D_BSD_SOURCE"
diff --git a/srcpkgs/cdecl/template b/srcpkgs/cdecl/template
index e4bd82933f8..96439d5357b 100644
--- a/srcpkgs/cdecl/template
+++ b/srcpkgs/cdecl/template
@@ -1,24 +1,21 @@
 # Template file for 'cdecl'
 pkgname=cdecl
 version=2.5
-revision=5
+revision=6
 wrksrc="${pkgname}-blocks-${version}"
 build_style=gnu-makefile
 make_build_args="-e"
 hostmakedepends="flex"
-makedepends="readline-devel"
 short_desc="Compose C and C++ type declarations"
 maintainer="beefcurtains <beefcurtains@voidlinux.org>"
-license="GPL-3"
-homepage="http://${pkgname}.org/"
+license="custom: Public Domain"
+homepage="http://cdecl.org/"
 distfiles="${homepage}files/${wrksrc}.tar.gz"
 checksum=9ee6402be7e4f5bb5e6ee60c6b9ea3862935bf070e6cecd0ab0842305406f3ac
-CFLAGS="-DUSE_READLINE"
 
 pre_build() {
 	flex -l -o cdlex.c cdlex.l
 	sed -i 's/getline/cdgetline/' cdecl.c
-	export LIBS="$LDFLAGS -lreadline"
 }
 
 do_install() {
@@ -27,3 +24,7 @@ do_install() {
 	vman cdecl.1
 	vman c++decl.1
 }
+
+post_install() {
+	vlicense README
+}
diff --git a/srcpkgs/editorconfig-core-lua/template b/srcpkgs/editorconfig-core-lua/template
index 864017d3066..c97e272d2e1 100644
--- a/srcpkgs/editorconfig-core-lua/template
+++ b/srcpkgs/editorconfig-core-lua/template
@@ -1,4 +1,4 @@
-# Template file for 'editorconfig-lua'
+# Template file for 'editorconfig-core-lua'
 pkgname=editorconfig-core-lua
 version=0.2.0
 revision=1
@@ -7,7 +7,7 @@ makedepends="editorconfig-devel lua-devel"
 short_desc="EditorConfig core library written in Lua"
 maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
 license="BSD-2-Clause"
-homepage="https://github.com/editorconfig/${pkgname}"
+homepage="https://github.com/editorconfig/editorconfig-core-lua"
 distfiles="https://github.com/editorconfig/${pkgname}/archive/v${version}.tar.gz"
 checksum=cce8fc6a02d41a665bee098b275026ab9b9043f97c553a3019ade650779b13a0
 
diff --git a/srcpkgs/faba-icon-theme/template b/srcpkgs/faba-icon-theme/template
index 7624d10a4db..c8e56bd1917 100644
--- a/srcpkgs/faba-icon-theme/template
+++ b/srcpkgs/faba-icon-theme/template
@@ -7,6 +7,6 @@ build_style=meson
 short_desc="Sexy, modern FreeDesktop icon set with Tango and elementary influences"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="CC-BY-SA-4.0"
-homepage="https://github.com/snwh/${pkgname}"
+homepage="https://github.com/snwh/faba-icon-theme"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=c87ce7dae8df6b25228297baa1be96cfad06c5c109ff60fedf1f0343bb0196a2
diff --git a/srcpkgs/ffmpegthumbnailer/template b/srcpkgs/ffmpegthumbnailer/template
index ab627032c2e..fb74deecc0a 100644
--- a/srcpkgs/ffmpegthumbnailer/template
+++ b/srcpkgs/ffmpegthumbnailer/template
@@ -9,7 +9,7 @@ depends="ffmpeg"
 short_desc="Lightweight video thumbnailer"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
-homepage="https://github.com/dirkvdb/${pkgname}"
+homepage="https://github.com/dirkvdb/ffmpegthumbnailer"
 distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.bz2"
 checksum=1cb24059c38223f657b300c84dd80491b7040d4b69471c4fea69be862bc99b5b
 
diff --git a/srcpkgs/flann/template b/srcpkgs/flann/template
index 055c935a0cb..b67aea38033 100644
--- a/srcpkgs/flann/template
+++ b/srcpkgs/flann/template
@@ -2,15 +2,15 @@
 pkgname=flann
 version=1.9.1
 revision=4
-patch_args="-Np1"
 build_style=cmake
 makedepends="gtest-devel hdf5-devel"
 short_desc="Fast library for approximate nearest neighbors"
 maintainer="Florian Eich <flrn@nrmncr.net>"
-license="BSD"
-homepage="http://www.cs.ubc.ca/research/${pkgname}/"
+license="BSD-3-Clause"
+homepage="http://www.cs.ubc.ca/research/flann/"
 distfiles="https://github.com/mariusmuja/${pkgname}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=b23b5f4e71139faa3bcb39e6bbcc76967fbaf308c4ee9d4f5bfbeceaa76cc5d3
+patch_args="-Np1"
 
 post_install() {
 	vlicense COPYING
diff --git a/srcpkgs/fstrcmp/template b/srcpkgs/fstrcmp/template
index 81d92c58d9e..da11d1037df 100644
--- a/srcpkgs/fstrcmp/template
+++ b/srcpkgs/fstrcmp/template
@@ -11,7 +11,7 @@ makedepends="libtool"
 short_desc="Fuzzy comparison of strings"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="http://${pkgname}.sourceforge.net/"
+homepage="http://fstrcmp.sourceforge.net/"
 distfiles="http://${pkgname}.sourceforge.net/${pkgname}-${version}.tar.gz"
 checksum=e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476
 
diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index ea214a6edba..dde7afeea4a 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -3,18 +3,17 @@ pkgname=gatling
 version=0.15
 revision=8
 build_style=gnu-makefile
+make_build_target="gatling dl getlinks"
+make_install_args="prefix=/usr MANDIR=/usr/share/man"
 makedepends="libowfat libressl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
-homepage="http://www.fefe.de/$pkgname/"
+license="GPL-2.0-only"
+homepage="http://www.fefe.de/gatling/"
 distfiles="https://www.fefe.de/gatling/$pkgname-$version.tar.xz"
 checksum=6fa329d0ced0c80deb8dde5460e9d9e984bee94f265043d7fdec0e253dce9aa4
-make_build_target="gatling dl getlinks"
-make_install_args="prefix=/usr MANDIR=/usr/share/man"
 CFLAGS+=" -std=c99 -I${XBPS_CROSS_BASE}/usr/include/libowfat"
 
 pre_install() {
 	vmkdir usr/share/man/man1
 }
-
diff --git a/srcpkgs/gengetopt/template b/srcpkgs/gengetopt/template
index b1af950036e..f794acef7c1 100644
--- a/srcpkgs/gengetopt/template
+++ b/srcpkgs/gengetopt/template
@@ -8,7 +8,7 @@ makedepends="libfl-devel"
 short_desc="Tool to write cli option parsing code for C programs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="http://www.gnu.org/software/${pkgname}"
+homepage="http://www.gnu.org/software/gengetopt"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=b941aec9011864978dd7fdeb052b1943535824169d2aa2b0e7eae9ab807584ac
 disable_parallel_build=yes
diff --git a/srcpkgs/gettext-stub/template b/srcpkgs/gettext-stub/template
index 0f1e6813da4..4076eb40147 100644
--- a/srcpkgs/gettext-stub/template
+++ b/srcpkgs/gettext-stub/template
@@ -6,7 +6,7 @@ wrksrc=${pkgname}
 short_desc="Gettext little stub"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="WTFPL"
-homepage="http://penma.de/code/${pkgname}/"
+homepage="http://penma.de/code/gettext-stub/"
 distfiles="${homepage}/${pkgname}-${version}.tar.gz"
 checksum=04af6ee6720c9a90b51f9e420e1b2e75e3ddaba23a30263bf6e10739d8e8f994
 
diff --git a/srcpkgs/git-cal/template b/srcpkgs/git-cal/template
index 1e4c4299b59..dd44d25aac8 100644
--- a/srcpkgs/git-cal/template
+++ b/srcpkgs/git-cal/template
@@ -10,7 +10,7 @@ depends="perl"
 short_desc="GitHub like contributions calendar on terminal"
 maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="MIT"
-homepage="https://github.com/k4rthik/${pkgname}"
+homepage="https://github.com/k4rthik/git-cal"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=783fa73197b349a51d90670480a750b063c97e5779a5231fe046315af0a946cd
 
diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index ce953960d23..dd49e746e84 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -7,10 +7,10 @@ configure_args="--disable-static --disable-error-on-warning"
 hostmakedepends="pkg-config"
 makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
  libunistring-devel readline-devel"
-short_desc="A portable, embeddable Scheme implementation written in C"
+short_desc="Portable, embeddable Scheme implementation written in C"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
-homepage="http://www.gnu.org/software/${pkgname}"
+homepage="http://www.gnu.org/software/guile"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8aeb2f353881282fe01694cce76bb72f7ffdd296a12c7a1a39255c27b0dfe5f1
 subpackages="libguile guile-devel"
diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template
index bb193245d63..cc8730e6da2 100644
--- a/srcpkgs/icecat/template
+++ b/srcpkgs/icecat/template
@@ -15,7 +15,7 @@ depends="desktop-file-utils hicolor-icon-theme nss>=3.19"
 short_desc="GNU version of the Firefox browser"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MPL-1.1, GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://www.gnu.org/software/${pkgname}/"
+homepage="https://www.gnu.org/software/icecat/"
 distfiles="${GNU_SITE}/${pkgname}/${version}/${pkgname}-${version}-gnu1.tar.bz2"
 checksum=6873d55b13e2d95ede3bf5bb59769179e91b1c4e05d8538d1576f18c9a6bb827
 lib32disabled=yes
diff --git a/srcpkgs/ii/template b/srcpkgs/ii/template
index 13a7ef62682..5bc44f4be50 100644
--- a/srcpkgs/ii/template
+++ b/srcpkgs/ii/template
@@ -7,7 +7,7 @@ make_build_args="INCLUDES=-I. LIBS="
 short_desc="Minimalist FIFO IRC client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://tools.suckless.org/${pkgname}"
+homepage="http://tools.suckless.org/ii"
 distfiles="http://dl.suckless.org/tools/${pkgname}-${version}.tar.gz"
 checksum=b9d9e1eae25e63071960e921af8b217ab1abe64210bd290994aca178a8dc68d2
 
diff --git a/srcpkgs/libdaemon/template b/srcpkgs/libdaemon/template
index 07fe35eaeea..41acb0f2c4c 100644
--- a/srcpkgs/libdaemon/template
+++ b/srcpkgs/libdaemon/template
@@ -7,7 +7,7 @@ configure_args="--disable-static --disable-lynx"
 short_desc="Lightweight C library that eases the writing of UNIX daemons"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
-homepage="http://0pointer.de/lennart/projects/$pkgname"
+homepage="http://0pointer.de/lennart/projects/libdaemon"
 distfiles="http://pkgs.fedoraproject.org/repo/pkgs/libdaemon/libdaemon-${version}.tar.gz/509dc27107c21bcd9fbf2f95f5669563/libdaemon-${version}.tar.gz"
 checksum=fd23eb5f6f986dcc7e708307355ba3289abe03cc381fc47a80bca4a50aa6b834
 
diff --git a/srcpkgs/libgit2-glib/template b/srcpkgs/libgit2-glib/template
index ce68cb35d66..e52855c1350 100644
--- a/srcpkgs/libgit2-glib/template
+++ b/srcpkgs/libgit2-glib/template
@@ -11,7 +11,7 @@ makedepends="libglib-devel libgit2-devel python-gobject-devel"
 short_desc="Glib wrapper library around libgit2"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
-homepage="https://github.com/GNOME/${pkgname}"
+homepage="https://github.com/GNOME/libgit2-glib"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=c9dd1333ae664f21cec05196cd052169fcd819d6ad8e40e3b9914ef240801408
 
diff --git a/srcpkgs/libinput-gestures/template b/srcpkgs/libinput-gestures/template
index 7439479767b..22e945b851b 100644
--- a/srcpkgs/libinput-gestures/template
+++ b/srcpkgs/libinput-gestures/template
@@ -7,7 +7,7 @@ depends="python3 libinput xdotool wmctrl hicolor-icon-theme"
 short_desc="Action gestures on your touchpad using libinput"
 maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/bulletmark/${pkgname}"
+homepage="https://github.com/bulletmark/libinput-gestures"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=79db6dc3b17286fd6d3ef1f38bd6fa6be291ea09ae6eefe5b5c5cefe0becd92c
 conf_files="/etc/libinput-gestures.conf"
diff --git a/srcpkgs/libmaxminddb/template b/srcpkgs/libmaxminddb/template
index 1bf9f18a1f1..3c97e1c665b 100644
--- a/srcpkgs/libmaxminddb/template
+++ b/srcpkgs/libmaxminddb/template
@@ -3,10 +3,10 @@ pkgname=libmaxminddb
 version=1.3.2
 revision=1
 build_style=gnu-configure
-short_desc="A library for working with MaxMind DB files"
+short_desc="Library for working with MaxMind DB files"
 maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="Apache-2.0"
-homepage="https://maxmind.github.io/${pkgname}/"
+homepage="https://maxmind.github.io/libmaxminddb/"
 distfiles="https://github.com/maxmind/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz"
 checksum=e6f881aa6bd8cfa154a44d965450620df1f714c6dc9dd9971ad98f6e04f6c0f0
 
diff --git a/srcpkgs/libnih/template b/srcpkgs/libnih/template
index 2e269931498..d19427f60cf 100644
--- a/srcpkgs/libnih/template
+++ b/srcpkgs/libnih/template
@@ -11,7 +11,7 @@ makedepends="dbus-devel expat-devel"
 short_desc="Small library for C application development"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
-homepage="https://github.com/keybuk/${pkgname}"
+homepage="https://github.com/keybuk/libnih"
 distfiles="${homepage}/archive/${_commit}.tar.gz"
 checksum=bd1ce78c9e4808fd02e06edaf581eb2b70fa43d7baae051848dfdbaf5b4d1a1c
 
diff --git a/srcpkgs/libopenraw/template b/srcpkgs/libopenraw/template
index 14af5153b38..2042b464cb5 100644
--- a/srcpkgs/libopenraw/template
+++ b/srcpkgs/libopenraw/template
@@ -10,7 +10,7 @@ short_desc="Library for camera RAW files decoding"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-3.0-or-later"
 #changelog="https://raw.githubusercontent.com/hfiguiere/libopenraw/master/NEWS"
-homepage="https://${pkgname}.freedesktop.org/wiki/"
+homepage="https://libopenraw.freedesktop.org/wiki/"
 distfiles="https://${pkgname}.freedesktop.org/download/${pkgname}-${version}.tar.bz2"
 checksum=6405634f555849eb01cb028e2a63936e7b841151ea2a1571ac5b5b10431cfab9
 
diff --git a/srcpkgs/libsexy/template b/srcpkgs/libsexy/template
index a185fc28ffe..80a71a83eaf 100644
--- a/srcpkgs/libsexy/template
+++ b/srcpkgs/libsexy/template
@@ -8,8 +8,8 @@ hostmakedepends="pkg-config glib-devel"
 makedepends="iso-codes gtk+-devel libxml2-devel"
 short_desc="Collection of additional GTK+ widgets"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://releases.chipx86.com/$pkgname"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
+homepage="http://releases.chipx86.com/libsexy"
 distfiles="http://releases.chipx86.com/$pkgname/$pkgname/$pkgname-$version.tar.gz"
 checksum=8c4101a8cda5fccbba85ba1a15f46f2cf75deaa8b3c525ce5b135b9e1a8fe49e
 
diff --git a/srcpkgs/libskk/template b/srcpkgs/libskk/template
index 452406a9901..88cee68bce3 100644
--- a/srcpkgs/libskk/template
+++ b/srcpkgs/libskk/template
@@ -10,7 +10,7 @@ makedepends="json-glib-devel libgee08-devel libxkbcommon-devel"
 short_desc="Japanese SKK input method library"
 maintainer="Satoshi Amemiya <amemiya@protonmail.com>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/ueno/${pkgname}"
+homepage="https://github.com/ueno/libskk"
 distfiles="https://github.com/ueno/${pkgname}/archive/${version}.tar.gz"
 checksum=a298e9726b784dd9a6ce8dcb76ff8fbe633037756795d75cfd77d3aeab4f50ed
 
diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index 9408171f3e8..ecd72b51077 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -10,7 +10,7 @@ makedepends="libcppunit-devel libressl-devel zlib-devel"
 short_desc="BitTorrent library written in C++"
 maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://github.com/rakshasa/${pkgname}"
+homepage="https://github.com/rakshasa/libtorrent"
 distfiles="https://github.com/rakshasa/${pkgname}/archive/v${version}.tar.gz"
 checksum=0f6c2e7ffd3a1723ab47fdac785ec40f85c0a5b5a42c1d002272205b988be722
 
diff --git a/srcpkgs/mb2md/template b/srcpkgs/mb2md/template
index 2fc5c5062d8..33c3b3f18cd 100644
--- a/srcpkgs/mb2md/template
+++ b/srcpkgs/mb2md/template
@@ -1,17 +1,22 @@
 # Template file for 'mb2md'
 pkgname=mb2md
 version=3.20
-revision=2
+revision=3
 archs=noarch
 create_wrksrc=yes
 depends="perl-TimeDate"
 short_desc="Convert mbox mailboxes into maildir mailboxes"
 maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
-license="Public Domain"
-homepage="http://batleth.sapienti-sat.org/projects/${pkgname}"
+license="custom: Public Domain"
+homepage="http://batleth.sapienti-sat.org/projects/mb2md"
 distfiles="${homepage}/${pkgname}-${version}.pl.gz"
 checksum=af45a9b5413a9fe49be0092e560485bf17efc50a4eb4a90744e380c4869f732f
 
 do_install() {
+	sed -n 7,12p mb2md-${version}.pl > license
 	vbin mb2md-${version}.pl mb2md
 }
+
+post_install() {
+	vlicense license
+}
diff --git a/srcpkgs/opentyrian/template b/srcpkgs/opentyrian/template
index 92a1ef220b5..93f06d1ef30 100644
--- a/srcpkgs/opentyrian/template
+++ b/srcpkgs/opentyrian/template
@@ -9,8 +9,8 @@ makedepends="SDL_net-devel"
 depends="${pkgname}-data"
 short_desc="OSS port of the DOS shoot-em-up Tyrian"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
-homepage="https://bitbucket.org/${pkgname}/${pkgname}/wiki/Home"
+license="LGPL-2.0-or-later"
+homepage="https://bitbucket.org/opentyrian/opentyrian/wiki/Home"
 distfiles="http://www.camanis.net/${pkgname}/releases/${pkgname}-${version}-src.tar.gz
  http://camanis.net/tyrian/tyrian${_dataver}.zip"
 checksum="f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f
diff --git a/srcpkgs/pantheon-agent-polkit/template b/srcpkgs/pantheon-agent-polkit/template
index b6398c6fd4f..2b7f61e621c 100644
--- a/srcpkgs/pantheon-agent-polkit/template
+++ b/srcpkgs/pantheon-agent-polkit/template
@@ -8,6 +8,6 @@ makedepends="gtk+3-devel polkit-devel"
 short_desc="Pantheon Polkit Agent"
 maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="LGPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
+homepage="https://github.com/elementary/pantheon-agent-polkit"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=3a6849230b489da2f0327bce530c545dc4f6686a0a73db5c77202566214c5ec9
diff --git a/srcpkgs/paper-icon-theme/template b/srcpkgs/paper-icon-theme/template
index dabaa3d7ec0..c26685202a1 100644
--- a/srcpkgs/paper-icon-theme/template
+++ b/srcpkgs/paper-icon-theme/template
@@ -2,12 +2,12 @@
 pkgname=paper-icon-theme
 version=1.5.0
 revision=1
-wrksrc="${pkgname}-v.${version}"
 archs=noarch
+wrksrc="${pkgname}-v.${version}"
 build_style=meson
-short_desc="A modern freedesktop icon theme"
+short_desc="Modern freedesktop icon theme"
 maintainer="travankor <travankor@tuta.io>"
 license="CC-BY-SA-4.0"
-homepage="https://github.com/snwh/${pkgname}"
+homepage="https://github.com/snwh/paper-icon-theme"
 distfiles="${homepage}/archive/v.${version}.tar.gz"
 checksum=62f21dfe95ece481e5c635480f32347f1ad27ea66b2ef0526fe799090b298ece
diff --git a/srcpkgs/pass-git-helper/template b/srcpkgs/pass-git-helper/template
index 6d7f25bd8a7..e9222fcbef6 100644
--- a/srcpkgs/pass-git-helper/template
+++ b/srcpkgs/pass-git-helper/template
@@ -9,6 +9,6 @@ depends="pass python3-xdg"
 short_desc="Git credential helper interfacing with pass"
 maintainer="teldra <teldra@rotce.de>"
 license="LGPL-3.0-or-later"
-homepage="https://github.com/languitar/${pkgname}"
+homepage="https://github.com/languitar/pass-git-helper"
 distfiles="https://github.com/languitar/${pkgname}/archive/v${version}.tar.gz"
 checksum=85c9e2f1f544227da9129503d91ce5d502be127c83ad24cbc6dc8ba3ab746b8e
diff --git a/srcpkgs/pdfcrack/template b/srcpkgs/pdfcrack/template
index 76a85706054..2223e8c89f2 100644
--- a/srcpkgs/pdfcrack/template
+++ b/srcpkgs/pdfcrack/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 short_desc="PDF password recovery tool"
 maintainer="misuchiru03 <misuchiru03+void@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://sourceforge.net/projects/${pkgname}"
+homepage="https://sourceforge.net/projects/pdfcrack"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8223aec52a2ae36f9a10a731513461458874f1fd8d803e4a04910d9dbf1cba0c
 
diff --git a/srcpkgs/pgpdump/template b/srcpkgs/pgpdump/template
index d1bfda21975..bb66b1335fc 100644
--- a/srcpkgs/pgpdump/template
+++ b/srcpkgs/pgpdump/template
@@ -3,11 +3,11 @@ pkgname=pgpdump
 version=0.33
 revision=1
 build_style=gnu-configure
-short_desc="A PGP packet visualizer"
+short_desc="PGP packet visualizer"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-3-Clause"
 #changelog="https://raw.githubusercontent.com/kazu-yamamoto/pgpdump/master/CHANGES"
-homepage="https://github.com/kazu-yamamoto/${pkgname}"
+homepage="https://github.com/kazu-yamamoto/pgpdump"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=fe580ef43f651da59816c70f38f177ea4fa769d64e3d6883a9d1f661bb0a6952
 
diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index 36daa9c936b..f64b6f9c717 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -10,7 +10,7 @@ makedepends="libressl-devel"
 short_desc="Library to help simplify interacting with PKCS#11 providers"
 maintainer="Aloz1 <kno0001@gmail.com>"
 license="GPL-2.0-only, BSD-3-Clause"
-homepage="https://github.com/OpenSC/${pkgname}/wiki"
+homepage="https://github.com/OpenSC/pkcs11-helper/wiki"
 distfiles="https://github.com/OpenSC/${pkgname}/archive/${pkgname}-${version}.tar.gz"
 checksum=fbcec9dd15a71d6ef22b09f63934c66d7d0292fefbaf3a60703ee4a9a73bf6a5
 build_options="threading"
diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index b858a42f99c..bf022762774 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -13,7 +13,7 @@ depends="dejavu-fonts-ttf"
 short_desc="Data logging and graphing system for time series data"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://oss.oetiker.ch/${pkgname}"
+homepage="http://oss.oetiker.ch/rrdtool"
 distfiles="http://oss.oetiker.ch/${pkgname}/pub/${pkgname}-${version}.tar.gz"
 checksum=a199faeb7eff7cafc46fac253e682d833d08932f3db93a550a4a5af180ca58db
 nocross=yes
diff --git a/srcpkgs/rtv/template b/srcpkgs/rtv/template
index 3a67da91e61..40fbea2fdc1 100644
--- a/srcpkgs/rtv/template
+++ b/srcpkgs/rtv/template
@@ -11,7 +11,7 @@ depends="ncurses python3-BeautifulSoup4 python3-decorator python3-kitchen
 short_desc="Simple terminal viewer for Reddit (Reddit Terminal Viewer)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="https://github.com/michael-lazar/${pkgname}"
+homepage="https://github.com/michael-lazar/rtv"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=c57a6cbb2525160b6aaa9180aec0293962b6969675f8ac0f2cfacff3cbd00d7c
 
diff --git a/srcpkgs/rwc/template b/srcpkgs/rwc/template
index 4c2bf3a6a34..195ea73fba2 100644
--- a/srcpkgs/rwc/template
+++ b/srcpkgs/rwc/template
@@ -6,6 +6,6 @@ build_style=gnu-makefile
 short_desc="Report when files change"
 maintainer="Anachron <Anachron14@gmx.de>"
 license="CC0-1.0"
-homepage="https://github.com/leahneukirchen/${pkgname}"
+homepage="https://github.com/leahneukirchen/rwc"
 distfiles="https://github.com/leahneukirchen/${pkgname}/archive/v${version}.tar.gz"
 checksum="6b1136aba4c857beccca5811615d20184c9aded39150b77c5da0f6e176f53bf0"
diff --git a/srcpkgs/s6-dns/template b/srcpkgs/s6-dns/template
index 34c8a05edf6..e4f62ab9266 100644
--- a/srcpkgs/s6-dns/template
+++ b/srcpkgs/s6-dns/template
@@ -10,7 +10,7 @@ makedepends="execline-devel skalibs-devel"
 short_desc="Suite of DNS client programs and libraries for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="ISC"
-homepage="https://skarnet.org/software/${pkgname}/"
+homepage="https://skarnet.org/software/s6-dns/"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=415e3e8a8baaa39b3eac57eef8b3023d63bcdb33d9f9b03bcb298fd940589132
 
diff --git a/srcpkgs/s6-linux-utils/template b/srcpkgs/s6-linux-utils/template
index 9d10a3e4ab1..0a4b19a2b74 100644
--- a/srcpkgs/s6-linux-utils/template
+++ b/srcpkgs/s6-linux-utils/template
@@ -10,7 +10,7 @@ makedepends="skalibs-devel"
 short_desc="Minimalistic Linux-specific system utilities (s6-chroot, s6-mount etc.)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
-homepage="https://skarnet.org/software/${pkgname}/"
+homepage="https://skarnet.org/software/s6-linux-utils/"
 changelog="https://skarnet.org/software/s6-linux-utils/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=25f61961f3247b9a833536ebd1e19f3b024fa095fce30f93d82fdfd4e015dc02
diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 7fedc8b0ebd..f1b2b413670 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -10,7 +10,7 @@ makedepends="execline-devel libressl-devel skalibs-devel s6-devel s6-dns-devel"
 short_desc="Suite of small network utilities for Unix systems"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="ISC"
-homepage="https://skarnet.org/software/${pkgname}/"
+homepage="https://skarnet.org/software/s6-networking/"
 changelog="https://skarnet.org/software/s6-networking/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=9d411b5f742529be8e14da0a21635fcc304a4d7ac05fe0e45cf2355e5e3cf188
diff --git a/srcpkgs/s6-portable-utils/template b/srcpkgs/s6-portable-utils/template
index d1ff97c9ca2..de73fa1dfcf 100644
--- a/srcpkgs/s6-portable-utils/template
+++ b/srcpkgs/s6-portable-utils/template
@@ -10,7 +10,7 @@ makedepends="skalibs-devel"
 short_desc="Tiny portable generic utilities (s6-cat, s6-chmod, etc.)"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
-homepage="https://skarnet.org/software/${pkgname}/"
+homepage="https://skarnet.org/software/s6-portable-utils/"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=1e473224350c6ebedd7adf162b68303e2e0a32ca2e99d7afee7573d9e78f931c
 
diff --git a/srcpkgs/sandy/template b/srcpkgs/sandy/template
index 26575518f15..b1ec1a37a66 100644
--- a/srcpkgs/sandy/template
+++ b/srcpkgs/sandy/template
@@ -5,10 +5,10 @@ revision=4
 build_style=gnu-makefile
 make_build_args="INCS=-I. LIBS=-lncurses"
 makedepends="ncurses-devel"
-short_desc="A simple ncurses text editor"
+short_desc="Simple ncurses text editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://tools.suckless.org/${pkgname}"
+homepage="http://tools.suckless.org/sandy"
 distfiles="${SOURCEFORGE_SITE}/sandyeditor/files/${pkgname}-${version}.tar.gz"
 checksum=3c51a891efa2ec9e2aa6ae3c1aa290beaf8075dae9abb9a46b5a7d619cb2fb67
 replaces="sandy-git>=0"
diff --git a/srcpkgs/sassc/template b/srcpkgs/sassc/template
index 91054ca2595..0dd6c0c8671 100644
--- a/srcpkgs/sassc/template
+++ b/srcpkgs/sassc/template
@@ -8,7 +8,7 @@ makedepends="libsass-devel"
 short_desc="C/C++ wrapper for sass"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
-homepage="https://github.com/sass/$pkgname"
+homepage="https://github.com/sass/sassc"
 distfiles="$homepage/archive/$version.tar.gz"
 checksum=8cee391c49a102b4464f86fc40c4ceac3a2ada52a89c4c933d8348e3e4542a60
 
diff --git a/srcpkgs/sic/template b/srcpkgs/sic/template
index 3269fe5c85d..0cbeacc6455 100644
--- a/srcpkgs/sic/template
+++ b/srcpkgs/sic/template
@@ -7,7 +7,7 @@ make_build_args="INCS=-I. LIBS="
 short_desc="Simple irc client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://tools.suckless.org/${pkgname}"
+homepage="http://tools.suckless.org/sic"
 distfiles="http://dl.suckless.org/tools/${pkgname}-${version}.tar.gz"
 checksum=ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185
 replaces="sic-git>=0"
diff --git a/srcpkgs/sniproxy/template b/srcpkgs/sniproxy/template
index 25eaee470c6..df480920eb2 100644
--- a/srcpkgs/sniproxy/template
+++ b/srcpkgs/sniproxy/template
@@ -1,14 +1,14 @@
 # Template file for 'sniproxy'
 pkgname=sniproxy
 version=0.6.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool autoconf pkg-config udns-devel gettext-devel"
 makedepends="libev-devel pcre-devel"
 short_desc="Proxies incoming HTTP and TLS connections based on the hostname"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3"
-homepage="https://github.com/dlundquist/${pkgname}"
+license="BSD-2-Clause"
+homepage="https://github.com/dlundquist/sniproxy"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=d73c77a9fa8199ae7ac551c0332d3e0a3ff234623f53d65369a8fa560d9880e2
 
@@ -20,4 +20,5 @@ pre_configure() {
 
 post_install() {
 	vconf $pkgname.conf
+	vlicense COPYING
 }
diff --git a/srcpkgs/steamos-compositor/template b/srcpkgs/steamos-compositor/template
index 8d7fd6a81c2..f98277edbde 100644
--- a/srcpkgs/steamos-compositor/template
+++ b/srcpkgs/steamos-compositor/template
@@ -7,10 +7,10 @@ hostmakedepends="automake pkg-config"
 makedepends="libXxf86vm-devel libXrender-devel libXcomposite-devel
  libXdamage-devel libXpm-devel libSM-devel MesaLib-devel
  SDL_image-devel eudev-libudev-devel"
-short_desc="The SteamOS Compositor"
+short_desc="SteamOS Compositor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="http://repo.steampowered.com/steamos/pool/main/s/${pkgname}"
+homepage="http://repo.steampowered.com/steamos/pool/main/s/steamos-compositor"
 distfiles="${homepage}/${pkgname}_${version}.tar.xz"
 checksum=fd260a7c361f59d90d76b8e52b584433ea96f6d6903c05234547ba3679fd1526
 
diff --git a/srcpkgs/switchboard-plug-bluetooth/template b/srcpkgs/switchboard-plug-bluetooth/template
index 518a7f59040..0642b277e2b 100644
--- a/srcpkgs/switchboard-plug-bluetooth/template
+++ b/srcpkgs/switchboard-plug-bluetooth/template
@@ -8,6 +8,6 @@ makedepends="switchboard-devel granite-devel gtk+3-devel"
 short_desc="Switchboard Bluetooth Plug"
 maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
+homepage="https://github.com/elementary/switchboard-plug-bluetooth"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=ffeb4cdb53696b241e203f4e0920bb90c05fd77b99a05bd9483cb4c8367f1000
diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index cb3351e34d5..f656baff3ba 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -9,6 +9,6 @@ makedepends="switchboard-devel granite-devel gtk+3-devel
 short_desc="Switchboard Network Plug"
 maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
+homepage="https://github.com/elementary/switchboard-plug-network"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=0b039bcb2a33fbdc8364da865c3abebb825e0d36ab89a2bf4589704722f76bba
diff --git a/srcpkgs/switchboard-plug-printers/template b/srcpkgs/switchboard-plug-printers/template
index 2ab9621523a..2d5355dfec6 100644
--- a/srcpkgs/switchboard-plug-printers/template
+++ b/srcpkgs/switchboard-plug-printers/template
@@ -9,6 +9,6 @@ depends="cups-pk-helper"
 short_desc="Switchboard Printers Plug"
 maintainer="Cameron Nemo <camerontnorman@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
+homepage="https://github.com/elementary/switchboard-plug-printers"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=fe2c748e3737c3304ea8613d43d5ba8596f95499a65b8d13f93c4f702901f442
diff --git a/srcpkgs/tpacpi-bat/template b/srcpkgs/tpacpi-bat/template
index 59b39817b20..31e5b41bf68 100644
--- a/srcpkgs/tpacpi-bat/template
+++ b/srcpkgs/tpacpi-bat/template
@@ -7,7 +7,7 @@ depends="acpi_call-dkms perl"
 short_desc="ThinkPad ACPI Battery Util using acpi_call"
 maintainer="Daniel A. Maierhofer <git@damadmai.at>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/teleshoes/$pkgname"
+homepage="https://github.com/teleshoes/tpacpi-bat"
 distfiles="$homepage/archive/v$version.tar.gz"
 checksum=017084cc82061ebf2837373adb516f1fd1beb78694bbef257a1d112d6081d9d6
 
diff --git a/srcpkgs/ueberzug/template b/srcpkgs/ueberzug/template
index dfa1ab29d96..8e8c1e36b98 100644
--- a/srcpkgs/ueberzug/template
+++ b/srcpkgs/ueberzug/template
@@ -9,10 +9,6 @@ depends="python3-xlib python3-pillow-simd python3-docopt python3-psutil python3-
 short_desc="Command line util which allows drawing images on terminals"
 maintainer="mustaqim <mustaqim@pm.me>"
 license="GPL-3.0-only"
-homepage="https://github.com/seebye/${pkgname}"
+homepage="https://github.com/seebye/ueberzug"
 distfiles="https://github.com/seebye/ueberzug/archive/${version}.tar.gz"
 checksum=99044941373d73d2caf0e12f42b5e635702ffac271b844b3b3ccdfbafaee417d
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/ulatencyd/template b/srcpkgs/ulatencyd/template
index f76ea1f3ebc..981b69cc43e 100644
--- a/srcpkgs/ulatencyd/template
+++ b/srcpkgs/ulatencyd/template
@@ -8,11 +8,10 @@ build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="procps-ng-devel glib-devel dbus-glib-devel lua51-devel libxcb-devel"
 depends="luaposix51 ConsoleKit2"
-nopie=yes
 short_desc="Daemon to minimize latency on a linux system using cgroups"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
-homepage="https://github.com/poelzi/${pkgname}"
+license="GPL-3.0-or-later"
+homepage="https://github.com/poelzi/ulatencyd"
 distfiles="${homepage}/archive/${version}-${_subrelease}.tar.gz"
 checksum=efaf0cf814ef36b9d63f6a588482a2f1ac435163ff5e9d8d20ce07de58efbf2e
 broken="missing symbols in procps-ng (user_from_uid, group_from_gid)"
diff --git a/srcpkgs/xcruiser/template b/srcpkgs/xcruiser/template
index 53a58e45772..7324dfe9a08 100644
--- a/srcpkgs/xcruiser/template
+++ b/srcpkgs/xcruiser/template
@@ -7,10 +7,10 @@ makedepends="libXaw-devel"
 short_desc="Filesystem visualization utility"
 maintainer="beefcurtains <beefcurtains@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://${pkgname}.sourceforge.net/"
+homepage="http://xcruiser.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
 checksum=917b68dc06389bfcdde742f0798f61cdeaea2ae3c6567960c33f7634d4861ce5
-LIBS="-lXaw -lXmu -lXt -lX11 -lm"
+export LIBS="-lXaw -lXmu -lXt -lX11 -lm"
 
 pre_build() {
 	local sources

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

end of thread, other threads:[~2020-03-04  9:42 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-16844@inbox.vuxu.org>
2020-01-23 13:44 ` [PR PATCH] [Updated] replace ${pkgname} with pkgname in homepage variable voidlinux-github
2020-01-23 14:30 ` voidlinux-github
2020-01-23 15:07 ` voidlinux-github
2020-03-04  9:42 ` [PR PATCH] [Closed]: " teldra

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).