Add a Makefile.common to tcl-expect and use it to keep tk-expect in sync.

Fixes PR 20055 from Robert Elz.  Updates tk-expect to version 5.38.

Also remove the pre-configure step from tk-expect that was removed from
tcl-expect a year ago.

Also use the standard test target rather than an explict one.

3 files changed, 26 insertions, 32 deletions

diff --git a/lang/tcl-expect/Makefile b/lang/tcl-expect/Makefile
index bea386d1dd2..22a22a6487a 100644
--- a/lang/tcl-expect/Makefile
+++ b/lang/tcl-expect/Makefile
@@ -1,28 +1,21 @@
-# $NetBSD: Makefile,v 1.11 2003/01/10 00:11:00 mycroft Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/28 03:41:02 markd Exp $
 #
 
-DISTNAME=	expect-5.38.0
-PKGNAME=	tcl-expect-5.38.0
+.include "Makefile.common"
+
+PKGNAME=	tcl-expect-${EXPECT_VERSION}
 CATEGORIES=	lang
-MASTER_SITES=	http://expect.nist.gov/src/
 
 MAINTAINER=	jwise@netbsd.org
-HOMEPAGE=	http://expect.nist.gov/
 COMMENT=	extensions to Tcl to support scripting of interactive programs
 
 DEPENDS+=	tcl>=8.3.2:../../lang/tcl
 
-WRKSRC=		${WRKDIR}/expect-5.38
 CONFLICTS+=	expect-[0-9]*
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
 CONFIGURE_ARGS= --enable-shared \
 		--with-tclconfig=${PREFIX}/lib \
 		--with-tclinclude=${PREFIX}/include/tcl \
 		--without-x
 
-test:
-	@(cd ${WRKSRC}; ${MAKE} test)
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/tcl-expect/Makefile.common b/lang/tcl-expect/Makefile.common
new file mode 100644
index 00000000000..d918a7072d6
--- /dev/null
+++ b/lang/tcl-expect/Makefile.common
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile.common,v 1.1 2003/01/28 03:41:02 markd Exp $
+#
+
+DISTNAME=	expect-${EXPECT_VERSION}
+MASTER_SITES=	http://expect.nist.gov/src/
+HOMEPAGE=	http://expect.nist.gov/
+
+EXPECT_VERSION=	5.38.0
+
+WRKSRC=		${WRKDIR}/expect-5.38
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+TEST_TARGET=	test
+
+DISTINFO_FILE=	${.CURDIR}/../../lang/tcl-expect/distinfo
+PATCHDIR=	${.CURDIR}/../../lang/tcl-expect/patches
diff --git a/lang/tk-expect/Makefile b/lang/tk-expect/Makefile
index 716673f469d..7bcc74b5c37 100644
--- a/lang/tk-expect/Makefile
+++ b/lang/tk-expect/Makefile
@@ -1,41 +1,25 @@
-# $NetBSD: Makefile,v 1.10 2001/10/25 22:21:53 jwise Exp $
+# $NetBSD: Makefile,v 1.11 2003/01/28 03:41:03 markd Exp $
 #
 
-DISTNAME=	expect-5.33.0
-PKGNAME=	tk-expect-5.33.0
+.include "../../lang/tcl-expect/Makefile.common"
+
+PKGNAME=	tk-expect-${EXPECT_VERSION}
 CATEGORIES=	lang
-MASTER_SITES=	http://expect.nist.gov/src/
 
 MAINTAINER=	jwise@netbsd.org
-HOMEPAGE=	http://expect.nist.gov/
 COMMENT=	tcl interpreter with both the expect and tk extensions built in
 
 DEPENDS+=	tk>=8.3.2:../../x11/tk
-DEPENDS+=	tcl-expect-5.33.0:../../lang/tcl-expect
-
-WRKSRC=		${WRKDIR}/expect-5.33
-
-DISTINFO_FILE=	${.CURDIR}/../../lang/tcl-expect/distinfo
-PATCHDIR=	${.CURDIR}/../../lang/tcl-expect/patches
+DEPENDS+=	tcl-expect-${EXPECT_VERSION}:../../lang/tcl-expect
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
 CONFIGURE_ARGS= --enable-shared \
 		--with-tclconfig=${PREFIX}/lib \
 		--with-tkconfig=${PREFIX}/lib \
 		--with-tclinclude=${PREFIX}/include/tcl \
 		--with-tkinclude=${PREFIX}/include/tk \
 
-.include "../../mk/bsd.prefs.mk"
-
-pre-configure:
-	cd ${WRKSRC} && ${TOUCH} configure
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/expectk ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/expectk.man ${PREFIX}/man/man1/expectk.1
 
-test:
-	@(cd ${WRKSRC}; ${MAKE} test)
-
 .include "../../mk/bsd.pkg.mk"