[arch-commits] Commit in xconq/repos (3 files)

[Jan de Groot]

    Date: Sunday, December 21, 2008 @ 12:54:27
  Author: jgc
Revision: 22080

Fix conflict

Added:
  xconq/repos/extra-x86_64/xconq.install
    (from rev 22076, xconq/trunk/xconq.install)
Modified:
  xconq/repos/extra-x86_64/	(properties)
  xconq/repos/extra-x86_64/PKGBUILD

---------------+
 PKGBUILD      |   35 +++++++++++++++++++++++++----------
 xconq.install |   17 +++++++++++++++++
 2 files changed, 42 insertions(+), 10 deletions(-)


Property changes on: xconq/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xconq/trunk:1
   + /xconq/trunk:1-22078

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-12-21 17:53:37 UTC (rev 22079)
+++ extra-x86_64/PKGBUILD	2008-12-21 17:54:27 UTC (rev 22080)
@@ -2,21 +2,36 @@
 # Maintainer: Jeff 'codemac' Mickey <jeff at archlinux.org>
 # Maintainer: roberto <roberto at archlinux.org>
 pkgname=xconq
-pkgver=20071021
+pkgver=7.5.0pre
+_rpmver=7.5.0-0pre.0.20040523
 pkgrel=1
 pkgdesc="Xconq is a general strategy game system."
 arch=(i686 x86_64)
 url="http://sources.redhat.com/xconq/"
 license=('GPL')
-depends=('tk' 'libxaw')
+makedepends=('rpmextract')
+depends=('tk>=8.5.5' 'libxmu')
+options=(force)
+install=xconq.install
+source=(ftp://sources.redhat.com/pub/xconq/xconq-7.5.pre/Unix/Sources/${pkgname}-${_rpmver}.src.rpm)
+md5sums=('f675fbc766290682f74b643845546898')
 
 build() {
-  cvs -z 9 -d :pserver:anoncvs:anoncvs at sources.redhat.com:/cvs/xconq login
-  cvs -z 9 -d :pserver:anoncvs at sources.redhat.com:/cvs/xconq co xconq
-  cd $startdir/src/xconq
-  mkdir -p $startdir/pkg/var/lib/xconq/scores
-  ./configure --prefix=/usr --enable-alternate-scoresdir=$startdir/pkg/var/lib/xconq/scores \
-  --enable-alternate-gameuser=root --enable-alternate-gamegroup=root
-  make || return 1
-  make prefix=$startdir/pkg/usr install
+  cd "${srcdir}"
+  rpmextract.sh ${pkgname}-${_rpmver}.src.rpm || return 1
+  bsdtar xf xconq-7.5.0.tar.gz || return 1
+  cd xconq-7.5.0
+  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --enable-alternate-scoresdir=/var/games --enable-alternate-x11-app-defaults-dir=/etc/X11/app-defaults --enable-alternate-gameuser=root --enable-alternate-gamegroup=root || return 1
+  make X11_LDFLAGS="" || return 1
+  install -m755 -d "${pkgdir}/var/games"
+  make X11_LDFLAGS="" \
+    prefix="${pkgdir}/usr" \
+    mandir="${pkgdir}/usr/share/man" \
+    infodir="${pkgdir}/usr/share/info" \
+    scoresdir="${pkgdir}/var/games" install || return 1
+  chown -R root:games "${pkgdir}/var/games" || return 1
+  chown root:games "${pkgdir}/usr/bin/xconq" || return 1
+  chmod 775 "${pkgdir}/var/games" || return 1
+  chmod 2755 "${pkgdir}/usr/bin/xconq" || return 1
+  rmdir "${pkgdir}/usr/share/info"
 }

Copied: xconq/repos/extra-x86_64/xconq.install (from rev 22076, xconq/trunk/xconq.install)
===================================================================
--- extra-x86_64/xconq.install	                        (rev 0)
+++ extra-x86_64/xconq.install	2008-12-21 17:54:27 UTC (rev 22080)
@@ -0,0 +1,17 @@
+post_install() {
+  if [ ! -e var/games/XconqScores ]; then
+    touch var/games/XconqScores
+    chown root:games var/games/XconqScores
+    chmod 664 var/games/XconqScores
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  if [ -e var/games/XconqScores ]; then
+    mv var/games/XconqScores var/games/XconqScores.pacsave
+  fi
+}