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

[Allan McRae]

    Date: Thursday, December 20, 2012 @ 22:55:18
  Author: allan
Revision: 173690

upgpkg: expect 5.45-3

tcl rebuild, clean-up PKGBUILD

Modified:
  expect/trunk/PKGBUILD
Deleted:
  expect/trunk/ChangeLog
  expect/trunk/expect.install

----------------+
 ChangeLog      |   16 ----------------
 PKGBUILD       |   24 ++++--------------------
 expect.install |    5 -----
 3 files changed, 4 insertions(+), 41 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2012-12-21 03:38:46 UTC (rev 173689)
+++ ChangeLog	2012-12-21 03:55:18 UTC (rev 173690)
@@ -1,16 +0,0 @@
-2011-01-01  Allan McRae  <allan at archlinux.org> 
-
-    * expect 5.45-2
-    - Package signing rebuild
-
-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	2012-12-21 03:38:46 UTC (rev 173689)
+++ PKGBUILD	2012-12-21 03:55:18 UTC (rev 173690)
@@ -1,32 +1,20 @@
 # $Id$
-# Maintainer: kevin <kevin at archlinux.org>
+# Maintainer: Allan McRae <allan at archlinux.org>
 
 pkgname=expect
 pkgver=5.45
-pkgrel=2
+pkgrel=3
 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')
-conflicts=('expectk')
-install=expect.install
-changelog=ChangeLog
+depends=('tcl')
 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)
 md5sums=('44e1a4f4c877e9ddc5a542dfa7ecc92b')
 
 build() {
   cd ${srcdir}/expect${pkgver}
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --mandir=/usr/share/man --with-tcl=/usr/lib \
-      --with-tclinclude=/usr/include
-
-  # Keep $startdir/pkg out of library search paths.
-  sed -e 's/-rpath,${LIB_RUNTIME_DIR}:/-rpath,/' -i Makefile
+  ./configure --prefix=/usr --mandir=/usr/share/man 
   make
 }
 
@@ -34,9 +22,5 @@
   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)
 }

Deleted: expect.install
===================================================================
--- expect.install	2012-12-21 03:38:46 UTC (rev 173689)
+++ expect.install	2012-12-21 03:55:18 UTC (rev 173690)
@@ -1,5 +0,0 @@
-post_upgrade() {
-  if [ "`vercmp $2 5.45`" -lt 0 ]; then
-    echo "  - expectk has been removed.  Use tclsh instead"
-  fi
-}