Update to 5.25. Now uses tcl80/tk80. Big cleanup of Makefile (thanks to

portlint!)

5 files changed, 39 insertions, 47 deletions

diff --git a/lang/expect/Makefile b/lang/expect/Makefile
index 46a7b0c9c444..8bbf42545511 100644
--- a/lang/expect/Makefile
+++ b/lang/expect/Makefile
@@ -1,26 +1,30 @@
 # New ports collection makefile for:	expect
 # Date created:		20 November 1994
 # Whom:			pst
-# Version required:	5.22.0
+# Version required:	5.25
 #
-# $Id: Makefile,v 1.19 1997/04/20 13:19:07 wosch Exp $
+# $Id: Makefile,v 1.20 1997/07/07 08:25:10 pst Exp $
 #
 
-DISTNAME=	expect-5.22
-PKGNAME=	expect-5.22.0
-CATEGORIES=	lang tcl76 tk42
+DISTNAME=	expect
+PKGNAME=	expect-5.25
+CATEGORIES=	lang tcl80 tk80
 MASTER_SITES=	http://expect.nist.gov/ \
 		ftp://expect.nist.gov/mel/div826/subject/expect/
-DISTFILES=	expect.tar.gz
 
-LIB_DEPENDS=	tk42\\.1\\.:${PORTSDIR}/x11/tk42
+MAINTAINER=	ports@freebsd.org
+
+DEPENDS=	${PORTSDIR}/lang/tcl80 \
+		${PORTSDIR}/x11/tk80
+
+WRKSRC=		${WRKDIR}/expect-5.25
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --enable-shared \
-		--with-tclconfig=${PREFIX}/lib/tcl7.6 \
-		--with-tclinclude=${PREFIX}/include/tcl7.6 \
-		--with-tkconfig=${PREFIX}/lib/tk4.2 \
-		--with-tkinclude=${PREFIX}/include/tk4.2
+		--with-tclconfig=${PREFIX}/lib/tcl8.0 \
+		--with-tclinclude=${PORTSDIR}/lang/tcl80/work/tcl8.0 \
+		--with-tkconfig=${PREFIX}/lib/tk8.0 \
+		--with-tkinclude=${PORTSDIR}/x11/tk80/work/tk8.0
 MAN1=		autoexpect.1 cryptdir.1 decryptdir.1 dislocate.1 \
 		expect.1 expectk.1 kibitz.1 mkpasswd.1 passmass.1 \
 		tknewsbiff.1 unbuffer.1 xkibitz.1
diff --git a/lang/expect/distinfo b/lang/expect/distinfo
index 69a0bb4f8111..9c453ad02104 100644
--- a/lang/expect/distinfo
+++ b/lang/expect/distinfo
@@ -1 +1 @@
-MD5 (expect.tar.gz) = 5a6e1b2709fa57466fca860efa88c34d
+MD5 (expect.tar.gz) = f64a719737b0b012f8bbee115a6b9a72
diff --git a/lang/expect/files/patch-aa b/lang/expect/files/patch-aa
index b883fe70448f..9ae9e31a3c0a 100644
--- a/lang/expect/files/patch-aa
+++ b/lang/expect/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Tue Feb  4 09:08:16 1997
-+++ configure	Tue Mar  4 12:03:22 1997
-@@ -1161,6 +1161,8 @@
+--- configure.ORIG	Sun Sep 28 19:23:25 1997
++++ configure	Fri Oct 10 08:37:05 1997
+@@ -1236,6 +1236,8 @@
  # It thinks the first close brace ends the variable substitution.
  test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
  
@@ -9,32 +9,11 @@
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
  
-@@ -5728,15 +5730,17 @@
-     EXP_LIB_VERSION=$EXP_VERSION_NODOTS
- fi
- 
-+VERSION=${EXP_LIB_VERSION}
-+
- EXP_BUILD_LIB_SPEC="-L`pwd` -lexpect${EXP_LIB_VERSION}"
- EXP_LIB_SPEC="-L\${exec_prefix}/lib -lexpect${EXP_LIB_VERSION}"
--EXP_NONSHARED_LIB_FILE=libexpect${EXP_LIB_VERSION}.a
-+eval EXP_NONSHARED_LIB_FILE=libexpect${TCL_UNSHARED_LIB_SUFFIX}
- 
- echo $ac_n "checking for type of library to build""... $ac_c" 1>&6
- echo "configure:5737: checking for type of library to build" >&5
--if test "$enable_shared" = "yes" && test "x${TCL_SHLIB_SUFFIX}" != "x" ; then
-+if test "$enable_shared" = "yes" -a "x${TCL_SHARED_LIB_SUFFIX}" != "x" ; then
-   EXP_SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
--  EXP_SHARED_LIB_FILE=libexpect$EXP_LIB_VERSION$TCL_SHLIB_SUFFIX
-+  eval EXP_SHARED_LIB_FILE=libexpect${TCL_SHARED_LIB_SUFFIX}
-   EXP_LIB_FILE=$EXP_SHARED_LIB_FILE
-   EXP_LIB_FILES="$EXP_SHARED_LIB_FILE $EXP_NONSHARED_LIB_FILE"
-   echo "$ac_t""both shared and nonshared" 1>&6
-@@ -5908,6 +5912,7 @@
+@@ -6019,6 +6021,7 @@
  s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g
  s%@CC@%$CC%g
  s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
  s%@INSTALL_DATA@%$INSTALL_DATA%g
+ s%@RANLIB@%$RANLIB%g
  s%@subdirs@%$subdirs%g
- s%@CPP@%$CPP%g
diff --git a/lang/expect/files/patch-ac b/lang/expect/files/patch-ac
index f456c3e352fd..6eff75af883d 100644
--- a/lang/expect/files/patch-ac
+++ b/lang/expect/files/patch-ac
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Sat Dec 28 01:50:41 1996
-+++ Makefile.in	Mon Jan  6 18:40:39 1997
-@@ -180,6 +180,7 @@
+--- Makefile.in.orig	Sun Sep 28 19:20:30 1997
++++ Makefile.in	Fri Oct 10 09:05:17 1997
+@@ -186,6 +186,7 @@
  
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -8,7 +8,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  
  AR = ar
-@@ -196,6 +197,7 @@
+@@ -202,6 +203,7 @@
  	"HDEFS=$(HDEFS)" \
  	"INSTALL=$(INSTALL)" \
  	"INSTALL_DATA=$(INSTALL_DATA)" \
@@ -16,7 +16,16 @@
  	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
  	"LDFLAGS=$(LDFLAGS)" \
  	"RUNTEST=$(RUNTEST)" \
-@@ -437,7 +439,7 @@
+@@ -350,7 +352,7 @@
+ 	else true; fi
+ 	if [ -s $(EXP_SHARED_LIB_FILE) ] ; then \
+ 	  $(INSTALL_PROGRAM) $(EXP_SHARED_LIB_FILE) $(tcl_libdir)/$(EXP_SHARED_LIB_FILE) ; \
+-	  $(INSTALL_PROGRAM) pkgIndex $(libdir)/pkgIndex.tcl ; \
++	  $(INSTALL_SCRIPT) pkgIndex $(libdir)/pkgIndex.tcl ; \
+ 	else true; fi
+ 
+ expect_installed:	exp_main_exp.o $(EXP_LIB_FILE) install_shared_lib
+@@ -430,7 +432,7 @@
  	${srcdir}/mkinstalldirs $(bindir_arch_indep) $(man1dir) $(SCRIPTDIR) $(EXECSCRIPTDIR)
  	-for i in $(SCRIPT_LIST) ; do \
  	  if [ -f $$i ] ; then \
diff --git a/lang/expect/pkg-plist b/lang/expect/pkg-plist
index b2940a2f06fa..fad83d759cc8 100644
--- a/lang/expect/pkg-plist
+++ b/lang/expect/pkg-plist
@@ -24,9 +24,9 @@ include/Dbg.h
 include/expect.h
 include/expect_comm.h
 include/expect_tcl.h
-lib/expect5.22/pkgIndex.tcl
-lib/libexpect522.a
-lib/libexpect522.so.1.0
+lib/expect5.25/pkgIndex.tcl
+lib/libexpect525.a
+lib/libexpect525.so.1.0
 man/man1/autoexpect.1.gz
 man/man1/cryptdir.1.gz
 man/man1/decryptdir.1.gz
@@ -40,4 +40,4 @@ man/man1/tknewsbiff.1.gz
 man/man1/unbuffer.1.gz
 man/man1/xkibitz.1.gz
 man/man3/libexpect.3.gz
-@dirrm lib/expect5.22
+@dirrm lib/expect5.25