From 3eab13e7ba7e0cac7bde269acd28c20dbad47a0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=2E=20Stani=C4=87?= <mps@arvanta.net>
Date: Fri, 3 May 2024 14:20:37 +0000
Subject: [PATCH] main/man-pages: upgrade to 6.7
add coreutils to makedepends and use install from it
remove no-install-T.patch
refactor gnumakefile-shell.patch
---
main/man-pages/APKBUILD | 9 ++++---
main/man-pages/gnumakefile-shell.patch | 14 +++++------
main/man-pages/no-install-T.patch | 33 --------------------------
3 files changed, 11 insertions(+), 45 deletions(-)
delete mode 100644 main/man-pages/no-install-T.patch
diff --git a/main/man-pages/APKBUILD b/main/man-pages/APKBUILD
index 190e84787a93..f1e7afd46ed7 100644
--- a/main/man-pages/APKBUILD
+++ b/main/man-pages/APKBUILD
@@ -1,15 +1,15 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=man-pages
-pkgver=6.06
+pkgver=6.7
pkgrel=0
pkgdesc="Linux man pages"
url="https://www.kernel.org/doc/man-pages/"
arch="noarch"
license="GPL-2.0-or-later"
+makedepends="coreutils" # need gnu install
source="https://cdn.kernel.org/pub/linux/docs/man-pages/man-pages-$pkgver.tar.xz
gnumakefile-shell.patch
- no-install-T.patch
"
# just manpages
options="!check"
@@ -48,7 +48,6 @@ package() {
}
sha512sums="
-c50b5a47cff5172e46752b61af4dd9f54ee0be88ab69bcc5914bd8ce5ddfaf7358143bea9f69bd6a45f0420eb5eb4596c2200109b23fe98a5221dd01e4a8ea15 man-pages-6.06.tar.xz
-1a11f3c6d15198e1eae7cc81c62fcecffce7a0a3690c1d00c312b749f4556b824dd8b87a96910da2936ecb94cefb52be8e957edaa38a201823629d66113c4b7d gnumakefile-shell.patch
-ee68e51fc13f058410b95236ae7cc7217531af39e15f6ca6ff5595efa1a7d10e1ef17da1499114e5e03e77268bb9ba0fb6732bf53958c4de744c43baed435005 no-install-T.patch
+6706bf1fcb1f60b2281c0ee1cf00edad3d883d75a14b861f9e6bba03cc56fac81cb3176ffce546ca043dc3f19e89fb6e9cec724e7bb1bb5ede19ea701cee15a2 man-pages-6.7.tar.xz
+a2c889288d5ebad8277fbdceea9b91d9eb1e522c8b1c2a0d35d0aaf83db89e03d5b45a156d6d5671f721ec68b86bea4fc5b830267295b2fef17c59cdefe6f156 gnumakefile-shell.patch
"
diff --git a/main/man-pages/gnumakefile-shell.patch b/main/man-pages/gnumakefile-shell.patch
index 7825028e47ac..e0c2ed74aa9d 100644
--- a/main/man-pages/gnumakefile-shell.patch
+++ b/main/man-pages/gnumakefile-shell.patch
@@ -1,12 +1,12 @@
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -21,8 +21,8 @@
- ########################################################################
+--- a/GNUmakefile 2024-05-03 13:21:43.669859309 +0000
++++ b/GNUmakefile 2024-05-03 13:26:15.463773574 +0000
+@@ -3,8 +3,8 @@
--SHELL := /usr/bin/env
--.SHELLFLAGS := -S bash -Eeuo pipefail -c
-+SHELL := /bin/sh
+ BASH := bash
+-SHELL := /usr/bin/env
+-.SHELLFLAGS := -S '$(BASH) -Eeuo pipefail -c'
++SHELL := /bin/sh
+.SHELLFLAGS := -Eeuo pipefail -c
diff --git a/main/man-pages/no-install-T.patch b/main/man-pages/no-install-T.patch
deleted file mode 100644
index 4f41192eeed1..000000000000
--- a/main/man-pages/no-install-T.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/share/mk/dist.mk
-+++ b/share/mk/dist.mk
-@@ -49,7 +49,7 @@
- <$< \
- $(SED) "/^.TH/s/(date)/$$(git log --format=%cs -1 -- $< $(HIDE_ERR))/" \
- | $(SED) '/^.TH/s/(unreleased)/$(DISTVERSION)/' \
-- | $(INSTALL_DATA) -T /dev/stdin $@
-+ | $(INSTALL_DATA) /dev/stdin $@
-
- $(_DISTOTHERS): $(_DISTDIR)/%: $(srcdir)/% $(MK) | $$(@D)/
- $(info CP $@)
---- a/share/mk/install/html.mk
-+++ b/share/mk/install/html.mk
-@@ -23,7 +23,7 @@
-
- $(_htmlpages): $(_htmldir)/%: $(_HTMLDIR)/% $(MK) | $$(@D)/
- $(info INSTALL $@)
-- $(INSTALL_DATA) -T $< $@
-+ $(INSTALL_DATA) $< $@
-
-
- .PHONY: install-html
---- a/share/mk/install/man.mk
-+++ b/share/mk/install/man.mk
-@@ -63,7 +63,7 @@
- <$< \
- $(SED) $(foreach s, $(MANSECTIONS), \
- -e '/^\.so /s, man$(s)/\(.*\)\.$(s)$$, $(notdir $(man$(s)dir))/\1$(man$(s)ext)$(Z),') \
-- | $(INSTALL_DATA) -T /dev/stdin $@
-+ | $(INSTALL_DATA) /dev/stdin $@
- ifeq ($(LINK_PAGES),symlink)
- if $(GREP) '^\.so ' <$@ >/dev/null; then \
- $(GREP) '^\.so ' <$@ \
--
GitLab