diff options
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/Makefile | 3 | ||||
| -rw-r--r-- | lang/smalltalk/Makefile | 4 | ||||
| -rw-r--r-- | lang/tcl-expect/Makefile | 4 | ||||
| -rw-r--r-- | lang/tcl-itcl/Makefile | 8 | ||||
| -rw-r--r-- | lang/tcl-itcl/buildlink2.mk | 4 | ||||
| -rw-r--r-- | lang/tcl-tclX/Makefile | 8 | ||||
| -rw-r--r-- | lang/tk-tclX/Makefile | 6 |
7 files changed, 19 insertions, 18 deletions
diff --git a/lang/Makefile b/lang/Makefile index 119a8279cc6..d1e35a7dcd8 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.166 2004/03/07 17:18:58 minskim Exp $ +# $NetBSD: Makefile,v 1.167 2004/03/08 19:52:51 minskim Exp $ # COMMENT= Programming languages @@ -134,6 +134,7 @@ SUBDIR+= sun-jre13 SUBDIR+= sun-jre14 SUBDIR+= swi-prolog SUBDIR+= tcl +SUBDIR+= tcl83 SUBDIR+= tcl-expect SUBDIR+= tcl-itcl SUBDIR+= tcl-otcl diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile index 2cdce6bdd57..c26cba81892 100644 --- a/lang/smalltalk/Makefile +++ b/lang/smalltalk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/02/14 17:21:44 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2004/03/08 19:52:51 minskim Exp $ DISTNAME= smalltalk-2.1.4 CATEGORIES= lang @@ -34,7 +34,7 @@ TEST_TARGET= check .include "../../devel/gmp/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk" .include "../../devel/readline/buildlink2.mk" -.include "../../lang/tcl/buildlink2.mk" +.include "../../lang/tcl83/buildlink2.mk" .include "../../x11/tk/buildlink2.mk" .include "../../databases/gdbm/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/tcl-expect/Makefile b/lang/tcl-expect/Makefile index d374151e754..e4d9b6b8731 100644 --- a/lang/tcl-expect/Makefile +++ b/lang/tcl-expect/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2003/07/21 16:54:07 martti Exp $ +# $NetBSD: Makefile,v 1.15 2004/03/08 19:52:51 minskim Exp $ # .include "Makefile.common" @@ -9,7 +9,7 @@ CATEGORIES= lang MAINTAINER= jwise@NetBSD.org COMMENT= Extensions to Tcl to support scripting of interactive programs -DEPENDS+= tcl>=8.3.2:../../lang/tcl +DEPENDS+= tcl>=8.3.2:../../lang/tcl83 CONFLICTS+= expect-[0-9]* diff --git a/lang/tcl-itcl/Makefile b/lang/tcl-itcl/Makefile index acb5328a03b..fee49b3504d 100644 --- a/lang/tcl-itcl/Makefile +++ b/lang/tcl-itcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/07/17 21:45:30 grant Exp $ +# $NetBSD: Makefile,v 1.9 2004/03/08 19:52:51 minskim Exp $ DISTNAME= itcl3.2 PKGNAME= tcl-itcl-3.2 @@ -27,16 +27,16 @@ post-extract: @${MV} -f ${WRKSRC}/iwidgets2.2.0/doc/menubar.n \ ${WRKSRC}/iwidgets2.2.0/doc/itclmenubar.n @if [ ! -e ${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.4 ]; then \ - cd ../../lang/tcl && ${MAKE} extract; \ + cd ../../lang/tcl83 && ${MAKE} extract; \ fi @if [ ! -e ${_PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.3.4 ]; then \ cd ../../x11/tk && ${MAKE} extract; \ fi pre-clean: - @cd ../../lang/tcl && ${MAKE} clean + @cd ../../lang/tcl83 && ${MAKE} clean @cd ../../x11/tk && ${MAKE} clean -.include "../../lang/tcl/buildlink2.mk" +.include "../../lang/tcl83/buildlink2.mk" .include "../../x11/tk/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/tcl-itcl/buildlink2.mk b/lang/tcl-itcl/buildlink2.mk index 8bb78b51354..978b9c81748 100644 --- a/lang/tcl-itcl/buildlink2.mk +++ b/lang/tcl-itcl/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.1 2002/10/25 09:13:49 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.2 2004/03/08 19:52:51 minskim Exp $ # .if !defined(TCL_ITCL_BUILDLINK2_MK) @@ -339,7 +339,7 @@ BUILDLINK_FILES.tcl-itcl+= lib/tcl/iwidgets3.0.1/scripts/toolbar.itk BUILDLINK_FILES.tcl-itcl+= lib/tcl/iwidgets3.0.1/scripts/unknownimage.gif BUILDLINK_FILES.tcl-itcl+= lib/tcl/iwidgets3.0.1/scripts/watch.itk -.include "../../lang/tcl/buildlink2.mk" +.include "../../lang/tcl83/buildlink2.mk" .include "../../x11/tk/buildlink2.mk" BUILDLINK_TARGETS+= tcl-itcl-buildlink diff --git a/lang/tcl-tclX/Makefile b/lang/tcl-tclX/Makefile index 20be60b9bb8..f071432dbfb 100644 --- a/lang/tcl-tclX/Makefile +++ b/lang/tcl-tclX/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/01/20 12:19:18 agc Exp $ +# $NetBSD: Makefile,v 1.16 2004/03/08 19:52:51 minskim Exp $ # DISTNAME= tclX8.2.0 @@ -29,7 +29,7 @@ MAKE_ENV+= GTAR=${GTAR} CHOWN=${CHOWN} CHMOD=${CHMOD} \ post-extract: @${MV} ${WRKSRC}/../doc/Memory.n ${WRKSRC}/../doc/TclXMemory.n @if [ ! -e ${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.4 ]; then \ - cd ../../lang/tcl && ${MAKE} extract; \ + cd ../../lang/tcl83 && ${MAKE} extract; \ fi post-build: @@ -45,7 +45,7 @@ post-install: # so... pre-clean: - @cd ../../lang/tcl && ${MAKE} clean + @cd ../../lang/tcl83 && ${MAKE} clean -.include "../../lang/tcl/buildlink2.mk" +.include "../../lang/tcl83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/tk-tclX/Makefile b/lang/tk-tclX/Makefile index a7f426dbde2..e718da30b9a 100644 --- a/lang/tk-tclX/Makefile +++ b/lang/tk-tclX/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/01/20 12:19:18 agc Exp $ +# $NetBSD: Makefile,v 1.14 2004/03/08 19:52:51 minskim Exp $ # DISTNAME= tclX8.2.0 @@ -37,14 +37,14 @@ PATCHDIR= ${.CURDIR}/../../lang/tcl-tclX/patches post-extract: ${MV} ${WRKSRC}/../doc/Memory.n ${WRKSRC}/../doc/TclXMemory.n @if [ ! -e ${_PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl8.3.4 ]; then \ - cd ../../lang/tcl && ${MAKE} extract; \ + cd ../../lang/tcl83 && ${MAKE} extract; \ fi @if [ ! -e ${_PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.3.4 ]; then \ cd ../../x11/tk && ${MAKE} extract; \ fi pre-clean: - @cd ../../lang/tcl && ${MAKE} clean + @cd ../../lang/tcl83 && ${MAKE} clean @cd ../../x11/tk && ${MAKE} clean do-build: |