diff options
90 files changed, 184 insertions, 183 deletions
diff --git a/audio/liveice/Makefile b/audio/liveice/Makefile index aea2a17a518..d65cdee8b5c 100644 --- a/audio/liveice/Makefile +++ b/audio/liveice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/07/17 21:22:46 grant Exp $ +# $NetBSD: Makefile,v 1.5 2004/03/08 20:27:13 minskim Exp $ # DISTNAME= liveice @@ -12,7 +12,7 @@ COMMENT= Source client for Icecast DEPENDS+= mpg123-0.5*:../../audio/mpg123 DEPENDS+= lame-3.*:../../audio/lame -DEPENDS+= tk>=8.0:../../x11/tk +DEPENDS+= tk>=8.0:../../x11/tk83 GNU_CONFIGURE= YES DIST_SUBDIR= liveice-0.20001121 diff --git a/audio/tcl-snack/Makefile b/audio/tcl-snack/Makefile index 9f5165c4375..514c079e974 100644 --- a/audio/tcl-snack/Makefile +++ b/audio/tcl-snack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/01/20 12:07:43 agc Exp $ +# $NetBSD: Makefile,v 1.9 2004/03/08 20:27:13 minskim Exp $ DISTNAME= snack2.2 PKGNAME= tcl-snack-2.2 @@ -15,5 +15,5 @@ USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_X11= YES -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/wavesurfer/Makefile b/audio/wavesurfer/Makefile index c3441942326..69700b05fa1 100644 --- a/audio/wavesurfer/Makefile +++ b/audio/wavesurfer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/09/10 20:44:18 jmmv Exp $ +# $NetBSD: Makefile,v 1.6 2004/03/08 20:27:13 minskim Exp $ DISTNAME= wavesurfer-1.4.6 CATEGORIES= audio @@ -16,5 +16,5 @@ do-install: ${CP} -R ${WRKSRC}/wsurf1.4 ${PREFIX}/lib/ .include "../../audio/tcl-snack/buildlink2.mk" -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/mpac/Makefile b/cad/mpac/Makefile index c6a992e3a43..c81eff70854 100644 --- a/cad/mpac/Makefile +++ b/cad/mpac/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/07/17 21:25:12 grant Exp $ +# $NetBSD: Makefile,v 1.5 2004/03/08 20:27:13 minskim Exp $ # DISTNAME= mpac-0.2.2 @@ -9,7 +9,7 @@ MASTER_SITES= http://goemon.polito.it/ftp/pub/software/lethal/Elettronica/antenn MAINTAINER= dmcmahill@NetBSD.org COMMENT= Microstrip Patch Antenna Calculator -DEPENDS+= tk>=8.1:../../x11/tk +DEPENDS+= tk>=8.1:../../x11/tk83 do-build: ${SED} 's;patch.gif;${PREFIX}/share/mpac/patch.gif;g' ${WRKSRC}/mpac.tcl > ${WRKSRC}/mpac diff --git a/cad/pcb-current/Makefile b/cad/pcb-current/Makefile index 834f2985a92..7a2f05c9304 100644 --- a/cad/pcb-current/Makefile +++ b/cad/pcb-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/02/15 23:14:25 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.5 2004/03/08 20:27:13 minskim Exp $ # DISTNAME= pcb-${SNAPDATE} @@ -12,7 +12,7 @@ COMMENT= Printed circuit board layout system (development snapshot version) BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison DEPENDS+= m4>=1.4:../../devel/m4 -DEPENDS+= tk>=8.3:../../x11/tk +DEPENDS+= tk>=8.3:../../x11/tk83 PKG_INSTALLATION_TYPES= overwrite pkgviews diff --git a/cad/tkgate/Makefile b/cad/tkgate/Makefile index 0fc6d6714cb..a733c6048bc 100644 --- a/cad/tkgate/Makefile +++ b/cad/tkgate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/01/25 03:08:46 grant Exp $ +# $NetBSD: Makefile,v 1.9 2004/03/08 20:27:13 minskim Exp $ # DISTNAME= tkgate-1.6i @@ -33,5 +33,5 @@ do-configure: ${ECHO} "${TKGATE_SITENAME}" > ${WRKSRC}/sitename.txt ( cd ${WRKSRC} && ${CONFIGURE_ENV} ./configure ) -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile index 9d058f24cc6..d71c492635d 100644 --- a/cad/xcircuit/Makefile +++ b/cad/xcircuit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/03/08 19:52:50 minskim Exp $ +# $NetBSD: Makefile,v 1.17 2004/03/08 20:27:13 minskim Exp $ DISTNAME= xcircuit-3.1.19 CATEGORIES= cad graphics @@ -31,7 +31,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/xcircuit/ .include "../../graphics/xpm/buildlink2.mk" -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../lang/tcl83/buildlink2.mk" .include "../../mk/ghostscript.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/quirc/Makefile b/chat/quirc/Makefile index 2f614325f6a..f0d310d08b3 100644 --- a/chat/quirc/Makefile +++ b/chat/quirc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/01/22 07:49:21 grant Exp $ +# $NetBSD: Makefile,v 1.4 2004/03/08 20:27:13 minskim Exp $ # DISTNAME= quirc-0.9.82 @@ -14,5 +14,5 @@ GNU_CONFIGURE= YES USE_GNU_TOOLS+= make USE_X11= YES -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/roxirc/Makefile b/chat/roxirc/Makefile index daafe0ae477..7078d3e9110 100644 --- a/chat/roxirc/Makefile +++ b/chat/roxirc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/08/28 20:05:15 xtraeme Exp $ +# $NetBSD: Makefile,v 1.4 2004/03/08 20:27:13 minskim Exp $ # DISTNAME= roxirc-1.8 @@ -26,5 +26,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/startup ${EXAMPLESDIR}/startup ${INSTALL_DATA} ${WRKSRC}/help ${PREFIX}/share/doc/roxirc/help -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/tik/Makefile b/chat/tik/Makefile index b3673c5da99..86e9847db55 100644 --- a/chat/tik/Makefile +++ b/chat/tik/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/01/20 12:09:35 agc Exp $ +# $NetBSD: Makefile,v 1.7 2004/03/08 20:27:13 minskim Exp $ # DISTNAME= tik-0.90 @@ -9,7 +9,7 @@ MAINTAINER= grant@NetBSD.org HOMEPAGE= http://tik.sourceforge.net/ COMMENT= Tcl/Tk AOL Instant Messenger client -DEPENDS+= tk>=8.1:../../x11/tk +DEPENDS+= tk>=8.1:../../x11/tk83 WRKSRC= ${WRKDIR}/tik NO_CONFIGURE= # defined diff --git a/chat/tkicb/Makefile b/chat/tkicb/Makefile index 3ddd10a1c71..259e93ee00b 100644 --- a/chat/tkicb/Makefile +++ b/chat/tkicb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/01/20 12:09:35 agc Exp $ +# $NetBSD: Makefile,v 1.10 2004/03/08 20:27:13 minskim Exp $ # DISTNAME= icb.2.1.4 @@ -38,5 +38,5 @@ do-install: ${WRKSRC}/lib/servers ${PREFIX}/libdata/tkicb/lib ${INSTALL_SCRIPT} ${WRKSRC}/lib/* ${PREFIX}/libdata/tkicb/lib -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/tkirc/Makefile b/chat/tkirc/Makefile index 10ac831b47f..5b7c9dbb25e 100644 --- a/chat/tkirc/Makefile +++ b/chat/tkirc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/01/20 12:09:35 agc Exp $ +# $NetBSD: Makefile,v 1.10 2004/03/08 20:27:13 minskim Exp $ DISTNAME= tkirc1.202 PKGNAME= tkirc-1.202 @@ -10,7 +10,7 @@ HOMEPAGE= http://netsplit.de/tkirc1/ COMMENT= GUI for the ircII Internet Relay Chat client DEPENDS+= ircII-[0-9]*:../../chat/ircII -DEPENDS+= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk83 WRKSRC= ${WRKDIR}/tkirc USE_X11= yes diff --git a/chat/tkirc2/Makefile b/chat/tkirc2/Makefile index fd314ed84f2..3ccf895c349 100644 --- a/chat/tkirc2/Makefile +++ b/chat/tkirc2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/01/20 12:09:35 agc Exp $ +# $NetBSD: Makefile,v 1.6 2004/03/08 20:27:13 minskim Exp $ DISTNAME= tkirc2.46 PKGNAME= tkirc2-2.46 @@ -10,7 +10,7 @@ HOMEPAGE= http://netsplit.de/tkirc2/ COMMENT= GUI for the ircII Internet Relay Chat client DEPENDS+= ircII-[0-9]*:../../chat/ircII -DEPENDS+= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk83 WRKSRC= ${WRKDIR}/tkirc2 USE_X11= yes diff --git a/chat/zircon/Makefile b/chat/zircon/Makefile index dd7591db06b..57668dd3125 100644 --- a/chat/zircon/Makefile +++ b/chat/zircon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 21:26:34 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/03/08 20:27:13 minskim Exp $ # DISTNAME= zircon-1.18.245 @@ -9,7 +9,7 @@ MAINTAINER= frueauf@NetBSD.org HOMEPAGE= http://catless.ncl.ac.uk/Programs/Zircon/ COMMENT= X11 interface to Internet Relay Chat -DEPENDS+= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk83 INTERACTIVE_STAGE= install NO_BUILD= yes diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile index 819d4415c3e..040b68ce0e8 100644 --- a/comms/pilot-link/Makefile +++ b/comms/pilot-link/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2004/03/08 19:52:50 minskim Exp $ +# $NetBSD: Makefile,v 1.35 2004/03/08 20:27:13 minskim Exp $ # .include "../../comms/pilot-link/Makefile.common" @@ -37,6 +37,6 @@ post-patch: .include "../../graphics/png/buildlink2.mk" .include "../../lang/perl5/buildlink2.mk" .include "../../lang/tcl83/buildlink2.mk" -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/tkhylafax/Makefile b/comms/tkhylafax/Makefile index ecdb5bc3958..d608b69552f 100644 --- a/comms/tkhylafax/Makefile +++ b/comms/tkhylafax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/01/20 12:10:01 agc Exp $ +# $NetBSD: Makefile,v 1.24 2004/03/08 20:27:13 minskim Exp $ # FreeBSD Id: Makefile,v 1.6 1998/08/07 23:56:12 asami Exp # @@ -15,7 +15,7 @@ COMMENT= Tcl/tk interface to Sam Leffler's fax package DEPENDS+= gv>=3.5.8nb1:../../print/gv DEPENDS+= hylafax>=4.1:../../comms/hylafax -DEPENDS+= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk83 WRKSRC= ${WRKDIR}/tkhylafax diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile index 0e506a585d3..e90deb56f6e 100644 --- a/converters/xdeview/Makefile +++ b/converters/xdeview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/01/28 13:20:05 xtraeme Exp $ +# $NetBSD: Makefile,v 1.26 2004/03/08 20:27:14 minskim Exp $ # DISTNAME= uudeview-0.5.18 @@ -24,5 +24,5 @@ post-install: ${INSTALL_MAN} ${WRKSRC}/man/xdeview.1 ${PREFIX}/man/man1 .include "../../converters/uulib/buildlink2.mk" -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/tk-postgresql/Makefile b/databases/tk-postgresql/Makefile index eb37f3d57d3..7be8c7663ab 100644 --- a/databases/tk-postgresql/Makefile +++ b/databases/tk-postgresql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/01/20 14:11:50 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2004/03/08 20:27:14 minskim Exp $ PKGNAME= tk-postgresql-${BASE_VERS} PKGREVISION= 1 @@ -28,6 +28,6 @@ post-install: .include "../postgresql-lib/buildlink2.mk" .include "../tcl-postgresql/buildlink2.mk" -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/cbrowser/Makefile b/devel/cbrowser/Makefile index 44974cecd47..ace054bdd9b 100644 --- a/devel/cbrowser/Makefile +++ b/devel/cbrowser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/07/21 16:43:16 martti Exp $ +# $NetBSD: Makefile,v 1.6 2004/03/08 20:27:14 minskim Exp $ # DISTNAME= cbrowser-0.6 @@ -25,5 +25,5 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/$$f ${PREFIX}/share/cbrowser; \ done -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/pvs/Makefile b/devel/pvs/Makefile index 6913f86210f..45cd6b5d232 100644 --- a/devel/pvs/Makefile +++ b/devel/pvs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/01/20 12:13:29 agc Exp $ +# $NetBSD: Makefile,v 1.11 2004/03/08 20:27:14 minskim Exp $ # DISTNAME= pvs-${VERSION} @@ -62,6 +62,6 @@ do-install: cd ${WRKSRC} && ${PAX} -s ,^./[.].*,, -rw . ${PREFIX}/pvs ${CHMOD} 755 ${PREFIX}/pvs/pvs -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/emacs.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/tcl-tclcl/Makefile b/devel/tcl-tclcl/Makefile index 96e70460240..4d04cd2a2d6 100644 --- a/devel/tcl-tclcl/Makefile +++ b/devel/tcl-tclcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/01/20 12:13:29 agc Exp $ +# $NetBSD: Makefile,v 1.7 2004/03/08 20:27:14 minskim Exp $ DISTNAME= tclcl-src-1.0b13 PKGNAME= tcl-${DISTNAME:S/b/rc/:S/-src//} @@ -21,5 +21,5 @@ CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk} CPPFLAGS+= -I${BUILDLINK_PREFIX.tcl}/include/tcl/generic .include "../../lang/tcl-otcl/buildlink2.mk" -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/tcl-tclcl/buildlink2.mk b/devel/tcl-tclcl/buildlink2.mk index 89c162671ab..9c43ceca623 100644 --- a/devel/tcl-tclcl/buildlink2.mk +++ b/devel/tcl-tclcl/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/08/28 10:00:11 seb Exp $ +# $NetBSD: buildlink2.mk,v 1.2 2004/03/08 20:27:14 minskim Exp $ .if !defined(TCL_TCLCL_BUILDLINK2_MK) TCL_TCLCL_BUILDLINK2_MK= # defined @@ -21,7 +21,7 @@ BUILDLINK_FILES.tcl-tclcl+= include/tracedvar.h BUILDLINK_FILES.tcl-tclcl+= lib/libtclcl.* .include "../../lang/tcl-otcl/buildlink2.mk" -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" BUILDLINK_TARGETS+= tcl-tclcl-buildlink diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile index 0fa2ebbfb67..492cadd2c59 100644 --- a/devel/tkcvs/Makefile +++ b/devel/tkcvs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2003/07/17 21:34:09 grant Exp $ +# $NetBSD: Makefile,v 1.28 2004/03/08 20:27:14 minskim Exp $ # DISTNAME= tkcvs_7_1_2 @@ -21,5 +21,5 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tkcvs ${INSTALL_DATA} ${WRKSRC}/README.tkcvs ${PREFIX}/share/doc/tkcvs/ -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/tkdiff/Makefile b/devel/tkdiff/Makefile index 56bc93308ba..34c3f401daa 100644 --- a/devel/tkdiff/Makefile +++ b/devel/tkdiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/02/16 16:34:02 recht Exp $ +# $NetBSD: Makefile,v 1.12 2004/03/08 20:27:14 minskim Exp $ # DISTNAME= tkdiff_3_09 @@ -11,7 +11,7 @@ MAINTAINER= recht@NetBSD.org HOMEPAGE= http://www.accurev.com/free/tkdiff/ COMMENT= Graphical 2-way diff/merge tool -DEPENDS+= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk83 NO_BUILD= yes NO_CONFIGURE= yes diff --git a/editors/vigor/Makefile b/editors/vigor/Makefile index ce139dadc46..5ccc1254f09 100644 --- a/editors/vigor/Makefile +++ b/editors/vigor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/01/20 12:14:06 agc Exp $ +# $NetBSD: Makefile,v 1.14 2004/03/08 20:27:14 minskim Exp $ # DISTNAME= vigor-0.016 @@ -34,5 +34,5 @@ post-patch: post-build: nroff -mandoc ${WRKSRC}/../docs/USD.doc/vi.man/vi.1 >${WRKSRC}/../docs/USD.doc/vi.man/vi.0 -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/finance/tclticker/Makefile b/finance/tclticker/Makefile index 87ff5d88656..178d19dd27c 100644 --- a/finance/tclticker/Makefile +++ b/finance/tclticker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/01/28 01:50:41 grant Exp $ +# $NetBSD: Makefile,v 1.8 2004/03/08 20:27:14 minskim Exp $ # DISTNAME= tclticker-1.1 @@ -8,7 +8,7 @@ MASTER_SITES= http://www.neosoft.com/tcl/ftparchive/sorted/apps/tclticker/1.1/ MAINTAINER= tech-pkg@NetBSD.org COMMENT= Stock-quote ticker tape application -DEPENDS+= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk83 NO_BUILD= yes diff --git a/games/xblast/Makefile b/games/xblast/Makefile index 5873239b23b..a23c06bb11d 100644 --- a/games/xblast/Makefile +++ b/games/xblast/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/01/20 12:15:41 agc Exp $ +# $NetBSD: Makefile,v 1.17 2004/03/08 20:27:14 minskim Exp $ # DISTNAME= xblast-2.6.beta-sound @@ -11,7 +11,7 @@ MAINTAINER= root@garbled.net HOMEPAGE= http://www.ikp.uni-koeln.de/~vogel/xblast/xblast.html COMMENT= 2-6 player kill the other guy with bombs game. A real blast! -DEPENDS+= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk83 WRKSRC= ${WRKDIR}/XBlast-2.6.beta USE_IMAKE= yes diff --git a/games/xconq/Makefile b/games/xconq/Makefile index 1f01798ccf3..7386b3b6492 100644 --- a/games/xconq/Makefile +++ b/games/xconq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/01/24 13:30:57 grant Exp $ +# $NetBSD: Makefile,v 1.20 2004/03/08 20:27:14 minskim Exp $ DISTNAME= xconq-7.4.1 CATEGORIES= games x11 @@ -28,6 +28,6 @@ post-build: post-install: cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install-info -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile index 7c0e49d69c4..6430d1356b2 100644 --- a/graphics/cqcam/Makefile +++ b/graphics/cqcam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2003/07/17 21:40:17 grant Exp $ +# $NetBSD: Makefile,v 1.18 2004/03/08 20:27:14 minskim Exp $ # DISTNAME= cqcam-0.45a @@ -18,5 +18,5 @@ USE_BUILDLINK2= YES USE_X11= YES .include "../../graphics/jpeg/buildlink2.mk" -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 59300acdaee..2526a5050ad 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/02/24 14:29:34 grant Exp $ +# $NetBSD: Makefile,v 1.20 2004/03/08 20:27:14 minskim Exp $ # DISTNAME= graphviz-1.10 @@ -78,7 +78,7 @@ post-install: .include "../../converters/libiconv/buildlink2.mk" .include "../../graphics/jpeg/buildlink2.mk" .include "../../graphics/freetype2/buildlink2.mk" -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" # .include "../../www/curl/buildlink2.mk" .include "../../textproc/expat/buildlink2.mk" .include "../../mk/xaw.buildlink2.mk" diff --git a/graphics/graphviz/buildlink2.mk b/graphics/graphviz/buildlink2.mk index a5158575669..9ebe41fa96c 100644 --- a/graphics/graphviz/buildlink2.mk +++ b/graphics/graphviz/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.5 2003/07/28 10:06:44 seb Exp $ +# $NetBSD: buildlink2.mk,v 1.6 2004/03/08 20:27:14 minskim Exp $ # # This Makefile fragment is included by packages that use graphviz. # @@ -21,7 +21,7 @@ BUILDLINK_FILES.graphviz+= lib/graphviz/* .include "../../graphics/png/buildlink2.mk" .include "../../graphics/jpeg/buildlink2.mk" .include "../../graphics/freetype2/buildlink2.mk" -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" BUILDLINK_TARGETS+= graphviz-buildlink diff --git a/graphics/iGMT/Makefile b/graphics/iGMT/Makefile index e9d64a19e31..b5c010b2e3a 100644 --- a/graphics/iGMT/Makefile +++ b/graphics/iGMT/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/03/08 19:52:51 minskim Exp $ +# $NetBSD: Makefile,v 1.20 2004/03/08 20:27:14 minskim Exp $ DISTNAME= igmt_v1.2 PKGNAME= iGMT-1.2 @@ -12,7 +12,7 @@ COMMENT= Interactive Mapping of Geoscientific Datasets DEPENDS+= GMT>=3.3.6:../../graphics/GMT DEPENDS+= tcl>=8.0:../../lang/tcl83 -DEPENDS+= tk>=8.0:../../x11/tk +DEPENDS+= tk>=8.0:../../x11/tk83 DEPENDS+= gv-[0-9]*:../../print/gv DEPENDS+= ImageMagick>=5.3.9nb1:../../graphics/ImageMagick diff --git a/graphics/impress/Makefile b/graphics/impress/Makefile index b6112c7ff13..3851964b983 100644 --- a/graphics/impress/Makefile +++ b/graphics/impress/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/03/08 19:52:51 minskim Exp $ +# $NetBSD: Makefile,v 1.7 2004/03/08 20:27:14 minskim Exp $ # DISTNAME= imp1.1b9 @@ -13,7 +13,7 @@ COMMENT= WYSIWYG vector graphics application DEPENDS+= pstoedit>=3.19:../../graphics/pstoedit DEPENDS+= tcl>=8.3.2nb2:../../lang/tcl83 -DEPENDS+= tk>=8.3.2nb1:../../x11/tk +DEPENDS+= tk>=8.3.2nb1:../../x11/tk83 WRKSRC= ${WRKDIR}/impress-1.1b9 diff --git a/graphics/plplot/Makefile b/graphics/plplot/Makefile index ce01c4293cc..5a035af4556 100644 --- a/graphics/plplot/Makefile +++ b/graphics/plplot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2004/03/08 19:52:51 minskim Exp $ +# $NetBSD: Makefile,v 1.34 2004/03/08 20:27:14 minskim Exp $ DISTNAME= plplot-5.2.1 CATEGORIES= graphics @@ -62,7 +62,7 @@ post-install: .include "../../devel/zlib/buildlink2.mk" .include "../../devel/zlib/buildlink2.mk" .include "../../devel/libtool/buildlink2.mk" -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../lang/tcl83/buildlink2.mk" .include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/tkpiechart/Makefile b/graphics/tkpiechart/Makefile index 8ad732aae98..d9491026eab 100644 --- a/graphics/tkpiechart/Makefile +++ b/graphics/tkpiechart/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2003/07/17 21:42:52 grant Exp $ +# $NetBSD: Makefile,v 1.11 2004/03/08 20:27:14 minskim Exp $ DISTNAME= tkpiechart-5.4 CATEGORIES= graphics @@ -8,7 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://jfontain.free.fr/ COMMENT= Tcl/Tk pie-chart utility; in Tcl, not as an extension -DEPENDS+= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk83 DEPENDS+= stooop>=3.7:../../devel/stooop NO_CONFIGURE= yes 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} diff --git a/mail/exmh/Makefile b/mail/exmh/Makefile index 21ef60cb786..9b7ad2905e5 100644 --- a/mail/exmh/Makefile +++ b/mail/exmh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2003/11/22 09:50:19 dsainty Exp $ +# $NetBSD: Makefile,v 1.34 2004/03/08 20:27:14 minskim Exp $ # FreeBSD Id: Makefile,v 1.25 1998/02/15 05:36:54 peter Exp # @@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.beedub.com/exmh/ COMMENT= X11/TK based mail reader front end to MH -DEPENDS+= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk83 DEPENDS+= nmh>=1.0:../../mail/nmh DEPENDS+= metamail>=2.7:../../mail/metamail diff --git a/math/R/Makefile b/math/R/Makefile index 8e6c5a3ee77..5ffe6568ad9 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2004/03/01 11:42:13 markd Exp $ +# $NetBSD: Makefile,v 1.50 2004/03/08 20:27:14 minskim Exp $ DISTNAME= R-1.8.1 PKGREVISION= 1 @@ -119,5 +119,5 @@ post-install: .include "../../graphics/jpeg/buildlink2.mk" .include "../../graphics/png/buildlink2.mk" .include "../../math/blas/buildlink2.mk" -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/scilab/Makefile b/math/scilab/Makefile index e9bfc9deef6..628ffa6f6db 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2004/02/14 17:21:44 jlam Exp $ +# $NetBSD: Makefile,v 1.49 2004/03/08 20:27:15 minskim Exp $ # DISTNAME= ${SCIBASE}.src @@ -91,5 +91,5 @@ do-test: tee ${WRKDIR}/examples.log .include "../../parallel/pvm3/buildlink2.mk" -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile index 91a20931d81..3a3b8c99284 100644 --- a/mbone/imm/Makefile +++ b/mbone/imm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2004/01/20 12:20:24 agc Exp $ +# $NetBSD: Makefile,v 1.19 2004/03/08 20:27:15 minskim Exp $ # # NetBSD "imm" package # The original was based on the imm-3.5a1 FreeBSD port maintained @@ -16,7 +16,7 @@ HOMEPAGE= http://tonnant.itd.nrl.navy.mil/ipresearch/imm.html COMMENT= Internet Image(or other data) Multicaster (and receiver) DEPENDS+= xv>=3.10:../../graphics/xv -DEPENDS+= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk83 WRKSRC= ${WRKDIR}/${DISTNAME}.src USE_X11= yes diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile index 3550a85104f..26bdaf5714e 100644 --- a/mbone/nte/Makefile +++ b/mbone/nte/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2004/01/24 14:00:13 grant Exp $ +# $NetBSD: Makefile,v 1.32 2004/03/08 20:27:15 minskim Exp $ # DISTNAME= nt.1.5a23 @@ -10,7 +10,7 @@ MAINTAINER= mycroft@NetBSD.org HOMEPAGE= http://www-mice.cs.ucl.ac.uk/multimedia/software/nte/ COMMENT= Multicast Network Text Editor -DEPENDS+= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk83 WRKSRC= ${WRKDIR} CRYPTO= yes diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile index 93e3c5a03cf..662af986dc6 100644 --- a/mbone/rat/Makefile +++ b/mbone/rat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/01/24 14:00:13 grant Exp $ +# $NetBSD: Makefile,v 1.21 2004/03/08 20:27:15 minskim Exp $ # DISTNAME= rat-3.0.28 @@ -9,7 +9,7 @@ MAINTAINER= mycroft@NetBSD.org HOMEPAGE= http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/ COMMENT= Robust Audio Tool - multicast audioconferencing -DEPENDS+= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk83 CRYPTO= yes USE_GNU_TOOLS+= make diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile index 4808ff456e3..30b4b80a5be 100644 --- a/mbone/sdr/Makefile +++ b/mbone/sdr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2004/01/24 14:00:13 grant Exp $ +# $NetBSD: Makefile,v 1.40 2004/03/08 20:27:15 minskim Exp $ # DISTNAME= sdr-3.0 @@ -9,7 +9,7 @@ MAINTAINER= is@NetBSD.org HOMEPAGE= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/ COMMENT= MBone Session Directory -DEPENDS+= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk83 DEPENDS+= common-mml>=1.2.0:../common-mml WRKSRC= ${WRKDIR}/sdr/${SYSDIR} diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile index 2325fe3492e..8b2a3db9b57 100644 --- a/mbone/vat/Makefile +++ b/mbone/vat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2004/01/20 12:20:24 agc Exp $ +# $NetBSD: Makefile,v 1.46 2004/03/08 20:27:15 minskim Exp $ # DISTNAME= vatsrc-4.0b2 @@ -10,7 +10,7 @@ MAINTAINER= mycroft@NetBSD.org HOMEPAGE= http://www-nrg.ee.lbl.gov/vat/ COMMENT= The Visual Audio Tool - multicast audioconferencing -DEPENDS+= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk83 DEPENDS+= gsm-1.0.10:../../audio/gsm WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile index 9c0169ea81a..6c1584342bd 100644 --- a/mbone/vic/Makefile +++ b/mbone/vic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2004/01/20 12:20:24 agc Exp $ +# $NetBSD: Makefile,v 1.27 2004/03/08 20:27:15 minskim Exp $ # FreeBSD Id: Makefile,v 1.12 1997/09/11 03:54:53 fenner Exp # @@ -18,7 +18,7 @@ MAINTAINER= is@NetBSD.org HOMEPAGE= http://www-nrg.ee.lbl.gov/vic/ COMMENT= MBONE video conferencing tool -DEPENDS+= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk83 WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} GNU_CONFIGURE= yes diff --git a/misc/dirdiff/Makefile b/misc/dirdiff/Makefile index 2a354b6e9ac..228afbba2ea 100644 --- a/misc/dirdiff/Makefile +++ b/misc/dirdiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:45 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2004/03/08 20:27:15 minskim Exp $ # DISTNAME= dirdiff-1.6 @@ -12,5 +12,5 @@ COMMENT= Displays differences between directories USE_BUILDLINK2= yes USE_LIBTOOL= yes -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/dotfile/Makefile b/misc/dotfile/Makefile index 4a2fe44286f..074465e8d56 100644 --- a/misc/dotfile/Makefile +++ b/misc/dotfile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/03/06 05:37:41 minskim Exp $ +# $NetBSD: Makefile,v 1.22 2004/03/08 20:27:15 minskim Exp $ # FreeBSD Id: Makefile,v 1.5 1997/04/20 13:19:30 wosch Exp # @@ -10,7 +10,7 @@ MAINTAINER= oly@world.std.com HOMEPAGE= http://www.blackie.dk/dotfile/ COMMENT= GUI dotfile generator program to create .config files -DEPENDS+= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk83 BUILD_DEFS+= DOTFILE_LANG diff --git a/misc/kp/Makefile b/misc/kp/Makefile index 5b4757ad764..a6ca507a32c 100644 --- a/misc/kp/Makefile +++ b/misc/kp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2003/07/17 21:49:21 grant Exp $ +# $NetBSD: Makefile,v 1.19 2004/03/08 20:27:15 minskim Exp $ # FreeBSD Id: Makefile,v 1.8 1997/04/20 13:19:32 wosch Exp # @@ -9,7 +9,7 @@ MASTER_SITES= ftp://stampede.cs.berkeley.edu/pub/kp/ MAINTAINER= tech-pkg@NetBSD.org COMMENT= The Keyboard Practicer, touch-type training program -DEPENDS= tk>=8.3.2:../../x11/tk +DEPENDS= tk>=8.3.2:../../x11/tk83 USE_X11= yes diff --git a/misc/nxtvepg/Makefile b/misc/nxtvepg/Makefile index 3c3bb450e20..9ddb070f884 100644 --- a/misc/nxtvepg/Makefile +++ b/misc/nxtvepg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2004/01/24 14:11:10 grant Exp $ +# $NetBSD: Makefile,v 1.31 2004/03/08 20:27:15 minskim Exp $ DISTNAME= nxtvepg-2.6.0 @@ -36,5 +36,5 @@ pre-configure: # cd ${WRKSRC}; \ # ${GMAKE} depend -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/visual-regexp/Makefile b/misc/visual-regexp/Makefile index da5729fb776..72c5cdaac90 100644 --- a/misc/visual-regexp/Makefile +++ b/misc/visual-regexp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/07/17 21:50:02 grant Exp $ +# $NetBSD: Makefile,v 1.4 2004/03/08 20:27:15 minskim Exp $ # DISTNAME= visual_regexp-3.0 @@ -9,7 +9,7 @@ MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://laurent.riesterer.free.fr/regexp/ COMMENT= Easily design and debug regular expressions graphically -DEPENDS+= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk83 NO_BUILD= yes diff --git a/misc/zorro/Makefile b/misc/zorro/Makefile index 206e7dec646..dbf988bb76b 100644 --- a/misc/zorro/Makefile +++ b/misc/zorro/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2003/07/17 21:50:07 grant Exp $ +# $NetBSD: Makefile,v 1.16 2004/03/08 20:27:15 minskim Exp $ # FreeBSD Id: Makefile,v 1.9 1997/11/22 19:55:25 jseger Exp # @@ -10,7 +10,7 @@ MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/sorted/apps/zorro-1.1p8/ MAINTAINER= tech-pkg@NetBSD.org COMMENT= Simple to-do list manager -DEPENDS+= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk83 NO_BUILD= yes USE_X11= yes diff --git a/net/nam/Makefile b/net/nam/Makefile index 7278ff3d475..d108dcd92b7 100644 --- a/net/nam/Makefile +++ b/net/nam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/01/25 17:32:45 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2004/03/08 20:27:15 minskim Exp $ DISTNAME= nam-src-1.9 PKGNAME= ${DISTNAME:S/-src//} @@ -29,5 +29,5 @@ post-install: .include "../../devel/zlib/buildlink2.mk" .include "../../lang/tcl-otcl/buildlink2.mk" .include "../../devel/tcl-tclcl/buildlink2.mk" -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/ns/Makefile b/net/ns/Makefile index ad5525a11d1..4f7ba1cfb0f 100644 --- a/net/ns/Makefile +++ b/net/ns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/01/25 17:32:45 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2004/03/08 20:27:15 minskim Exp $ DISTNAME= ns-src-2.26 PKGNAME= ${DISTNAME:S/-src//} @@ -36,6 +36,6 @@ post-install: .include "../../net/libpcap/buildlink2.mk" .include "../../devel/tcl-tclcl/buildlink2.mk" .include "../../lang/tcl-otcl/buildlink2.mk" -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/pthread.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/tcpillust/Makefile b/net/tcpillust/Makefile index 6c50de2150b..5aeaa53e211 100644 --- a/net/tcpillust/Makefile +++ b/net/tcpillust/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2003/07/17 22:51:55 grant Exp $ +# $NetBSD: Makefile,v 1.11 2004/03/08 20:27:15 minskim Exp $ # $FreeBSD: ports/net/tcpillust/Makefile,v 1.1.1.1 2000/07/29 06:26:00 sada Exp $ # @@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.csl.sony.co.jp/person/nishida/tcpillust.html COMMENT= Graphical TCP connection analysis tool -DEPENDS+= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk83 USE_IMAKE= yes GNU_CONFIGURE= yes diff --git a/net/tkined/Makefile b/net/tkined/Makefile index b88608c9515..e345fd6a711 100644 --- a/net/tkined/Makefile +++ b/net/tkined/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/01/20 12:22:22 agc Exp $ +# $NetBSD: Makefile,v 1.10 2004/03/08 20:27:15 minskim Exp $ # DISTNAME= scotty-2.1.11 @@ -10,7 +10,7 @@ MAINTAINER= jwise@NetBSD.org HOMEPAGE= http://wwwhome.cs.utwente.nl/~schoenw/scotty/ COMMENT= Graphical network discovery and monitoring tool based on scotty -DEPENDS+= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk83 DEPENDS+= tcl-scotty>=2.1.11:../../net/tcl-scotty WRKSRC= ${WRKDIR}/${DISTNAME}/unix diff --git a/net/ttt/Makefile b/net/ttt/Makefile index 0f8c439ccc0..54fedfb3d15 100644 --- a/net/ttt/Makefile +++ b/net/ttt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/01/13 23:35:38 xtraeme Exp $ +# $NetBSD: Makefile,v 1.8 2004/03/08 20:27:15 minskim Exp $ # DISTNAME= ttt-1.8 @@ -17,5 +17,5 @@ INSTALL_TARGET= install install-man .include "../../net/libpcap/buildlink2.mk" .include "../../x11/blt/buildlink2.mk" -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/xspeakfree/Makefile b/net/xspeakfree/Makefile index e3c1037c26a..7877d23940d 100644 --- a/net/xspeakfree/Makefile +++ b/net/xspeakfree/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:52:05 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/03/08 20:27:15 minskim Exp $ DISTNAME= xspeakfree-0.8.1 CATEGORIES= net audio x11 @@ -9,7 +9,7 @@ HOMEPAGE= http://www.spearce.org/projects/xspeakfree/ COMMENT= Tcl/Tk (wish) frontend to Speak Freely DEPENDS+= speakfreely>=7.1:../../net/speakfreely -DEPENDS+= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk83 NO_BUILD= yes diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile index cabb3cfb78b..874b96a0287 100644 --- a/parallel/mpi-ch/Makefile +++ b/parallel/mpi-ch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2004/02/18 13:33:41 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2004/03/08 20:27:15 minskim Exp $ DISTNAME= mpich-1.2.5.2 CATEGORIES= parallel @@ -12,7 +12,7 @@ COMMENT= Free implementation of the Message Passing Interface .if !exists(/usr/bin/ssh) DEPENDS+= {openssh-[0-9]*,ssh{,6}-1.2.27*}:../../security/ssh .endif -DEPENDS+= tk>=8.3.0:../../x11/tk +DEPENDS+= tk>=8.3.0:../../x11/tk83 ALL_TARGET= ALL examples INSTALL_TARGET= install-all diff --git a/parallel/openpbs/Makefile b/parallel/openpbs/Makefile index 97637cba3fd..df6d53375ee 100644 --- a/parallel/openpbs/Makefile +++ b/parallel/openpbs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/12/03 22:14:46 kristerw Exp $ +# $NetBSD: Makefile,v 1.4 2004/03/08 20:27:15 minskim Exp $ # DISTNAME= OpenPBS_2_3_16 @@ -35,5 +35,5 @@ _REPLACE_FILES.tk2+= src/tools/xpbsmon/xpbsmon.src _CONFIGURE_POSTREQ+= replace-interpreter -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/tkpasman/Makefile b/security/tkpasman/Makefile index af62286c531..aedb8973cc0 100644 --- a/security/tkpasman/Makefile +++ b/security/tkpasman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/11/12 03:39:43 jschauma Exp $ +# $NetBSD: Makefile,v 1.7 2004/03/08 20:27:15 minskim Exp $ # DISTNAME= TkPasMan-2.2a @@ -43,5 +43,5 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tkpasman ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/tkpasman -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile index 48a31c94192..d317e4d27f3 100644 --- a/sysutils/lavaps/Makefile +++ b/sysutils/lavaps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/01/20 12:26:15 agc Exp $ +# $NetBSD: Makefile,v 1.17 2004/03/08 20:27:15 minskim Exp $ # DISTNAME= lavaps-1.20 @@ -10,7 +10,7 @@ MAINTAINER= hubertf@NetBSD.org HOMEPAGE= http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/ COMMENT= Lava lamp of currently running processes -DEPENDS+= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk83 USE_PERL5= build WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} diff --git a/sysutils/tkcron/Makefile b/sysutils/tkcron/Makefile index 6e95102c108..722ca4f44bb 100644 --- a/sysutils/tkcron/Makefile +++ b/sysutils/tkcron/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/01/20 12:26:16 agc Exp $ +# $NetBSD: Makefile,v 1.10 2004/03/08 20:27:15 minskim Exp $ # DISTNAME= tkcron-2.12 @@ -9,7 +9,7 @@ EXTRACT_SUFX= .tcl.gz MAINTAINER= tech-pkg@NetBSD.org COMMENT= Graphical frontend to crontab -DEPENDS+= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk83 WRKSRC= ${WRKDIR} USE_X11= yes diff --git a/sysutils/tkdesk/Makefile b/sysutils/tkdesk/Makefile index ac1d2d154c3..00767e6d78d 100644 --- a/sysutils/tkdesk/Makefile +++ b/sysutils/tkdesk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/03/08 19:52:51 minskim Exp $ +# $NetBSD: Makefile,v 1.8 2004/03/08 20:27:16 minskim Exp $ # DISTNAME= tkdesk-1.2 @@ -24,5 +24,5 @@ pre-install: .include "../../lang/tcl83/buildlink2.mk" .include "../../lang/tcl-itcl/buildlink2.mk" .include "../../x11/blt/buildlink2.mk" -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xhfs/Makefile b/sysutils/xhfs/Makefile index 97e8954663c..22d8aa31aa2 100644 --- a/sysutils/xhfs/Makefile +++ b/sysutils/xhfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:53:58 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/03/08 20:27:16 minskim Exp $ # DISTNAME= hfsutils-3.2.6 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.mars.org/home/rob/proj/hfs/ COMMENT= Tk GUI + Tcl Shell for accessing HFS volumes DEPENDS= libhfs-3.2.6:../../devel/libhfs -DEPENDS+= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk83 USE_X11= yes diff --git a/textproc/catdoc-tk/Makefile b/textproc/catdoc-tk/Makefile index e67d3f7af02..a3f8ab118c9 100644 --- a/textproc/catdoc-tk/Makefile +++ b/textproc/catdoc-tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/09/17 14:58:44 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2004/03/08 20:27:16 minskim Exp $ # .include "../../textproc/catdoc/Makefile.common" @@ -17,5 +17,5 @@ CONFIGURE_ENV+= enable_wordview=yes do-install: ${INSTALL_SCRIPT} ${WRKSRC}/src/wordview ${PREFIX}/bin/wordview -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/ical/Makefile b/time/ical/Makefile index a87284879fd..01fa7dd6a3f 100644 --- a/time/ical/Makefile +++ b/time/ical/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/10/02 20:14:23 tron Exp $ +# $NetBSD: Makefile,v 1.8 2004/03/08 20:27:16 minskim Exp $ DISTNAME= ical-2.2.1 CATEGORIES= time @@ -22,5 +22,5 @@ post-configure: ${WRKDIR}/${DISTNAME}/startup.tcl \ ${WRKDIR}/${DISTNAME}/time/Makefile -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/projclock/Makefile b/time/projclock/Makefile index a02a8291117..7e4dc5a4c28 100644 --- a/time/projclock/Makefile +++ b/time/projclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/02/15 23:24:36 lukem Exp $ +# $NetBSD: Makefile,v 1.8 2004/03/08 20:27:16 minskim Exp $ # DISTNAME= pclock0.7 @@ -16,5 +16,5 @@ WRKSRC= ${WRKDIR}/projclock USE_BUILDLINK2= # defined NO_BUILD= # defined -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/icewmconf/Makefile b/wm/icewmconf/Makefile index f4d5fab5e82..8ee3b648e5c 100644 --- a/wm/icewmconf/Makefile +++ b/wm/icewmconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/01/20 12:27:35 agc Exp $ +# $NetBSD: Makefile,v 1.7 2004/03/08 20:27:16 minskim Exp $ DISTNAME= icewmconf-2.1.0 CATEGORIES= wm @@ -24,5 +24,5 @@ post-patch: do-install: ${INSTALL_SCRIPT} ${FILENAME} ${PREFIX}/bin/ -.include "../../x11/tk/buildlink2.mk" +.include "../../x11/tk83/buildlink2.mk" .include "../../mk/bsd.pkg.mk" 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" |