Date: Wed, 18 Aug 1999 18:45:08 -0500 From: Ade Lovett <ade@lovett.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/13242: unbreak lang/expect Message-ID: <E11HFOG-0002rr-00@zen.lovett.com>
next in thread | raw e-mail | index | archive | help
>Number: 13242
>Category: ports
>Synopsis: unbreak lang/expect
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Aug 18 16:50:01 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator: Ade Lovett
>Release: FreeBSD 4.0-CURRENT i386
>Organization:
Lovett Network Consultancy
>Environment:
Up-to-date ports tree.
>Description:
Another distfile survey cleanup. Distfiles for lang/expect
were unfetchable from the one and only master site.
>How-To-Repeat:
cd lang/expect; make fetch
>Fix:
Following patch upgrades expect to version 5.30 and uses the
official home location. Sadly, they've decided not to use
version numbers in their ftp/http'able source distributions, so
this may break without warning as and when they upgrade.
japanese/expect can probably be upgraded in a similar manner
by the maintainer -- this poor, dumb, Englishman is going to
stay away from that though -- to quote a phrase,
"I know two languages.. English.. and bad English.."
cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /home/FreeBSD/cvs/ports/lang/expect/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- Makefile 1998/11/14 09:43:17 1.38
+++ Makefile 1999/08/18 23:38:03
@@ -1,15 +1,15 @@
# New ports collection makefile for: expect
# Date created: 20 November 1994
# Whom: pst
-# Version required: 5.28
+# Version required: 5.30
#
# $Id: Makefile,v 1.38 1998/11/14 09:43:17 asami Exp $
-#
-# Note this file is included from japanese/expect/Makefile
-DISTNAME= expect-5.28
+DISTNAME= expect
+PKGNAME= expect-5.30
+WRKSRC= ${WRKDIR}/${PKGNAME}
CATEGORIES= lang tcl80 tk80
-MASTER_SITES= ftp://peloton.physics.montana.edu/pub/distfiles/
+MASTER_SITES= http://expect.nist.gov/
MAINTAINER= ports@freebsd.org
@@ -31,13 +31,13 @@
.include <bsd.port.pre.mk>
.if ${PORTOBJFORMAT} == "elf"
-SOLIB= libexpect528.so.1
+SOLIB= libexpect530.so.1
.else
-SOLIB= libexpect528.so.1.2
+SOLIB= libexpect530.so.1.2
.endif
post-install:
- ${LN} -sf ${SOLIB} ${PREFIX}/lib/libexpect528.so
+ ${LN} -sf ${SOLIB} ${PREFIX}/lib/libexpect530.so
${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
.include <bsd.port.post.mk>
cvs diff: Diffing files
Index: files/md5
===================================================================
RCS file: /home/FreeBSD/cvs/ports/lang/expect/files/md5,v
retrieving revision 1.14
diff -u -r1.14 md5
--- md5 1998/10/10 04:07:07 1.14
+++ md5 1999/08/18 23:01:48
@@ -1 +1 @@
-MD5 (expect-5.28.tar.gz) = 4fd07ed06049da86f63f8b0aa188367a
+MD5 (expect.tar.gz) = fdfb69b8f41802e690bc7d002c559d72
cvs diff: Diffing patches
Index: patches/patch-aa
===================================================================
RCS file: /home/FreeBSD/cvs/ports/lang/expect/patches/patch-aa,v
retrieving revision 1.8
diff -u -r1.8 patch-aa
--- patch-aa 1998/10/01 07:06:00 1.8
+++ patch-aa 1999/08/18 23:25:06
@@ -1,18 +1,9 @@
---- configure.orig Tue May 19 00:22:13 1998
-+++ configure Thu Oct 1 08:14:36 1998
-@@ -1236,6 +1236,8 @@
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-+
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-@@ -5902,7 +5904,11 @@
+--- configure.orig Wed Aug 18 11:52:19 1999
++++ configure Wed Aug 18 18:24:52 1999
+@@ -6076,7 +6076,11 @@
if test "$enable_shared" = "yes" && test "x${TCL_SHLIB_SUFFIX}" != "x" ; then
EXP_SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
- # EXP_SHARED_LIB_FILE=libexpect$EXP_LIB_VERSION$TCL_SHLIB_SUFFIX
+ # EXP_SHARED_LIB_FILE=libexpect$EXP_LIB_VERSION$TCL_DBGX$TCL_SHLIB_SUFFIX
- eval "EXP_SHARED_LIB_FILE=libexpect${TCL_SHARED_LIB_SUFFIX}"
+ if test X`objformat` = Xelf ; then
+ eval "EXP_SHARED_LIB_FILE=libexpect`echo ${VERSION} | tr -d .`.so.1"
@@ -22,7 +13,7 @@
EXP_LIB_FILE=$EXP_SHARED_LIB_FILE
EXP_LIB_FILES="$EXP_SHARED_LIB_FILE $EXP_UNSHARED_LIB_FILE"
echo "$ac_t""both shared and unshared" 1>&6
-@@ -6099,17 +6105,18 @@
+@@ -6290,7 +6294,7 @@
s%@TCL_SHLIB_LD@%$TCL_SHLIB_LD%g
s%@SHLIB_SUFFIX@%$SHLIB_SUFFIX%g
s%@TCL_LD_FLAGS@%$TCL_LD_FLAGS%g
@@ -31,7 +22,8 @@
s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
s%@TCL_SHARED_LIB_SUFFIX@%$TCL_SHARED_LIB_SUFFIX%g
s%@TK_VERSION@%$TK_VERSION%g
- s%@TK_DEFS@%$TK_DEFS%g
+@@ -6298,7 +6302,7 @@
+ s%@TK_DBGX@%$TK_DBGX%g
s%@TK_XINCLUDES@%$TK_XINCLUDES%g
s%@TK_XLIBSW@%$TK_XLIBSW%g
-s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g
@@ -39,7 +31,3 @@
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
cvs diff: Diffing pkg
Index: pkg/PLIST
===================================================================
RCS file: /home/FreeBSD/cvs/ports/lang/expect/pkg/PLIST,v
retrieving revision 1.13
diff -u -r1.13 PLIST
--- PLIST 1998/10/10 04:07:07 1.13
+++ PLIST 1999/08/18 23:27:56
@@ -23,11 +23,13 @@
include/expect.h
include/expect_comm.h
include/expect_tcl.h
-lib/expect5.28/pkgIndex.tcl
-lib/expect5.28/libexpect528.a
-lib/libexpect528.a
-lib/libexpect528.so
-lib/libexpect528.so.1.2
+include/tclRegexp.h
+include/tcldbg.h
+lib/expect5.30/pkgIndex.tcl
+lib/expect5.30/libexpect530.a
+lib/libexpect530.a
+lib/libexpect530.so
+lib/libexpect530.so.1
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-@dirrm lib/expect5.28
+@dirrm lib/expect5.30
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E11HFOG-0002rr-00>