[arch-commits] Commit in xbill/repos (6 files)
Ionut Biru
ibiru at archlinux.org
Sun Feb 5 11:46:02 UTC 2012
Date: Sunday, February 5, 2012 @ 06:46:02
Author: ibiru
Revision: 148662
db-move: moved xbill from [testing] to [extra] (x86_64)
Added:
xbill/repos/extra-x86_64/03_fix_ftbfs_binutils_gold.diff
(from rev 148654, xbill/repos/testing-x86_64/03_fix_ftbfs_binutils_gold.diff)
xbill/repos/extra-x86_64/PKGBUILD
(from rev 148654, xbill/repos/testing-x86_64/PKGBUILD)
xbill/repos/extra-x86_64/xbill.install
(from rev 148654, xbill/repos/testing-x86_64/xbill.install)
Deleted:
xbill/repos/extra-x86_64/PKGBUILD
xbill/repos/extra-x86_64/xbill.install
xbill/repos/testing-x86_64/
---------------------------------+
03_fix_ftbfs_binutils_gold.diff | 15 ++++++
PKGBUILD | 83 ++++++++++++++++++++------------------
xbill.install | 52 +++++++++++------------
3 files changed, 85 insertions(+), 65 deletions(-)
Copied: xbill/repos/extra-x86_64/03_fix_ftbfs_binutils_gold.diff (from rev 148654, xbill/repos/testing-x86_64/03_fix_ftbfs_binutils_gold.diff)
===================================================================
--- extra-x86_64/03_fix_ftbfs_binutils_gold.diff (rev 0)
+++ extra-x86_64/03_fix_ftbfs_binutils_gold.diff 2012-02-05 11:46:02 UTC (rev 148662)
@@ -0,0 +1,15 @@
+Description: Fix FTBFS with binutils-gold
+Author: Vincent Legout <vincent at legout.info>
+Bug-Debian: http://bugs.debian.org/556690
+Last-Update: 2009-12-08
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -21,7 +21,7 @@
+ VPATH = @srcdir@
+
+ ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS) -I$(srcdir)
+-ALL_LDFLAGS = $(CFLAGS) $(LDFLAGS)
++ALL_LDFLAGS = $(CFLAGS) $(LDFLAGS) -lXpm
+ IMAGE_DEFINES=-DIMAGES=\"${datadir}/xbill\"
+ SCORE_DEFINES=-DSCOREFILE=\"${localstatedir}/xbill.scores\"
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-02-05 11:46:00 UTC (rev 148661)
+++ extra-x86_64/PKGBUILD 2012-02-05 11:46:02 UTC (rev 148662)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=xbill
-pkgver=2.1
-pkgrel=7
-pkgdesc="A game that tests your reflexes as you seek and destroy all forms of Bill"
-arch=('i686' 'x86_64')
-url="http://www.xbill.org/"
-license=('GPL')
-depends=('xaw3d')
-makedepends=('libxaw')
-install=xbill.install
-source=(http://www.xbill.org/download/${pkgname}-${pkgver}.tar.gz)
-md5sums=('585e4866b15255a24203db9959407b2f')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --mandir=/usr/share/man --localstatedir=/var/games \
- --disable-motif --enable-athena --disable-gtk
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
-# set appropriate permissions and destinations
- chown root:games "${pkgdir}/usr/bin/xbill"
- chmod 2755 "${pkgdir}/usr/bin/xbill"
-
- chown root:games "${pkgdir}/var/games"
- chmod 775 "${pkgdir}/var/games"
- chown root:games "${pkgdir}/var/games/xbill"
- chmod 775 "${pkgdir}/var/games/xbill"
-
-# Handle the scores file creation in the install script
- rm "${pkgdir}/var/games/xbill/scores"
-}
Copied: xbill/repos/extra-x86_64/PKGBUILD (from rev 148654, xbill/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-02-05 11:46:02 UTC (rev 148662)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=xbill
+pkgver=2.1
+pkgrel=8
+pkgdesc="A game that tests your reflexes as you seek and destroy all forms of Bill"
+arch=('i686' 'x86_64')
+url="http://www.xbill.org/"
+license=('GPL')
+depends=('xaw3d>=1.6')
+makedepends=('libxaw')
+install=xbill.install
+source=(http://www.xbill.org/download/${pkgname}-${pkgver}.tar.gz
+ 03_fix_ftbfs_binutils_gold.diff)
+md5sums=('585e4866b15255a24203db9959407b2f'
+ 'e260a6cd4f9af003d249961cb60e2d01')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ # taken from Debian
+ patch -Np1 -i ${srcdir}/03_fix_ftbfs_binutils_gold.diff
+ autoconf -v -f
+ ./configure --prefix=/usr --mandir=/usr/share/man --localstatedir=/var/games \
+ --disable-motif --enable-athena --disable-gtk
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+# set appropriate permissions and destinations
+ chown root:games "${pkgdir}/usr/bin/xbill"
+ chmod 2755 "${pkgdir}/usr/bin/xbill"
+
+ chown root:games "${pkgdir}/var/games"
+ chmod 775 "${pkgdir}/var/games"
+ chown root:games "${pkgdir}/var/games/xbill"
+ chmod 775 "${pkgdir}/var/games/xbill"
+
+# Handle the scores file creation in the install script
+ rm "${pkgdir}/var/games/xbill/scores"
+}
Deleted: extra-x86_64/xbill.install
===================================================================
--- extra-x86_64/xbill.install 2012-02-05 11:46:00 UTC (rev 148661)
+++ extra-x86_64/xbill.install 2012-02-05 11:46:02 UTC (rev 148662)
@@ -1,26 +0,0 @@
-pre_install() {
- if [ ! -e var/games/xbill/scores -a -e usr/var/xbill/scores ]; then
- mkdir -p var/games/xbill
- mv usr/var/xbill/scores var/games/xbill/scores
- fi
-}
-
-post_install() {
- touch var/games/xbill/scores
- chown root:games var/games/xbill/scores
- chmod 664 var/games/xbill/scores
-}
-
-pre_upgrade() {
- pre_install $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- if [ -e var/games/xbill/scores ]; then
- mv var/games/xbill/scores var/games/xbill/scores.pacsave
- fi
-}
Copied: xbill/repos/extra-x86_64/xbill.install (from rev 148654, xbill/repos/testing-x86_64/xbill.install)
===================================================================
--- extra-x86_64/xbill.install (rev 0)
+++ extra-x86_64/xbill.install 2012-02-05 11:46:02 UTC (rev 148662)
@@ -0,0 +1,26 @@
+pre_install() {
+ if [ ! -e var/games/xbill/scores -a -e usr/var/xbill/scores ]; then
+ mkdir -p var/games/xbill
+ mv usr/var/xbill/scores var/games/xbill/scores
+ fi
+}
+
+post_install() {
+ touch var/games/xbill/scores
+ chown root:games var/games/xbill/scores
+ chmod 664 var/games/xbill/scores
+}
+
+pre_upgrade() {
+ pre_install $1
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ if [ -e var/games/xbill/scores ]; then
+ mv var/games/xbill/scores var/games/xbill/scores.pacsave
+ fi
+}
More information about the arch-commits
mailing list