diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-05-31 14:29:41 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-05-31 16:30:51 +0200 |
| commit | bc37d83ebc13d00e846db7157ae10e4fd05285cb (patch) | |
| tree | 4797c7b17f39e41f89d1732810227b4c1c00bd9e /main | |
| parent | d2b9ac4f2df9f3cb0899f67bfaf17fc03340d5b6 (diff) | |
| download | aports-bc37d83ebc13d00e846db7157ae10e4fd05285cb.tar.bz2 aports-bc37d83ebc13d00e846db7157ae10e4fd05285cb.tar.xz | |
main/man-pages: fix conflict with libbsd-doc
(cherry picked from commit 8189ff577aca44753cbe089c786fc62b26c5e190)
Diffstat (limited to 'main')
| -rw-r--r-- | main/man-pages/APKBUILD | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/main/man-pages/APKBUILD b/main/man-pages/APKBUILD index 1955e56403..588739ff72 100644 --- a/main/man-pages/APKBUILD +++ b/main/man-pages/APKBUILD @@ -3,7 +3,7 @@ pkgname=man-pages pkgver=4.11 _posixver=2013-a -pkgrel=0 +pkgrel=1 pkgdesc="Linux man pages" url="http://www.kernel.org/doc/man-pages/" arch="noarch" @@ -11,8 +11,8 @@ license="GPL" depends="" makedepends="" options="!strip !check" -source="http://www.kernel.org/pub/linux/docs/$pkgname/$pkgname-$pkgver.tar.xz - http://www.kernel.org/pub/linux/docs/$pkgname/$pkgname-posix/$pkgname-posix-${_posixver}.tar.xz +source="https://cdn.kernel.org/pub/linux/docs/$pkgname/$pkgname-$pkgver.tar.xz + https://cdn.kernel.org/pub/linux/docs/$pkgname/$pkgname-posix/$pkgname-posix-${_posixver}.tar.xz " builddir="$srcdir"/$pkgname-$pkgver @@ -46,6 +46,9 @@ package() { "$pkgdir"/usr/share/man/man8/tzselect* \ "$pkgdir"/usr/share/man/man8/zic* \ "$pkgdir"/usr/share/man/man8/zdump* + + # provided by libbsd + rm -f "$pkgdir"/usr/share/man/man3/explicit_bzero* } sha512sums="cc1282467255d5c078b099ab6dbc407c5f56fa66fb3f5789286bc66c98b229cae88bf8afdafa7c9609a37c87cdb1401bb381cec25c64690ab69faf4d00787187 man-pages-4.11.tar.xz |