aboutsummaryrefslogtreecommitdiffstats
path: root/main/nginx
diff options
context:
space:
mode:
authorValery Kartel <valery.kartel@gmail.com>2016-06-03 17:31:51 +0300
committerNatanael Copa <ncopa@alpinelinux.org>2016-06-03 14:41:04 +0000
commit1bdad196b644074c06aa25aee4f46d2a69b09757 (patch)
treeedf35c144b33bee0aaded762415544a9242a0080 /main/nginx
parent910011586e352662e691afcebd578829ec4f40b2 (diff)
downloadaports-1bdad196b644074c06aa25aee4f46d2a69b09757.tar.bz2
aports-1bdad196b644074c06aa25aee4f46d2a69b09757.tar.xz
main/nginx: fix collision with deprecated package "nginx-initscripts"
ref #5671
Diffstat (limited to 'main/nginx')
-rw-r--r--main/nginx/APKBUILD3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/nginx/APKBUILD b/main/nginx/APKBUILD
index 646313ca32..3bea5b503d 100644
--- a/main/nginx/APKBUILD
+++ b/main/nginx/APKBUILD
@@ -4,7 +4,7 @@
pkgname=nginx
pkgver=1.10.1
-pkgrel=0
+pkgrel=1
pkgdesc="HTTP and reverse proxy server"
url="http://www.nginx.org/en"
arch="all"
@@ -134,6 +134,7 @@ package() {
common() {
pkgdesc="$pkgdesc (common files)"
depends=
+ replaces="nginx-initscripts"
arch="noarch"
mkdir -p "$subpkgdir"
mv "$pkgdir"/etc "$pkgdir"/var "$subpkgdir"/