diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2017-09-09 02:26:34 -0500 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-09-19 10:54:40 +0000 |
| commit | 9eed8a574e55a9113d949cf030bc39d388312c16 (patch) | |
| tree | f5a3d91fe573b0de34ff45341de3abbcc8d33d64 | |
| parent | 7385d5f6f489c896c3e116eb784c5340b3cc9d35 (diff) | |
main/xinit: modernise, fix deps, mark no test
| -rw-r--r-- | main/xinit/APKBUILD | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/main/xinit/APKBUILD b/main/xinit/APKBUILD index ece5de58d69..16d1519b43f 100644 --- a/main/xinit/APKBUILD +++ b/main/xinit/APKBUILD @@ -1,14 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xinit pkgver=1.3.4 -pkgrel=0 +pkgrel=1 pkgdesc="X.Org initialisation program" url="http://xorg.freedesktop.org/" arch="all" license="GPL" +options="!check" # No test suite. subpackages="$pkgname-doc" depends="xauth mcookie xmodmap xrdb" -makedepends="libx11-dev" +makedepends="libx11-dev util-macros" source="http://www.x.org/releases/individual/app/xinit-$pkgver.tar.bz2 06_move_serverauthfile_into_tmp.patch xinitrc @@ -26,25 +27,20 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var \ - --with-xinitdir=/etc/X11/xinit \ - || return 1 - make || return 1 + --with-xinitdir=/etc/X11/xinit + make } package() { cd "$builddir" - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install chmod +x "$pkgdir"/usr/bin/startx install -m755 -d "$pkgdir"/etc/skel - install -m755 -D "$srcdir"/xinitrc "$pkgdir"/etc/X11/xinit/xinitrc \ - || return 1 - install -m755 -D "$srcdir"/Xsession "$pkgdir"/etc/X11/xinit/Xsession \ - || return 1 - install -m755 "$srcdir"/xsession.skel "$pkgdir"/etc/skel/.xsession \ - || return 1 - install -m755 "$srcdir"/xserverrc "$pkgdir"/etc/X11/xinit/xserverrc \ - || return 1 - mkdir -p "$pkgdir"/etc/X11/xinit/xinitrc.d || return 1 + install -m755 -D "$srcdir"/xinitrc "$pkgdir"/etc/X11/xinit/xinitrc + install -m755 -D "$srcdir"/Xsession "$pkgdir"/etc/X11/xinit/Xsession + install -m755 "$srcdir"/xsession.skel "$pkgdir"/etc/skel/.xsession + install -m755 "$srcdir"/xserverrc "$pkgdir"/etc/X11/xinit/xserverrc + mkdir -p "$pkgdir"/etc/X11/xinit/xinitrc.d } md5sums="4e928452dfaf73851413a2d8b8c76388 xinit-1.3.4.tar.bz2 |