[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD)

[Jan de Groot]

    Date: Monday, November 15, 2010 @ 06:06:22
  Author: jgc
Revision: 99539

upgpkg: xorg-xinit 1.3.0-1
Update to 1.3.0, now supports xinitrc.d directory

Modified:
  xorg-xinit/trunk/PKGBUILD

----------+
 PKGBUILD |   23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2010-11-15 10:37:25 UTC (rev 99538)
+++ PKGBUILD    2010-11-15 11:06:22 UTC (rev 99539)
@@ -2,14 +2,14 @@
 # Maintainer: Alexander Baldeck <alexan...@archlinux.org>
 # Contributor: Jan de Groot <j...@archlinux.org>
 pkgname=xorg-xinit
-pkgver=1.2.1
+pkgver=1.3.0
 pkgrel=1
 pkgdesc="X.Org initialisation program "
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/";
 depends=('libx11' 'xorg-xauth')
-makedepends=('pkgconfig')
+makedepends=('xorg-util-macros')
 optdepends=('xorg-twm' 'xterm')
 backup=('etc/skel/.xinitrc'
         'etc/skel/.xsession'
@@ -22,7 +22,7 @@
         xsession
         xserverrc)
 options=(!emptydirs)
-md5sums=('56f2d202b3dc10fcd21931a67bb270f7'
+md5sums=('bc4e8b7d1919597cc37a0d24aa149dda'
          'abd072ec435ce084cf4e89c58f83d45c'
          'cee2d70748a089fbc7db64a4a6e8fdb1'
          '7873d97db30d6c279ed37e3559e7c59d'
@@ -30,16 +30,15 @@
 
 build() {
   cd "${srcdir}/xinit-${pkgver}"
-  patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff" || return 1
-  ./configure --prefix=/usr || return 1
-  make XINITDIR=/etc/X11/xinit || return 1
-  make XINITDIR=/etc/X11/xinit DESTDIR="${pkgdir}" install || return 1
+  patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
+  ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
+  make
+  make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/etc/skel"
-  install -m755 -d "${pkgdir}/etc/X11/xinit"
-  install -m644 "${srcdir}/xinitrc" "${pkgdir}/etc/skel/.xinitrc" || return 1
-  install -m644 "${srcdir}/xsession" "${pkgdir}/etc/skel/.xsession" || return 1
-  install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc" || 
return 1
+  install -m644 "${srcdir}/xinitrc" "${pkgdir}/etc/skel/.xinitrc"
+  install -m644 "${srcdir}/xsession" "${pkgdir}/etc/skel/.xsession"
+  install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc"
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }