[Lunar-commits] <moonbase> expect: version bump.

[Florin Braescu]

commit 7cbe1fa645ece84a98a46cb9244815da01a41bc4
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Mon Aug 23 10:14:12 2010 +0300

    expect: version bump.
    
    Thanks to Jon Kopetz for the submission.
---
 devel/expect/BUILD     |   15 ++++++++++-----
 devel/expect/DEPENDS   |    2 +-
 devel/expect/DETAILS   |   13 ++++---------
 devel/expect/PRE_BUILD |    2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/devel/expect/BUILD b/devel/expect/BUILD
index de2c390..4796bbf 100644
--- a/devel/expect/BUILD
+++ b/devel/expect/BUILD
@@ -2,13 +2,20 @@
 
  if in_depends $MODULE tk ; then
    OPTS="$OPTS --with-tk=$SOURCE_DIRECTORY/libtke/tk/unix"
+   cp -f "/usr/lib/tkConfig.sh" libtke/tk/unix
  fi
 
-  patch_it $SOURCE_CACHE/$SOURCE3 1  &&
- 
- cd $SOURCE_DIRECTORY/                 &&
+ if [ -e "/usr/lib/tclConfig.sh" ]; then
+   cp "/usr/lib/tclConfig.sh" libtke/tcl/unix
+ fi
+
+ # for some reason, the build uses exec_prefix everywhere
+ # which isn't effected by our setting prefix
+ cd $SOURCE_DIRECTORY  &&
+
  ./configure $OPTS                      \
              --prefix=/usr              \
+             --exec-prefix=/usr         \
              --sysconfdir=/etc          \
              --localstatedir=/var       \
              --infodir=/usr/share/info  \
@@ -17,8 +24,6 @@
              --with-tclinclude=$SOURCE_DIRECTORY/libtke/tcl/generic  \
              --enable-gcc  &&
 
- sedit "s:8.4:8.5:" Makefile  &&
-
  default_make
 
 ) > $C_FIFO 2>&1
diff --git a/devel/expect/DEPENDS b/devel/expect/DEPENDS
index 786b1c0..d1dcee8 100644
--- a/devel/expect/DEPENDS
+++ b/devel/expect/DEPENDS
@@ -1,3 +1,3 @@
-depends tcl &&
+depends tcl
 
 optional_depends "tk" "" "--without-Tk" "For expectk"
diff --git a/devel/expect/DETAILS b/devel/expect/DETAILS
index 6516859..303fb34 100644
--- a/devel/expect/DETAILS
+++ b/devel/expect/DETAILS
@@ -1,19 +1,14 @@
            MODULE=expect
-          VERSION=5.43.0
+          VERSION=5.44.1.15
            SOURCE=$MODULE-$VERSION.tar.bz2
           SOURCE2=tcl_tk_bits_for_expect.tar.bz2
-          SOURCE3=$MODULE-$VERSION-tcl_8.5.x_fix.patch.bz2
- SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-5.43
-       SOURCE_URL=http://expect.nist.gov/old
-       SOURCE_VFY=sha1:a73530772f9d735e98175c7807efa8e785c5fa60
+       SOURCE_URL=$SFORGE_URL/expect
+       SOURCE_VFY=sha1:946c3591d16c216f409882f294378fc53e4f6c0a
       SOURCE2_URL=$PATCH_URL
       SOURCE2_VFY=sha1:7f5680463d431ad139ea0dedeecc845195a4ef83
-      SOURCE3_URL=$PATCH_URL
-      SOURCE3_VFY=sha1:413060c3d13ef68c7d8ef3e558fd6ff01856dbd9
          WEB_SITE=http://expect.nist.gov
           ENTERED=20030817
-          UPDATED=20090416
-            PSAFE="no"
+          UPDATED=20100823
             SHORT="tool for automating interactive applications"
 
 cat << EOF
diff --git a/devel/expect/PRE_BUILD b/devel/expect/PRE_BUILD
index 0988af1..437989f 100644
--- a/devel/expect/PRE_BUILD
+++ b/devel/expect/PRE_BUILD
@@ -4,4 +4,4 @@
   mkdir libtke          &&
   cd libtke             &&
   tar xjf $SOURCE_CACHE/$SOURCE2
-) 
+)