[arch-commits] Commit in xbill/trunk (03_fix_ftbfs_binutils_gold.diff PKGBUILD)

[Eric Bélanger]

    Date: Thursday, July 3, 2014 @ 23:00:54
  Author: eric
Revision: 216439

upgpkg: xbill 2.1-9

Rebuild to add mtree file, Add libxpm depends, Remove old patch

Modified:
  xbill/trunk/PKGBUILD
Deleted:
  xbill/trunk/03_fix_ftbfs_binutils_gold.diff

---------------------------------+
 03_fix_ftbfs_binutils_gold.diff |   15 ---------------
 PKGBUILD                        |   19 +++++++------------
 2 files changed, 7 insertions(+), 27 deletions(-)

Deleted: 03_fix_ftbfs_binutils_gold.diff
===================================================================
--- 03_fix_ftbfs_binutils_gold.diff	2014-07-03 20:33:58 UTC (rev 216438)
+++ 03_fix_ftbfs_binutils_gold.diff	2014-07-03 21:00:54 UTC (rev 216439)
@@ -1,15 +0,0 @@
-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\"
- 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-03 20:33:58 UTC (rev 216438)
+++ PKGBUILD	2014-07-03 21:00:54 UTC (rev 216439)
@@ -3,31 +3,26 @@
 
 pkgname=xbill
 pkgver=2.1
-pkgrel=8
+pkgrel=9
 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')
+depends=('xaw3d' 'libxpm')
 makedepends=('libxaw')
 install=xbill.install
-source=(http://www.xbill.org/download/${pkgname}-${pkgver}.tar.gz
-        03_fix_ftbfs_binutils_gold.diff)
-md5sums=('585e4866b15255a24203db9959407b2f'
-         'e260a6cd4f9af003d249961cb60e2d01')
+source=(http://www.xbill.org/download/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('ca466fb90a7c41055005d2e4dcece2e82b6c55c6')
 
 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 \
+  cd ${pkgname}-${pkgver}
+  LIBS='-lXpm' ./configure --prefix=/usr --mandir=/usr/share/man --localstatedir=/var/games \
     --disable-motif  --enable-athena --disable-gtk
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
 # set appropriate permissions and destinations