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

[Jan de Groot]

    Date: Saturday, November 8, 2008 @ 14:17:52
  Author: jgc
Revision: 18700

Merged revisions 356,18699 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/plotutils/trunk

........
  r356 | aaron | 2008-04-19 00:56:27 +0200 (Sat, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r18699 | jgc | 2008-11-08 20:17:17 +0100 (Sat, 08 Nov 2008) | 2 lines
  
  upgpkg: plotutils 2.5.1-1
      Remove dependency on libxmi, rebuild for libxaw
........

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

----------+
 PKGBUILD |   23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)


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

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-08 19:17:17 UTC (rev 18699)
+++ extra-i686/PKGBUILD	2008-11-08 19:17:52 UTC (rev 18700)
@@ -3,33 +3,24 @@
 # Packager: Maksim Sipos (maxsipos at gmail dot com)
 
 pkgname=plotutils
-pkgver=2.5
+pkgver=2.5.1
 pkgrel=1
 arch=('x86_64' 'i686')
 pkgdesc="Set of utilities and libraries for plotting."
 url="http://directory.fsf.org/graphics/plotutils.html"
 license=("GPL")
-depends=("libpng" "gcc-libs" "libxaw" "libxmi")
+depends=("libpng" "gcc-libs" "libxaw>=1.0.5")
 makedepends=("flex")
-# _patches=""
-source=("http://ftp.gnu.org/pub/gnu/plotutils/$pkgname-$pkgver.tar.gz" \
-	${_patches})
+source=(http://ftp.gnu.org/pub/gnu/plotutils/$pkgname-$pkgver.tar.gz)
 options=('!libtool')
+md5sums=('fad3bc273de4ca5d74462b908db658ce')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-#   for patch in ${_patches}
-#   do
-#     patch -Np1 -i $startdir/src/$patch 
-#   done
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr \
 	--with-gnu-ld \
 	--with-x \
-	--enable-libplotter \
-	--enable-libxmi=no # is separate pkg in arch
+	--enable-libplotter || return 1
   make || return 1
-  make DESTDIR=$startdir/pkg install
-  # disabling the build of libxmi does not work, so lets remove it simply:
-  rm $startdir/pkg/usr/{include/xmi.h,lib/libxmi.{a,so,so.0,so.0.1.3}}
+  make DESTDIR="${pkgdir}" install || return 1
 }
-md5sums=('0d6855cce17832afe2ff75c26a57be49')