From d9668f24d3e9edc4899cc0a4e6d6d8e9fd1207c0 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Tue, 16 Nov 2010 03:35:14 +0000
Subject: expect: up to latest

---
 abs/core/expect/ChangeLog |  7 ++++++
 abs/core/expect/PKGBUILD  | 61 ++++++++++++++++++++++++++++++-----------------
 2 files changed, 46 insertions(+), 22 deletions(-)
 create mode 100644 abs/core/expect/ChangeLog

diff --git a/abs/core/expect/ChangeLog b/abs/core/expect/ChangeLog
new file mode 100644
index 0000000..3e1246f
--- /dev/null
+++ b/abs/core/expect/ChangeLog
@@ -0,0 +1,7 @@
+
+2010-03-27  kevin  <kevin@archlinux.org> 
+
+    * expect 5.44.1.15-1
+    - Source on sourceforge now and maintained mostly by ActiveState
+    - Added symlink to fix FS#18686 - libexpect.so is not found 
+
diff --git a/abs/core/expect/PKGBUILD b/abs/core/expect/PKGBUILD
index 0f2f46b..d219fbc 100644
--- a/abs/core/expect/PKGBUILD
+++ b/abs/core/expect/PKGBUILD
@@ -1,35 +1,52 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
+# $Id: PKGBUILD 73840 2010-03-28 22:17:41Z kevin $
+# Maintainer: kevin <kevin@archlinux.org>
 
 pkgname=expect
-pkgver=5.44.1.4
-pkgrel=2
+pkgver=5.44.1.15
+pkgrel=1
 pkgdesc="A tool for automating interactive applications"
 arch=(i686 x86_64)
-depends=('tcl>=8.5.0' 'tk>=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')
+source=(http://downloads.sourceforge.net/project/expect/Expect/${pkgver}/expect-${pkgver}.tar.bz2)
+# CVS checkout on gerolde.
+#source=(ftp://ftp.archlinux.org/other/expect/expect-${pkgver}.tar.bz2)
+# old nist source=(http://expect.nist.gov/src/expect-${pkgver}.tar.bz2)
+license=('custom')
+md5sums=('9307bbf67e19125036ce34544a78dadf')
 
 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}
+
   ./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
+}
+package() {
+  cd ${srcdir}/expect-${pkgver}
+  make DESTDIR=${pkgdir} install || return 1
+
+  # license.
+  install -D -m644 README ${pkgdir}/usr/share/licenses/${pkgname}/README
+
+  (cd ${pkgdir}/usr/lib;
+   ln -s expect${pkgver}/libexpect${pkgver}.so libexpect.so)
+
   # 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')
-- 
cgit v0.12

