aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2015-11-03 15:06:03 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2015-11-03 14:21:24 +0000
commit53e59eb87c4e5d91691d377c4128bbd6ebde4403 (patch)
tree4cd8b28c8c455019d7e268eaf4eb84d08e60405e
parented161c66b23692c9818701a1da04c14c6d542b04 (diff)
downloadaports-53e59eb87c4e5d91691d377c4128bbd6ebde4403.tar.bz2
aports-53e59eb87c4e5d91691d377c4128bbd6ebde4403.tar.xz
main/xorg-server: Don't conflict with xf86-input-evdev
-rw-r--r--main/xorg-server/APKBUILD5
1 files changed, 4 insertions, 1 deletions
diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD
index 962ea8a3f0..dabf2e7073 100644
--- a/main/xorg-server/APKBUILD
+++ b/main/xorg-server/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xorg-server
pkgver=1.17.4
-pkgrel=0
+pkgrel=1
pkgdesc="X.Org X servers"
url="http://xorg.freedesktop.org"
arch="all"
@@ -145,6 +145,9 @@ package() {
make -j1 DESTDIR="$pkgdir" install || return 1
chmod u+s "$pkgdir"/usr/bin/Xorg
+ # Don't conflict with xf86-input-evdev
+ rm -f "$pkgdir"/usr/share/X11/xorg.conf.d/10-evdev.conf || return 1
+
install -m755 -d "$pkgdir"/etc/X11/xorg.conf.d || return 1
install -m644 "$srcdir"/20-modules.conf "$pkgdir"/etc/X11/xorg.conf.d/ \
|| return 1