From ae62f79b145b5c2a33bf6045735ed3f7b32b16e6 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Thu, 3 Jun 2021 09:43:58 -0700 Subject: [PATCH 01/12] ucl: fix license, layout --- srcpkgs/ucl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ucl/template b/srcpkgs/ucl/template index aa876e11bf6d..fa5dc492fae7 100644 --- a/srcpkgs/ucl/template +++ b/srcpkgs/ucl/template @@ -1,12 +1,12 @@ # Template file for 'ucl' pkgname=ucl version=1.03 -revision=5 -conflicts="libucl-devel>=0" +revision=6 build_style=gnu-configure short_desc="Portable lossless data compression library written in ANSI C" maintainer="Orphaned " +license="GPL-2.0-or-later" homepage="http://www.oberhumer.com/opensource/ucl/" -license="GPL-2" distfiles="http://www.oberhumer.com/opensource/ucl/download/ucl-${version}.tar.gz" checksum=b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348 +conflicts="libucl-devel>=0" From 04bab9816ec8d389dafd2411c9f5cbe89fd2a59d Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Mon, 7 Jun 2021 22:58:02 -0700 Subject: [PATCH 02/12] ucommon: fix license, description --- srcpkgs/ucommon/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ucommon/template b/srcpkgs/ucommon/template index a4a5baa92b34..b620e484ea29 100644 --- a/srcpkgs/ucommon/template +++ b/srcpkgs/ucommon/template @@ -1,12 +1,12 @@ # Template file for 'ucommon' pkgname=ucommon version=7.0.0 -revision=1 +revision=2 build_style=gnu-configure makedepends="gnutls-devel" -short_desc="A light-weight C++ library to facilitate using C++ design patterns" +short_desc="Light-weight C++ library to facilitate using C++ design patterns" maintainer="David " -license="GPL-3" +license="LGPL-3.0-or-later" homepage="http://www.gnu.org/software/commoncpp/" distfiles="${GNU_SITE}/commoncpp/$pkgname-${version}.tar.gz" checksum="6ac9f76c2af010f97e916e4bae1cece341dc64ca28e3881ff4ddc3bc334060d7" From 450d31523b1a3c514d2addf25c7e4a8b4d55c03e Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Mon, 7 Jun 2021 23:23:17 -0700 Subject: [PATCH 03/12] ucspi-tcp: fix license, skip checks (methodology broken) --- srcpkgs/ucspi-tcp/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ucspi-tcp/template b/srcpkgs/ucspi-tcp/template index 150832cbc493..f4ef8b1df9db 100644 --- a/srcpkgs/ucspi-tcp/template +++ b/srcpkgs/ucspi-tcp/template @@ -1,15 +1,16 @@ # Template file for 'ucspi-tcp' pkgname=ucspi-tcp version=0.88 -revision=3 +revision=4 build_style=gnu-makefile short_desc="Command-line tools for building TCP client-server applications" maintainer="Nikolay Hristov " -license="public domain" +license="Public Domain" homepage="http://cr.yp.to/ucspi-tcp.html" distfiles="http://cr.yp.to/ucspi-tcp/ucspi-tcp-${version}.tar.gz" checksum=4a0615cab74886f5b4f7e8fd32933a07b955536a3476d74ea087a3ea66a23e9c patch_args="-Np1" +make_check=no # checks are only designed to check if an installation worked do_install() { vbin addcr From d76a98cd3dad080c6d6598476cf35e1a7992396b Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Mon, 7 Jun 2021 23:29:03 -0700 Subject: [PATCH 04/12] umurmur: fix license, http->https, template cleanup --- srcpkgs/umurmur/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template index fa89bf9e8eb7..11eb69f05b07 100644 --- a/srcpkgs/umurmur/template +++ b/srcpkgs/umurmur/template @@ -1,7 +1,7 @@ # Template file for 'umurmur' pkgname=umurmur version=0.2.20 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-shmapi --with-ssl=openssl" conf_files="/etc/umurmur/umurmur.conf" @@ -9,8 +9,8 @@ hostmakedepends="automake libtool" makedepends="libconfig-devel openssl-devel protobuf-c-devel" short_desc="Minimalistic Mumble server" maintainer="Duncaen " -license="BSD-3-clause" -homepage="http://umurmur.net/" +license="BSD-3-Clause" +homepage="https://umurmur.net/" changelog="https://github.com/umurmur/umurmur/raw/master/ChangeLog" distfiles="https://github.com/umurmur/umurmur/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" checksum=b7b2978c3197aef0a6531f1cf0ee1aebb32a55ad8bda43064ce3a944edbcac83 @@ -33,4 +33,3 @@ post_install() { vinstall umurmur.conf.example 644 etc/umurmur umurmur.conf vsv umurmurd } - From 41c56c4dfbb3785e43afd944856f04ef471e3392 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Mon, 7 Jun 2021 23:31:28 -0700 Subject: [PATCH 05/12] unibilium: fix license, description --- srcpkgs/unibilium/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/unibilium/template b/srcpkgs/unibilium/template index 9eecb8be39f3..b744e1ae6dc2 100644 --- a/srcpkgs/unibilium/template +++ b/srcpkgs/unibilium/template @@ -1,12 +1,12 @@ # Template file for 'unibilium' pkgname=unibilium version=2.0.0 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="libtool perl" -short_desc="A simple, self-contained terminfo library" +short_desc="Simple, self-contained terminfo library" maintainer="Steve Prybylski " -license="LGPL-3" +license="LGPL-3.0-or-later" homepage="https://github.com/mauke/unibilium" distfiles="https://github.com/mauke/${pkgname}/archive/v${version}.tar.gz" checksum=78997d38d4c8177c60d3d0c1aa8c53fd0806eb21825b7b335b1768d7116bc1c1 @@ -14,8 +14,8 @@ checksum=78997d38d4c8177c60d3d0c1aa8c53fd0806eb21825b7b335b1768d7116bc1c1 do_build() { if [ "$CROSS_BUILD" ]; then cp /usr/bin/libtool . - sed -e "s,CCLD=.*,CCLD=$CC,g;s,CC=.*,CC=$CC,g" -i libtool - sed -e 's,libtool,./libtool,g' -i Makefile + vsed -e "s,CCLD=.*,CCLD=$CC,g;s,CC=.*,CC=$CC,g" -i libtool + vsed -e 's,libtool,./libtool,g' -i Makefile fi make ${makejobs} } From 30ee2523b748f9a171704734dd3f81bac1bc5bf3 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Mon, 7 Jun 2021 23:37:58 -0700 Subject: [PATCH 06/12] unison: fix license, description, package name, http->https --- srcpkgs/unison/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template index c3cb8e454c85..3d86606a7d75 100644 --- a/srcpkgs/unison/template +++ b/srcpkgs/unison/template @@ -1,12 +1,12 @@ # Template file for 'unison' -pkgname="unison" +pkgname=unison version=2.51.3 -revision=1 +revision=2 hostmakedepends="ocaml" -short_desc="A file-synchronization tool" +short_desc="File-synchronization tool" maintainer="allan " -license="GPL-3" -homepage="http://www.cis.upenn.edu/~bcpierce/unison/" +license="GPL-3.0-or-later" +homepage="https://www.cis.upenn.edu/~bcpierce/unison/" distfiles="https://github.com/bcpierce00/unison/archive/v${version}.tar.gz" checksum=0c287d17f52729440b2bdc28edf4d19b2d5ea5869983d78e780d501c5866914b nocross="OCaml does not cross compile" From ee1e8c84bad1d88118f4849028082af455323b05 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Mon, 7 Jun 2021 23:46:07 -0700 Subject: [PATCH 07/12] unknown-horizons: fix license, maintainer, http->https --- srcpkgs/unknown-horizons/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/unknown-horizons/template b/srcpkgs/unknown-horizons/template index 56404addb864..e1bb72e5743a 100644 --- a/srcpkgs/unknown-horizons/template +++ b/srcpkgs/unknown-horizons/template @@ -1,13 +1,14 @@ # Template file for 'unknown-horizons' pkgname=unknown-horizons version=2019.1 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3 intltool git python3-Pillow" depends="python3 fifengine python3-yaml" short_desc="2D real time strategy simulation" -license="GPL-2.0-or-later, MIT, BSD-3-Clause, CC-BY-SY-3.0" -homepage="http://unknown-horizons.org" +maintainer="Orphaned " +license="GPL-2.0-or-later, MIT, BSD-3-Clause, CC-BY-3.0, CC-BY-SA-3.0, OFL-1.0" +homepage="https://unknown-horizons.org" distfiles="https://github.com/unknown-horizons/unknown-horizons/archive/${version}.tar.gz" checksum=a417fd3d342212fd190e4f21be82ef13c10e1ed7c288fbbe46e46200cf3de4d8 From 5449528b0a95cc00bb71c0b4b8467f933e7b48b4 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Mon, 7 Jun 2021 23:59:02 -0700 Subject: [PATCH 08/12] upower0: fix license, layout --- srcpkgs/upower0/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/upower0/template b/srcpkgs/upower0/template index 959edf63356c..9eab95670cfd 100644 --- a/srcpkgs/upower0/template +++ b/srcpkgs/upower0/template @@ -2,13 +2,13 @@ pkgname=upower0 reverts="0.99.7_3 0.99.7_2" version=0.9.23 -revision=11 +revision=12 build_style=meta depends="upower>=${version}_${revision}" short_desc="Abstraction for enumerating power devices (transitional dummy package)" maintainer="Orphaned " +license="GPL-2.0-only" homepage="https://upower.freedesktop.org" -license="GPL-2" upower0-devel_package() { build_style=meta From 2e2832948de615d471a842cc92cbcba6e1ec7edd Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Tue, 8 Jun 2021 00:04:33 -0700 Subject: [PATCH 09/12] urbanterror: fix license, description --- srcpkgs/urbanterror/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/urbanterror/template b/srcpkgs/urbanterror/template index 947a12cf2d8f..2790380ddc35 100644 --- a/srcpkgs/urbanterror/template +++ b/srcpkgs/urbanterror/template @@ -1,13 +1,13 @@ # Template file for 'urbanterror' pkgname=urbanterror version=4.3.4 -revision=1 +revision=2 wrksrc="ioq3-for-UrbanTerror-4-release-${version}" makedepends="SDL-devel libopenal-devel libcurl-devel libvorbis-devel" depends="urbanterror-data>=${version}" -short_desc="A team tactical shooter based on ioquake" +short_desc="Team tactical shooter based on ioquake" maintainer="Andrea Brancaleoni " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://github.com/Barbatos/ioq3-for-UrbanTerror-4" distfiles="https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${version}.tar.gz" checksum=ce9d09a8ad149f8a1d36a85a586e1dd8ec9b8dcb3e5e9e82ec2a33017655bf43 @@ -17,7 +17,7 @@ do_build() { case "$XBPS_TARGET_MACHINE" in i686*) CFLAGS+=" -msse2";; esac - sed -i 's,-O3 -march=i586,,' Makefile + vsed -i 's,-O3 -march=i586,,' Makefile make CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS -ldl -lm" \ USE_OPENAL=yes USE_OPENAL_DLOPEN=0 \ USE_CURL=1 USE_CURL_DLOPEN=0 \ From 661700dc98077c8a1afaa934a08809c0f2244644 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Tue, 8 Jun 2021 00:06:20 -0700 Subject: [PATCH 10/12] urlview: fix license --- srcpkgs/urlview/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/urlview/template b/srcpkgs/urlview/template index 7fdbb3119577..3be31c596ac8 100644 --- a/srcpkgs/urlview/template +++ b/srcpkgs/urlview/template @@ -1,20 +1,20 @@ # Template file for 'urlview' pkgname=urlview version=0.9 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="mk-configure" makedepends="ncurses-devel" conf_files="/etc/urlview.conf" short_desc="Extract URLs from a text file and allow the user to select via a menu" maintainer="Liam Howley " -license="GPL-2.0" +license="GPL-2.0-or-later" homepage="https://github.com/sigpipe/urlview" distfiles="https://gnupg.org/ftp/mutt/contrib/$pkgname-$version.tar.gz" checksum=74d18026e84e3cd70a3fdd1a7247a68031b0c1c1c6d761d64b7063ff71091cc3 pre_configure() { - sed -i '/install-data-local/,/^$/d' Makefile.am + vsed -i '/install-data-local/,/^$/d' Makefile.am } post_install() { vbin url_handler.sh From 05bb915f66dca29cfe961d45d52197bfe88bcb86 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Tue, 8 Jun 2021 00:15:00 -0700 Subject: [PATCH 11/12] urxvtconfig: fix license, layout --- srcpkgs/urxvtconfig/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/urxvtconfig/template b/srcpkgs/urxvtconfig/template index a21e2b1e8633..f16ee353dcdb 100644 --- a/srcpkgs/urxvtconfig/template +++ b/srcpkgs/urxvtconfig/template @@ -1,15 +1,15 @@ # Template file for 'urxvtconfig' pkgname=urxvtconfig version=1.0 -revision=2 +revision=3 wrksrc="URXVTConfig-${version}" build_wrksrc="source" build_style="qmake" makedepends="libmagick-devel libXft-devel qt5-devel" -maintainer="Orphaned " short_desc="GUI tool for configuration of the rxvt-unicode terminal emulator" +maintainer="Orphaned " +license="LGPL-3.0-or-later" homepage="https://github.com/daedreth/URXVTConfig" -license="LGPL-3.0" distfiles="https://github.com/daedreth/URXVTConfig/archive/${version}.tar.gz" checksum=74ad9539f4d795ddeca56d53b02483c6ad162a24576b9667e2de54cc84ffd8f3 From a252c262c5dc40502290fde5efd0a79ea7f51448 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Tue, 8 Jun 2021 00:16:40 -0700 Subject: [PATCH 12/12] usb-modeswitch: fix license, http->https --- srcpkgs/usb-modeswitch/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/usb-modeswitch/template b/srcpkgs/usb-modeswitch/template index 475c1695fab1..b548abff2a11 100644 --- a/srcpkgs/usb-modeswitch/template +++ b/srcpkgs/usb-modeswitch/template @@ -1,7 +1,7 @@ # Template file for 'usb-modeswitch' pkgname=usb-modeswitch version=2.6.0 -revision=1 +revision=2 build_style=gnu-makefile conf_files="/etc/usb_modeswitch.conf" make_install_args="SBINDIR=/usr/bin UDEVDIR=/usr/lib/udev" @@ -10,7 +10,7 @@ makedepends="libusb-devel" depends="tcl ${pkgname}-data" short_desc="Mode switching tool for controlling multi-mode USB devices" maintainer="Enno Boland " -license="GPL-2" -homepage="http://www.draisberghof.de/usb_modeswitch/" -distfiles="http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${version}.tar.bz2" +license="GPL-2.0-or-later" +homepage="https://www.draisberghof.de/usb_modeswitch/" +distfiles="https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${version}.tar.bz2" checksum=c215236e6bada6e659fc195a31d611ea298a4bdb4d57a0d68c553b56585f8ba3