From 17959b09e2f94a942b34112f3c609887470abd28 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Wed, 21 Oct 2020 19:04:01 +1100 Subject: [PATCH 01/13] binutils: drop noarch. --- srcpkgs/binutils/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template index 06a279cff2c..976cd6da01f 100644 --- a/srcpkgs/binutils/template +++ b/srcpkgs/binutils/template @@ -1,7 +1,7 @@ # Template file for 'binutils' pkgname=binutils version=2.34 -revision=1 +revision=2 bootstrap=yes short_desc="GNU binary utilities" maintainer="Enno Boland " @@ -120,7 +120,6 @@ binutils-devel_package() { } binutils-doc_package() { - archs=noarch short_desc+=" - info files" pkg_install() { vmove usr/share/info From f69697d75590fe678fe2573de3942ec50c692111 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Wed, 21 Oct 2020 19:04:02 +1100 Subject: [PATCH 02/13] db: drop noarch, xlintify. --- srcpkgs/db/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/db/template b/srcpkgs/db/template index b7519609b9e..2d340913b04 100644 --- a/srcpkgs/db/template +++ b/srcpkgs/db/template @@ -1,17 +1,17 @@ # Template file for 'db' pkgname=db version=5.3.28 -revision=7 +revision=8 wrksrc="db-${version}" build_wrksrc="build_unix" build_style=gnu-configure configure_script="../dist/configure" configure_args="--enable-compat185 --enable-cxx --enable-static --enable-dbm" make_build_args="LIBSO_LIBS=-lpthread" -short_desc="The Berkeley DB embedded database system" +short_desc="Berkeley DB embedded database system" maintainer="Orphaned " +license="BSD-4-Clause" homepage="http://www.oracle.com/technetwork/products/berkeleydb/overview/index.html" -license="BSD" distfiles="http://download.oracle.com/berkeley-db/db-${version}.tar.gz" checksum=e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628 @@ -20,6 +20,7 @@ post_install() { vmkdir usr/share/doc/${pkgname}-${version} mv ${DESTDIR}/usr/docs/* ${DESTDIR}/usr/share/doc/${pkgname}-${version} rmdir ${DESTDIR}/usr/docs + vlicense ../LICENSE } db-devel_package() { @@ -32,7 +33,6 @@ db-devel_package() { } db-doc_package() { short_desc+=" - documentation files" - archs=noarch pkg_install() { vmove usr/share/doc } From 6f1de742e5529c90f96a2f8aba07a86a15da3a20 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Wed, 21 Oct 2020 19:04:02 +1100 Subject: [PATCH 03/13] dnssec-anchors: drop noarch. --- srcpkgs/dnssec-anchors/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/dnssec-anchors/template b/srcpkgs/dnssec-anchors/template index 18b24b4f80d..7bd4a9dceda 100644 --- a/srcpkgs/dnssec-anchors/template +++ b/srcpkgs/dnssec-anchors/template @@ -1,14 +1,13 @@ # Template file for 'dnssec-anchors' pkgname=dnssec-anchors version=20181012 -revision=1 +revision=2 # can be refreshed by a local DNSSEC aware name server. conf_files="/etc/dns/root.key" short_desc="DNSSEC trust anchors for the root zone" maintainer="Leah Neukirchen " license="Public Domain" homepage="http://data.iana.org/root-anchors/" -archs=noarch do_install() { # Generate using unbound-anchor(1). From 750fcd54fb772f06db50c394de7dc6f4021de659 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Wed, 21 Oct 2020 19:04:02 +1100 Subject: [PATCH 04/13] glibc: drop noarch. --- srcpkgs/glibc/template | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template index 4ea327aa1fa..67dea99a6f5 100644 --- a/srcpkgs/glibc/template +++ b/srcpkgs/glibc/template @@ -1,7 +1,7 @@ # Template file for 'glibc' pkgname=glibc version=2.30 -revision=1 +revision=2 bootstrap=yes short_desc="GNU C library" maintainer="Enno Boland " @@ -143,7 +143,6 @@ do_install() { # ldd is a bash script, so make it run as such. replace_interpreter bash ${DESTDIR}/usr/bin/ldd - rtldlist="" # On x86_64, add dynamic linker's 32bit version to ldd, # on ppc64 substitute with our own dynamic linker path case "$XBPS_TARGET_MACHINE" in @@ -201,7 +200,6 @@ glibc-devel_package() { } } glibc-locales_package() { - archs="noarch" conf_files="/etc/default/libc-locales" short_desc+=" - locale data files" pkg_install() { From 390e83869b9f1f81909c5bab976b857da81bd462 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Wed, 21 Oct 2020 19:04:02 +1100 Subject: [PATCH 05/13] groff: drop noarch. --- srcpkgs/groff/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/groff/template b/srcpkgs/groff/template index 396313d3805..e58613b4c63 100644 --- a/srcpkgs/groff/template +++ b/srcpkgs/groff/template @@ -6,7 +6,7 @@ build_style=gnu-configure configure_args="--without-x --disable-rpath" hostmakedepends="texinfo perl bison" makedepends="zlib-devel" -short_desc="The GNU troff text-formatting system" +short_desc="GNU troff text-formatting system" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/groff/groff.html" From 5c7477d99e6735ad3863ad4c410ce176c6ebb172 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Wed, 21 Oct 2020 19:04:02 +1100 Subject: [PATCH 06/13] ipw2100-firmware: drop noarch, xlinitify. --- srcpkgs/ipw2100-firmware/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ipw2100-firmware/template b/srcpkgs/ipw2100-firmware/template index 91d72d07724..7a6c9fcabc2 100644 --- a/srcpkgs/ipw2100-firmware/template +++ b/srcpkgs/ipw2100-firmware/template @@ -2,13 +2,12 @@ pkgname=ipw2100-firmware _distname=ipw2100-fw version=1.3 -revision=5 -archs=noarch +revision=6 wrksrc="${_distname}-${version}" create_wrksrc=yes short_desc="Firmware for the Intel PRO/Wireless 2100 wifi cards" maintainer="Orphaned " -license="Custom" +license="custom:IPW2100-EULA" homepage="http://ipw2100.sourceforge.net/" distfiles="http://firmware.openbsd.org/firmware-dist/${_distname}-${version}.tgz" checksum=e1107c455e48d324a616b47a622593bc8413dcce72026f72731c0b03dae3a7a2 From a520740f9d881d204cefdaed9c703ef75af8ccc8 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Wed, 21 Oct 2020 19:04:03 +1100 Subject: [PATCH 07/13] ipw2200-firmware: drop noarch, xlintify. --- srcpkgs/ipw2200-firmware/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/ipw2200-firmware/template b/srcpkgs/ipw2200-firmware/template index f6accfe3dbb..30f9ad3c06b 100644 --- a/srcpkgs/ipw2200-firmware/template +++ b/srcpkgs/ipw2200-firmware/template @@ -2,12 +2,11 @@ pkgname=ipw2200-firmware _distname=ipw2200-fw version=3.1 -revision=5 -archs=noarch +revision=6 wrksrc="${_distname}-${version}" short_desc="Firmware for the Intel PRO/Wireless 2200BG wifi cards" maintainer="Orphaned " -license="Custom" +license="custom:IPW2200-EULA" homepage="http://ipw2200.sourceforge.net/" distfiles="http://firmware.openbsd.org/firmware-dist/${_distname}-${version}.tgz" checksum=c6818c11c18cc030d55ff83f64b2bad8feef485e7742f84f94a61d811a6258bd @@ -16,5 +15,5 @@ do_install() { vmkdir usr/lib/firmware vmkdir usr/share/licenses/$pkgname install -m644 *.fw ${DESTDIR}/usr/lib/firmware - install -m644 LICENSE* ${DESTDIR}/usr/share/licenses/$pkgname + vlicense LICENSE.ipw2200-fw } From 50cf312ff3a96c09653e3e102bd83c20efc1494d Mon Sep 17 00:00:00 2001 From: fosslinux Date: Wed, 21 Oct 2020 19:04:03 +1100 Subject: [PATCH 08/13] kbd: drop noarch. --- srcpkgs/kbd/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/kbd/template b/srcpkgs/kbd/template index 2680406aae9..47604e8ad55 100644 --- a/srcpkgs/kbd/template +++ b/srcpkgs/kbd/template @@ -1,7 +1,7 @@ # Template file for 'kbd' pkgname=kbd version=2.3.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--datadir=/usr/share/kbd --localedir=/usr/share/kbd/locale" hostmakedepends="automake libtool gettext-devel flex pkg-config" @@ -53,7 +53,6 @@ post_install() { kbd-data_package() { short_desc+=" - keymaps, console fonts and unicode maps" replaces="kbd<2.0.1_1" - archs=noarch pkg_install() { vmove usr/share/kbd/consolefonts vmove usr/share/kbd/consoletrans From b0e38afbedfee69b57bce91dd7dc656d2f32a791 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Wed, 21 Oct 2020 19:04:03 +1100 Subject: [PATCH 09/13] ncurses: drop noarch. --- srcpkgs/ncurses/template | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/srcpkgs/ncurses/template b/srcpkgs/ncurses/template index d1bb2ae3aa8..f6f70b36e06 100644 --- a/srcpkgs/ncurses/template +++ b/srcpkgs/ncurses/template @@ -1,7 +1,7 @@ # Template file for 'ncurses' pkgname=ncurses version=6.2 -revision=3 +revision=4 bootstrap=yes configure_args="--enable-big-core" short_desc="System V Release 4.0 curses emulation library" @@ -131,7 +131,6 @@ ncurses-devel_package() { } ncurses-base_package() { short_desc+=" - base terminfo files" - archs=noarch pkg_install() { cat ${FILESDIR}/base-files | while read line; do vmove ${line} @@ -141,7 +140,6 @@ ncurses-base_package() { ncurses-term_package() { depends="ncurses-base-${version}_${revision}" short_desc+=" - full terminal descriptions" - archs=noarch pkg_install() { vmove usr/share/tabset vmove usr/share/terminfo From 4fb970017b19358a82032dc4ec59c1bb4a2ff7c9 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Wed, 21 Oct 2020 19:04:03 +1100 Subject: [PATCH 10/13] pam-base: drop noarch, xlintify. Public Domain is not a SPDX license, but then again, we don't have anything to vlicense... --- srcpkgs/pam-base/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/pam-base/template b/srcpkgs/pam-base/template index 216cea3679f..883f3d4f465 100644 --- a/srcpkgs/pam-base/template +++ b/srcpkgs/pam-base/template @@ -1,11 +1,10 @@ # Template file for 'pam-base' pkgname=pam-base version=0.3 -revision=5 -archs=noarch +revision=6 short_desc="PAM base configuration files" maintainer="Orphaned " -license="public domain" +license="custom:Public Domain" homepage="http://www.voidlinux.org" conf_files=" From 77d8c7f68a810d1f515a56be98c83cb887d0f210 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Wed, 21 Oct 2020 19:04:03 +1100 Subject: [PATCH 11/13] void-artwork: drop noarch, xlintify. --- srcpkgs/void-artwork/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/void-artwork/template b/srcpkgs/void-artwork/template index ecfc2b9b5e6..d02a5a0fa3b 100644 --- a/srcpkgs/void-artwork/template +++ b/srcpkgs/void-artwork/template @@ -1,11 +1,10 @@ # Template file for 'void-artwork' pkgname=void-artwork version=20170517 -revision=2 -archs=noarch +revision=3 short_desc="Void Linux artwork" maintainer="Enno Boland " -license="Public domain" +license="custom:Public Domain" homepage="http://www.voidlinux.org" do_install() { From 87d7da8ae0a3334333d4b59bdf0c61709180b7d9 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Wed, 21 Oct 2020 19:04:03 +1100 Subject: [PATCH 12/13] wifi-firmware: drop noarch. --- srcpkgs/wifi-firmware/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/wifi-firmware/template b/srcpkgs/wifi-firmware/template index d48d21b3aec..9d3bff83c3b 100644 --- a/srcpkgs/wifi-firmware/template +++ b/srcpkgs/wifi-firmware/template @@ -1,8 +1,7 @@ # Template file for 'wifi-firmware' pkgname=wifi-firmware version=1.3 -revision=3 -archs=noarch +revision=4 build_style=meta depends="ipw2100-firmware ipw2200-firmware zd1211-firmware" short_desc="WiFi firmware meta-package" From 3fc35a50f844c2789efdd0055160ecf681cfdfad Mon Sep 17 00:00:00 2001 From: fosslinux Date: Wed, 21 Oct 2020 19:04:03 +1100 Subject: [PATCH 13/13] zd1211-firmware: drop noarch. [ci skip] --- srcpkgs/zd1211-firmware/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/zd1211-firmware/template b/srcpkgs/zd1211-firmware/template index d53a71b7fde..a5e81a1774b 100644 --- a/srcpkgs/zd1211-firmware/template +++ b/srcpkgs/zd1211-firmware/template @@ -1,8 +1,7 @@ # Template file for 'zd1211-firmware' pkgname=zd1211-firmware version=1.5 -revision=2 -archs=noarch +revision=3 wrksrc="${pkgname}" short_desc="Firmware for the Zydas 1211 wifi cards" maintainer="Orphaned "