summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/Makefile3
-rw-r--r--x11/XF86Setup/Makefile4
-rw-r--r--x11/blt/Makefile4
-rw-r--r--x11/blt/buildlink2.mk4
-rw-r--r--x11/blt/buildlink3.mk4
-rw-r--r--x11/filerunner/Makefile4
-rw-r--r--x11/py-Tk/Makefile4
-rw-r--r--x11/py-Tk/buildlink2.mk4
-rw-r--r--x11/ruby-tcltklib/Makefile4
-rw-r--r--x11/tk-Tix/Makefile4
-rw-r--r--x11/tkinfo/Makefile4
-rw-r--r--x11/tkman/Makefile4
-rw-r--r--x11/xbindkeys-tk/Makefile4
-rw-r--r--x11/xplanet/Makefile4
14 files changed, 28 insertions, 27 deletions
diff --git a/x11/Makefile b/x11/Makefile
index 0049f8c4744..562c79741d0 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.340 2004/02/23 13:28:21 cube Exp $
+# $NetBSD: Makefile,v 1.341 2004/03/08 20:27:16 minskim Exp $
#
COMMENT= Packages to support the X window system
@@ -193,6 +193,7 @@ SUBDIR+= ssystem
SUBDIR+= startup-notification
SUBDIR+= swing
SUBDIR+= tk
+SUBDIR+= tk83
SUBDIR+= tk-Tix
SUBDIR+= tkinfo
SUBDIR+= tkman
diff --git a/x11/XF86Setup/Makefile b/x11/XF86Setup/Makefile
index d3f67b82570..17fdeb7136b 100644
--- a/x11/XF86Setup/Makefile
+++ b/x11/XF86Setup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2004/03/08 19:52:52 minskim Exp $
+# $NetBSD: Makefile,v 1.32 2004/03/08 20:27:17 minskim Exp $
DISTNAME= XF86Setup-3.3.6
PKGREVISION= 1
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.xfree86.org/
COMMENT= Graphical configuration tool for XFree86
BUILD_DEPENDS= tcl>=8.3.2:../../lang/tcl83
-BUILD_DEPENDS+= tk>=8.3.2:../../x11/tk
+BUILD_DEPENDS+= tk>=8.3.2:../../x11/tk83
ONLY_FOR_PLATFORM= *-*-i386
diff --git a/x11/blt/Makefile b/x11/blt/Makefile
index c3da48e058b..cad8a3ab350 100644
--- a/x11/blt/Makefile
+++ b/x11/blt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/03/08 19:52:52 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2004/03/08 20:27:17 minskim Exp $
#
DISTNAME= BLT2.4z
@@ -23,6 +23,6 @@ CONFIGURE_ENV+= X11BASE=${X11BASE}
MAKE_ENV+= CP=${CP}
.include "../../lang/tcl83/buildlink3.mk"
-.include "../../x11/tk/buildlink3.mk"
+.include "../../x11/tk83/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/blt/buildlink2.mk b/x11/blt/buildlink2.mk
index 11d8f12f5d5..2a9718eff8b 100644
--- a/x11/blt/buildlink2.mk
+++ b/x11/blt/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2004/03/08 19:52:52 minskim Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2004/03/08 20:27:17 minskim Exp $
#
# This Makefile fragment is included by packages that use blt.
#
@@ -26,7 +26,7 @@ BUILDLINK_FILES.blt+= lib/libBLT.*
BUILDLINK_FILES.blt+= lib/libBLT24.*
.include "../../lang/tcl83/buildlink2.mk"
-.include "../../x11/tk/buildlink2.mk"
+.include "../../x11/tk83/buildlink2.mk"
BUILDLINK_TARGETS+= blt-buildlink
diff --git a/x11/blt/buildlink3.mk b/x11/blt/buildlink3.mk
index 6cfaa74aa33..9171ab09873 100644
--- a/x11/blt/buildlink3.mk
+++ b/x11/blt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/08 19:52:52 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/08 20:27:17 minskim Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BLT_BUILDLINK3_MK:= ${BLT_BUILDLINK3_MK}+
@@ -15,7 +15,7 @@ BUILDLINK_DEPENDS.blt+= blt>=2.4o
BUILDLINK_PKGSRCDIR.blt?= ../../x11/blt
.include "../../lang/tcl83/buildlink3.mk"
-.include "../../x11/tk/buildlink3.mk"
+.include "../../x11/tk83/buildlink3.mk"
.endif # BLT_BUILDLINK3_MK
diff --git a/x11/filerunner/Makefile b/x11/filerunner/Makefile
index 0b53975c814..2ebf5bfede6 100644
--- a/x11/filerunner/Makefile
+++ b/x11/filerunner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/09/26 10:53:54 jmmv Exp $
+# $NetBSD: Makefile,v 1.21 2004/03/08 20:27:17 minskim Exp $
# $FreeBSD Id: Makefile,v 1.12 1998/02/24 21:43:11 jseger Exp
#
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.cd.chalmers.se/~hch/filerunner.html
COMMENT= Filemanager with FTP capabilities. Uses Tcl/Tk
-DEPENDS+= tk>=8.3.2:../../x11/tk
+DEPENDS+= tk>=8.3.2:../../x11/tk83
USE_X11BASE= yes
diff --git a/x11/py-Tk/Makefile b/x11/py-Tk/Makefile
index 103611d416a..77aa8f43b09 100644
--- a/x11/py-Tk/Makefile
+++ b/x11/py-Tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/03/08 19:52:52 minskim Exp $
+# $NetBSD: Makefile,v 1.26 2004/03/08 20:27:17 minskim Exp $
#
PKGNAME= ${PYPKGPREFIX}-Tk-0
@@ -33,6 +33,6 @@ do-patch:
.include "../../lang/python/extension.mk"
.include "../../lang/python/srcdist.mk"
.include "../../lang/tcl83/buildlink2.mk"
-.include "../../x11/tk/buildlink2.mk"
+.include "../../x11/tk83/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-Tk/buildlink2.mk b/x11/py-Tk/buildlink2.mk
index a1067069c73..4a2bce15cdc 100644
--- a/x11/py-Tk/buildlink2.mk
+++ b/x11/py-Tk/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/10/24 19:33:39 drochner Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/03/08 20:27:17 minskim Exp $
.include "../../lang/python/pyversion.mk"
@@ -6,4 +6,4 @@ BUILDLINK_PACKAGES+= pytk
BUILDLINK_DEPENDS.pytk?= ${PYPKGPREFIX}-Tk-*
BUILDLINK_PKGSRCDIR.pytk?= ../../x11/py-Tk
-.include "../../x11/tk/buildlink2.mk"
+.include "../../x11/tk83/buildlink2.mk"
diff --git a/x11/ruby-tcltklib/Makefile b/x11/ruby-tcltklib/Makefile
index 8909cdd9fcd..c8081c1e10f 100644
--- a/x11/ruby-tcltklib/Makefile
+++ b/x11/ruby-tcltklib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/03/08 19:52:52 minskim Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/08 20:27:17 minskim Exp $
# FreeBSD: ports/lang/ruby-tcltklib/Makefile,v 1.21 2000/10/20 19:56:04 knu Exp
DISTNAME= ${RUBY_DISTNAME}
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.ruby-lang.org/en/
COMMENT= Ruby interface to Tcl/Tk libraries
DEPENDS+= tcl>=8.3:../../lang/tcl83
-DEPENDS+= tk>=8.3:../../x11/tk
+DEPENDS+= tk>=8.3:../../x11/tk83
WRKSRC= ${RUBY_WRKSRC}/ext/tcltklib
DIST_SUBDIR= ruby
diff --git a/x11/tk-Tix/Makefile b/x11/tk-Tix/Makefile
index 8c929bdaaf2..319f973aa51 100644
--- a/x11/tk-Tix/Makefile
+++ b/x11/tk-Tix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/20 12:28:27 agc Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/08 20:27:17 minskim Exp $
#
DISTNAME= tix8.2.0b1
@@ -21,5 +21,5 @@ MAKE_ENV+= TCL_DIR=${BUILDLINK_PREFIX.tcl}
MAKE_ENV+= TK_DIR=${BUILDLINK_PREFIX.tk}
TEST_TARGET= test
-.include "../../x11/tk/buildlink2.mk"
+.include "../../x11/tk83/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/tkinfo/Makefile b/x11/tkinfo/Makefile
index 5f756f65d22..495518fc339 100644
--- a/x11/tkinfo/Makefile
+++ b/x11/tkinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/07/17 22:56:47 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/03/08 20:27:17 minskim Exp $
# FreeBSD Id: Makefile,v 1.15 1997/12/16 09:26:12 tg Exp
#
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://math-www.uni-paderborn.de/~axel/tkinfo/
COMMENT= Tk script to read and display GNU "info" files
-DEPENDS= tk>=8.3.2:../../x11/tk
+DEPENDS= tk>=8.3.2:../../x11/tk83
USE_X11= yes
NO_BUILD= yes
diff --git a/x11/tkman/Makefile b/x11/tkman/Makefile
index 562a0e23b88..af40012842b 100644
--- a/x11/tkman/Makefile
+++ b/x11/tkman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2004/01/20 12:28:27 agc Exp $
+# $NetBSD: Makefile,v 1.36 2004/03/08 20:27:17 minskim Exp $
# FreeBSD Id: Makefile,v 1.28 1997/12/08 15:51:20 tg Exp
#
@@ -13,7 +13,7 @@ HOMEPAGE= http://tkman.sourceforge.net/
COMMENT= Tcl/Tk based manual browser
DEPENDS+= glimpse>=4.1:../../textproc/glimpse
-DEPENDS+= tk>=8.3.2:../../x11/tk
+DEPENDS+= tk>=8.3.2:../../x11/tk83
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_RMAN= yes
diff --git a/x11/xbindkeys-tk/Makefile b/x11/xbindkeys-tk/Makefile
index 0254d2fa3dc..72648326292 100644
--- a/x11/xbindkeys-tk/Makefile
+++ b/x11/xbindkeys-tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/02/22 15:29:11 kristerw Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/08 20:27:17 minskim Exp $
#
.include "../../x11/xbindkeys/Makefile.common"
@@ -15,5 +15,5 @@ do-install:
${INSTALL_SCRIPT} ${WRKSRC}/xbindkeys_show ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/xbindkeys_show.1 ${PREFIX}/man/man1
-.include "../../x11/tk/buildlink3.mk"
+.include "../../x11/tk83/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile
index 448333860cf..792e110d648 100644
--- a/x11/xplanet/Makefile
+++ b/x11/xplanet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/24 15:30:34 grant Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/08 20:27:17 minskim Exp $
#
DISTNAME= xplanet-1.0.1
@@ -29,6 +29,6 @@ MAKE_ENV+= LIBS="${LIBS}"
.include "../../graphics/netpbm/buildlink2.mk"
.include "../../graphics/png/buildlink2.mk"
.include "../../graphics/tiff/buildlink2.mk"
-.include "../../x11/tk/buildlink2.mk"
+.include "../../x11/tk83/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"