From 98f9ae42f569ab8a9a0fcd40c4f947c3f5fc8aff Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Mon, 7 Jun 2021 23:37:58 -0700 Subject: [PATCH 1/7] 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 ca8989b3b7d53947bf90439cb5b71d4da748d272 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Mon, 7 Jun 2021 23:46:07 -0700 Subject: [PATCH 2/7] 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 11320f871a8656770cb3ecc039fd37fabe9258e7 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Mon, 7 Jun 2021 23:59:02 -0700 Subject: [PATCH 3/7] 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 f4d87c0e1244b9b9769f77984456e5bef362aa09 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Tue, 8 Jun 2021 00:04:33 -0700 Subject: [PATCH 4/7] 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 571f496bf6441ba71dde52860142c03015fcb354 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Tue, 8 Jun 2021 00:06:20 -0700 Subject: [PATCH 5/7] 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 a63d7db258a07de4c7425047e3d1938d546e710c Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Tue, 8 Jun 2021 00:15:00 -0700 Subject: [PATCH 6/7] 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 fbf9c0e475776aaf75680bb69673a4660eb83f90 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Tue, 8 Jun 2021 00:16:40 -0700 Subject: [PATCH 7/7] usb-modeswitch: fix license, http->https --- srcpkgs/usb-modeswitch/template | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/srcpkgs/usb-modeswitch/template b/srcpkgs/usb-modeswitch/template index 475c1695fab1..ef478c3f4952 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,11 @@ 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, BSD-2-Clause" +homepage="https://www.draisberghof.de/usb_modeswitch/" +distfiles="https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${version}.tar.bz2" checksum=c215236e6bada6e659fc195a31d611ea298a4bdb4d57a0d68c553b56585f8ba3 + +post_install() { + vlicense COPYING LICENSE +}