From 8ff189f95e10ea5a539167d2e88727608f4b5ed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 11 May 2022 21:35:45 +0200 Subject: [PATCH 1/6] perl-Stow: replace with stow --- srcpkgs/perl-Stow | 1 + srcpkgs/perl-Stow/template | 15 --------------- srcpkgs/stow/template | 8 +++++++- 3 files changed, 8 insertions(+), 16 deletions(-) create mode 120000 srcpkgs/perl-Stow delete mode 100644 srcpkgs/perl-Stow/template diff --git a/srcpkgs/perl-Stow b/srcpkgs/perl-Stow new file mode 120000 index 000000000000..1466463c80cd --- /dev/null +++ b/srcpkgs/perl-Stow @@ -0,0 +1 @@ +stow \ No newline at end of file diff --git a/srcpkgs/perl-Stow/template b/srcpkgs/perl-Stow/template deleted file mode 100644 index 33dfbcc7cf05..000000000000 --- a/srcpkgs/perl-Stow/template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'perl-Stow' -pkgname=perl-Stow -version=2.3.1 -revision=2 -wrksrc="Stow-v${version}" -build_style=perl-ModuleBuild -hostmakedepends="perl perl-Module-Build perl-Test-Output perl-IO-stringy" -makedepends="${hostmakedepends}" -depends="${makedepends}" -short_desc="Perl module for managing symlinks" -maintainer="Martin Harrigan " -license="GPL-3.0-or-later" -homepage="https://metacpan.org/release/Stow" -distfiles="${CPAN_SITE}/Finance/ASPIERS/Stow-v${version}.tar.gz" -checksum=5062a1f8d0c03e38aca5cf46b72de0cba03f901279729338b7b2f93e518182d8 diff --git a/srcpkgs/stow/template b/srcpkgs/stow/template index cb6eb1aa1199..f20c72acbc16 100644 --- a/srcpkgs/stow/template +++ b/srcpkgs/stow/template @@ -1,7 +1,7 @@ # Template file for 'stow' pkgname=stow version=2.3.1 -revision=3 +revision=4 build_style=gnu-configure make_check_target="test" hostmakedepends="perl" @@ -14,3 +14,9 @@ license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/stow/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=09d5d99671b78537fd9b2c0b39a5e9761a7a0e979f6fdb7eabfa58ee45f03d4b + +perl-Stow_package() { + build_style=meta + depends="stow>=${version}_${revision}" + short_desc+=" (transitional dummy package)" +} From bdc313700d6100fa70b56b1c924f97db7de05020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 11 May 2022 23:49:38 +0200 Subject: [PATCH 2/6] bash-completion: resolve conflict with pacman --- srcpkgs/bash-completion/template | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/srcpkgs/bash-completion/template b/srcpkgs/bash-completion/template index 8908de525e82..74d80d5f5dde 100644 --- a/srcpkgs/bash-completion/template +++ b/srcpkgs/bash-completion/template @@ -1,7 +1,7 @@ # Template file for 'bash-completion' pkgname=bash-completion version=2.11 -revision=3 +revision=4 build_style=gnu-configure make_install_args="profiledir=/etc/bash/bashrc.d" depends="bash" @@ -60,3 +60,8 @@ pre_check() { done export PYTEST_ADDOPTS } + +post_install() { + # for slackware's that we don't have, conflicts with pacman's + rm ${DESTDIR}/usr/share/bash-completion/completions/makepkg +} From eb0a5616f082a10b4f69e5cf1c61ec4f2db582bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 11 May 2022 23:50:21 +0200 Subject: [PATCH 3/6] bff-apankrat: resolve conflict with bff --- srcpkgs/bff-apankrat/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bff-apankrat/template b/srcpkgs/bff-apankrat/template index 452aa4c3f0b7..9355d1ef7e38 100644 --- a/srcpkgs/bff-apankrat/template +++ b/srcpkgs/bff-apankrat/template @@ -1,7 +1,7 @@ # Template file for 'bff-apankrat' pkgname=bff-apankrat version=1.0.7 -revision=1 +revision=2 wrksrc="bff-${version}" build_style=gnu-makefile short_desc="Moderately-optimizing brainfuck interpreter" @@ -12,7 +12,7 @@ distfiles="https://github.com/apankrat/bff/archive/v${version}.tar.gz" checksum=1f8787f8bc12ae4282112dabc5b85f03002269dce57023ee0443250d5a68702f do_install() { - vbin bff + vbin bff bff-apankrat head -n 13 bff.c > LICENSE vlicense LICENSE } From cc272baac0454c2b749b853ac8b7c0a1068e4ec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 11 May 2022 23:54:43 +0200 Subject: [PATCH 4/6] nullmailer: provide smtp-server - resolve conflict with other `smtp-server`s - fix tests --- srcpkgs/nullmailer/template | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/srcpkgs/nullmailer/template b/srcpkgs/nullmailer/template index 16a0bc618ef8..0812b846f8ec 100644 --- a/srcpkgs/nullmailer/template +++ b/srcpkgs/nullmailer/template @@ -1,7 +1,7 @@ # Template file for 'nullmailer' pkgname=nullmailer version=2.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-tls" conf_files="/etc/nullmailer/*" @@ -10,6 +10,7 @@ make_dirs=" /var/spool/nullmailer/queue 0700 _nullmail root /var/spool/nullmailer/tmp 0700 _nullmail root" makedepends="gnutls-devel" +checkdepends="daemontools ucspi-tcp" short_desc="Simple relay-only mail transport agent" maintainer="Deneys S. Maartens " license="GPL-2.0-or-later" @@ -17,6 +18,13 @@ homepage="https://untroubled.org/nullmailer/" distfiles="https://untroubled.org/nullmailer/archive/nullmailer-${version}.tar.gz" checksum=9886fa627b7e7e775e2f09fbe789247b1ca304f152da04ff705e50079263a855 system_accounts="_nullmail" +provides="smtp-server-0_1" +replaces="smtp-server>=0" + +pre_check() { + # Hangs, possibly missing test data + vsed -i test/tests/smtp-auth -e '/Testing auth permanent failure with smtp/,/error/d' +} post_install() { for f in mailq sendmail; do From 17677d5560b213b2b35a8f1bf34a119ebf4ef7cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 11 May 2022 23:55:13 +0200 Subject: [PATCH 5/6] qdirstat-cache-writer: resolve conflict with qdirstat --- srcpkgs/qdirstat/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qdirstat/template b/srcpkgs/qdirstat/template index 5016c664a012..d297cd50e41a 100644 --- a/srcpkgs/qdirstat/template +++ b/srcpkgs/qdirstat/template @@ -1,7 +1,7 @@ # Template file for 'qdirstat' pkgname=qdirstat version=1.8 -revision=3 +revision=4 build_style=qmake hostmakedepends="qt5-qmake qt5-host-tools" makedepends="zlib-devel qt5-devel" @@ -21,6 +21,6 @@ qdirstat-cache-writer_package() { depends="perl" pkg_install() { vmove usr/bin/qdirstat-cache-writer - vman man/qdirstat-cache-writer.1 + vmove usr/share/man/man1/qdirstat-cache-writer.1.gz } } From 186523647f5d223d7a79d84aa3ecd14307701916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Wed, 11 May 2022 23:55:29 +0200 Subject: [PATCH 6/6] zsh-completions: resolve conflict with cheat --- srcpkgs/zsh-completions/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/zsh-completions/template b/srcpkgs/zsh-completions/template index db1fa7a5f517..dfbb5cde85b8 100644 --- a/srcpkgs/zsh-completions/template +++ b/srcpkgs/zsh-completions/template @@ -1,7 +1,7 @@ # Template file for 'zsh-completions' pkgname=zsh-completions version=0.33.0 -revision=1 +revision=2 depends="zsh" short_desc="Additional completions for Zsh" maintainer="Alexander Gehrke " @@ -16,6 +16,7 @@ post_patch() { do_install() { vmkdir usr/share/zsh/site-functions/ + rm src/_cheat # cheat package includes better one vcopy src/_* usr/share/zsh/site-functions/ vlicense LICENSE }