[arch-commits] Commit in expat/repos (extra-i686 extra-i686/PKGBUILD)

[Allan McRae]

    Date: Tuesday, October 21, 2008 @ 09:03:42
  Author: allan
Revision: 16367

Merged revisions 356,13764,16357 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/expat/trunk

........
  r356 | aaron | 2008-04-19 08:56:27 +1000 (Sat, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r13764 | allan | 2008-09-29 00:37:13 +1000 (Mon, 29 Sep 2008) | 1 line
  
  correct sourceforge url
........
  r16357 | jgc | 2008-10-21 22:43:42 +1000 (Tue, 21 Oct 2008) | 2 lines
  
  upgpkg: expat 2.0.1-2
      Rebuild for core. Fix manpath, add checks to PKGBUILD
........

Modified:
  expat/repos/extra-i686/	(properties)
  expat/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)


Property changes on: expat/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /expat/trunk:1
   + /expat/trunk:1-16366

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-10-21 12:59:47 UTC (rev 16366)
+++ extra-i686/PKGBUILD	2008-10-21 13:03:42 UTC (rev 16367)
@@ -4,20 +4,21 @@
 
 pkgname=expat
 pkgver=2.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An XML Parser library written in C"
 arch=(i686 x86_64)
 license=('custom')
 depends=('glibc')
 options=('!libtool')
-source=(http://heanet.dl.sourceforge.net/sourceforge/expat/${pkgname}-${pkgver}.tar.gz)
+source=(http://downloads.sourceforge.net/sourceforge/expat/${pkgname}-${pkgver}.tar.gz)
 url="http://expat.sourceforge.net/"
 md5sums=('ee8b492592568805593f81f8cdf2a04c')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
-  install -m644 -D COPYING ${startdir}/pkg/usr/share/licenses/${pkgname}/COPYING
+  make DESTDIR="${pkgdir}" install || return 1
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
 }