[arch-commits] Commit in libxp/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Jan de Groot]

    Date: Monday, July 7, 2008 @ 13:46:20
  Author: jgc
Revision: 4487

fix conflict

Modified:
  libxp/repos/extra-x86_64/	(properties)
  libxp/repos/extra-x86_64/PKGBUILD

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


Property changes on: libxp/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /libxp/trunk:1
   + /libxp/trunk:1-4486

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-07-07 17:44:57 UTC (rev 4486)
+++ extra-x86_64/PKGBUILD	2008-07-07 17:46:20 UTC (rev 4487)
@@ -3,22 +3,22 @@
 
 pkgname=libxp
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 X Print Library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
+license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxext' 'printproto')
 makedepends=('pkgconfig')
-_xorg=X11R7.0-RC4
-_relname=libXp
-source=(${url}/releases/${_xorg}/everything/${_relname}-${pkgver}.tar.bz2)
+options=('!libtool')
+source=(${url}/releases/individual/lib/libXp-${pkgver}.tar.bz2)
+md5sums=('0f4ac39108c1ae8c443cdfac259b58fa')
 
 build() {
-  cd ${startdir}/src/${_relname}-${pkgver}
-  ./configure --prefix=/usr \
-              --host=${CHOST} --build=${CHOST}
+  cd ${srcdir}/libXp-${pkgver}
+  ./configure --prefix=/usr || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-  find ${startdir}/pkg -name '*.la' -exec rm {} \;
+  make DESTDIR=${pkgdir} install || return 1
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
 }
-