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

[Eric Bélanger]

    Date: Friday, November 7, 2008 @ 23:55:53
  Author: eric
Revision: 18633

fixed svn conflict

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

----------+
 PKGBUILD |   52 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 20 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-08 04:53:45 UTC (rev 18632)
+++ extra-x86_64/PKGBUILD	2008-11-08 04:55:53 UTC (rev 18633)
@@ -1,35 +1,47 @@
 # $Id$
-# Maintainer: Kevin Piche <kevin at archlinux.org>
+# Maintainer: kevin <kevin at archlinux.org>
 
 pkgname=expect
-pkgver=5.44.1.4
+pkgver=5.44.1.10
 pkgrel=1
 pkgdesc="A tool for automating interactive applications"
 arch=(i686 x86_64)
-depends=('tcl>=8.5.0')
-makedepends=('tk>=8.5.0')
-tcltkver=8.5.0
-source=(ftp://ftp.archlinux.org/other/expect/expect-$pkgver.tar.bz2
-#http://expect.nist.gov/src/expect-$pkgver.tar.bz2
-http://heanet.dl.sourceforge.net/sourceforge/tcl/tk$tcltkver-src.tar.gz
-http://heanet.dl.sourceforge.net/sourceforge/tcl/tcl$tcltkver-src.tar.gz)
 url="http://expect.nist.gov/"
+depends=('tcl>=8.5.3')
+makedepends=('tk>=8.5.3')
+# CVS checkout on gerolde.
+source=(ftp://ftp.archlinux.org/other/expect/expect-${pkgver}.tar.bz2)
+md5sums=('da02c862015da2d67f72f1693adab0db')
+#source=(http://expect.nist.gov/src/expect-${pkgver}.tar.bz2)
+license=('custom')
 
 build() {
-  cd $startdir/src/expect-5.44.1.4
+  # stuff to remove.
+  BIN="expectk multixterm tknewsbiff tkpasswd xkibitz xpstat"
+  MAN="multixterm tknewsbiff xkibitz"
+
+  cd ${srcdir}/expect-${pkgver}
+  sed 's#/usr/local/bin#/usr/bin#' -i expect.man
+  sed '/^PACKAGE_/ s/5\.44\.1\.9/5.44.1.10/' -i configure
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --with-tcl=/usr/lib --with-tk=/usr/lib --without-x \
-      --with-tclinclude=$startdir/src/tcl$tcltkver/generic \
-      --with-tkinclude=$startdir/src/tk$tcltkver/generic
+      --mandir=/usr/share/man --with-tcl=/usr/lib \
+      --with-tclinclude=/usr/include --with-tk=/usr/lib \
+      --with-tkinclude=/usr/include \
+
   # Keep $startdir/pkg out of library search paths.
   sed -e 's/-rpath,${LIB_RUNTIME_DIR}:/-rpath,/' -i Makefile
   make || return 1
-  make prefix=$startdir/pkg/usr exec_prefix=$startdir/pkg/usr sysconfdir=$startdir/pkg/etc \
-      localstatedir=$startdir/pkg/var install
+  make DESTDIR=${pkgdir} install
+
+  # license.
+  install -D -m644 README ${pkgdir}/usr/share/licenses/${pkgname}/README
+
   # Remove X related stuff.
-  rm -f $startdir/pkg/usr/bin/{multixterm,tknewsbiff,tkpasswd,xpstat}
-  rm -f $startdir/pkg/usr/man/man1/{multixterm.1,tknewsbiff.1}
+  for i in ${BIN}; do
+      rm -f ${pkgdir}/usr/bin/${i}
+  done
+  for i in ${MAN}; do
+      rm -f ${pkgdir}/usr/share/man/man1/${i}.1
+  done
 }
-md5sums=('bbfd5ef50f3c1df4fe79e5a20a947d41'
-         'bc217c45ed6b2f5b8d3120df63fa13bd'
-         'd890c505465411b25050b6cd95971d2c')