Subject: [alpine-aports] [PATCH] main/man-pages: don't conflict with mdocml

From: Sören Tempel <[email-masked]>
Date: Thu, 13 Aug 2015 13:02:32 +0200

---
 main/man-pages/APKBUILD | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/main/man-pages/APKBUILD b/main/man-pages/APKBUILD
index 3004d68..c727e11 100644
--- a/main/man-pages/APKBUILD
+++ b/main/man-pages/APKBUILD
@@ -2,12 +2,12 @@
 pkgname=man-pages
 pkgver=4.02
 _posixver=2003-a
-pkgrel=2
+pkgrel=3
 pkgdesc="Linux man pages"
 url="http://www.kernel.org/doc/man-pages/"
 arch="noarch"
 license="GPL"
-depends=
+depends=""
 makedepends=""
 options="!strip"
 source="http://www.kernel.org/pub/linux/docs/man-pages/man-pages-$pkgver.tar.xz
@@ -43,9 +43,13 @@ package() {
 	make prefix="$pkgdir"/usr install || return 1
 
 	# provided by libiconv-doc
-	rm "$pkgdir"/usr/share/man/man3/iconv*
+	rm -f "$pkgdir"/usr/share/man/man3/iconv*
 
+	# provided by mdocml
+	rm -f "$pkgdir"/usr/share/man/man7/man* \
+		"$pkgdir"/usr/share/man/man7/mdoc*
 }
+
 md5sums="6c5692af39eb5fe468a8bd1f110b0edd  man-pages-4.02.tar.xz
 7c78aff03c0a6767ba483d34f19e4b09  man-pages-posix-2003-a.tar.bz2
 a1c5e5e809d366b0a94b311f3baaf2b5  mktemp-invalid-argument.patch"
-- 
2.5.0

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---

---

From: Sören Tempel <[email-masked]>
Date: Thu, 13 Aug 2015 13:06:26 +0200

---
 main/man-pages/APKBUILD | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/main/man-pages/APKBUILD b/main/man-pages/APKBUILD
index c727e11..bc47610 100644
--- a/main/man-pages/APKBUILD
+++ b/main/man-pages/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=man-pages
 pkgver=4.02
-_posixver=2003-a
-pkgrel=3
+_posixver=2013-a
+pkgrel=4
 pkgdesc="Linux man pages"
 url="http://www.kernel.org/doc/man-pages/"
 arch="noarch"
@@ -11,7 +11,7 @@ depends=""
 makedepends=""
 options="!strip"
 source="http://www.kernel.org/pub/linux/docs/man-pages/man-pages-$pkgver.tar.xz
-	http://www.kernel.org/pub/linux/docs/$pkgname/$pkgname-posix/$pkgname-posix-${_posixver}.tar.bz2
+	http://www.kernel.org/pub/linux/docs/$pkgname/$pkgname-posix/$pkgname-posix-${_posixver}.tar.xz
 	mktemp-invalid-argument.patch"
 
 prepare() {
@@ -51,11 +51,11 @@ package() {
 }
 
 md5sums="6c5692af39eb5fe468a8bd1f110b0edd  man-pages-4.02.tar.xz
-7c78aff03c0a6767ba483d34f19e4b09  man-pages-posix-2003-a.tar.bz2
+825fde78e6fddd02426ecdd50e2cbe0d  man-pages-posix-2013-a.tar.xz
 a1c5e5e809d366b0a94b311f3baaf2b5  mktemp-invalid-argument.patch"
 sha256sums="48aacb75d522dd31978682c4fd8bc68e43c9a409bc4c7a126810e7610dff0dd3  man-pages-4.02.tar.xz
-e355b1b7bbccd4cef6b4a38dccf090e4535e038c21a9985c19891f21173d49ea  man-pages-posix-2003-a.tar.bz2
+19633a5c75ff7deab35b1d2c3d5b7748e7bd4ef4ab598b647bb7e7f60b90a808  man-pages-posix-2013-a.tar.xz
 363aebb15bdc8326a0996d8f8af3d67bfe933282251d5f921ccebc91b92b3075  mktemp-invalid-argument.patch"
 sha512sums="7a9c2464b25409a5aa1e074f6a511fa9e924c830205dddf5efcfca72ff5c1105a5c32cf24ba3c796063078dd28f715588cc0706ff49f3f11a0671636d0e30668  man-pages-4.02.tar.xz
-70d1e1e5ceb3095323bfe2c85bfd5661e25fd77469a4b18eb9806f327cb65a030c2ea51185577d6230aec1778185ee2d4385f677af3069d28ab07e9373857024  man-pages-posix-2003-a.tar.bz2
+e6ec8eb57269fadf368aeaac31b5a98b9c71723d4d5cc189f9c4642d6e865c88e44f77481dccbdb72e31526488eb531f624d455016361687a834ccfcac19fa14  man-pages-posix-2013-a.tar.xz
 8e0b8302419bbf38013c887b3b2c92f6cc6566a8fa39378d00657d4ed27704e2de47d1efabeabe6219629335e69cb469bf09f886fd85a381cfc11c515c86821d  mktemp-invalid-argument.patch"
-- 
2.5.0

---