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

[Dennis `stumbles` Veatch]

commit e06b7b90d07718d6b8b4a53d5e15f63925a4d492
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Thu Mar 31 07:25:15 2011 -0400

    expect: Version bump.
    
    The PRE_BUILD is not needed and some adjustments in the BUILD.
---
 devel/expect/BUILD     |   16 ++++------------
 devel/expect/DEPENDS   |    2 +-
 devel/expect/DETAILS   |   25 +++++++++++++------------
 devel/expect/PRE_BUILD |    7 -------
 4 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/devel/expect/BUILD b/devel/expect/BUILD
index 7d6cf11..d06692b 100644
--- a/devel/expect/BUILD
+++ b/devel/expect/BUILD
@@ -1,13 +1,8 @@
 (
 
- if in_depends $MODULE tk ; then
-   OPTS+=" --with-tk=$SOURCE_DIRECTORY/libtke/tk/unix"
-   cp -f "/usr/lib/tkConfig.sh" libtke/tk/unix
- fi
-
- if [ -e "/usr/lib/tclConfig.sh" ]; then
-   cp "/usr/lib/tclConfig.sh" libtke/tcl/unix
- fi
+ if [ `arch` == "x86_64" ] ; then
+   OPTS="--enable-64bit"
+ fi &&
 
  # for some reason, the build uses exec_prefix everywhere
  # which isn't effected by our setting prefix
@@ -19,10 +14,7 @@
              --sysconfdir=/etc          \
              --localstatedir=/var       \
              --infodir=/usr/share/info  \
-             --mandir=/usr/share/man    \
-             --with-tcl=$SOURCE_DIRECTORY/libtke/tcl/unix            \
-             --with-tclinclude=$SOURCE_DIRECTORY/libtke/tcl/generic  \
-             --enable-gcc  &&
+             --mandir=/usr/share/man   &&
 
  default_make
 
diff --git a/devel/expect/DEPENDS b/devel/expect/DEPENDS
index d1dcee8..fa24ab8 100644
--- a/devel/expect/DEPENDS
+++ b/devel/expect/DEPENDS
@@ -1,3 +1,3 @@
 depends tcl
 
-optional_depends "tk" "" "--without-Tk" "For expectk"
+optional_depends "tk" "" "" "For expectk"
diff --git a/devel/expect/DETAILS b/devel/expect/DETAILS
index 54e5657..66b841f 100644
--- a/devel/expect/DETAILS
+++ b/devel/expect/DETAILS
@@ -1,15 +1,16 @@
-           MODULE=expect
-          VERSION=5.44.1.15
-           SOURCE=$MODULE-$VERSION.tar.bz2
-          SOURCE2=tcl_tk_bits_for_expect.tar.bz2
-       SOURCE_URL=$SFORGE_URL/expect
-       SOURCE_VFY=sha1:946c3591d16c216f409882f294378fc53e4f6c0a
-      SOURCE2_URL=$PATCH_URL
-      SOURCE2_VFY=sha1:7f5680463d431ad139ea0dedeecc845195a4ef83
-         WEB_SITE=http://expect.nist.gov
-          ENTERED=20030817
-          UPDATED=20100823
-            SHORT="tool for automating interactive applications"
+          MODULE=expect
+         VERSION=5.45
+          SOURCE=$MODULE$VERSION.tar.gz
+         SOURCE2=tcl_tk_bits_for_expect.tar.bz2
+      SOURCE_URL=$SFORGE_URL/expect/Expect/$VERSION/
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE$VERSION
+      SOURCE_VFY=sha1:e634992cab35b7c6931e1f21fbb8f74d464bd496
+     SOURCE2_URL=$PATCH_URL
+     SOURCE2_VFY=sha1:7f5680463d431ad139ea0dedeecc845195a4ef83
+        WEB_SITE=http://expect.nist.gov
+         ENTERED=20030817
+         UPDATED=20110331
+           SHORT="tool for automating interactive applications"
 
 cat << EOF
 Expect is a tool for automating interactive applications such as telnet,
diff --git a/devel/expect/PRE_BUILD b/devel/expect/PRE_BUILD
deleted file mode 100644
index 437989f..0000000
--- a/devel/expect/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-(
-  default_pre_build     &&
-  cd $SOURCE_DIRECTORY  &&
-  mkdir libtke          &&
-  cd libtke             &&
-  tar xjf $SOURCE_CACHE/$SOURCE2
-)