From 6a9e209c84bc0190339d5d0813f104a8d5dbddda Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Sun, 28 Mar 2021 09:14:43 -0700 Subject: [PATCH 01/18] daemonize: fix license --- srcpkgs/daemonize/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/daemonize/template b/srcpkgs/daemonize/template index 70dd249d23df..05ec75cda058 100644 --- a/srcpkgs/daemonize/template +++ b/srcpkgs/daemonize/template @@ -1,16 +1,16 @@ # Template file for 'daemonize' pkgname=daemonize version=1.7.8 -revision=1 +revision=2 +wrksrc="$pkgname-release-$version" build_style=gnu-configure make_install_args="INSTALL_SBIN=/usr/bin" short_desc="Run a program as a Unix daemon" maintainer="Andrea Brancaleoni " -license="BSD, MIT, Public Domain" +license="BSD-3-Clause, MIT, Public Domain" homepage="http://software.clapper.org/daemonize/daemonize.html" distfiles="https://github.com/bmc/$pkgname/archive/release-$version.tar.gz" checksum=20c4fc9925371d1ddf1b57947f8fb93e2036eb9ccc3b43a1e3678ea8471c4c60 -wrksrc="$pkgname-release-$version" post_extract() { sed -i '/CC.*-o/s/$/ $(LDFLAGS)/' Makefile.in From 29dbeab52a051486178a298b2fb9dd17ab0cb337 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Sun, 28 Mar 2021 10:30:36 -0700 Subject: [PATCH 02/18] darkice: fix license --- srcpkgs/darkice/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/darkice/template b/srcpkgs/darkice/template index b86b883060a8..b61c6d8c7f8a 100644 --- a/srcpkgs/darkice/template +++ b/srcpkgs/darkice/template @@ -1,7 +1,7 @@ # Template file for 'darkice' pkgname=darkice version=1.3 -revision=2 +revision=3 build_style=gnu-configure configure_args=" --with-lame-prefix=${XBPS_CROSS_BASE}/usr @@ -15,9 +15,9 @@ hostmakedepends="pkg-config" makedepends="lame-devel libogg-devel libvorbis-devel faac-devel alsa-lib-devel pulseaudio-devel jack-devel libsamplerate-devel" conf_files="/etc/darkice.cfg" -short_desc="A live audio streamer source client for icecast" +short_desc="Live audio streamer source client for icecast" maintainer="Orphaned " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://www.darkice.org" distfiles="${SOURCEFORGE_SITE}/project/darkice/darkice/${version}/darkice-${version}.tar.gz" checksum=2c0d0faaa627c0273b2ce8b38775a73ef97e34ef866862a398f660ad8f6e9de6 From 08b15627a846bb944dac9a1ea64cc821d8740c93 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Sun, 28 Mar 2021 12:18:46 -0700 Subject: [PATCH 03/18] dcfldd: fix license, use vsed --- srcpkgs/dcfldd/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/dcfldd/template b/srcpkgs/dcfldd/template index 60df0c6b4017..6a935d979d76 100644 --- a/srcpkgs/dcfldd/template +++ b/srcpkgs/dcfldd/template @@ -1,16 +1,16 @@ # Template file for 'dcfldd' pkgname=dcfldd version=1.3.4r1 -revision=2 +revision=3 wrksrc="${pkgname}-${version/r/-}" build_style=gnu-configure short_desc="Fork of dd with hashing, status, wipe and verify" maintainer="Leah Neukirchen " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://dcfldd.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version/r/-}.tar.gz" checksum=f5143a184da56fd5ac729d6d8cbcf9f5da8e1cf4604aa9fb97c59553b7e6d5f8 post_extract() { - sed -i 's/__linux__/__GLIBC__/' util.c # disable obscure workaround + vsed -i 's/__linux__/__GLIBC__/' util.c # disable obscure workaround } From 4e91c919074cc90c98fdc7501897a3c98b648e93 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Sun, 28 Mar 2021 12:21:26 -0700 Subject: [PATCH 04/18] dfc: fix license --- srcpkgs/dfc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dfc/template b/srcpkgs/dfc/template index 8e29452f84a4..3b351375dcd0 100644 --- a/srcpkgs/dfc/template +++ b/srcpkgs/dfc/template @@ -1,13 +1,13 @@ # Template file for 'dfc' pkgname=dfc version=3.1.1 -revision=1 +revision=2 build_style=cmake configure_args="-DXDG_CONFIG_DIR=/etc/xdg" hostmakedepends="gettext" short_desc="Display file system space usage using graphs and colors" maintainer="Orphaned " -license="3-clause-BSD" +license="BSD-3-Clause" homepage="http://projects.gw-computing.net/projects/dfc" distfiles="https://github.com/Rolinh/dfc/archive/v${version}.tar.gz" checksum=cea18fab1f053eddc359530816712edd1f497c556035a7c4d63ac87a4abc4b28 From 90da6414a2f1111e0f8c169bee97879357f31531 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Sun, 28 Mar 2021 12:22:43 -0700 Subject: [PATCH 05/18] dfu-programmer: fix license --- srcpkgs/dfu-programmer/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/dfu-programmer/template b/srcpkgs/dfu-programmer/template index 7556fe631a10..d3fca448e6bf 100644 --- a/srcpkgs/dfu-programmer/template +++ b/srcpkgs/dfu-programmer/template @@ -1,17 +1,17 @@ # Template file for 'dfu-programmer' pkgname=dfu-programmer version=0.7.2 -revision=1 +revision=2 build_style=gnu-configure +configure_args="--includedir=${XBPS_CROSS_BASE}/usr/include" hostmakedepends="automake" makedepends="libusb-devel" short_desc="Device Firmware Upgrade class USB driver and flasher" maintainer="Matt Carroll " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://dfu-programmer.github.io" distfiles="${SOURCEFORGE_SITE}/dfu-programmer/dfu-programmer/${version}/dfu-programmer-${version}.tar.gz" checksum=1db4d36b1aedab2adc976e8faa5495df3cf82dc4bf883633dc6ba71f7c4af995 -configure_args="--includedir=${XBPS_CROSS_BASE}/usr/include" pre_configure() { ./bootstrap.sh From 890af2d6ac6badd5b6cee04c5774b6f935faed69 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Sun, 28 Mar 2021 13:55:59 -0700 Subject: [PATCH 06/18] dgen-sdl: fix licenses --- srcpkgs/dgen-sdl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dgen-sdl/template b/srcpkgs/dgen-sdl/template index 52bc28e21688..d32ca6d23948 100644 --- a/srcpkgs/dgen-sdl/template +++ b/srcpkgs/dgen-sdl/template @@ -1,13 +1,13 @@ # Template file for 'dgen-sdl' pkgname=dgen-sdl version=1.33 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="automake libtool pkg-config nasm" makedepends="SDL-devel libarchive-devel" short_desc="Multi-platform Genesis/Mega Drive Emulator" maintainer="Orphaned " -license="BSD, GPL-2, LGPL-2.1" +license="BSD-3-Clause, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="http://dgen.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/dgen/${pkgname}-${version}.tar.gz" checksum=99e2c06017c22873c77f88186ebcc09867244eb6e042c763bb094b02b8def61e From 94f41afad837598dc91d4105ff030eb1c7e8d0f6 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Sun, 28 Mar 2021 14:00:13 -0700 Subject: [PATCH 07/18] dhcp-helper: fix license As there isn't a GPL v2.1 nor a GPL v4, I'm making the assumption that GPL-2-only OR GPL-3-only is a wordy way of sauing GPL-2-or-later. --- srcpkgs/dhcp-helper/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dhcp-helper/template b/srcpkgs/dhcp-helper/template index bf5e2641e050..bf2672d010d3 100644 --- a/srcpkgs/dhcp-helper/template +++ b/srcpkgs/dhcp-helper/template @@ -1,14 +1,14 @@ # Template file for 'dhcp-helper' pkgname=dhcp-helper version=1.2 -revision=1 +revision=2 _srcver=1 build_style=gnu-makefile make_build_args="version=$version" make_install_args="BINDIR=/usr/bin MANDIR=/usr/share/man" short_desc="Simple, straightforward DHCP relay agent" maintainer="fosslinux " -license="GPL-2.0-only OR GPL-3.0-only" +license="GPL-2.0-or-later" homepage="http://www.thekelleys.org.uk/dhcp-helper/" distfiles="${DEBIAN_SITE}/main/d/dhcp-helper/dhcp-helper_${version}-${_srcver}.tar.gz" checksum=d11647e4af1f8b25fb854b6f444fec66910d7446d97de918eff5b8a284397e49 From 826c2292fd96b7686fbb6289338375ec9771b76a Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Sun, 28 Mar 2021 14:10:59 -0700 Subject: [PATCH 08/18] dhcping: fix license --- srcpkgs/dhcping/template | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/dhcping/template b/srcpkgs/dhcping/template index 201c54bde415..e7fc06965a8c 100644 --- a/srcpkgs/dhcping/template +++ b/srcpkgs/dhcping/template @@ -1,11 +1,15 @@ # Template file for 'dhcping' pkgname=dhcping version=1.2 -revision=2 +revision=3 build_style=gnu-configure +short_desc="Small tool to test availability of a dhcp-server" maintainer="Orphaned " -license="2-clause-BSD" +license="BSD-2-Clause" homepage="http://www.mavetju.org/unix/general.php" -short_desc="A small tool letting you perform a dhcp-request to find out if a dhcp-server is still running" distfiles="http://www.mavetju.org/download/${pkgname}-${version}.tar.gz" checksum=32ef86959b0bdce4b33d4b2b216eee7148f7de7037ced81b2116210bc7d3646a + +post_install() { + vlicense LICENSE +} From de8eb1e5ca4f1b39a48ebdabdc446d7d714f407c Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Sun, 28 Mar 2021 14:16:50 -0700 Subject: [PATCH 09/18] diction: fix license --- srcpkgs/diction/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/diction/template b/srcpkgs/diction/template index 0a141dffb580..4beee8c9564a 100644 --- a/srcpkgs/diction/template +++ b/srcpkgs/diction/template @@ -1,11 +1,11 @@ # Template file for 'diction' pkgname=diction version=1.11 -revision=1 +revision=2 build_style=gnu-configure short_desc="Writing style checkers, diction and style" maintainer="Rui Abreu Ferreira " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/diction/diction.html" distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=35c2f1bf8ddf0d5fa9f737ffc8e55230736e5d850ff40b57fdf5ef1d7aa024f6 From ac60f8d4b662e805333f53c229f67bd3b57b1b07 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Sun, 28 Mar 2021 14:19:00 -0700 Subject: [PATCH 10/18] diff-pdf: fix license --- srcpkgs/diff-pdf/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/diff-pdf/template b/srcpkgs/diff-pdf/template index 520c2c24e8ba..d58932a4a0df 100644 --- a/srcpkgs/diff-pdf/template +++ b/srcpkgs/diff-pdf/template @@ -1,14 +1,14 @@ # Template file for 'diff-pdf' pkgname=diff-pdf version=0.5 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-wx-config=wx-config-gtk3" hostmakedepends="automake pkg-config" makedepends="wxWidgets-gtk3-devel cairo-devel poppler-devel poppler-glib-devel" -short_desc="A simple tool for visually comparing two PDF files" +short_desc="Simple tool for visually comparing two PDF files" maintainer="Andrea Brancaleoni " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://vslavik.github.io/diff-pdf/" distfiles="https://github.com/vslavik/diff-pdf/archive/v$version.tar.gz" checksum=0648a8c07127dbf3eed4b0856d1042987b9da9a96dc86ebee62e988af13e4475 From efe58c8f568c97e6474f1cd743af7d81bee6c92c Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Sun, 28 Mar 2021 14:42:58 -0700 Subject: [PATCH 11/18] dmraid: fix license --- srcpkgs/dmraid/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/dmraid/template b/srcpkgs/dmraid/template index 7fccd9201546..60273975af92 100644 --- a/srcpkgs/dmraid/template +++ b/srcpkgs/dmraid/template @@ -3,20 +3,20 @@ pkgname=dmraid _distver=1.0.0.rc16 _patchver=3 version="${_distver}.${_patchver}" -revision=11 +revision=14 wrksrc="${pkgname}" build_wrksrc="${_distver}-${_patchver}/${pkgname}" build_style=gnu-configure configure_args="--enable-led --enable-intel_led --enable-shared_lib" makedepends="device-mapper-devel" -lib32disabled=yes -disable_parallel_build="yes" short_desc="Device mapper RAID interface" maintainer="Orphaned " -license="GPL-2, LGPL-2.1" +license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="http://people.redhat.com/~heinzm/sw/dmraid/" distfiles="${homepage}/src/dmraid-${_distver}-${_patchver}.tar.bz2" checksum=93421bd169d71ff5e7d2db95b62b030bfa205a12010b6468dcdef80337d6fbd8 +disable_parallel_build="yes" +lib32disabled=yes dmraid-devel_package() { short_desc+=" - development files" From a3f9ae39f03c600e9c5c06ce0e6bdb3959004fa8 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Sun, 28 Mar 2021 14:44:59 -0700 Subject: [PATCH 12/18] dnstracer: fix license --- srcpkgs/dnstracer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dnstracer/template b/srcpkgs/dnstracer/template index f71827d3d792..eb5c5baa2321 100644 --- a/srcpkgs/dnstracer/template +++ b/srcpkgs/dnstracer/template @@ -1,13 +1,13 @@ # Template file for 'dnstracer' pkgname=dnstracer version=1.10 -revision=1 +revision=2 wrksrc="$pkgname" build_style=gnu-makefile hostmakedepends="perl" short_desc="Trace a chain of DNS servers to the source" maintainer="Diogo Leal " -license="BSD" +license="BSD-2-Clause" homepage="http://www.mavetju.org/unix/dnstracer.php" distfiles="http://www.mavetju.org/download/dnstracer-${version}.tar.bz2" checksum=64cda0ed15ef598a38ec72a96a356e3d10b7f822fc75928115eae96a65ae2b21 From 24ea638300e4633e8535c194661f91da12c42df9 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Sun, 28 Mar 2021 14:51:38 -0700 Subject: [PATCH 13/18] docker-gc: fix license --- srcpkgs/docker-gc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/docker-gc/template b/srcpkgs/docker-gc/template index 87d828eecf8d..d8e39ff15fc1 100644 --- a/srcpkgs/docker-gc/template +++ b/srcpkgs/docker-gc/template @@ -1,13 +1,13 @@ # Template file for 'docker-gc' pkgname=docker-gc version=0.0.20170125 -revision=1 +revision=2 _commit=f460c1d2d50b652e156ffe68489362bedc9278a5 wrksrc="$pkgname-$_commit" depends="docker" short_desc="Docker garbage collection of containers and images" maintainer="Andrea Brancaleoni " -license="GPL-3" +license="Apache-2.0" homepage="https://github.com/spotify/docker-gc" distfiles="$homepage/archive/$_commit.tar.gz" checksum=82ebc5eab842b41282c10e5cf1a82af521e4aa46e6d0fb9bddb2565cef5984a2 From 2f0d68e895f9488b5255ad7ce03db189394f9996 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Sun, 28 Mar 2021 14:53:41 -0700 Subject: [PATCH 14/18] dsh: fix license --- srcpkgs/dsh/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/dsh/template b/srcpkgs/dsh/template index d290305d7d02..41be3809e0a0 100644 --- a/srcpkgs/dsh/template +++ b/srcpkgs/dsh/template @@ -1,13 +1,13 @@ -# Template build file for 'dsh' +# Template file for 'dsh' pkgname=dsh version=0.25.10 -revision=6 -conf_files="/etc/dsh.conf" +revision=7 build_style=gnu-configure +makedepends="libdshconfig-devel" +conf_files="/etc/dsh.conf" short_desc="Wrapper for executing multiple remote shell (rsh/remsh/ssh) commands" maintainer="Enno Boland " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://www.netfort.gr.jp/~dancer/software/dsh.html.en" -makedepends="libdshconfig-devel" distfiles="http://www.netfort.gr.jp/~dancer/software/downloads/$pkgname-$version.tar.gz" checksum=520031a5474c25c6b3f9a0840e06a4fea4750734043ab06342522f533fa5b4d0 From 33818a0b2910b57f5043bbd35ca5b1d28a0a6cda Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Sun, 28 Mar 2021 14:56:56 -0700 Subject: [PATCH 15/18] dssi: fix license --- srcpkgs/dssi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dssi/template b/srcpkgs/dssi/template index fac019b9f57b..0a53d93ea421 100644 --- a/srcpkgs/dssi/template +++ b/srcpkgs/dssi/template @@ -1,7 +1,7 @@ # Template file for 'dssi' pkgname=dssi version=1.1.1 -revision=8 +revision=9 build_style=gnu-configure hostmakedepends="pkg-config" makedepends=" @@ -9,7 +9,7 @@ makedepends=" ladspa-sdk libSM-devel libX11-devel" short_desc="API for audio processing plugins" maintainer="Orphaned " -license="LGPL-2.1" +license="LGPL-2.1-or-later" homepage="http://dssi.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=f2c82b073a947c8255284249097667f9b14e660bf86186f3fcd3b3b3e087814e From 2675e2d5e708bd84162f15bb4475a1624a24cc04 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Sun, 28 Mar 2021 14:58:04 -0700 Subject: [PATCH 16/18] dtach: fix license --- srcpkgs/dtach/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dtach/template b/srcpkgs/dtach/template index f1a0fe3fd865..09fdd2505cdb 100644 --- a/srcpkgs/dtach/template +++ b/srcpkgs/dtach/template @@ -1,12 +1,12 @@ # Template file for 'dtach' pkgname=dtach version=0.9 -revision=1 +revision=2 build_style=gnu-configure short_desc="Tiny program that emulates the detach feature of GNU screen" maintainer="Orphaned " +license="GPL-2.0-or-later" homepage="http://dtach.sourceforge.net/" -license="GPL-2" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=32e9fd6923c553c443fab4ec9c1f95d83fa47b771e6e1dafb018c567291492f3 From fb4d8e98e7a322076108fc7f4dab9120fc08a035 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Sun, 28 Mar 2021 14:59:24 -0700 Subject: [PATCH 17/18] dumpet: fix license --- srcpkgs/dumpet/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dumpet/template b/srcpkgs/dumpet/template index bb6a7713afe6..35204d8aa5e2 100644 --- a/srcpkgs/dumpet/template +++ b/srcpkgs/dumpet/template @@ -1,13 +1,13 @@ # Template file for 'dumpet' pkgname=dumpet version=2.1 -revision=4 +revision=5 build_style=gnu-makefile hostmakedepends="pkg-config" makedepends="popt-devel libxml2-devel" short_desc="Tool to dump and debug bootable CD-like images" maintainer="Orphaned " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://tracker.debian.org/pkg/dumpet" distfiles="http://http.debian.net/debian/pool/main/d/dumpet/dumpet_${version}.orig.tar.bz2" checksum=2cc1fa3a1b06f885e4524d1be80bdacc5b6a55057d0577262f2f5186b49a4da3 From 1a27d727500b20155b511d3cfe2bf247dfbdda10 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Sun, 28 Mar 2021 15:27:59 -0700 Subject: [PATCH 18/18] dvd+rw-tools: fix license and description --- srcpkgs/dvd+rw-tools/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/dvd+rw-tools/template b/srcpkgs/dvd+rw-tools/template index 5388e15692c9..b3c996b8fc2f 100644 --- a/srcpkgs/dvd+rw-tools/template +++ b/srcpkgs/dvd+rw-tools/template @@ -1,12 +1,12 @@ # Template file for 'dvd+rw-tools' pkgname=dvd+rw-tools version=7.1 -revision=4 +revision=5 build_style=gnu-makefile hostmakedepends="m4" -short_desc="A set of tools for DVD+RW/-RW drives" +short_desc="Tools for DVD+RW/-RW drives" maintainer="Duncaen " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://fy.chalmers.se/~appro/linux/DVD+RW/" distfiles="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${pkgname}-${version}.tar.gz" checksum=f8d60f822e914128bcbc5f64fbe3ed131cbff9045dca7e12c5b77b26edde72ca