Attachment #6406 for bug #14577

View | Details | Raw Unified | Return to bug 14577
Collapse All | Expand All




# New ports collection makefile for:	expect
# Date created:		20 November 1994
# Whom:			pst
# Version required:	5.31
#
# $FreeBSD: ports/lang/expect/Makefile,v 1.40 1999/08/25 06:34:30 obrien Exp $

DISTNAME=	expect
PKGNAME=	expect-5.31
CATEGORIES=	lang tcl82 tk82
MASTER_SITES=	http://expect.nist.gov/

MAINTAINER=	ports@freebsd.org

LIB_DEPENDS?=	tk82.1:${PORTSDIR}/x11-toolkits/tk82

WRKSRC=		${WRKDIR}/${PKGNAME}
GNU_CONFIGURE=	yes
CONFIGURE_ARGS?= --enable-shared \
		--with-tclconfig=${PREFIX}/lib/tcl8.2 \
		--with-tclinclude=${PREFIX}/include/tcl8.2 \
		--with-tkconfig=${PREFIX}/lib/tk8.2 \
		--with-tkinclude=${PREFIX}/include/tk8.2
.if !defined(NO_MAN_INSTALL)
MAN1=		autoexpect.1 cryptdir.1 decryptdir.1 dislocate.1 \
		expect.1 expectk.1 kibitz.1 mkpasswd.1 passmass.1 \

MAN3=		libexpect.3
.endif

.include <bsd.port.pre.mk>

.if ${PORTOBJFORMAT} == "elf"
SOLIB=	libexpect530.so.1
.else
SOLIB=	libexpect530.so.1.2
.endif

post-install:
	${LN} -sf libexpect531.so.1 ${PREFIX}/lib/libexpect531.so
	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib

.include <bsd.port.mk>

Line 1 Link Here

(-)md5 (-1 / +1 lines)
1	MD5 (expect.tar.gz) = 947ac547a40b02e7db0ecdae84b33ca7	1	MD5 (expect.tar.gz) = aee409b4d3ebb4cc9a32b194006c0a51




--- configure.orig	Fri Oct 22 22:48:14 1999
+++ configure	Wed Oct 27 18:10:25 1999
@@ -6273,7 +6273,7 @@
 echo "configure:6274: checking for type of library to build" >&5
 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_DBGX$TCL_SHLIB_SUFFIX
-  eval "EXP_SHARED_LIB_FILE=libexpect${TCL_SHARED_LIB_SUFFIX}"
+  eval "EXP_SHARED_LIB_FILE=libexpect`echo ${VERSION} | tr -d .`.so.1"
+    eval "EXP_SHARED_LIB_FILE=libexpect`echo ${VERSION} | tr -d .`.so.1"
+  else
+    eval "EXP_SHARED_LIB_FILE=libexpect`echo ${VERSION} | tr -d .`.so.1.2"
+  fi
   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
@@ -6504,7 +6504,7 @@
 s%@TCL_SHLIB_LD@%$TCL_SHLIB_LD%g
 s%@SHLIB_SUFFIX@%$SHLIB_SUFFIX%g
 s%@TCL_LD_FLAGS@%$TCL_LD_FLAGS%g

 s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
 s%@TCL_SHARED_LIB_SUFFIX@%$TCL_SHARED_LIB_SUFFIX%g
 s%@TK_VERSION@%$TK_VERSION%g
@@ -6512,7 +6512,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
+s%@TK_BUILD_LIB_SPEC@%$TK_LIB_SPEC%g
 s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g
 s%@CC@%$CC%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g

Lines 25-35 Link Here

(-)PLIST (-6 / +6 lines)
25	include/expect_tcl.h	25	include/expect_tcl.h
26	include/tclRegexp.h	26	include/tclRegexp.h
27	include/tcldbg.h	27	include/tcldbg.h
28	lib/expect5.30/pkgIndex.tcl	28	lib/expect5.31/pkgIndex.tcl
29	lib/expect5.30/libexpect530.a	29	lib/expect5.31/libexpect531.a
30	lib/libexpect530.a	30	lib/libexpect531.a
31	lib/libexpect530.so	31	lib/libexpect531.so
32	lib/libexpect530.so.1	32	lib/libexpect531.so.1
33	@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B	33	@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
34	@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R	34	@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
35	@dirrm lib/expect5.30	35	@dirrm lib/expect5.31

Return to bug 14577

Lines 1-26 Link Here

(-)Makefile (-18 / +10 lines)
1	# New ports collection makefile for: expect	1	# New ports collection makefile for: expect
2	# Date created: 20 November 1994	2	# Date created: 20 November 1994
3	# Whom: pst	3	# Whom: pst
4	# Version required: 5.30	4	# Version required: 5.31
5	#	5	#
6	# $FreeBSD: ports/lang/expect/Makefile,v 1.40 1999/08/25 06:34:30 obrien Exp $	6	# $FreeBSD: ports/lang/expect/Makefile,v 1.40 1999/08/25 06:34:30 obrien Exp $
7		7
8	DISTNAME= expect	8	DISTNAME= expect
9	PKGNAME= expect-5.30	9	PKGNAME= expect-5.31
10	CATEGORIES= lang tcl80 tk80	10	CATEGORIES= lang tcl82 tk82
11	MASTER_SITES= http://expect.nist.gov/	11	MASTER_SITES= http://expect.nist.gov/
12		12
13	MAINTAINER= ports@freebsd.org	13	MAINTAINER= ports@freebsd.org
14		14
15	LIB_DEPENDS?= tk80.1:${PORTSDIR}/x11-toolkits/tk80	15	LIB_DEPENDS?= tk82.1:${PORTSDIR}/x11-toolkits/tk82
16		16
17	WRKSRC= ${WRKDIR}/${PKGNAME}	17	WRKSRC= ${WRKDIR}/${PKGNAME}
18	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
19	CONFIGURE_ARGS?= --enable-shared \	19	CONFIGURE_ARGS?= --enable-shared \
20	--with-tclconfig=${PREFIX}/lib/tcl8.0 \	20	--with-tclconfig=${PREFIX}/lib/tcl8.2 \
21	--with-tclinclude=${PREFIX}/include/tcl8.0 \	21	--with-tclinclude=${PREFIX}/include/tcl8.2 \
22	--with-tkconfig=${PREFIX}/lib/tk8.0 \	22	--with-tkconfig=${PREFIX}/lib/tk8.2 \
23	--with-tkinclude=${PREFIX}/include/tk8.0	23	--with-tkinclude=${PREFIX}/include/tk8.2
24	.if !defined(NO_MAN_INSTALL)	24	.if !defined(NO_MAN_INSTALL)
25	MAN1= autoexpect.1 cryptdir.1 decryptdir.1 dislocate.1 \	25	MAN1= autoexpect.1 cryptdir.1 decryptdir.1 dislocate.1 \
26	expect.1 expectk.1 kibitz.1 mkpasswd.1 passmass.1 \	26	expect.1 expectk.1 kibitz.1 mkpasswd.1 passmass.1 \
Lines 28-43 Link Here
28	MAN3= libexpect.3	28	MAN3= libexpect.3
29	.endif	29	.endif
30		30
31	.include <bsd.port.pre.mk>
32
33	.if ${PORTOBJFORMAT} == "elf"
34	SOLIB= libexpect530.so.1
35	.else
36	SOLIB= libexpect530.so.1.2
37	.endif
38
39	post-install:	31	post-install:
40	${LN} -sf ${SOLIB} ${PREFIX}/lib/libexpect530.so	32	${LN} -sf libexpect531.so.1 ${PREFIX}/lib/libexpect531.so
41	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib	33	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
42		34
43	.include <bsd.port.post.mk>	35	.include <bsd.port.mk>

Lines 1-19 Link Here

(-)patch-aa (-12 / +8 lines)
1	--- configure.orig Wed Aug 18 11:52:19 1999	1	--- configure.orig Fri Oct 22 22:48:14 1999
2	+++ configure Wed Aug 18 18:24:52 1999	2	+++ configure Wed Oct 27 18:10:25 1999
3	@@ -6076,7 +6076,11 @@	3	@@ -6273,7 +6273,7 @@
		4	echo "configure:6274: checking for type of library to build" >&5
4	if test "$enable_shared" = "yes" && test "x${TCL_SHLIB_SUFFIX}" != "x" ; then	5	if test "$enable_shared" = "yes" && test "x${TCL_SHLIB_SUFFIX}" != "x" ; then
5	EXP_SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS	6	EXP_SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
6	# EXP_SHARED_LIB_FILE=libexpect$EXP_LIB_VERSION$TCL_DBGX$TCL_SHLIB_SUFFIX
7	- eval "EXP_SHARED_LIB_FILE=libexpect${TCL_SHARED_LIB_SUFFIX}"	7	- eval "EXP_SHARED_LIB_FILE=libexpect${TCL_SHARED_LIB_SUFFIX}"
8	+ if test X`objformat` = Xelf ; then	8	+ eval "EXP_SHARED_LIB_FILE=libexpect`echo ${VERSION} \| tr -d .`.so.1"
9	+ eval "EXP_SHARED_LIB_FILE=libexpect`echo ${VERSION} \| tr -d .`.so.1"
10	+ else
11	+ eval "EXP_SHARED_LIB_FILE=libexpect`echo ${VERSION} \| tr -d .`.so.1.2"
12	+ fi
13	EXP_LIB_FILE=$EXP_SHARED_LIB_FILE	9	EXP_LIB_FILE=$EXP_SHARED_LIB_FILE
14	EXP_LIB_FILES="$EXP_SHARED_LIB_FILE $EXP_UNSHARED_LIB_FILE"	10	EXP_LIB_FILES="$EXP_SHARED_LIB_FILE $EXP_UNSHARED_LIB_FILE"
15	echo "$ac_t""both shared and unshared" 1>&6	11	echo "$ac_t""both shared and unshared" 1>&6
16	@@ -6290,7 +6294,7 @@	12	@@ -6504,7 +6504,7 @@
17	s%@TCL_SHLIB_LD@%$TCL_SHLIB_LD%g	13	s%@TCL_SHLIB_LD@%$TCL_SHLIB_LD%g
18	s%@SHLIB_SUFFIX@%$SHLIB_SUFFIX%g	14	s%@SHLIB_SUFFIX@%$SHLIB_SUFFIX%g
19	s%@TCL_LD_FLAGS@%$TCL_LD_FLAGS%g	15	s%@TCL_LD_FLAGS@%$TCL_LD_FLAGS%g
Lines 22-33 Link Here
22	s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g	18	s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
23	s%@TCL_SHARED_LIB_SUFFIX@%$TCL_SHARED_LIB_SUFFIX%g	19	s%@TCL_SHARED_LIB_SUFFIX@%$TCL_SHARED_LIB_SUFFIX%g
24	s%@TK_VERSION@%$TK_VERSION%g	20	s%@TK_VERSION@%$TK_VERSION%g
25	@@ -6298,7 +6302,7 @@	21	@@ -6512,7 +6512,7 @@
26	s%@TK_DBGX@%$TK_DBGX%g	22	s%@TK_DBGX@%$TK_DBGX%g
27	s%@TK_XINCLUDES@%$TK_XINCLUDES%g	23	s%@TK_XINCLUDES@%$TK_XINCLUDES%g
28	s%@TK_XLIBSW@%$TK_XLIBSW%g	24	s%@TK_XLIBSW@%$TK_XLIBSW%g
29	-s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g	25	-s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g
30	+s%@TK_BUILD_LIB_SPEC@%$TK_LIB_SPEC%g	26	+s%@TK_BUILD_LIB_SPEC@%$TK_LIB_SPEC%g
31	s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g	27	s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g
32	s%@CC@%$CC%g
33	s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g	28	s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
		29	s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g