[Lunar-commits] CVS: moonbase/devel/expect BUILD, 1.3, 1.4 DEPENDS, 1.3, 1.4 DETAILS, 1.4, 1.5 PRE_BUILD, 1.1, 1.2 POST_INSTALL, 1.1, NONE

[Auke Kok]

Update of /var/cvs/lunar/moonbase/devel/expect
In directory dbguin.lunar-linux.org:/tmp/cvs-serv16398

Modified Files:
	BUILD DEPENDS DETAILS PRE_BUILD 
Removed Files:
	POST_INSTALL 
Log Message:
Making the hack into something usefull: don't use /tmp but a subtree of $SOURCE_DIRECTORY. Also upstream author releases versioned tarballs.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/devel/expect/BUILD,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- BUILD	7 Nov 2003 09:48:10 -0000	1.3
+++ BUILD	12 Mar 2004 19:18:27 -0000	1.4
@@ -1,5 +1,9 @@
 (
 
+ if in_depends $MODULE tk ; then
+   OPTS="$OPTS --with-tk=$SOURCE_DIRECTORY/libtke/tk/unix"
+ fi
+
  cd $SOURCE_DIRECTORY/                                  &&
  ./configure $OPTS                                      \
              --prefix=/usr                              \
@@ -7,8 +11,8 @@
              --localstatedir=/var                       \
              --infodir=/usr/share/info                  \
              --mandir=/usr/share/man                    \
-             --with-tcl=/tmp/libtke/tcl/unix            \
-             --with-tclinclude=/tmp/libtke/tcl/generic  \
+             --with-tcl=$SOURCE_DIRECTORY/libtke/tcl/unix            \
+             --with-tclinclude=$SOURCE_DIRECTORY/libtke/tcl/generic  \
              --enable-gcc                   &&
  make                                       &&
  prepare_install                            &&

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/devel/expect/DEPENDS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- DEPENDS	7 Nov 2003 09:48:10 -0000	1.3
+++ DEPENDS	12 Mar 2004 19:18:27 -0000	1.4
@@ -1,2 +1,2 @@
 depends tcl &&
-optional_depends "tk" "--with-tk=/tmp/libtke/tk/unix" "" "For expectk"
+optional_depends "tk" "" "" "For expectk"

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/devel/expect/DETAILS,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- DETAILS	2 Feb 2004 17:16:20 -0000	1.4
+++ DETAILS	12 Mar 2004 19:18:27 -0000	1.5
@@ -1,18 +1,17 @@
            MODULE=expect
-          VERSION=5.40
-           SOURCE=$MODULE.tar.gz
+          VERSION=5.40.0
+           SOURCE=$MODULE-$VERSION.tar.gz
           SOURCE2=tcl_tk_bits_for_expect.tar.bz2
- SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
-    SOURCE_URL[0]=http://expect.nist.gov/$SOURCE
-         WEB_SITE=http://expect.nist.gov/
-   SOURCE2_URL[0]=http://lunar-linux.org/lunar/cache/$SOURCE2
-       SOURCE_VFY=md5:c79799a1c4ae2f51d8267110f6e37a8d 
+ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-5.40
+       SOURCE_URL=http://expect.nist.gov/old/$SOURCE
+       SOURCE_VFY=md5:6ae1b87c9af993a69b901b6e52962c18
+      SOURCE2_URL=http://lunar-linux.org/lunar/cache/$SOURCE2
       SOURCE2_VFY=md5:60d35518949f6ab07b51f04346128c3a
-          PSAFE="no"
+         WEB_SITE=http://expect.nist.gov/
           ENTERED=20030817
           UPDATED=20030817
         SHORT="Expect is a tool for automating interactive applications"
-
+PSAFE="no"
 cat << EOF
 Expect is a tool for automating interactive applications such as telnet, 
 ftp, passwd, fsck, rlogin, tip, etc. Expect really makes this stuff 

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/devel/expect/PRE_BUILD,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PRE_BUILD	18 Aug 2003 00:46:54 -0000	1.1
+++ PRE_BUILD	12 Mar 2004 19:18:27 -0000	1.2
@@ -1,7 +1,7 @@
 (
-  default_pre_build &&
-  cd /tmp           &&
-  mkdir libtke      &&
-  cd libtke         &&
+  default_pre_build     &&
+  cd $SOURCE_DIRECTORY  &&
+  mkdir libtke          &&
+  cd libtke             &&
   tar xjf $SOURCE_CACHE/$SOURCE2
 ) 

--- POST_INSTALL DELETED ---