[arch-commits] Commit in graphviz/repos (3 files)

[Jan de Groot]

    Date: Saturday, November 8, 2008 @ 13:43:06
  Author: jgc
Revision: 18698

Merged revisions 18697 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/graphviz/trunk

........
  r18697 | jgc | 2008-11-08 19:42:36 +0100 (Sat, 08 Nov 2008) | 2 lines
  
  upgpkg: graphviz 2.20.3-1
      Rebuild for new libxaw
........

Modified:
  graphviz/repos/extra-i686/	(properties)
  graphviz/repos/extra-i686/PKGBUILD
  graphviz/repos/extra-i686/graphviz.install

------------------+
 PKGBUILD         |   18 +++++-------------
 graphviz.install |    4 ----
 2 files changed, 5 insertions(+), 17 deletions(-)


Property changes on: graphviz/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /graphviz/trunk:1-9926
   + /graphviz/trunk:1-18697

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-08 18:42:36 UTC (rev 18697)
+++ extra-i686/PKGBUILD	2008-11-08 18:43:06 UTC (rev 18698)
@@ -3,30 +3,22 @@
 # Contributor: John Proctor <jproctor at prium.net>
 
 pkgname=graphviz
-pkgver=2.20.2
+pkgver=2.20.3
 pkgrel=1
 pkgdesc="Creates acircular graph images"
 arch=('i686' 'x86_64')
 license=('CPL')
- depends=('gd>=2.0.35' 'librsvg>=2.22.2' 'libxaw>=1.0.4' 'libtool>=2.2')
-makedepends=('bison' 'flex')
+ depends=('gd>=2.0.35' 'librsvg>=2.22.3' 'libxaw>=1.0.5' 'libtool>=2.2')
 url="http://www.graphviz.org/"
 options=('!libtool' 'force')
 source=(${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz)
 install=graphviz.install
-md5sums=('8129b4682efbf0cf321c2ec8f7994003')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --without-gnomeui \
     --disable-tcl --disable-sharp --disable-ruby --disable-python \
-    --disable-lua --disable-guile --disable-perl
+    --disable-lua --disable-guile --disable-perl || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
-
-  # Remove docs.
-  rm -rf ${startdir}/pkg/usr/share/graphviz/doc
-
-  #install missing headers
-#  install -m644 ${startdir}/src/${pkgname}-${pkgver}/lib/common/arith.h ${startdir}/pkg/usr/include/graphviz/
+  make DESTDIR="${pkgdir}" install || return 1
 }

Modified: extra-i686/graphviz.install
===================================================================
--- extra-i686/graphviz.install	2008-11-08 18:42:36 UTC (rev 18697)
+++ extra-i686/graphviz.install	2008-11-08 18:43:06 UTC (rev 18698)
@@ -14,7 +14,3 @@
 post_remove() {
   rm -f usr/lib/graphviz/config
 }
-
-op=$1
-shift
-$op $*