summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lang')
-rw-r--r--lang/ocaml/Makefile4
-rw-r--r--lang/sather/Makefile4
-rw-r--r--lang/smalltalk/Makefile4
-rw-r--r--lang/tcl-itcl/Makefile8
-rw-r--r--lang/tcl-itcl/buildlink2.mk4
-rw-r--r--lang/tcl-otcl/Makefile4
-rw-r--r--lang/tcl-otcl/buildlink2.mk4
-rw-r--r--lang/tk-expect/Makefile4
-rw-r--r--lang/tk-tclX/Makefile8
9 files changed, 22 insertions, 22 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 26cb7e402cd..0f98a98dfbd 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/01/24 13:51:14 grant Exp $
+# $NetBSD: Makefile,v 1.24 2004/03/08 20:27:14 minskim Exp $
#
DISTNAME= ocaml-3.06
@@ -59,5 +59,5 @@ PLIST_SUBST+= NATIVE_THREADS=
PLIST_SRC+= ${PKGDIR}/PLIST.common_end
-.include "../../x11/tk/buildlink3.mk"
+.include "../../x11/tk83/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sather/Makefile b/lang/sather/Makefile
index d72ff308632..eb644f1693a 100644
--- a/lang/sather/Makefile
+++ b/lang/sather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/03/07 09:29:04 seb Exp $
+# $NetBSD: Makefile,v 1.17 2004/03/08 20:27:14 minskim Exp $
DISTNAME= sather-1.2.1
PKGREVISION= 3
@@ -90,6 +90,6 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/Emacs/*.el ${PREFIX}/share/emacs/site-lisp
.include "../../devel/boehm-gc/buildlink2.mk"
-.include "../../x11/tk/buildlink2.mk"
+.include "../../x11/tk83/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index c26cba81892..be137cc8964 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/03/08 19:52:51 minskim Exp $
+# $NetBSD: Makefile,v 1.26 2004/03/08 20:27:14 minskim Exp $
DISTNAME= smalltalk-2.1.4
CATEGORIES= lang
@@ -35,6 +35,6 @@ TEST_TARGET= check
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../devel/readline/buildlink2.mk"
.include "../../lang/tcl83/buildlink2.mk"
-.include "../../x11/tk/buildlink2.mk"
+.include "../../x11/tk83/buildlink2.mk"
.include "../../databases/gdbm/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/tcl-itcl/Makefile b/lang/tcl-itcl/Makefile
index fee49b3504d..90dd21abece 100644
--- a/lang/tcl-itcl/Makefile
+++ b/lang/tcl-itcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/03/08 19:52:51 minskim Exp $
+# $NetBSD: Makefile,v 1.10 2004/03/08 20:27:14 minskim Exp $
DISTNAME= itcl3.2
PKGNAME= tcl-itcl-3.2
@@ -30,13 +30,13 @@ post-extract:
cd ../../lang/tcl83 && ${MAKE} extract; \
fi
@if [ ! -e ${_PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.3.4 ]; then \
- cd ../../x11/tk && ${MAKE} extract; \
+ cd ../../x11/tk83 && ${MAKE} extract; \
fi
pre-clean:
@cd ../../lang/tcl83 && ${MAKE} clean
- @cd ../../x11/tk && ${MAKE} clean
+ @cd ../../x11/tk83 && ${MAKE} clean
.include "../../lang/tcl83/buildlink2.mk"
-.include "../../x11/tk/buildlink2.mk"
+.include "../../x11/tk83/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/tcl-itcl/buildlink2.mk b/lang/tcl-itcl/buildlink2.mk
index 978b9c81748..5eb97e00ce9 100644
--- a/lang/tcl-itcl/buildlink2.mk
+++ b/lang/tcl-itcl/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2004/03/08 19:52:51 minskim Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/08 20:27:14 minskim Exp $
#
.if !defined(TCL_ITCL_BUILDLINK2_MK)
@@ -340,7 +340,7 @@ 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/tcl83/buildlink2.mk"
-.include "../../x11/tk/buildlink2.mk"
+.include "../../x11/tk83/buildlink2.mk"
BUILDLINK_TARGETS+= tcl-itcl-buildlink
diff --git a/lang/tcl-otcl/Makefile b/lang/tcl-otcl/Makefile
index c10d896574c..a298f5cc0aa 100644
--- a/lang/tcl-otcl/Makefile
+++ b/lang/tcl-otcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/02/14 00:54:45 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/08 20:27:14 minskim Exp $
DISTNAME= otcl-1.0a8
PKGNAME= tcl-${DISTNAME:S/a/rc/}
@@ -36,5 +36,5 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/doc/${_file_} ${DOCDIR}
.endfor
-.include "../../x11/tk/buildlink2.mk"
+.include "../../x11/tk83/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/tcl-otcl/buildlink2.mk b/lang/tcl-otcl/buildlink2.mk
index 029aa0f0eb4..cccbd7c521b 100644
--- a/lang/tcl-otcl/buildlink2.mk
+++ b/lang/tcl-otcl/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/09/02 23:12:23 seb Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/08 20:27:14 minskim Exp $
.if !defined(TCL_OTCL_BUILDLINK2_MK)
TCL_OTCL_BUILDLINK2_MK= # defined
@@ -12,7 +12,7 @@ BUILDLINK_PREFIX.tcl-otcl_DEFAULT= ${LOCALBASE}
BUILDLINK_FILES.tcl-otcl+= include/otcl.h
BUILDLINK_FILES.tcl-otcl+= lib/libotcl.*
-.include "../../x11/tk/buildlink2.mk"
+.include "../../x11/tk83/buildlink2.mk"
BUILDLINK_TARGETS+= tcl-otcl-buildlink
diff --git a/lang/tk-expect/Makefile b/lang/tk-expect/Makefile
index 014b434760f..14f3e81107c 100644
--- a/lang/tk-expect/Makefile
+++ b/lang/tk-expect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/07/21 16:54:07 martti Exp $
+# $NetBSD: Makefile,v 1.14 2004/03/08 20:27:14 minskim Exp $
#
.include "../../lang/tcl-expect/Makefile.common"
@@ -9,7 +9,7 @@ CATEGORIES= lang
MAINTAINER= jwise@NetBSD.org
COMMENT= Tcl interpreter with both the expect and tk extensions built in
-DEPENDS+= tk>=8.3.2:../../x11/tk
+DEPENDS+= tk>=8.3.2:../../x11/tk83
DEPENDS+= tcl-expect-${EXPECT_VERSION}:../../lang/tcl-expect
CONFIGURE_ARGS= --enable-shared \
diff --git a/lang/tk-tclX/Makefile b/lang/tk-tclX/Makefile
index e718da30b9a..5433d0c8285 100644
--- a/lang/tk-tclX/Makefile
+++ b/lang/tk-tclX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/03/08 19:52:51 minskim Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/08 20:27:14 minskim Exp $
#
DISTNAME= tclX8.2.0
@@ -10,7 +10,7 @@ MAINTAINER= jwise@NetBSD.org
HOMEPAGE= http://www.neosoft.com/TclX/
COMMENT= Extended Tcl (TclX), a set of Tcl extensions for system programming
-DEPENDS+= tk>=8.3.4:../../x11/tk
+DEPENDS+= tk>=8.3.4:../../x11/tk83
DEPENDS+= tcl-tclX-8.2.0:../../lang/tcl-tclX
CONFLICTS+= tclX-[0-9]*
@@ -40,12 +40,12 @@ post-extract:
cd ../../lang/tcl83 && ${MAKE} extract; \
fi
@if [ ! -e ${_PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk8.3.4 ]; then \
- cd ../../x11/tk && ${MAKE} extract; \
+ cd ../../x11/tk83 && ${MAKE} extract; \
fi
pre-clean:
@cd ../../lang/tcl83 && ${MAKE} clean
- @cd ../../x11/tk && ${MAKE} clean
+ @cd ../../x11/tk83 && ${MAKE} clean
do-build:
@cd ${WRKSRC}/../tk/unix && ${MAKE_ENV} ${MAKE}