summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorminskim <minskim@pkgsrc.org>2004-03-11 07:16:45 +0000
committerminskim <minskim@pkgsrc.org>2004-03-11 07:16:45 +0000
commit0af32f2c70bf89dcfcd4c38e99d214c1b79bb2e5 (patch)
treec160fc6941c77c89783017a373acdaf7bd7be6fb
parentc95af4404b6eee558abe6aaa70dbda7087f96397 (diff)
downloadpkgsrc-0af32f2c70bf89dcfcd4c38e99d214c1b79bb2e5.tar.gz
Switch to Tcl/Tk 8.4 and bl3ify.
-rw-r--r--lang/tcl-expect/Makefile6
-rw-r--r--lang/tcl-expect/Makefile.common3
-rw-r--r--lang/tk-expect/Makefile8
3 files changed, 10 insertions, 7 deletions
diff --git a/lang/tcl-expect/Makefile b/lang/tcl-expect/Makefile
index e4d9b6b8731..9346d354632 100644
--- a/lang/tcl-expect/Makefile
+++ b/lang/tcl-expect/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.15 2004/03/08 19:52:51 minskim Exp $
+# $NetBSD: Makefile,v 1.16 2004/03/11 07:16:45 minskim Exp $
#
.include "Makefile.common"
PKGNAME= tcl-expect-${EXPECT_VERSION}
+PKGREVISION= 1
CATEGORIES= lang
MAINTAINER= jwise@NetBSD.org
COMMENT= Extensions to Tcl to support scripting of interactive programs
-DEPENDS+= tcl>=8.3.2:../../lang/tcl83
-
CONFLICTS+= expect-[0-9]*
CONFIGURE_ARGS= --enable-shared \
@@ -18,4 +17,5 @@ CONFIGURE_ARGS= --enable-shared \
--with-tclinclude=${PREFIX}/include/tcl \
--without-x
+.include "../../lang/tcl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/tcl-expect/Makefile.common b/lang/tcl-expect/Makefile.common
index e1fdfa34fc6..afd085e09e1 100644
--- a/lang/tcl-expect/Makefile.common
+++ b/lang/tcl-expect/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2004/01/20 12:19:18 agc Exp $
+# $NetBSD: Makefile.common,v 1.3 2004/03/11 07:16:45 minskim Exp $
#
DISTNAME= expect-${EXPECT_VERSION}
@@ -8,6 +8,7 @@ HOMEPAGE= http://expect.nist.gov/
EXPECT_VERSION= 5.38.0
WRKSRC= ${WRKDIR}/expect-5.38
+USE_BUILDLINK3= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
TEST_TARGET= test
diff --git a/lang/tk-expect/Makefile b/lang/tk-expect/Makefile
index 14f3e81107c..b4fb3555312 100644
--- a/lang/tk-expect/Makefile
+++ b/lang/tk-expect/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.14 2004/03/08 20:27:14 minskim Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/11 07:16:45 minskim Exp $
#
.include "../../lang/tcl-expect/Makefile.common"
PKGNAME= tk-expect-${EXPECT_VERSION}
+PKGREVISION= 1
CATEGORIES= lang
MAINTAINER= jwise@NetBSD.org
COMMENT= Tcl interpreter with both the expect and tk extensions built in
-DEPENDS+= tk>=8.3.2:../../x11/tk83
-DEPENDS+= tcl-expect-${EXPECT_VERSION}:../../lang/tcl-expect
+DEPENDS+= tcl-expect>=${EXPECT_VERSION}:../../lang/tcl-expect
CONFIGURE_ARGS= --enable-shared \
--with-tclconfig=${PREFIX}/lib \
@@ -22,4 +22,6 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/expectk ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/expectk.man ${PREFIX}/man/man1/expectk.1
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"