From 0032947b8eb7fb4b5cec993272e7c49875d5b1f6 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Tue, 4 May 2021 22:01:32 -0700 Subject: [PATCH 01/10] netbsd-rumpkernel: fix license --- srcpkgs/netbsd-rumpkernel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/netbsd-rumpkernel/template b/srcpkgs/netbsd-rumpkernel/template index 630bcf1fb30f..f60c0be54369 100644 --- a/srcpkgs/netbsd-rumpkernel/template +++ b/srcpkgs/netbsd-rumpkernel/template @@ -1,13 +1,13 @@ # Template file for 'netbsd-rumpkernel' pkgname=netbsd-rumpkernel version=20140526 -revision=3 +revision=4 archs="x86_64* i686*" wrksrc="buildrump.sh-${version}" hostmakedepends="git tar" short_desc="NetBSD rump kernel" maintainer="Orphaned " -license="BSD" +license="BSD-2-Clause" homepage="https://github.com/anttikantee/buildrump.sh" distfiles="https://github.com/rumpkernel/buildrump.sh/archive/v${version}.tar.gz" checksum=c39e587868cd36ff5c6fa778aa47dd21dfcc9529409fad02a7fe33ade24a57a8 From 6a697d1c996f2bacac51760e7d3f672310adc899 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Tue, 4 May 2021 22:08:21 -0700 Subject: [PATCH 02/10] netpgp: fix license, other lint --- srcpkgs/netpgp/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template index 2bc40e253d09..08e27d5a40bb 100644 --- a/srcpkgs/netpgp/template +++ b/srcpkgs/netpgp/template @@ -1,13 +1,13 @@ # Template file for 'netpgp' pkgname=netpgp version=20140220 -revision=19 +revision=20 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="zlib-devel bzip2-devel openssl-devel" -short_desc="PGP signing, verification, encryption and decryption program" +short_desc="NetBSD PGP implementation" maintainer="Orphaned " -license="3-clause-BSD" +license="BSD-3-Clause" homepage="http://www.netbsd.org" distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz" checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf @@ -33,7 +33,7 @@ libmj_package() { } } libmj-devel_package() { - short_desc="Minimalist JSON lightweight data interchange library - development files" + short_desc="Minimalist JSON data interchange library - development files" depends="libmj>=${version}_${revision}" pkg_install() { vinstall ${wrksrc}/src/libmj/mj.h 644 usr/include From a627bf82248ea314da48c829dad409b3f8dc46f2 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Tue, 4 May 2021 22:10:23 -0700 Subject: [PATCH 03/10] netpgpverify: fix license --- srcpkgs/netpgpverify/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/netpgpverify/template b/srcpkgs/netpgpverify/template index 03531032da54..77d2f1061805 100644 --- a/srcpkgs/netpgpverify/template +++ b/srcpkgs/netpgpverify/template @@ -1,12 +1,12 @@ # Template file for 'netpgpverify' pkgname=netpgpverify version=20160707 -revision=1 +revision=2 build_style=configure configure_args="--prefix=/usr --mandir=/usr/share/man" short_desc="PGP/SSH standalone verification utility" maintainer="Orphaned " -license="2-clause-BSD" +license="BSD-2-Clause" homepage="http://www.netpgp.com" distfiles="http://www.netpgp.com/src/${pkgname}-${version}.tar.gz" checksum=1eedf30b35cacbf8f39b80fbc4ea6129ba8c7815b0ad7f3d1ae05e521f684b00 From 11217ba9715d27e3c236ae0649e4bfbe6e76e58e Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Tue, 4 May 2021 22:13:27 -0700 Subject: [PATCH 04/10] neverball: fix license --- srcpkgs/neverball/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/neverball/template b/srcpkgs/neverball/template index 9743e97086d6..085ec1c4d084 100644 --- a/srcpkgs/neverball/template +++ b/srcpkgs/neverball/template @@ -1,13 +1,13 @@ # Template file for 'neverball' pkgname=neverball version=1.6.0 -revision=4 +revision=5 hostmakedepends="gettext" makedepends="libpng-devel libjpeg-turbo-devel libvorbis-devel SDL2_ttf-devel physfs-devel" depends="desktop-file-utils" short_desc="Puzzle/action game similar to Super Monkey Ball" maintainer="Orphaned " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://www.neverball.org" distfiles="http://www.neverball.org/$pkgname-$version.tar.gz" checksum=73fe63cca4f96e2d355480d03bc0b2904e83a0abdf65fe8c52db5cc3cca88fa0 From 2d6cfab7e90d763b6e02b98a8b7b868ceb07951b Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Tue, 4 May 2021 22:23:51 -0700 Subject: [PATCH 05/10] newt: fix license, other lint --- srcpkgs/newt/template | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/srcpkgs/newt/template b/srcpkgs/newt/template index 14655c2a10f7..204f714be185 100644 --- a/srcpkgs/newt/template +++ b/srcpkgs/newt/template @@ -1,13 +1,13 @@ # Template file for 'newt' pkgname=newt version=0.52.21 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="python-devel python3-devel" makedepends="slang-devel popt-devel python3-devel python-devel" short_desc="Library for color text mode, widget based user interfaces" maintainer="Enno Boland " -license="GPL-3" +license="LGPL-2.0-only" homepage="https://pagure.io/newt/" distfiles="https://pagure.io/releases/newt/newt-${version}.tar.gz" checksum=265eb46b55d7eaeb887fca7a1d51fe115658882dfe148164b6c49fccac5abb31 @@ -24,14 +24,12 @@ newt-devel_package() { } newt-python_package() { short_desc+=" - Python2 bindings" - pycompile_module="snake.py" pkg_install() { vmove usr/lib/python2* } } newt-python3_package() { short_desc+=" - Python3 bindings" - pycompile_module="snake.py" pkg_install() { vmove usr/lib/python3* } From ac0227d171e5b021d29f3a1e3ee35d6ea82e24aa Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Tue, 4 May 2021 22:26:52 -0700 Subject: [PATCH 06/10] nitrogen: fix license, other lint --- srcpkgs/nitrogen/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nitrogen/template b/srcpkgs/nitrogen/template index 8d06b407a824..55c7fcf05530 100644 --- a/srcpkgs/nitrogen/template +++ b/srcpkgs/nitrogen/template @@ -1,14 +1,14 @@ # Template file for 'nitrogen' pkgname=nitrogen version=1.6.1 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="gtkmm2-devel libXinerama-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="Background browser and setter for X with support for Xinerama" maintainer="Orphaned " +license="GPL-2.0-or-later" homepage="https://github.com/l3ib/nitrogen" -license="GPL-2" distfiles="https://github.com/l3ib/nitrogen/releases/download/${version}/${pkgname}-${version}.tar.gz" checksum=f40213707b7a3be87e556f65521cef8795bd91afda13dfac8f00c3550375837d From 9c1ed5f68e59843e026315b7893e64a9c031a523 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Tue, 4 May 2021 22:28:21 -0700 Subject: [PATCH 07/10] notification-daemon: fix license --- srcpkgs/notification-daemon/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/notification-daemon/template b/srcpkgs/notification-daemon/template index b25032b590c1..9bc1ecd2bdf2 100644 --- a/srcpkgs/notification-daemon/template +++ b/srcpkgs/notification-daemon/template @@ -1,7 +1,7 @@ # Template file for 'notification-daemon' pkgname=notification-daemon version=3.20.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config intltool glib-devel" @@ -9,7 +9,7 @@ makedepends="libglib-devel gtk+3-devel libcanberra-devel" depends="desktop-file-utils" short_desc="Shows notification messages on the desktop" maintainer="Orphaned " +license="GPL-2.0-or-later" homepage="http://www.galago-project.org/specs/notification/" -license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=dd13768f35fd8bba9c4920b0f8269f39270e5a3cfed1a34c3b940a492286ece5 From 1a3c150aa4f736d611e287544b0d78a7d5047d50 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Tue, 4 May 2021 22:37:39 -0700 Subject: [PATCH 08/10] npapi-sdk: fix license, package location --- srcpkgs/npapi-sdk/template | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/srcpkgs/npapi-sdk/template b/srcpkgs/npapi-sdk/template index 384b6efe0d50..cb2021ef8a31 100644 --- a/srcpkgs/npapi-sdk/template +++ b/srcpkgs/npapi-sdk/template @@ -1,11 +1,15 @@ # Template file for 'npapi-sdk' pkgname=npapi-sdk version=0.27.2 -revision=1 +revision=2 build_style=gnu-configure short_desc="Netscape Plugin API (NPAPI)" maintainer="oliver JH " -license="MPL-1.1,GPL-2,LGPL-2.1" -homepage="https://bitbucket.org/mgorny/npapi-sdk" -distfiles="https://bitbucket.org/mgorny/$pkgname/downloads/$pkgname-$version.tar.bz2" +license="BSD-3-Clause" +homepage="https://github.com/mgorny/npapi-sdk" +distfiles="https://github.com/mgorny/npapi-sdk/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.bz2" checksum=01bf34bdd0fcaa546ba3d5c96f5d91f91dd117d4ed5ffe13f56bbd5aa566ae77 + +post_install() { + vlicense COPYING +} From fb955afed28b78a37b2915f5dc197c05f376945c Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Tue, 4 May 2021 22:46:32 -0700 Subject: [PATCH 09/10] ntfs-3g: fix license, other lint --- srcpkgs/ntfs-3g/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ntfs-3g/template b/srcpkgs/ntfs-3g/template index d569ee438741..b17d940d0bb6 100644 --- a/srcpkgs/ntfs-3g/template +++ b/srcpkgs/ntfs-3g/template @@ -1,7 +1,7 @@ # Template file for 'ntfs-3g' pkgname=ntfs-3g version=2017.3.23 -revision=2 +revision=3 wrksrc="${pkgname}_ntfsprogs-${version}" build_style=gnu-configure configure_args="--exec-prefix=/usr --disable-static --with-fuse=external @@ -13,8 +13,8 @@ hostmakedepends="pkg-config" makedepends="libuuid-devel fuse-devel $(vopt_if crypto 'libgcrypt-devel gnutls-devel')" short_desc="Stable Read/Write NTFS Driver in userspace" maintainer="Orphaned " +license="GPL-2.0-or-later, LGPL-2.0-only" homepage="http://www.tuxera.com/community/ntfs-3g-download/" -license="GPL-2" distfiles="http://www.tuxera.com/opensource/${pkgname}_ntfsprogs-${version}.tgz" checksum=3e5a021d7b761261836dcb305370af299793eedbded731df3d6943802e1262d5 From 7785f1edd8bf27b53aaa53d3fcb1e33840565062 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Tue, 4 May 2021 22:58:02 -0700 Subject: [PATCH 10/10] nvi: fix license, other lint --- srcpkgs/nvi/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/nvi/template b/srcpkgs/nvi/template index a24dde6ca225..a0e27bf8ac29 100644 --- a/srcpkgs/nvi/template +++ b/srcpkgs/nvi/template @@ -1,18 +1,18 @@ # Template file for 'nvi' pkgname=nvi version=1.81.6 -revision=16 -patch_args="-Np1" -build_style=gnu-configure +revision=17 build_wrksrc=dist +build_style=gnu-configure makedepends="ncurses-devel db-devel" -short_desc="The Berkeley Vi Editor" +short_desc="Berkeley Vi Editor" maintainer="Enno Boland " -license="BSD" -homepage="http://garage.linux.student.kuleuven.be/~skimo/nvi" +license="BSD-3-Clause" +homepage="https://repo.or.cz/nvi.git" #distfiles="${homepage}/devel/nvi-$version.tar.bz2" distfiles="http://pkgs.fedoraproject.org/repo/pkgs/nvi/nvi-${version}.tar.bz2/88d1e23115ee9f2961186b62e55f5704/nvi-${version}.tar.bz2" checksum=3441b8e3247b2b6dd19b5fd38355fe6593b2a92e960ecb3dd00d676f63d06b59 +patch_args="-Np1" alternatives=" vi:ex:/usr/bin/nex @@ -33,6 +33,7 @@ pre_build() { sed -i -e '/define.*_PATH_MSGCAT/ s/".*"/"\/usr\/share\/vi\/catalog\/"/' pathnames.h } post_install() { + vlicense ../LICENSE # remove cat pages. rm -rf ${DESTDIR}/usr/share/man/cat1 # remove lib.