3 files changed, 33 insertions, 29 deletions
diff --git a/abs/core/expect/ChangeLog b/abs/core/expect/ChangeLog
index 3e1246f..f0432ba 100644
--- a/abs/core/expect/ChangeLog
+++ b/abs/core/expect/ChangeLog
@@ -1,7 +1,16 @@
+2011-01-01  Allan McRae  <allan@archlinux.org> 
+
+    * expect 5.45-2
+    - Package signing rebuild
+
+2011-01-01  kevin  <kevin@archlinux.org> 
+
+    * expect 5.45-1
+    - Added upgrade message about expectk being removed
+    - Have expect conflict with expectk
 
 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 d219fbc..140b4a4 100644
--- a/abs/core/expect/PKGBUILD
+++ b/abs/core/expect/PKGBUILD
@@ -1,52 +1,42 @@
-# $Id: PKGBUILD 73840 2010-03-28 22:17:41Z kevin $
+# $Id: PKGBUILD 151250 2012-02-25 10:00:44Z allan $
 # Maintainer: kevin <kevin@archlinux.org>
 
 pkgname=expect
-pkgver=5.44.1.15
-pkgrel=1
+pkgver=5.45
+pkgrel=2
 pkgdesc="A tool for automating interactive applications"
-arch=(i686 x86_64)
-url="http://expect.nist.gov/"
+arch=('i686' 'x86_64')
+url="http://www.nist.gov/el/msid/expect.cfm"
+license=('custom')
 depends=('tcl>=8.5.3')
-makedepends=('tk>=8.5.3')
-source=(http://downloads.sourceforge.net/project/expect/Expect/${pkgver}/expect-${pkgver}.tar.bz2)
+conflicts=('expectk')
+install=expect.install
+changelog=ChangeLog
+source=(http://downloads.sourceforge.net/project/expect/Expect/${pkgver}/expect${pkgver}.tar.gz)
 # 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')
+md5sums=('44e1a4f4c877e9ddc5a542dfa7ecc92b')
 
 build() {
-  # stuff to remove.
-  BIN="expectk multixterm tknewsbiff tkpasswd xkibitz xpstat"
-  MAN="multixterm tknewsbiff xkibitz"
-
-  cd ${srcdir}/expect-${pkgver}
+  cd ${srcdir}/expect${pkgver}
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --mandir=/usr/share/man --with-tcl=/usr/lib \
-      --with-tclinclude=/usr/include --with-tk=/usr/lib \
-      --with-tkinclude=/usr/include \
+      --with-tclinclude=/usr/include
 
   # Keep $startdir/pkg out of library search paths.
   sed -e 's/-rpath,${LIB_RUNTIME_DIR}:/-rpath,/' -i Makefile
-  make || return 1
+  make
 }
+
 package() {
-  cd ${srcdir}/expect-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
+  cd ${srcdir}/expect${pkgver}
+  make DESTDIR=${pkgdir} install
 
   # 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.
-  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
+    ln -s expect${pkgver}/libexpect${pkgver}.so libexpect.so)
 }
diff --git a/abs/core/expect/expect.install b/abs/core/expect/expect.install
new file mode 100644
index 0000000..2847848
--- /dev/null
+++ b/abs/core/expect/expect.install
@@ -0,0 +1,5 @@
+post_upgrade() {
+  if [ "`vercmp $2 5.45`" -lt 0 ]; then
+    echo "  - expectk has been removed.  Use tclsh instead"
+  fi
+}