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

[Jan de Groot]

    Date: Saturday, August 15, 2009 @ 10:38:19
  Author: jgc
Revision: 49741

Merged revisions 356,49739 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/psutils/trunk

........
  r356 | aaron | 2008-04-19 00:56:27 +0200 (Sat, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r49739 | jgc | 2009-08-15 16:37:37 +0200 (Sat, 15 Aug 2009) | 2 lines
  
  upgpkg: psutils 1.17-2
      Fix manpath, do some PKGBUILD styling
........

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

----------+
 PKGBUILD |   29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-08-15 14:38:02 UTC (rev 49740)
+++ extra-x86_64/PKGBUILD	2009-08-15 14:38:19 UTC (rev 49741)
@@ -4,7 +4,7 @@
  
 pkgname=psutils
 pkgver=1.17
-pkgrel=1
+pkgrel=2
 pkgdesc="A set of postscript utilities"
 arch=(i686 x86_64)
 license=('custom')
@@ -14,19 +14,20 @@
 url="http://www.tardis.ed.ac.uk/~ajcd/psutils/index.html"
 source=(ftp://ftp.enst.fr/pub/unix/a2ps/${pkgname}-${pkgver}.tar.gz
         psutils-1.17.diff)
-md5sums=('b161522f3bd1507655326afa7db4a0ad' '2b49e9e796000b42f42804d4b50a2be1')
+md5sums=('b161522f3bd1507655326afa7db4a0ad'
+         '2b49e9e796000b42f42804d4b50a2be1')
 
 build() {
-  cd ${startdir}/src/${pkgname}
-  patch -Np1 -i ${startdir}/src/psutils-1.17.diff
-  mkdir -p ${startdir}/pkg/usr ${startdir}/pkg/usr/include \
-    ${startdir}/pkg/usr/man
-  make -f Makefile.unix BINDIR=${startdir}/pkg/usr/bin \
-    INCLUDEDIR=${startdir}/pkg/usr/include/psutils PERL=/usr/bin/perl \
-    MANDIR=${startdir}/pkg/usr/man/man1 || return 1
-  make -f Makefile.unix BINDIR=${startdir}/pkg/usr/bin \
-    INCLUDEDIR=${startdir}/pkg/usr/include/psutils PERL=/usr/bin/perl \
-    MANDIR=${startdir}/pkg/usr/man/man1 install
-  mkdir -p ${startdir}/pkg/usr/share/licenses/${pkgname}
-  install -m644 LICENSE ${startdir}/pkg/usr/share/licenses/${pkgname}/
+  cd "${srcdir}/${pkgname}"
+  patch -Np1 -i "${srcdir}/psutils-1.17.diff" || return 1
+  install -d -m755 "${pkgdir}/usr/include"
+  install -d -m755 "${pkgdir}/usr/share/man"
+  make -j1 -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \
+    INCLUDEDIR="${pkgdir}/usr/include/psutils" PERL=/usr/bin/perl \
+    MANDIR="${pkgdir}/usr/share/man/man1" || return 1
+  make -j1 -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \
+    INCLUDEDIR="${pkgdir}/usr/include/psutils" PERL=/usr/bin/perl \
+    MANDIR="${pkgdir}/usr/share/man/man1" install || return 1
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
 }