expect: update to 5.45

expect/build.sh

@@ -6,11 +6,11 @@
 ###########################################################
 # Check the following 4 variables before running the script
 topdir=expect
-version=5.43.0
+version=5.45
 pkgver=1
-source[0]=$topdir-$version.tar.gz
+source[0]=http://prdownloads.sourceforge.net/expect/$topdir$version.tar.gz
 # If there are no patches, simply comment this
-patch[0]=expect-5.43-no-rpath.patch
+#patch[0]=
 
 # Source function library
 . ${BUILDPKG_SCRIPTS}/buildpkg.functions
@@ -19,17 +19,15 @@ patch[0]=expect-5.43-no-rpath.patch
 export CPPFLAGS="-I$prefix/include"
 export LDFLAGS="-L$prefix/lib -R$prefix/lib"
 
-configure_args=(--prefix=$prefix --mandir=$prefix/$_mandir --with-tcl=${prefix}/${_libdir} --with-tclinclude=${prefix}/${_includedir}/tcl-private --with-tkinclude=${prefix}/${_includedir}/tk-private --with-tk=${prefix}/${_libdir} --enable-shared)
-
-topsrcdir=$topdir-${version%.*}
-majorver=5.43
+configure_args=(--prefix=$prefix --mandir=$prefix/$_mandir --with-tcl=${prefix}/${_libdir} --with-tclinclude=${prefix}/${_includedir} --enable-shared)
+make_check_target=test
+topsrcdir=$topdir${version}
+majorver=$version
 
 reg prep
 prep()
 {
     generic_prep
-    sleep 1
-    touch configure
 }
 
 reg build
@@ -47,9 +45,9 @@ check()
 reg install
 install()
 {
-    generic_install INSTALL_ROOT
+    generic_install DESTDIR
     setdir ${stagedir}${prefix}/${_libdir}
-    ${__ln} -s libexpect${majorver}.so libexpect.so
+    ${__ln} -s ${topdir}${version}/libexpect${majorver}.so libexpect.so
     ${__rm} -f ${_libdir}/expect-${majorver}/*.a
     doc FAQ README HISTORY
 }

expect/meta/ChangeLog

@@ -0,0 +1,4 @@
+CHANGELOG
+---------
+* Mon Nov 18 2013 Tom G. Christensen <swpkg@jupiterrise.com> - 5.45-1
+- Update to 5.45

expect/meta/pkgdef

@@ -8,7 +8,8 @@ pkgver="$pkgver"
 files(-,root,bin)
 default_docs
 $_bindir
-$_libdir/libexpect${majorver}.so
+$_libdir/libexpect.so
+$_libdir/expect${majorver}/libexpect${majorver}.so
 $_libdir/expect${majorver}/pkgIndex.tcl
 $_mandir/?a?[12456789]
 
@@ -21,8 +22,5 @@ pkgdesc="Files needed for developing with libexpect"
 pkgver="$pkgver"
 files(-,root,bin)
 $_includedir
-$_libdir/libexpect.so
-$_libdir/*.a
-$_libdir/expect${majorver}/*.a
 $_mandir/?a?3
 

expect/meta/relnotes

@@ -1,27 +0,0 @@
-PACKAGE DETAILS
----------------
-Name:	    %%PKGNAME%%
-Version:    %%SOURCE_AND_VER%%
-Vendor:	    %%VENDOR%%
-Packager:   %%PKGEDBY%%
-
-Source (sha1sum):
-%%SOURCE_SHA1SUM%%
-
-BUILD DETAILS
--------------
-Compiler:
-%%COMPILER%%
-
-Environment:
-%%ENVIRONMENT%%
-
-Configure:
-%%CONFIGURE%%
-
-KNOWN DEPENDENCIES
-------------------
-%%DEPENDENCIES%%
-
-ERRORS/MISCELLANEOUS
---------------------

expect/src/expect-5.43-no-rpath.patch

@@ -1,13 +0,0 @@
---- expect-5.43/Makefile.in.norpath	2008-01-19 15:44:59.460000000 +0100
-+++ expect-5.43/Makefile.in	2008-01-19 15:45:15.510000000 +0100
-@@ -311,8 +311,8 @@
- # -lsocket	For SCO UNIX 3.2.2 (this should now be done automatically)
- # -lX11		For Pyramid OSx, poll is broken, so use select from X lib
- #  /usr/ucblib/libucb.a is needed for solaris 2.0 after -lm
--EXP_AND_TCL_LIBS = $(LDFLAGS) @EXP_AND_TCL_LIBS@
--EXP_AND_TK_LIBS = $(LDFLAGS) @EXP_AND_TK_LIBS@
-+EXP_AND_TCL_LIBS = $(LDFLAGS) -lm
-+EXP_AND_TK_LIBS = $(LDFLAGS) -lm -lX11
- 
- CFLAGS_INT = $(MH_CFLAGS) $(CPPFLAGS) $(XCFLAGS)
-