[arch-commits] Commit in expect/trunk (ChangeLog PKGBUILD)

[Kevin Piché]

    Date: Saturday, January 1, 2011 @ 18:52:17
  Author: kevin
Revision: 104372

upgpkg: expect 5.45-1
Updated to 5.45.  Mention expectk removal

Modified:
  expect/trunk/ChangeLog
  expect/trunk/PKGBUILD

-----------+
 ChangeLog |    6 +++++-
 PKGBUILD  |   33 +++++++++++----------------------
 2 files changed, 16 insertions(+), 23 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2011-01-01 23:49:12 UTC (rev 104371)
+++ ChangeLog	2011-01-01 23:52:17 UTC (rev 104372)
@@ -1,7 +1,11 @@
+2011-01-01  kevin  <kevin at archlinux.org> 
 
+    * expect 5.45-1
+    - Added upgrade message about expectk being removed
+    - Have expect conflict with expectk
+
 2010-03-27  kevin  <kevin at 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 
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-01 23:49:12 UTC (rev 104371)
+++ PKGBUILD	2011-01-01 23:52:17 UTC (rev 104372)
@@ -2,48 +2,37 @@
 # Maintainer: kevin <kevin at archlinux.org>
 
 pkgname=expect
-pkgver=5.44.1.15
+pkgver=5.45
 pkgrel=1
 pkgdesc="A tool for automating interactive applications"
 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
   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)
 }