diff options
74 files changed, 405 insertions, 404 deletions
diff --git a/audio/xcd/Makefile b/audio/xcd/Makefile index f3f6de626fa9..16829da9d247 100644 --- a/audio/xcd/Makefile +++ b/audio/xcd/Makefile @@ -3,16 +3,16 @@ # Date created: 22 November 1994 # Whom: jmz # -# $Id: Makefile,v 1.17 1997/06/01 22:54:12 jmz Exp $ +# $Id: Makefile,v 1.18 1997/10/08 13:10:20 jmz Exp $ # DISTNAME= xcd-1.6 -CATEGORIES= audio tk80 +CATEGORIES= audio tk81 MASTER_SITES= ftp://ftp.obs-besancon.fr/pub/outgoing/ MAINTAINER= jmz@FreeBSD.org -RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80 +RUN_DEPENDS= wish8.1:${PORTSDIR}/x11/tk81 WRKSRC= ${WRKDIR}/xcd MAN1= cdplayer.1 xcd.1 diff --git a/audio/xcd/scripts/configure b/audio/xcd/scripts/configure index d2d74e8a2f9c..15f1c6b4e8a8 100644 --- a/audio/xcd/scripts/configure +++ b/audio/xcd/scripts/configure @@ -11,5 +11,5 @@ MANDIR = $PREFIX/man/man1 END mv xcd.in xcd.in~ -sed -e 's/wish4\.1/wish8.0/' < xcd.in~ > xcd.in +sed -e 's/wish4\.1/wish8.1/' < xcd.in~ > xcd.in exit 0; diff --git a/audio/xmpeg3/Makefile b/audio/xmpeg3/Makefile index 42400b2392b9..adbd91668c95 100644 --- a/audio/xmpeg3/Makefile +++ b/audio/xmpeg3/Makefile @@ -3,19 +3,19 @@ # Date created: 7 July 1997 # Whom: doconnor@ist.flinders.edu.au # -# $Id: Makefile,v 1.3 1997/10/30 15:04:15 tg Exp $ +# $Id: Makefile,v 1.4 1998/02/21 22:38:11 fenner Exp $ # DISTNAME= xmp3_1.0.0 PKGNAME= xmpeg3-1.0 -CATEGORIES= audio tk80 +CATEGORIES= audio tk81 MASTER_SITES= ftp://ftp.rasip.fer.hr/pub/mpeg/ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.ORG RUN_DEPENDS= amp:${PORTSDIR}/audio/amp \ - wish8.0:${PORTSDIR}/x11/tk80 + wish8.1:${PORTSDIR}/x11/tk81 WRKSRC= ${WRKDIR}/xmpeg3 NO_BUILD= yes diff --git a/audio/xmpeg3/files/patch-aa b/audio/xmpeg3/files/patch-aa index 1b290d64d6c9..9e91120829d8 100644 --- a/audio/xmpeg3/files/patch-aa +++ b/audio/xmpeg3/files/patch-aa @@ -1,7 +1,7 @@ --- xmpeg3.orig Tue Mar 25 13:21:26 1997 +++ xmpeg3 Thu Oct 30 16:00:48 1997 @@ -1,3 +1,4 @@ -+#!@@PREFIX@@/bin/wish8.0 ++#!@@PREFIX@@/bin/wish8.1 ############################################################################# # Visual Tcl v1.07 Project # diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile index 3577d2939dff..d642d154d739 100644 --- a/converters/xdeview/Makefile +++ b/converters/xdeview/Makefile @@ -3,24 +3,24 @@ # Date Created: 9 Feb 1997 # Whom: Tim Vanderhoek <ac199@freenet.hamilton.on.ca> # -# $Id: Makefile,v 1.9 1997/11/26 23:24:31 jseger Exp $ +# $Id: Makefile,v 1.10 1998/02/18 22:20:06 hoek Exp $ # DISTNAME= uudeview-0.5.13 PKGNAME= xdeview-0.5.13 -CATEGORIES= converters tk80 +CATEGORIES= converters tk81 MASTER_SITES= http://www.uni-frankfurt.de/~fp/uudeview/Apps/frank/ \ ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/ MAINTAINER= hoek@FreeBSD.ORG -LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80 \ +LIB_DEPENDS= tk81\\.1\\.:${PORTSDIR}/x11/tk81 \ uu\\.1\\.:${PORTSDIR}/converters/uulib GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-tcl="${PREFIX}" --enable-tk="${PREFIX}" # Season to taste --- anything over tcl7.5 -CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include/tcl8.0 -I${PREFIX}/include/tk8.0" +CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include/tcl8.1 -I${PREFIX}/include/tk8.1" ALL_TARGET= xdeview INSTALL_TARGET= install-tcl diff --git a/deskutils/ical/Makefile b/deskutils/ical/Makefile index d526e57b0faf..bb5421750a04 100644 --- a/deskutils/ical/Makefile +++ b/deskutils/ical/Makefile @@ -3,24 +3,24 @@ # Date created: Mon Aug 28 13:35:31 CDT 1995 # Whom: erich@rrnet.com # -# $Id: Makefile,v 1.15 1998/02/07 22:59:16 hoek Exp $ +# $Id: Makefile,v 1.16 1998/02/21 22:38:00 fenner Exp $ # DISTNAME= ical-2.2 -CATEGORIES= misc tk80 +CATEGORIES= misc tk81 MASTER_SITES= http://www.research.digital.com/SRC/personal/Sanjay_Ghemawat/ical/icalbins/ MAINTAINER= erich@FreeBSD.ORG -LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80 +LIB_DEPENDS= tk81\\.1:${PORTSDIR}/x11/tk81 GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ - --with-tclconfig=${PREFIX}/lib/tcl8.0 \ - --with-tclhdir=${PREFIX}/include/tcl8.0 \ - --with-tclsh=${PREFIX}/bin/tclsh8.0 \ - --with-tkconfig=${PREFIX}/lib/tk8.0 \ - --with-tkhdir=${PREFIX}/include/tk8.0 + --with-tclconfig=${PREFIX}/lib/tcl8.1 \ + --with-tclhdir=${PREFIX}/include/tcl8.1 \ + --with-tclsh=${PREFIX}/bin/tclsh8.1 \ + --with-tkconfig=${PREFIX}/lib/tk8.1 \ + --with-tkhdir=${PREFIX}/include/tk8.1 MAN1= ical.1 diff --git a/deskutils/zorro/Makefile b/deskutils/zorro/Makefile index 294eb1d6756d..6227f0387c62 100644 --- a/deskutils/zorro/Makefile +++ b/deskutils/zorro/Makefile @@ -3,17 +3,17 @@ # Date created: 03 Aug 1996 # Whom: shanee@rabbit.augusta.de # -# $Id: Makefile,v 1.8 1997/08/10 22:25:19 fenner Exp $ +# $Id: Makefile,v 1.9 1997/11/22 19:55:25 jseger Exp $ # DISTNAME= zorro-1.1p8 PKGNAME= zorro-1.1.8 -CATEGORIES= misc tk80 +CATEGORIES= misc tk81 MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/sorted/apps/zorro-1.1p8/ MAINTAINER= shanee@augusta.de -LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80 +LIB_DEPENDS= tk81\\.1\\.:${PORTSDIR}/x11/tk81 NO_BUILD= yes diff --git a/deskutils/zorro/files/patch-aa b/deskutils/zorro/files/patch-aa index 02f645527961..e9a53376fd8b 100644 --- a/deskutils/zorro/files/patch-aa +++ b/deskutils/zorro/files/patch-aa @@ -9,7 +9,7 @@ # ---------------------------------------------------------------------- # AUTHOR: Lindsay Marshall <lindsay.marshall@newcastle.ac.uk> --- 1,6 ---- -! #!/usr/local/bin/wish8.0 +! #!/usr/local/bin/wish8.1 # ! # Version 1.1 Patch 8 # diff --git a/devel/SWIG-devel/Makefile b/devel/SWIG-devel/Makefile index 0917e23a2996..d8e4025bc628 100644 --- a/devel/SWIG-devel/Makefile +++ b/devel/SWIG-devel/Makefile @@ -3,12 +3,12 @@ # Date created: 19 April 1996 # Whom: jkh # -# $Id: Makefile,v 1.9 1997/12/09 10:22:39 tg Exp $ +# $Id: Makefile,v 1.10 1998/01/29 09:53:25 tg Exp $ # DISTNAME= swig1.1p4 PKGNAME= swig-1.1p4 -CATEGORIES= devel +CATEGORIES= devel tcl81 MASTER_SITES= ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \ ftp://ftp.rge.com/pub/languages/swig/ \ ftp://ftp.mcc.ac.uk/pub/mvc/swig/ @@ -16,13 +16,13 @@ MASTER_SITES= ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \ MAINTAINER= erich@FreeBSD.ORG BUILD_DEPENDS= ${PREFIX}/bin/python:${PORTSDIR}/lang/python/ \ - ${PREFIX}/bin/tclsh8.0:${PORTSDIR}/lang/tcl80 + ${PREFIX}/bin/tclsh8.1:${PORTSDIR}/lang/tcl81 USE_PERL5= YES WRKSRC= ${WRKDIR}/SWIG1.1p4 GNU_CONFIGURE= YES -CONFIGURE_ARGS= --with-tclincl=${PREFIX}/include/tcl8.0/ \ - --with-tcllib=${PREFIX}/lib/tcl8.0/ +CONFIGURE_ARGS= --with-tclincl=${PREFIX}/include/tcl8.1/ \ + --with-tcllib=${PREFIX}/lib/tcl8.1/ ALL_TARGET= all runtime diff --git a/devel/SWIG/Makefile b/devel/SWIG/Makefile index 0917e23a2996..d8e4025bc628 100644 --- a/devel/SWIG/Makefile +++ b/devel/SWIG/Makefile @@ -3,12 +3,12 @@ # Date created: 19 April 1996 # Whom: jkh # -# $Id: Makefile,v 1.9 1997/12/09 10:22:39 tg Exp $ +# $Id: Makefile,v 1.10 1998/01/29 09:53:25 tg Exp $ # DISTNAME= swig1.1p4 PKGNAME= swig-1.1p4 -CATEGORIES= devel +CATEGORIES= devel tcl81 MASTER_SITES= ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \ ftp://ftp.rge.com/pub/languages/swig/ \ ftp://ftp.mcc.ac.uk/pub/mvc/swig/ @@ -16,13 +16,13 @@ MASTER_SITES= ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \ MAINTAINER= erich@FreeBSD.ORG BUILD_DEPENDS= ${PREFIX}/bin/python:${PORTSDIR}/lang/python/ \ - ${PREFIX}/bin/tclsh8.0:${PORTSDIR}/lang/tcl80 + ${PREFIX}/bin/tclsh8.1:${PORTSDIR}/lang/tcl81 USE_PERL5= YES WRKSRC= ${WRKDIR}/SWIG1.1p4 GNU_CONFIGURE= YES -CONFIGURE_ARGS= --with-tclincl=${PREFIX}/include/tcl8.0/ \ - --with-tcllib=${PREFIX}/lib/tcl8.0/ +CONFIGURE_ARGS= --with-tclincl=${PREFIX}/include/tcl8.1/ \ + --with-tcllib=${PREFIX}/lib/tcl8.1/ ALL_TARGET= all runtime diff --git a/devel/SpecTcl/Makefile b/devel/SpecTcl/Makefile index 98dcc6b846e7..452c617a1c51 100644 --- a/devel/SpecTcl/Makefile +++ b/devel/SpecTcl/Makefile @@ -3,17 +3,17 @@ # Date created: Fri Oct 3 18:50:53 CEST 1997 # Whom: Andreas Klemm <andreas@klemm.gtn.com> # -# $Id: Makefile,v 1.2 1997/10/13 20:33:00 andreas Exp $ +# $Id: Makefile,v 1.3 1998/02/21 22:37:47 fenner Exp $ # DISTNAME= SpecTcl1.1 PKGNAME= SpecTcl-1.1 -CATEGORIES= devel tk80 +CATEGORIES= devel tk81 MASTER_SITES= ftp://ftp.sunlabs.com/pub/tcl/SpecTcl/ MAINTAINER= andreas@FreeBSD.ORG -RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80 +RUN_DEPENDS= wish8.1:${PORTSDIR}/x11/tk81 NO_BUILD= yes diff --git a/devel/SpecTcl/files/patch-aa b/devel/SpecTcl/files/patch-aa index da3ccd3320fc..f996fe573650 100644 --- a/devel/SpecTcl/files/patch-aa +++ b/devel/SpecTcl/files/patch-aa @@ -9,7 +9,7 @@ # Change WISH to the pathname of your tk4.1a2 (or >) wish binary -WISH=`which wish` -+WISH=wish8.0 ++WISH=wish8.1 env SPECTCL_DIR=$DIR $WISH $DIR/main.tk $@ & echo "Starting SpecTcl 1.1" diff --git a/devel/SpecTcl/files/patch-ab b/devel/SpecTcl/files/patch-ab index 989a413e26ae..06392c097e30 100644 --- a/devel/SpecTcl/files/patch-ab +++ b/devel/SpecTcl/files/patch-ab @@ -9,7 +9,7 @@ # Change WISH to the pathname of your tk4.1a2 (or >) wish binary -WISH=`which wish` -+WISH=wish8.0 ++WISH=wish8.1 env SPECTCL_DIR=$DIR $WISH $DIR/main.tk -java $@ & echo "Starting SpecTcl 1.0" diff --git a/devel/swig11/Makefile b/devel/swig11/Makefile index 0917e23a2996..d8e4025bc628 100644 --- a/devel/swig11/Makefile +++ b/devel/swig11/Makefile @@ -3,12 +3,12 @@ # Date created: 19 April 1996 # Whom: jkh # -# $Id: Makefile,v 1.9 1997/12/09 10:22:39 tg Exp $ +# $Id: Makefile,v 1.10 1998/01/29 09:53:25 tg Exp $ # DISTNAME= swig1.1p4 PKGNAME= swig-1.1p4 -CATEGORIES= devel +CATEGORIES= devel tcl81 MASTER_SITES= ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \ ftp://ftp.rge.com/pub/languages/swig/ \ ftp://ftp.mcc.ac.uk/pub/mvc/swig/ @@ -16,13 +16,13 @@ MASTER_SITES= ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \ MAINTAINER= erich@FreeBSD.ORG BUILD_DEPENDS= ${PREFIX}/bin/python:${PORTSDIR}/lang/python/ \ - ${PREFIX}/bin/tclsh8.0:${PORTSDIR}/lang/tcl80 + ${PREFIX}/bin/tclsh8.1:${PORTSDIR}/lang/tcl81 USE_PERL5= YES WRKSRC= ${WRKDIR}/SWIG1.1p4 GNU_CONFIGURE= YES -CONFIGURE_ARGS= --with-tclincl=${PREFIX}/include/tcl8.0/ \ - --with-tcllib=${PREFIX}/lib/tcl8.0/ +CONFIGURE_ARGS= --with-tclincl=${PREFIX}/include/tcl8.1/ \ + --with-tcllib=${PREFIX}/lib/tcl8.1/ ALL_TARGET= all runtime diff --git a/devel/swig13/Makefile b/devel/swig13/Makefile index 0917e23a2996..d8e4025bc628 100644 --- a/devel/swig13/Makefile +++ b/devel/swig13/Makefile @@ -3,12 +3,12 @@ # Date created: 19 April 1996 # Whom: jkh # -# $Id: Makefile,v 1.9 1997/12/09 10:22:39 tg Exp $ +# $Id: Makefile,v 1.10 1998/01/29 09:53:25 tg Exp $ # DISTNAME= swig1.1p4 PKGNAME= swig-1.1p4 -CATEGORIES= devel +CATEGORIES= devel tcl81 MASTER_SITES= ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \ ftp://ftp.rge.com/pub/languages/swig/ \ ftp://ftp.mcc.ac.uk/pub/mvc/swig/ @@ -16,13 +16,13 @@ MASTER_SITES= ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \ MAINTAINER= erich@FreeBSD.ORG BUILD_DEPENDS= ${PREFIX}/bin/python:${PORTSDIR}/lang/python/ \ - ${PREFIX}/bin/tclsh8.0:${PORTSDIR}/lang/tcl80 + ${PREFIX}/bin/tclsh8.1:${PORTSDIR}/lang/tcl81 USE_PERL5= YES WRKSRC= ${WRKDIR}/SWIG1.1p4 GNU_CONFIGURE= YES -CONFIGURE_ARGS= --with-tclincl=${PREFIX}/include/tcl8.0/ \ - --with-tcllib=${PREFIX}/lib/tcl8.0/ +CONFIGURE_ARGS= --with-tclincl=${PREFIX}/include/tcl8.1/ \ + --with-tcllib=${PREFIX}/lib/tcl8.1/ ALL_TARGET= all runtime diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile index 0917e23a2996..d8e4025bc628 100644 --- a/devel/swig20/Makefile +++ b/devel/swig20/Makefile @@ -3,12 +3,12 @@ # Date created: 19 April 1996 # Whom: jkh # -# $Id: Makefile,v 1.9 1997/12/09 10:22:39 tg Exp $ +# $Id: Makefile,v 1.10 1998/01/29 09:53:25 tg Exp $ # DISTNAME= swig1.1p4 PKGNAME= swig-1.1p4 -CATEGORIES= devel +CATEGORIES= devel tcl81 MASTER_SITES= ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \ ftp://ftp.rge.com/pub/languages/swig/ \ ftp://ftp.mcc.ac.uk/pub/mvc/swig/ @@ -16,13 +16,13 @@ MASTER_SITES= ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \ MAINTAINER= erich@FreeBSD.ORG BUILD_DEPENDS= ${PREFIX}/bin/python:${PORTSDIR}/lang/python/ \ - ${PREFIX}/bin/tclsh8.0:${PORTSDIR}/lang/tcl80 + ${PREFIX}/bin/tclsh8.1:${PORTSDIR}/lang/tcl81 USE_PERL5= YES WRKSRC= ${WRKDIR}/SWIG1.1p4 GNU_CONFIGURE= YES -CONFIGURE_ARGS= --with-tclincl=${PREFIX}/include/tcl8.0/ \ - --with-tcllib=${PREFIX}/lib/tcl8.0/ +CONFIGURE_ARGS= --with-tclincl=${PREFIX}/include/tcl8.1/ \ + --with-tcllib=${PREFIX}/lib/tcl8.1/ ALL_TARGET= all runtime diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile index 0482b5bfb4c5..f4204ac1b51f 100644 --- a/devel/tkcvs/Makefile +++ b/devel/tkcvs/Makefile @@ -3,17 +3,17 @@ # Date created: 02 Aug 1996 # Whom: shanee@augusta.de # -# $Id: Makefile,v 1.10 1997/10/26 23:57:02 fenner Exp $ +# $Id: Makefile,v 1.11 1997/10/31 08:30:45 tg Exp $ # DISTNAME= tkcvs-6.0 -CATEGORIES= devel tk80 +CATEGORIES= devel tk81 MASTER_SITES= http://www.neosoft.com/tcl/ftparchive/sorted/apps/tkcvs-6.0/ \ http://ftp.sunet.se/pub/lang/tcl/sorted/apps/tkcvs-6.0/ MAINTAINER= shanee@augusta.de -LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80 +LIB_DEPENDS= tk81\\.1\\.:${PORTSDIR}/x11/tk81 NO_BUILD= yes MAN1= tkcvs.1 tkdiff.1 diff --git a/devel/tkcvs/files/patch-aa b/devel/tkcvs/files/patch-aa index 2fbced5d12af..aa97081e2447 100644 --- a/devel/tkcvs/files/patch-aa +++ b/devel/tkcvs/files/patch-aa @@ -22,10 +22,10 @@ # Find a Tk interpreter. -WISH=`which wish4.0` -+WISH=`which wish8.0` ++WISH=`which wish8.1` if [ ! -f $WISH ]; then - WISH=`which wish4.1` -+ WISH=`which wish4.0` ++ WISH=`which wish4.1` fi if [ ! -f $WISH ]; then - echo "I cant find a Tk interpreter on your system" diff --git a/devel/tkref/Makefile b/devel/tkref/Makefile index f55b64e06032..58c5b286c324 100644 --- a/devel/tkref/Makefile +++ b/devel/tkref/Makefile @@ -3,23 +3,23 @@ # Date created: 3 August 1997 # Whom: Bruce Gingery <bgingery@gtcs.com> # -# $Id: Makefile,v 1.2 1997/11/10 13:20:32 tg Exp $ +# $Id: Makefile,v 1.3 1998/02/21 22:38:09 fenner Exp $ # DISTNAME= tkref-1.01 -CATEGORIES= devel x11 tk80 +CATEGORIES= devel x11 tk81 MASTER_SITES= http://gtcs.com/softdist/ \ ${MASTER_SITE_LOCAL} MAINTAINER= bgingery@gtcs.com -RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80 +RUN_DEPENDS= wish8.1:${PORTSDIR}/x11/tk81 NO_BUILD= yes NO_CONFIGURE= yes do-patch: - perl -pi -e "s|/usr/local/bin/wish4.1|${PREFIX}/bin/wish8.0|;" \ + perl -pi -e "s|/usr/local/bin/wish4.1|${PREFIX}/bin/wish8.1|;" \ ${WRKDIR}/TkRef do-install: diff --git a/devel/vtcl/Makefile b/devel/vtcl/Makefile index d7e1f644b7c4..ed8b5def2964 100644 --- a/devel/vtcl/Makefile +++ b/devel/vtcl/Makefile @@ -3,18 +3,18 @@ # Date Created: 29 May 1997 # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # -# $Id: Makefile,v 1.5 1997/11/30 19:38:51 vanilla Exp $ +# $Id: Makefile,v 1.6 1998/02/13 15:07:54 vanilla Exp $ # DISTNAME= vt-1.11 PKGNAME= vtcl-1.11 -CATEGORIES= devel x11 tk80 +CATEGORIES= devel x11 tk81 MASTER_SITES= http://www.neuron.com/stewart/vtcl/dload/ \ ftp://ftp.neuron.com/pub/ MAINTAINER= vanilla@FreeBSD.ORG -RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80 +RUN_DEPENDS= wish8.1:${PORTSDIR}/x11/tk81 WRKSRC= ${WRKDIR}/vtcl NO_BUILD= yes diff --git a/devel/vtcl/files/patch-aa b/devel/vtcl/files/patch-aa index 2de7e44da2b3..d95aff2fcfd0 100644 --- a/devel/vtcl/files/patch-aa +++ b/devel/vtcl/files/patch-aa @@ -4,4 +4,4 @@ *** 1,1 **** ! #!/usr/bin/wish -f --- 1,1 ---- -! #!/usr/local/bin/wish8.0 -f +! #!/usr/local/bin/wish8.1 -f diff --git a/devel/vtcl/files/patch-ab b/devel/vtcl/files/patch-ab index e89be3cbe90b..36bb1661e66e 100644 --- a/devel/vtcl/files/patch-ab +++ b/devel/vtcl/files/patch-ab @@ -12,7 +12,7 @@ --- 1,7 ---- #!/bin/sh -! PATH_TO_WISH=/usr/local/bin/wish8.0 +! PATH_TO_WISH=/usr/local/bin/wish8.1 ! VTCL_HOME=/usr/local/lib/vtcl export PATH_TO_WISH diff --git a/editors/e93/Makefile b/editors/e93/Makefile index da2700c6c83a..faa732d60520 100644 --- a/editors/e93/Makefile +++ b/editors/e93/Makefile @@ -3,18 +3,18 @@ # Date created: 21 June 1995 # Whom: Satoshi Asami (asami) # -# $Id: Makefile,v 1.14 1997/12/25 22:29:16 asami Exp $ +# $Id: Makefile,v 1.15 1998/02/22 08:34:54 fenner Exp $ # DISTNAME= e93-1.2r6X PKGNAME= e93-1.2.6 -CATEGORIES= editors tcl80 +CATEGORIES= editors tcl81 MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= editors MAINTAINER= ports@FreeBSD.ORG -LIB_DEPENDS= tcl80\\.1\\.:${PORTSDIR}/lang/tcl80 +LIB_DEPENDS= tcl81\\.1\\.:${PORTSDIR}/lang/tcl81 MAKEFILE= makefile USE_X11= yes diff --git a/emulators/hfsutils/Makefile b/emulators/hfsutils/Makefile index 5715fbfda7e3..e099d9c5a8d8 100644 --- a/emulators/hfsutils/Makefile +++ b/emulators/hfsutils/Makefile @@ -3,16 +3,16 @@ # Date Created: 7 Sep 1997 # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # -# $Id: Makefile,v 1.3 1997/12/12 06:22:23 vanilla Exp $ +# $Id: Makefile,v 1.4 1998/02/21 22:37:59 fenner Exp $ # DISTNAME= hfsutils-2.0 -CATEGORIES= emulators tk80 +CATEGORIES= emulators tk81 MASTER_SITES= ftp://ftp.ps.ucl.ac.uk/pub/mkhfs/ MAINTAINER= vanilla@FreeBSD.ORG -LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80 +LIB_DEPENDS= tk81\\.1\\.:${PORTSDIR}/x11/tk81 MAKE_ENV+= COPTS="${CFLAGS}" MAN1= hattrib.1 hcd.1 hcopy.1 hdel.1 hdir.1 hformat.1 hfs.1 \ diff --git a/games/tksol/Makefile b/games/tksol/Makefile index b3a87fe28e4a..e2122363b452 100644 --- a/games/tksol/Makefile +++ b/games/tksol/Makefile @@ -3,17 +3,17 @@ # Date created: 26 June 1995 # Whom: thomas@ghpc8.ihf.rwth-aachen.de # -# $Id: Makefile,v 1.8 1997/09/24 06:56:48 asami Exp $ +# $Id: Makefile,v 1.9 1997/11/22 20:48:34 jseger Exp $ # DISTNAME= tksol-1.0 -CATEGORIES= games tk80 +CATEGORIES= games tk81 MASTER_SITES= ftp://ftp.cs.umd.edu/pub/misc_software/tksol/ EXTRACT_SUFX= .tar.Z MAINTAINER= tg@freebsd.org -RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80 +RUN_DEPENDS= wish8.1:${PORTSDIR}/x11/tk81 PATCH_STRIP= -p1 WRKSRC= ${WRKDIR}/release diff --git a/games/tksol/files/patch-a b/games/tksol/files/patch-a index f68768b2b93c..9305876571a0 100644 --- a/games/tksol/files/patch-a +++ b/games/tksol/files/patch-a @@ -14,7 +14,7 @@ # Absolute pathname of the wish executable # ############################################ -WISH = /usr/imports/bin/wish -+WISH = ${PREFIX}/bin/wish8.0 ++WISH = ${PREFIX}/bin/wish8.1 #################################################### # Directory where the script tksol will be located # diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile index 66e9f1dfd0f1..4f61ae996d35 100644 --- a/graphics/cqcam/Makefile +++ b/graphics/cqcam/Makefile @@ -3,17 +3,18 @@ # Date created: 29 Oct 1997 # Whom: Kensaku Masuda <greg@greg.rim.or.jp> # -# $Id: Makefile,v 1.1.1.1 1998/02/09 08:09:35 tg Exp $ +# $Id: Makefile,v 1.2 1998/02/21 22:37:54 fenner Exp $ # DISTNAME= cqcam-0.45a -CATEGORIES= graphics tk80 +CATEGORIES= graphics tk81 MASTER_SITES= http://www.cs.virginia.edu/~patrick/cqcam/ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.ORG -LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80 +LIB_DEPENDS= jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg \ + tk81\\.1:${PORTSDIR}/x11/tk81 MAN1= cqcam.1 diff --git a/irc/zircon/Makefile b/irc/zircon/Makefile index 18347bd38208..44e48ed5cf6a 100644 --- a/irc/zircon/Makefile +++ b/irc/zircon/Makefile @@ -3,17 +3,17 @@ # Date created: 19 Aug 1995 # Whom: jkh / pst # -# $Id: Makefile,v 1.23 1998/02/10 02:11:11 jseger Exp $ +# $Id: Makefile,v 1.24 1998/02/12 14:28:01 jseger Exp $ # DISTNAME= zircon-1.18.91 -CATEGORIES= net tk80 +CATEGORIES= net tk81 MASTER_SITES= ftp://catless.ncl.ac.uk/pub/ MAINTAINER= jseger@FreeBSD.org -BUILD_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80 -RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80 +BUILD_DEPENDS= wish8.1:${PORTSDIR}/x11/tk81 +RUN_DEPENDS= wish8.1:${PORTSDIR}/x11/tk81 IS_INTERACTIVE= yes NO_BUILD= yes diff --git a/irc/zircon/files/patch-aa b/irc/zircon/files/patch-aa index 66415b5d6352..37a59ffec0d5 100644 --- a/irc/zircon/files/patch-aa +++ b/irc/zircon/files/patch-aa @@ -5,7 +5,7 @@ global CC GCC SCflag CFlags Type SLDflag share scflags switch {} $CC {} default return - set CFlags -O -+ set CFlags {-O -I/usr/local/include/tcl8.0} ++ set CFlags {-O -I/usr/local/include/tcl8.1} catch {set CFlags $cflags($Type)} switch BSDI $Type { set CC gcc2 diff --git a/lang/python+ipv6/Makefile b/lang/python+ipv6/Makefile index 265572375abd..dd13841445e2 100644 --- a/lang/python+ipv6/Makefile +++ b/lang/python+ipv6/Makefile @@ -3,12 +3,12 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ +# $Id: Makefile,v 1.20 1998/01/07 08:32:53 tg Exp $ # DISTNAME= python1.5 PKGNAME= python-1.5 -CATEGORIES= lang tk80 +CATEGORIES= lang tk81 MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ @@ -34,7 +34,7 @@ SETUP_FILE= Setup # WITH_TK?= yes .if defined(WITH_TK) && $(WITH_TK) == yes -TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80 +TK_DEPENDS= tk81\\.1\\.:${PORTSDIR}/x11/tk81 SETUP_LOCAL= Setup.tk .endif diff --git a/lang/python+ipv6/files/Setup.tk b/lang/python+ipv6/files/Setup.tk index 291a9ca3d748..4400b44675dd 100644 --- a/lang/python+ipv6/files/Setup.tk +++ b/lang/python+ipv6/files/Setup.tk @@ -15,14 +15,14 @@ TKPATH=:lib-tk # every system. # *** Always uncomment this (leave the leading underscore in!): -_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT -I${X11BASE}/include -I${PREFIX}/include/tcl8.0 -I${PREFIX}/include/tk8.0 -L${PREFIX}/lib -ltk80 -ltcl80 -L${X11BASE}/lib -lX11 +_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT -I${X11BASE}/include -I${PREFIX}/include/tcl8.1 -I${PREFIX}/include/tk8.1 -L${PREFIX}/lib -ltk81 -ltcl81 -L${X11BASE}/lib -lX11 # *** Uncommend and edit to reflect where your X11 header files are: # -I/usr/X11R6/include \ # *** Or uncomment this for Solaris: # -I/usr/openwin/include \ # *** Uncomment and edit to reflect where your Tcl/Tk headers are: -# -I/usr/local/include/tcl8.0 -I/usr/local/include/tk8.0 \ +# -I/usr/local/include/tcl8.1 -I/usr/local/include/tk8.1 \ # *** Uncomment and edit for Tix extension only: # -DWITH_TIX -ltix4.1.8.0 \ # *** Uncomment and edit for BLT extension only: @@ -36,7 +36,7 @@ _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT -I${X11BASE}/include -I${PREFIX}/ # *** Uncomment and edit to reflect where your Tcl/Tk libraries are: # -L/usr/local/lib \ # *** Uncomment and edit to reflect your Tcl/Tk versions: -# -ltk80 -ltcl80 \ +# -ltk81 -ltcl81 \ # *** Uncomment and edit to reflect where your X11 libraries are: # -L/usr/X11R6/lib \ # *** Or uncomment this for Solaris: diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile index 265572375abd..dd13841445e2 100644 --- a/lang/python-devel/Makefile +++ b/lang/python-devel/Makefile @@ -3,12 +3,12 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ +# $Id: Makefile,v 1.20 1998/01/07 08:32:53 tg Exp $ # DISTNAME= python1.5 PKGNAME= python-1.5 -CATEGORIES= lang tk80 +CATEGORIES= lang tk81 MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ @@ -34,7 +34,7 @@ SETUP_FILE= Setup # WITH_TK?= yes .if defined(WITH_TK) && $(WITH_TK) == yes -TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80 +TK_DEPENDS= tk81\\.1\\.:${PORTSDIR}/x11/tk81 SETUP_LOCAL= Setup.tk .endif diff --git a/lang/python/Makefile b/lang/python/Makefile index 265572375abd..dd13841445e2 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -3,12 +3,12 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ +# $Id: Makefile,v 1.20 1998/01/07 08:32:53 tg Exp $ # DISTNAME= python1.5 PKGNAME= python-1.5 -CATEGORIES= lang tk80 +CATEGORIES= lang tk81 MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ @@ -34,7 +34,7 @@ SETUP_FILE= Setup # WITH_TK?= yes .if defined(WITH_TK) && $(WITH_TK) == yes -TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80 +TK_DEPENDS= tk81\\.1\\.:${PORTSDIR}/x11/tk81 SETUP_LOCAL= Setup.tk .endif diff --git a/lang/python15/Makefile b/lang/python15/Makefile index 265572375abd..dd13841445e2 100644 --- a/lang/python15/Makefile +++ b/lang/python15/Makefile @@ -3,12 +3,12 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ +# $Id: Makefile,v 1.20 1998/01/07 08:32:53 tg Exp $ # DISTNAME= python1.5 PKGNAME= python-1.5 -CATEGORIES= lang tk80 +CATEGORIES= lang tk81 MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ @@ -34,7 +34,7 @@ SETUP_FILE= Setup # WITH_TK?= yes .if defined(WITH_TK) && $(WITH_TK) == yes -TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80 +TK_DEPENDS= tk81\\.1\\.:${PORTSDIR}/x11/tk81 SETUP_LOCAL= Setup.tk .endif diff --git a/lang/python20/Makefile b/lang/python20/Makefile index 265572375abd..dd13841445e2 100644 --- a/lang/python20/Makefile +++ b/lang/python20/Makefile @@ -3,12 +3,12 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ +# $Id: Makefile,v 1.20 1998/01/07 08:32:53 tg Exp $ # DISTNAME= python1.5 PKGNAME= python-1.5 -CATEGORIES= lang tk80 +CATEGORIES= lang tk81 MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ @@ -34,7 +34,7 @@ SETUP_FILE= Setup # WITH_TK?= yes .if defined(WITH_TK) && $(WITH_TK) == yes -TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80 +TK_DEPENDS= tk81\\.1\\.:${PORTSDIR}/x11/tk81 SETUP_LOCAL= Setup.tk .endif diff --git a/lang/python21/Makefile b/lang/python21/Makefile index 265572375abd..dd13841445e2 100644 --- a/lang/python21/Makefile +++ b/lang/python21/Makefile @@ -3,12 +3,12 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ +# $Id: Makefile,v 1.20 1998/01/07 08:32:53 tg Exp $ # DISTNAME= python1.5 PKGNAME= python-1.5 -CATEGORIES= lang tk80 +CATEGORIES= lang tk81 MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ @@ -34,7 +34,7 @@ SETUP_FILE= Setup # WITH_TK?= yes .if defined(WITH_TK) && $(WITH_TK) == yes -TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80 +TK_DEPENDS= tk81\\.1\\.:${PORTSDIR}/x11/tk81 SETUP_LOCAL= Setup.tk .endif diff --git a/lang/python22/Makefile b/lang/python22/Makefile index 265572375abd..dd13841445e2 100644 --- a/lang/python22/Makefile +++ b/lang/python22/Makefile @@ -3,12 +3,12 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ +# $Id: Makefile,v 1.20 1998/01/07 08:32:53 tg Exp $ # DISTNAME= python1.5 PKGNAME= python-1.5 -CATEGORIES= lang tk80 +CATEGORIES= lang tk81 MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ @@ -34,7 +34,7 @@ SETUP_FILE= Setup # WITH_TK?= yes .if defined(WITH_TK) && $(WITH_TK) == yes -TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80 +TK_DEPENDS= tk81\\.1\\.:${PORTSDIR}/x11/tk81 SETUP_LOCAL= Setup.tk .endif diff --git a/lang/python23/Makefile b/lang/python23/Makefile index 265572375abd..dd13841445e2 100644 --- a/lang/python23/Makefile +++ b/lang/python23/Makefile @@ -3,12 +3,12 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ +# $Id: Makefile,v 1.20 1998/01/07 08:32:53 tg Exp $ # DISTNAME= python1.5 PKGNAME= python-1.5 -CATEGORIES= lang tk80 +CATEGORIES= lang tk81 MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ @@ -34,7 +34,7 @@ SETUP_FILE= Setup # WITH_TK?= yes .if defined(WITH_TK) && $(WITH_TK) == yes -TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80 +TK_DEPENDS= tk81\\.1\\.:${PORTSDIR}/x11/tk81 SETUP_LOCAL= Setup.tk .endif diff --git a/lang/python24/Makefile b/lang/python24/Makefile index 265572375abd..dd13841445e2 100644 --- a/lang/python24/Makefile +++ b/lang/python24/Makefile @@ -3,12 +3,12 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ +# $Id: Makefile,v 1.20 1998/01/07 08:32:53 tg Exp $ # DISTNAME= python1.5 PKGNAME= python-1.5 -CATEGORIES= lang tk80 +CATEGORIES= lang tk81 MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ @@ -34,7 +34,7 @@ SETUP_FILE= Setup # WITH_TK?= yes .if defined(WITH_TK) && $(WITH_TK) == yes -TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80 +TK_DEPENDS= tk81\\.1\\.:${PORTSDIR}/x11/tk81 SETUP_LOCAL= Setup.tk .endif diff --git a/lang/python25/Makefile b/lang/python25/Makefile index 265572375abd..dd13841445e2 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -3,12 +3,12 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ +# $Id: Makefile,v 1.20 1998/01/07 08:32:53 tg Exp $ # DISTNAME= python1.5 PKGNAME= python-1.5 -CATEGORIES= lang tk80 +CATEGORIES= lang tk81 MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ @@ -34,7 +34,7 @@ SETUP_FILE= Setup # WITH_TK?= yes .if defined(WITH_TK) && $(WITH_TK) == yes -TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80 +TK_DEPENDS= tk81\\.1\\.:${PORTSDIR}/x11/tk81 SETUP_LOCAL= Setup.tk .endif diff --git a/lang/python26/Makefile b/lang/python26/Makefile index 265572375abd..dd13841445e2 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -3,12 +3,12 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ +# $Id: Makefile,v 1.20 1998/01/07 08:32:53 tg Exp $ # DISTNAME= python1.5 PKGNAME= python-1.5 -CATEGORIES= lang tk80 +CATEGORIES= lang tk81 MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ @@ -34,7 +34,7 @@ SETUP_FILE= Setup # WITH_TK?= yes .if defined(WITH_TK) && $(WITH_TK) == yes -TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80 +TK_DEPENDS= tk81\\.1\\.:${PORTSDIR}/x11/tk81 SETUP_LOCAL= Setup.tk .endif diff --git a/lang/python27/Makefile b/lang/python27/Makefile index 265572375abd..dd13841445e2 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -3,12 +3,12 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ +# $Id: Makefile,v 1.20 1998/01/07 08:32:53 tg Exp $ # DISTNAME= python1.5 PKGNAME= python-1.5 -CATEGORIES= lang tk80 +CATEGORIES= lang tk81 MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ @@ -34,7 +34,7 @@ SETUP_FILE= Setup # WITH_TK?= yes .if defined(WITH_TK) && $(WITH_TK) == yes -TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80 +TK_DEPENDS= tk81\\.1\\.:${PORTSDIR}/x11/tk81 SETUP_LOCAL= Setup.tk .endif diff --git a/lang/python30/Makefile b/lang/python30/Makefile index 265572375abd..dd13841445e2 100644 --- a/lang/python30/Makefile +++ b/lang/python30/Makefile @@ -3,12 +3,12 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ +# $Id: Makefile,v 1.20 1998/01/07 08:32:53 tg Exp $ # DISTNAME= python1.5 PKGNAME= python-1.5 -CATEGORIES= lang tk80 +CATEGORIES= lang tk81 MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ @@ -34,7 +34,7 @@ SETUP_FILE= Setup # WITH_TK?= yes .if defined(WITH_TK) && $(WITH_TK) == yes -TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80 +TK_DEPENDS= tk81\\.1\\.:${PORTSDIR}/x11/tk81 SETUP_LOCAL= Setup.tk .endif diff --git a/lang/python31/Makefile b/lang/python31/Makefile index 265572375abd..dd13841445e2 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -3,12 +3,12 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ +# $Id: Makefile,v 1.20 1998/01/07 08:32:53 tg Exp $ # DISTNAME= python1.5 PKGNAME= python-1.5 -CATEGORIES= lang tk80 +CATEGORIES= lang tk81 MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ @@ -34,7 +34,7 @@ SETUP_FILE= Setup # WITH_TK?= yes .if defined(WITH_TK) && $(WITH_TK) == yes -TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80 +TK_DEPENDS= tk81\\.1\\.:${PORTSDIR}/x11/tk81 SETUP_LOCAL= Setup.tk .endif diff --git a/lang/python32/Makefile b/lang/python32/Makefile index 265572375abd..dd13841445e2 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -3,12 +3,12 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.19 1998/01/06 08:02:48 tg Exp $ +# $Id: Makefile,v 1.20 1998/01/07 08:32:53 tg Exp $ # DISTNAME= python1.5 PKGNAME= python-1.5 -CATEGORIES= lang tk80 +CATEGORIES= lang tk81 MASTER_SITES= ftp://www.python.org/pub/python/src/ \ ftp://ftp.cwi.nl/pub/python/src/ @@ -34,7 +34,7 @@ SETUP_FILE= Setup # WITH_TK?= yes .if defined(WITH_TK) && $(WITH_TK) == yes -TK_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80 +TK_DEPENDS= tk81\\.1\\.:${PORTSDIR}/x11/tk81 SETUP_LOCAL= Setup.tk .endif diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index af3f00cea19a..bf01aed5eb0f 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -3,17 +3,17 @@ # Date created: May 4th 1997 # Whom: jfitz@FreeBSD.ORG # -# $Id: Makefile,v 1.4 1998/02/15 12:14:12 jkh Exp $ +# $Id: Makefile,v 1.5 1998/02/22 08:34:53 fenner Exp $ # DISTNAME= cyrus-imapd-v1.5.2 PKGNAME= cyrus-1.5.2 -CATEGORIES= mail tcl80 +CATEGORIES= mail tcl81 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ MAINTAINER= jfitz@FreeBSD.ORG -LIB_DEPENDS= tcl80\\.1\\.:${PORTSDIR}/lang/tcl80 +LIB_DEPENDS= tcl81\\.1\\.:${PORTSDIR}/lang/tcl81 BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend HAS_CONFIGURE= YES diff --git a/mail/cyrus-imapd/files/patch-bb b/mail/cyrus-imapd/files/patch-bb index c690f73c4803..34ee5682c95b 100644 --- a/mail/cyrus-imapd/files/patch-bb +++ b/mail/cyrus-imapd/files/patch-bb @@ -6,8 +6,8 @@ DEFS = @DEFS@ -CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ -LIBS = @LIBS@ @TCLLIBS@ -+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et -I$(prefix)/include/tcl8.0 @CPPFLAGS@ -+LIBS = @LIBS@ -L/usr/local/lib -ltcl80 -lm ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et -I$(prefix)/include/tcl8.1 @CPPFLAGS@ ++LIBS = @LIBS@ -L/usr/local/lib -ltcl81 -lm DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ CFLAGS = @CFLAGS@ diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile index af3f00cea19a..bf01aed5eb0f 100644 --- a/mail/cyrus-imapd2/Makefile +++ b/mail/cyrus-imapd2/Makefile @@ -3,17 +3,17 @@ # Date created: May 4th 1997 # Whom: jfitz@FreeBSD.ORG # -# $Id: Makefile,v 1.4 1998/02/15 12:14:12 jkh Exp $ +# $Id: Makefile,v 1.5 1998/02/22 08:34:53 fenner Exp $ # DISTNAME= cyrus-imapd-v1.5.2 PKGNAME= cyrus-1.5.2 -CATEGORIES= mail tcl80 +CATEGORIES= mail tcl81 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ MAINTAINER= jfitz@FreeBSD.ORG -LIB_DEPENDS= tcl80\\.1\\.:${PORTSDIR}/lang/tcl80 +LIB_DEPENDS= tcl81\\.1\\.:${PORTSDIR}/lang/tcl81 BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend HAS_CONFIGURE= YES diff --git a/mail/cyrus-imapd2/files/patch-bb b/mail/cyrus-imapd2/files/patch-bb index c690f73c4803..34ee5682c95b 100644 --- a/mail/cyrus-imapd2/files/patch-bb +++ b/mail/cyrus-imapd2/files/patch-bb @@ -6,8 +6,8 @@ DEFS = @DEFS@ -CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ -LIBS = @LIBS@ @TCLLIBS@ -+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et -I$(prefix)/include/tcl8.0 @CPPFLAGS@ -+LIBS = @LIBS@ -L/usr/local/lib -ltcl80 -lm ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et -I$(prefix)/include/tcl8.1 @CPPFLAGS@ ++LIBS = @LIBS@ -L/usr/local/lib -ltcl81 -lm DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ CFLAGS = @CFLAGS@ diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile index af3f00cea19a..bf01aed5eb0f 100644 --- a/mail/cyrus-imapd22/Makefile +++ b/mail/cyrus-imapd22/Makefile @@ -3,17 +3,17 @@ # Date created: May 4th 1997 # Whom: jfitz@FreeBSD.ORG # -# $Id: Makefile,v 1.4 1998/02/15 12:14:12 jkh Exp $ +# $Id: Makefile,v 1.5 1998/02/22 08:34:53 fenner Exp $ # DISTNAME= cyrus-imapd-v1.5.2 PKGNAME= cyrus-1.5.2 -CATEGORIES= mail tcl80 +CATEGORIES= mail tcl81 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ MAINTAINER= jfitz@FreeBSD.ORG -LIB_DEPENDS= tcl80\\.1\\.:${PORTSDIR}/lang/tcl80 +LIB_DEPENDS= tcl81\\.1\\.:${PORTSDIR}/lang/tcl81 BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend HAS_CONFIGURE= YES diff --git a/mail/cyrus-imapd22/files/patch-bb b/mail/cyrus-imapd22/files/patch-bb index c690f73c4803..34ee5682c95b 100644 --- a/mail/cyrus-imapd22/files/patch-bb +++ b/mail/cyrus-imapd22/files/patch-bb @@ -6,8 +6,8 @@ DEFS = @DEFS@ -CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ -LIBS = @LIBS@ @TCLLIBS@ -+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et -I$(prefix)/include/tcl8.0 @CPPFLAGS@ -+LIBS = @LIBS@ -L/usr/local/lib -ltcl80 -lm ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et -I$(prefix)/include/tcl8.1 @CPPFLAGS@ ++LIBS = @LIBS@ -L/usr/local/lib -ltcl81 -lm DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ CFLAGS = @CFLAGS@ diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile index af3f00cea19a..bf01aed5eb0f 100644 --- a/mail/cyrus-imapd23/Makefile +++ b/mail/cyrus-imapd23/Makefile @@ -3,17 +3,17 @@ # Date created: May 4th 1997 # Whom: jfitz@FreeBSD.ORG # -# $Id: Makefile,v 1.4 1998/02/15 12:14:12 jkh Exp $ +# $Id: Makefile,v 1.5 1998/02/22 08:34:53 fenner Exp $ # DISTNAME= cyrus-imapd-v1.5.2 PKGNAME= cyrus-1.5.2 -CATEGORIES= mail tcl80 +CATEGORIES= mail tcl81 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ MAINTAINER= jfitz@FreeBSD.ORG -LIB_DEPENDS= tcl80\\.1\\.:${PORTSDIR}/lang/tcl80 +LIB_DEPENDS= tcl81\\.1\\.:${PORTSDIR}/lang/tcl81 BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend HAS_CONFIGURE= YES diff --git a/mail/cyrus-imapd23/files/patch-bb b/mail/cyrus-imapd23/files/patch-bb index c690f73c4803..34ee5682c95b 100644 --- a/mail/cyrus-imapd23/files/patch-bb +++ b/mail/cyrus-imapd23/files/patch-bb @@ -6,8 +6,8 @@ DEFS = @DEFS@ -CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ -LIBS = @LIBS@ @TCLLIBS@ -+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et -I$(prefix)/include/tcl8.0 @CPPFLAGS@ -+LIBS = @LIBS@ -L/usr/local/lib -ltcl80 -lm ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et -I$(prefix)/include/tcl8.1 @CPPFLAGS@ ++LIBS = @LIBS@ -L/usr/local/lib -ltcl81 -lm DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ CFLAGS = @CFLAGS@ diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile index af3f00cea19a..bf01aed5eb0f 100644 --- a/mail/cyrus-imapd24/Makefile +++ b/mail/cyrus-imapd24/Makefile @@ -3,17 +3,17 @@ # Date created: May 4th 1997 # Whom: jfitz@FreeBSD.ORG # -# $Id: Makefile,v 1.4 1998/02/15 12:14:12 jkh Exp $ +# $Id: Makefile,v 1.5 1998/02/22 08:34:53 fenner Exp $ # DISTNAME= cyrus-imapd-v1.5.2 PKGNAME= cyrus-1.5.2 -CATEGORIES= mail tcl80 +CATEGORIES= mail tcl81 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ MAINTAINER= jfitz@FreeBSD.ORG -LIB_DEPENDS= tcl80\\.1\\.:${PORTSDIR}/lang/tcl80 +LIB_DEPENDS= tcl81\\.1\\.:${PORTSDIR}/lang/tcl81 BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend HAS_CONFIGURE= YES diff --git a/mail/cyrus-imapd24/files/patch-bb b/mail/cyrus-imapd24/files/patch-bb index c690f73c4803..34ee5682c95b 100644 --- a/mail/cyrus-imapd24/files/patch-bb +++ b/mail/cyrus-imapd24/files/patch-bb @@ -6,8 +6,8 @@ DEFS = @DEFS@ -CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ -LIBS = @LIBS@ @TCLLIBS@ -+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et -I$(prefix)/include/tcl8.0 @CPPFLAGS@ -+LIBS = @LIBS@ -L/usr/local/lib -ltcl80 -lm ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et -I$(prefix)/include/tcl8.1 @CPPFLAGS@ ++LIBS = @LIBS@ -L/usr/local/lib -ltcl81 -lm DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ CFLAGS = @CFLAGS@ diff --git a/mail/cyrus/Makefile b/mail/cyrus/Makefile index af3f00cea19a..bf01aed5eb0f 100644 --- a/mail/cyrus/Makefile +++ b/mail/cyrus/Makefile @@ -3,17 +3,17 @@ # Date created: May 4th 1997 # Whom: jfitz@FreeBSD.ORG # -# $Id: Makefile,v 1.4 1998/02/15 12:14:12 jkh Exp $ +# $Id: Makefile,v 1.5 1998/02/22 08:34:53 fenner Exp $ # DISTNAME= cyrus-imapd-v1.5.2 PKGNAME= cyrus-1.5.2 -CATEGORIES= mail tcl80 +CATEGORIES= mail tcl81 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ MAINTAINER= jfitz@FreeBSD.ORG -LIB_DEPENDS= tcl80\\.1\\.:${PORTSDIR}/lang/tcl80 +LIB_DEPENDS= tcl81\\.1\\.:${PORTSDIR}/lang/tcl81 BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend HAS_CONFIGURE= YES diff --git a/mail/cyrus/files/patch-bb b/mail/cyrus/files/patch-bb index c690f73c4803..34ee5682c95b 100644 --- a/mail/cyrus/files/patch-bb +++ b/mail/cyrus/files/patch-bb @@ -6,8 +6,8 @@ DEFS = @DEFS@ -CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ -LIBS = @LIBS@ @TCLLIBS@ -+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et -I$(prefix)/include/tcl8.0 @CPPFLAGS@ -+LIBS = @LIBS@ -L/usr/local/lib -ltcl80 -lm ++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et -I$(prefix)/include/tcl8.1 @CPPFLAGS@ ++LIBS = @LIBS@ -L/usr/local/lib -ltcl81 -lm DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ CFLAGS = @CFLAGS@ diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile index d435f69a2b9f..870683d5ad9c 100644 --- a/mbone/imm/Makefile +++ b/mbone/imm/Makefile @@ -3,18 +3,18 @@ # Date created: 13 October 1994 # Whom: wollman # -# $Id: Makefile,v 1.14 1997/09/12 16:39:31 fenner Exp $ +# $Id: Makefile,v 1.15 1997/09/13 16:58:21 fenner Exp $ # DISTNAME= imm-3.5a1 -CATEGORIES= mbone tk80 +CATEGORIES= mbone tk81 MASTER_SITES= ftp://ftp.hawaii.edu/paccom/imm-3.5a1/ DISTFILES= imm.source.tar.Z WRKSRC= ${WRKDIR}/mnm MAINTAINER= fenner@freebsd.org -LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80 +LIB_DEPENDS= tk81\\.1:${PORTSDIR}/x11/tk81 USE_X11= yes diff --git a/mbone/imm/files/Makefile.freebsd b/mbone/imm/files/Makefile.freebsd index 51724b551d01..c84e9af025f1 100644 --- a/mbone/imm/files/Makefile.freebsd +++ b/mbone/imm/files/Makefile.freebsd @@ -1,11 +1,11 @@ # Some versions of make, like SGI's, use the following variable to # determine which shell to use for executing commands: SHELL = /bin/sh -INCLUDE_DIR = -I${PREFIX}/include -I${LOCALBASE}/include/tcl8.0 -I${LOCALBASE}/include/tk8.0 +INCLUDE_DIR = -I${PREFIX}/include -I${LOCALBASE}/include/tcl8.1 -I${LOCALBASE}/include/tk8.1 # Libraries to use when linking: LIBS = -lm -TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk80 -ltcl80 -lX11 +TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk81 -ltcl81 -lX11 TARGET = ../freebsd diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile index 5b3b2620a38d..e80beb458fbe 100644 --- a/mbone/vic/Makefile +++ b/mbone/vic/Makefile @@ -3,17 +3,17 @@ # Date created: 14 December 1994 # Whom: wollman # -# $Id: Makefile,v 1.11 1997/04/20 13:19:27 wosch Exp $ +# $Id: Makefile,v 1.12 1997/09/11 03:54:53 fenner Exp $ # DISTNAME= vic-2.8 -CATEGORIES= mbone tk80 +CATEGORIES= mbone tk81 MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vic/ DISTFILES= vicsrc-2.8.tar.gz MAINTAINER= fenner@FreeBSD.ORG -LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80 +LIB_DEPENDS= tk81\\.1:${PORTSDIR}/x11/tk81 GNU_CONFIGURE= yes USE_X11= yes diff --git a/mbone/vic/files/patch-aa b/mbone/vic/files/patch-aa index 982d9f9a509c..0c0b6d117d66 100644 --- a/mbone/vic/files/patch-aa +++ b/mbone/vic/files/patch-aa @@ -809,8 +809,8 @@ fi - places="$d/lib/libtcl7.5.so \ - $d/lib/libtcl7.5.a \ -+ places="$d/lib/libtcl8.0.so \ -+ $d/lib/libtcl8.0.a \ ++ places="$d/lib/libtcl8.1.so \ ++ $d/lib/libtcl8.1.a \ $d/lib/libtcl.so \ $d/lib/libtcl.a" V_LIB_TCL=FAIL @@ -819,7 +819,7 @@ exit 1 fi - places="$d/lib/tcl7.5 \ -+ places="$d/lib/tcl8.0 \ ++ places="$d/lib/tcl8.1 \ $d/lib/tcl" V_LIBRARY_TCL=FAIL for dir in $places; do @@ -852,14 +852,14 @@ - places="$PWD/../tcl7.5 \ - /usr/src/local/tcl7.5 \ - /import/tcl/include/tcl7.5 \ -+ places="$PWD/../tcl8.0 \ -+ /usr/src/local/tcl8.0 \ -+ /import/tcl/include/tcl8.0 \ ++ places="$PWD/../tcl8.1 \ ++ /usr/src/local/tcl8.1 \ ++ /import/tcl/include/tcl8.1 \ $prefix/include \ $x_includes/tk \ $x_includes \ /usr/local/include \ -+ /usr/local/include/tcl8.0 \ ++ /usr/local/include/tcl8.1 \ /usr/contrib/include \ /usr/include" for dir in $places; do @@ -869,15 +869,15 @@ fi - echo $ac_n "checking for -ltcl7.5""... $ac_c" 1>&6 -ac_lib_var=`echo tcl7.5'_'main | tr './+\055' '__p_'` -+ echo $ac_n "checking for main in -ltcl8.0""... $ac_c" 1>&6 -+echo "configure:1665: checking for main in -ltcl8.0" >&5 -+ac_lib_var=`echo tcl8.0'_'main | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for main in -ltcl8.1""... $ac_c" 1>&6 ++echo "configure:1665: checking for main in -ltcl8.1" >&5 ++ac_lib_var=`echo tcl8.1'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-ltcl7.5 $LIBS" -+LIBS="-ltcl8.0 $LIBS" ++LIBS="-ltcl8.1 $LIBS" cat > conftest.$ac_ext <<EOF -#line 1558 "configure" +#line 1673 "configure" @@ -904,7 +904,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - V_LIB_TCL="-ltcl7.5" -+ V_LIB_TCL="-ltcl8.0" ++ V_LIB_TCL="-ltcl8.1" else echo "$ac_t""no" 1>&6 V_LIB_TCL="FAIL" @@ -915,15 +915,15 @@ - $PWD/../tcl7.5 \ - /usr/src/local/tcl7.5 \ - /import/tcl/lib/tcl7.5 \ -+ $PWD/../tcl8.0 \ -+ /usr/src/local/tcl8.0 \ -+ /import/tcl/lib/tcl8.0 \ ++ $PWD/../tcl8.1 \ ++ /usr/src/local/tcl8.1 \ ++ /import/tcl/lib/tcl8.1 \ " for dir in $places; do - if test -r $dir/libtcl7.5.so -o -r $dir/libtcl7.5.a; then - V_LIB_TCL="-L$dir -ltcl7.5" -+ if test -r $dir/libtcl80.so -o -r $dir/libtcl80.a; then -+ V_LIB_TCL="-L$dir -ltcl80" ++ if test -r $dir/libtcl81.so -o -r $dir/libtcl81.a; then ++ V_LIB_TCL="-L$dir -ltcl81" break fi if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then @@ -938,13 +938,13 @@ - /import/tcl/lib/tcl7.5 \ - $prefix/lib/tcl7.5 \ - $x_libraries/tcl7.5 \ -+ places="/usr/local/lib/tcl8.0 \ -+ /usr/contrib/lib/tcl8.0 \ -+ /usr/lib/tcl8.0 \ -+ /usr/lib/tk/tcl8.0 \ -+ /import/tcl/lib/tcl8.0 \ -+ $prefix/lib/tcl8.0 \ -+ $x_libraries/tcl8.0 \ ++ places="/usr/local/lib/tcl8.1 \ ++ /usr/contrib/lib/tcl8.1 \ ++ /usr/lib/tcl8.1 \ ++ /usr/lib/tk/tcl8.1 \ ++ /import/tcl/lib/tcl8.1 \ ++ $prefix/lib/tcl8.1 \ ++ $x_libraries/tcl8.1 \ /usr/local/lib/tcl \ /usr/lib/tcl \ /usr/lib/tk/tcl \ @@ -954,8 +954,8 @@ fi - places="$d/lib/libtk4.1.so \ - $d/lib/libtk4.1.a \ -+ places="$d/lib/libtk8.0.so \ -+ $d/lib/libtk8.0.a \ ++ places="$d/lib/libtk8.1.so \ ++ $d/lib/libtk8.1.a \ $d/lib/libtk.so \ $d/lib/libtk.a" V_LIB_TK=FAIL @@ -964,7 +964,7 @@ exit 1 fi - places="$d/lib/tk4.1 \ -+ places="$d/lib/tk8.0 \ ++ places="$d/lib/tk8.1 \ $d/lib/tk" V_LIBRARY_TK=FAIL for dir in $places; do @@ -999,7 +999,7 @@ places="\ $prefix/include \ /usr/local/include \ -+ /usr/local/include/tk8.0 \ ++ /usr/local/include/tk8.1 \ /usr/contrib/include \ /usr/include/tcl \ /usr/include\ @@ -1008,9 +1008,9 @@ - $PWD/../tk4.1 \ - /usr/src/local/tk4.1 \ - /import/tcl/include/tk4.1 \ -+ $PWD/../tk8.0 \ -+ /usr/src/local/tk8.0 \ -+ /import/tcl/include/tk8.0 \ ++ $PWD/../tk8.1 \ ++ /usr/src/local/tk8.1 \ ++ /import/tcl/include/tk8.1 \ " for dir in $places; do if test -r $dir/tk.h ; then @@ -1020,15 +1020,15 @@ fi - echo $ac_n "checking for -ltk4.1""... $ac_c" 1>&6 -ac_lib_var=`echo tk4.1'_'main | tr './+\055' '__p_'` -+ echo $ac_n "checking for main in -ltk8.0""... $ac_c" 1>&6 -+echo "configure:1857: checking for main in -ltk8.0" >&5 -+ac_lib_var=`echo tk8.0'_'main | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for main in -ltk8.1""... $ac_c" 1>&6 ++echo "configure:1857: checking for main in -ltk8.1" >&5 ++ac_lib_var=`echo tk8.1'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-ltk4.1 $LIBS" -+LIBS="-ltk8.0 $LIBS" ++LIBS="-ltk8.1 $LIBS" cat > conftest.$ac_ext <<EOF -#line 1745 "configure" +#line 1865 "configure" @@ -1055,7 +1055,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - V_LIB_TK="-ltk4.1" -+ V_LIB_TK="-ltk8.0" ++ V_LIB_TK="-ltk8.1" else echo "$ac_t""no" 1>&6 V_LIB_TK="FAIL" @@ -1065,15 +1065,15 @@ /import/tcl/lib \ - $PWD/../tk4.1 \ - /usr/src/local/tk4.1 \ -+ $PWD/../tk8.0 \ -+ /usr/src/local/tk8.0 \ ++ $PWD/../tk8.1 \ ++ /usr/src/local/tk8.1 \ $prefix/lib \ $x_libraries" for dir in $places; do - if test -r $dir/libtk4.1.so -o -r $dir/libtk4.1.a; then - V_LIB_TK="-L$dir -ltk4.1" -+ if test -r $dir/libtk80.so -o -r $dir/libtk80.a; then -+ V_LIB_TK="-L$dir -ltk80" ++ if test -r $dir/libtk81.so -o -r $dir/libtk81.a; then ++ V_LIB_TK="-L$dir -ltk81" break fi if test -r $dir/libtk.so -o -r $dir/libtk.a; then @@ -1090,15 +1090,15 @@ - $x_libraries/tk4.1 \ - $PWD/../tk4.1/library \ - /usr/src/local/tk4.1/library \ -+ places="/usr/local/lib/tk8.0 \ -+ /usr/contrib/lib/tk8.0 \ -+ /usr/lib/tk8.0 \ -+ /usr/lib/tk/tk8.0 \ -+ /import/tcl/lib/tk8.0 \ -+ $prefix/lib/tk8.0 \ -+ $x_libraries/tk8.0 \ -+ $PWD/../tk8.0/library \ -+ /usr/src/local/tk8.0/library \ ++ places="/usr/local/lib/tk8.1 \ ++ /usr/contrib/lib/tk8.1 \ ++ /usr/lib/tk8.1 \ ++ /usr/lib/tk/tk8.1 \ ++ /import/tcl/lib/tk8.1 \ ++ $prefix/lib/tk8.1 \ ++ $x_libraries/tk8.1 \ ++ $PWD/../tk8.1/library \ ++ /usr/src/local/tk8.1/library \ /usr/local/lib/tk \ /usr/lib/tk \ /usr/lib/tk/tk \ @@ -1345,8 +1345,8 @@ fi - places="$d/lib/libtcl7.5.so \ - $d/lib/libtcl7.5.a \ -+ places="$d/lib/libtcl8.0.so \ -+ $d/lib/libtcl8.0.a \ ++ places="$d/lib/libtcl8.1.so \ ++ $d/lib/libtcl8.1.a \ $d/lib/libtcl.so \ $d/lib/libtcl.a" V_LIB_TCL=FAIL @@ -1355,7 +1355,7 @@ exit 1 fi - places="$d/lib/tcl7.5 \ -+ places="$d/lib/tcl8.0 \ ++ places="$d/lib/tcl8.1 \ $d/lib/tcl" V_LIBRARY_TCL=FAIL for dir in $places; do @@ -1366,14 +1366,14 @@ - places="$PWD/../tcl7.5 \ - /usr/src/local/tcl7.5 \ - /import/tcl/include/tcl7.5 \ -+ places="$PWD/../tcl8.0 \ -+ /usr/src/local/tcl8.0 \ -+ /import/tcl/include/tcl8.0 \ ++ places="$PWD/../tcl8.1 \ ++ /usr/src/local/tcl8.1 \ ++ /import/tcl/include/tcl8.1 \ $prefix/include \ $x_includes/tk \ $x_includes \ /usr/local/include \ -+ /usr/local/include/tcl8.0 \ ++ /usr/local/include/tcl8.1 \ /usr/contrib/include \ /usr/include" for dir in $places; do @@ -1382,7 +1382,7 @@ fi fi - AC_CHECK_LIB(tcl7.5, main, V_LIB_TCL="-ltcl7.5", V_LIB_TCL="FAIL") -+ AC_CHECK_LIB(tcl8.0, main, V_LIB_TCL="-ltcl8.0", V_LIB_TCL="FAIL") ++ AC_CHECK_LIB(tcl8.1, main, V_LIB_TCL="-ltcl8.1", V_LIB_TCL="FAIL") if test "$V_LIB_TCL" = FAIL; then echo "checking for libtcl.a" places="\ @@ -1393,15 +1393,15 @@ - $PWD/../tcl7.5 \ - /usr/src/local/tcl7.5 \ - /import/tcl/lib/tcl7.5 \ -+ $PWD/../tcl8.0 \ -+ /usr/src/local/tcl8.0 \ -+ /import/tcl/lib/tcl8.0 \ ++ $PWD/../tcl8.1 \ ++ /usr/src/local/tcl8.1 \ ++ /import/tcl/lib/tcl8.1 \ " for dir in $places; do - if test -r $dir/libtcl7.5.so -o -r $dir/libtcl7.5.a; then - V_LIB_TCL="-L$dir -ltcl7.5" -+ if test -r $dir/libtcl80.so -o -r $dir/libtcl80.a; then -+ V_LIB_TCL="-L$dir -ltcl80" ++ if test -r $dir/libtcl81.so -o -r $dir/libtcl81.a; then ++ V_LIB_TCL="-L$dir -ltcl81" break fi if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then @@ -1416,13 +1416,13 @@ - /import/tcl/lib/tcl7.5 \ - $prefix/lib/tcl7.5 \ - $x_libraries/tcl7.5 \ -+ places="/usr/local/lib/tcl8.0 \ -+ /usr/contrib/lib/tcl8.0 \ -+ /usr/lib/tcl8.0 \ -+ /usr/lib/tk/tcl8.0 \ -+ /import/tcl/lib/tcl8.0 \ -+ $prefix/lib/tcl8.0 \ -+ $x_libraries/tcl8.0 \ ++ places="/usr/local/lib/tcl8.1 \ ++ /usr/contrib/lib/tcl8.1 \ ++ /usr/lib/tcl8.1 \ ++ /usr/lib/tk/tcl8.1 \ ++ /import/tcl/lib/tcl8.1 \ ++ $prefix/lib/tcl8.1 \ ++ $x_libraries/tcl8.1 \ /usr/local/lib/tcl \ /usr/lib/tcl \ /usr/lib/tk/tcl \ @@ -1432,8 +1432,8 @@ fi - places="$d/lib/libtk4.1.so \ - $d/lib/libtk4.1.a \ -+ places="$d/lib/libtk8.0.so \ -+ $d/lib/libtk8.0.a \ ++ places="$d/lib/libtk8.1.so \ ++ $d/lib/libtk8.1.a \ $d/lib/libtk.so \ $d/lib/libtk.a" V_LIB_TK=FAIL @@ -1442,7 +1442,7 @@ exit 1 fi - places="$d/lib/tk4.1 \ -+ places="$d/lib/tk8.0 \ ++ places="$d/lib/tk8.1 \ $d/lib/tk" V_LIBRARY_TK=FAIL for dir in $places; do @@ -1455,7 +1455,7 @@ places="\ $prefix/include \ /usr/local/include \ -+ /usr/local/include/tk8.0 \ ++ /usr/local/include/tk8.1 \ /usr/contrib/include \ /usr/include/tcl \ /usr/include\ @@ -1464,9 +1464,9 @@ - $PWD/../tk4.1 \ - /usr/src/local/tk4.1 \ - /import/tcl/include/tk4.1 \ -+ $PWD/../tk8.0 \ -+ /usr/src/local/tk8.0 \ -+ /import/tcl/include/tk8.0 \ ++ $PWD/../tk8.1 \ ++ /usr/src/local/tk8.1 \ ++ /import/tcl/include/tk8.1 \ " for dir in $places; do if test -r $dir/tk.h ; then @@ -1475,7 +1475,7 @@ fi fi - AC_CHECK_LIB(tk4.1, main, V_LIB_TK="-ltk4.1", V_LIB_TK="FAIL") -+ AC_CHECK_LIB(tk8.0, main, V_LIB_TK="-ltk8.0", V_LIB_TK="FAIL") ++ AC_CHECK_LIB(tk8.1, main, V_LIB_TK="-ltk8.1", V_LIB_TK="FAIL") if test "$V_LIB_TK" = FAIL; then echo "checking for libtk.a" places="/usr/local/lib \ @@ -1485,15 +1485,15 @@ /import/tcl/lib \ - $PWD/../tk4.1 \ - /usr/src/local/tk4.1 \ -+ $PWD/../tk8.0 \ -+ /usr/src/local/tk8.0 \ ++ $PWD/../tk8.1 \ ++ /usr/src/local/tk8.1 \ $prefix/lib \ $x_libraries" for dir in $places; do - if test -r $dir/libtk4.1.so -o -r $dir/libtk4.1.a; then - V_LIB_TK="-L$dir -ltk4.1" -+ if test -r $dir/libtk80.so -o -r $dir/libtk80.a; then -+ V_LIB_TK="-L$dir -ltk80" ++ if test -r $dir/libtk81.so -o -r $dir/libtk81.a; then ++ V_LIB_TK="-L$dir -ltk81" break fi if test -r $dir/libtk.so -o -r $dir/libtk.a; then @@ -1510,15 +1510,15 @@ - $x_libraries/tk4.1 \ - $PWD/../tk4.1/library \ - /usr/src/local/tk4.1/library \ -+ places="/usr/local/lib/tk8.0 \ -+ /usr/contrib/lib/tk8.0 \ -+ /usr/lib/tk8.0 \ -+ /usr/lib/tk/tk8.0 \ -+ /import/tcl/lib/tk8.0 \ -+ $prefix/lib/tk8.0 \ -+ $x_libraries/tk8.0 \ -+ $PWD/../tk8.0/library \ -+ /usr/src/local/tk8.0/library \ ++ places="/usr/local/lib/tk8.1 \ ++ /usr/contrib/lib/tk8.1 \ ++ /usr/lib/tk8.1 \ ++ /usr/lib/tk/tk8.1 \ ++ /import/tcl/lib/tk8.1 \ ++ $prefix/lib/tk8.1 \ ++ $x_libraries/tk8.1 \ ++ $PWD/../tk8.1/library \ ++ /usr/src/local/tk8.1/library \ /usr/local/lib/tk \ /usr/lib/tk \ /usr/lib/tk/tk \ diff --git a/misc/tkcron/Makefile b/misc/tkcron/Makefile index 33f5e4c84395..80bd5118092e 100644 --- a/misc/tkcron/Makefile +++ b/misc/tkcron/Makefile @@ -3,17 +3,17 @@ # Date created: 30 July 1996 # Whom: Sander Vesik <sander@haldjas.folklore.ee> # -# $Id: Makefile,v 1.4 1997/07/21 19:28:44 max Exp $ +# $Id: Makefile,v 1.5 1997/11/22 20:10:39 jseger Exp $ # DISTNAME= tkcron-2.12 -CATEGORIES= misc tk80 +CATEGORIES= misc tk81 MASTER_SITES= ftp://ftp.neosoft.com/languages/tcl/alcatel/code/ EXTRACT_SUFX= .tcl.gz MAINTAINER= sander@haldjas.folklore.ee -RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80 +RUN_DEPENDS= wish8.1:${PORTSDIR}/x11/tk81 EXTRACT_CMD= ${GZIP_CMD} EXTRACT_BEFORE_ARGS= -cd diff --git a/misc/tkcron/files/Makefile b/misc/tkcron/files/Makefile index b46a3ce43f0b..5c93e51cc1da 100644 --- a/misc/tkcron/files/Makefile +++ b/misc/tkcron/files/Makefile @@ -4,7 +4,7 @@ WISHDIR?= ${BINDIR} all: tkcron tkcron: - sed -e "\:/usr/local/bin/wish: s;;${BINDIR}/wish8.0;g" tkcron.tcl > tkcron + sed -e "\:/usr/local/bin/wish: s;;${BINDIR}/wish8.1;g" tkcron.tcl > tkcron install: all install ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} tkcron ${BINDIR} diff --git a/misc/tkinfo/Makefile b/misc/tkinfo/Makefile index f7733304bf74..6ca46893ef56 100644 --- a/misc/tkinfo/Makefile +++ b/misc/tkinfo/Makefile @@ -3,16 +3,16 @@ # Date created: 16 Jan 1995 # Whom: Thomas Gellekum <tg@FreeBSD.ORG> # -# $Id: Makefile,v 1.15 1997/12/16 09:26:12 tg Exp $ +# $Id: Makefile,v 1.16 1998/01/29 07:49:36 tg Exp $ # DISTNAME= tkinfo-2.4 -CATEGORIES= misc tk80 +CATEGORIES= misc tk81 MASTER_SITES= http://math-www.uni-paderborn.de/~axel/tkinfo/ MAINTAINER= tg@FreeBSD.ORG -RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80 +RUN_DEPENDS= wish8.1:${PORTSDIR}/x11/tk81 NO_BUILD= yes MAN1= tkinfo.1 diff --git a/misc/tkinfo/files/patch-aa b/misc/tkinfo/files/patch-aa index 06b17a94ae6a..8b57ac9aa6aa 100644 --- a/misc/tkinfo/files/patch-aa +++ b/misc/tkinfo/files/patch-aa @@ -4,7 +4,7 @@ #!/bin/sh # This is a Tcl/Tk script to be interpreted by wish (Tk4.0 or better): \ -exec wish "$0" "$@" -+exec wish8.0 "$0" "$@" ++exec wish8.1 "$0" "$@" ########################################################################## # Version of TkInfo: diff --git a/multimedia/vic/Makefile b/multimedia/vic/Makefile index 5b3b2620a38d..e80beb458fbe 100644 --- a/multimedia/vic/Makefile +++ b/multimedia/vic/Makefile @@ -3,17 +3,17 @@ # Date created: 14 December 1994 # Whom: wollman # -# $Id: Makefile,v 1.11 1997/04/20 13:19:27 wosch Exp $ +# $Id: Makefile,v 1.12 1997/09/11 03:54:53 fenner Exp $ # DISTNAME= vic-2.8 -CATEGORIES= mbone tk80 +CATEGORIES= mbone tk81 MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vic/ DISTFILES= vicsrc-2.8.tar.gz MAINTAINER= fenner@FreeBSD.ORG -LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80 +LIB_DEPENDS= tk81\\.1:${PORTSDIR}/x11/tk81 GNU_CONFIGURE= yes USE_X11= yes diff --git a/multimedia/vic/files/patch-aa b/multimedia/vic/files/patch-aa index 982d9f9a509c..0c0b6d117d66 100644 --- a/multimedia/vic/files/patch-aa +++ b/multimedia/vic/files/patch-aa @@ -809,8 +809,8 @@ fi - places="$d/lib/libtcl7.5.so \ - $d/lib/libtcl7.5.a \ -+ places="$d/lib/libtcl8.0.so \ -+ $d/lib/libtcl8.0.a \ ++ places="$d/lib/libtcl8.1.so \ ++ $d/lib/libtcl8.1.a \ $d/lib/libtcl.so \ $d/lib/libtcl.a" V_LIB_TCL=FAIL @@ -819,7 +819,7 @@ exit 1 fi - places="$d/lib/tcl7.5 \ -+ places="$d/lib/tcl8.0 \ ++ places="$d/lib/tcl8.1 \ $d/lib/tcl" V_LIBRARY_TCL=FAIL for dir in $places; do @@ -852,14 +852,14 @@ - places="$PWD/../tcl7.5 \ - /usr/src/local/tcl7.5 \ - /import/tcl/include/tcl7.5 \ -+ places="$PWD/../tcl8.0 \ -+ /usr/src/local/tcl8.0 \ -+ /import/tcl/include/tcl8.0 \ ++ places="$PWD/../tcl8.1 \ ++ /usr/src/local/tcl8.1 \ ++ /import/tcl/include/tcl8.1 \ $prefix/include \ $x_includes/tk \ $x_includes \ /usr/local/include \ -+ /usr/local/include/tcl8.0 \ ++ /usr/local/include/tcl8.1 \ /usr/contrib/include \ /usr/include" for dir in $places; do @@ -869,15 +869,15 @@ fi - echo $ac_n "checking for -ltcl7.5""... $ac_c" 1>&6 -ac_lib_var=`echo tcl7.5'_'main | tr './+\055' '__p_'` -+ echo $ac_n "checking for main in -ltcl8.0""... $ac_c" 1>&6 -+echo "configure:1665: checking for main in -ltcl8.0" >&5 -+ac_lib_var=`echo tcl8.0'_'main | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for main in -ltcl8.1""... $ac_c" 1>&6 ++echo "configure:1665: checking for main in -ltcl8.1" >&5 ++ac_lib_var=`echo tcl8.1'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-ltcl7.5 $LIBS" -+LIBS="-ltcl8.0 $LIBS" ++LIBS="-ltcl8.1 $LIBS" cat > conftest.$ac_ext <<EOF -#line 1558 "configure" +#line 1673 "configure" @@ -904,7 +904,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - V_LIB_TCL="-ltcl7.5" -+ V_LIB_TCL="-ltcl8.0" ++ V_LIB_TCL="-ltcl8.1" else echo "$ac_t""no" 1>&6 V_LIB_TCL="FAIL" @@ -915,15 +915,15 @@ - $PWD/../tcl7.5 \ - /usr/src/local/tcl7.5 \ - /import/tcl/lib/tcl7.5 \ -+ $PWD/../tcl8.0 \ -+ /usr/src/local/tcl8.0 \ -+ /import/tcl/lib/tcl8.0 \ ++ $PWD/../tcl8.1 \ ++ /usr/src/local/tcl8.1 \ ++ /import/tcl/lib/tcl8.1 \ " for dir in $places; do - if test -r $dir/libtcl7.5.so -o -r $dir/libtcl7.5.a; then - V_LIB_TCL="-L$dir -ltcl7.5" -+ if test -r $dir/libtcl80.so -o -r $dir/libtcl80.a; then -+ V_LIB_TCL="-L$dir -ltcl80" ++ if test -r $dir/libtcl81.so -o -r $dir/libtcl81.a; then ++ V_LIB_TCL="-L$dir -ltcl81" break fi if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then @@ -938,13 +938,13 @@ - /import/tcl/lib/tcl7.5 \ - $prefix/lib/tcl7.5 \ - $x_libraries/tcl7.5 \ -+ places="/usr/local/lib/tcl8.0 \ -+ /usr/contrib/lib/tcl8.0 \ -+ /usr/lib/tcl8.0 \ -+ /usr/lib/tk/tcl8.0 \ -+ /import/tcl/lib/tcl8.0 \ -+ $prefix/lib/tcl8.0 \ -+ $x_libraries/tcl8.0 \ ++ places="/usr/local/lib/tcl8.1 \ ++ /usr/contrib/lib/tcl8.1 \ ++ /usr/lib/tcl8.1 \ ++ /usr/lib/tk/tcl8.1 \ ++ /import/tcl/lib/tcl8.1 \ ++ $prefix/lib/tcl8.1 \ ++ $x_libraries/tcl8.1 \ /usr/local/lib/tcl \ /usr/lib/tcl \ /usr/lib/tk/tcl \ @@ -954,8 +954,8 @@ fi - places="$d/lib/libtk4.1.so \ - $d/lib/libtk4.1.a \ -+ places="$d/lib/libtk8.0.so \ -+ $d/lib/libtk8.0.a \ ++ places="$d/lib/libtk8.1.so \ ++ $d/lib/libtk8.1.a \ $d/lib/libtk.so \ $d/lib/libtk.a" V_LIB_TK=FAIL @@ -964,7 +964,7 @@ exit 1 fi - places="$d/lib/tk4.1 \ -+ places="$d/lib/tk8.0 \ ++ places="$d/lib/tk8.1 \ $d/lib/tk" V_LIBRARY_TK=FAIL for dir in $places; do @@ -999,7 +999,7 @@ places="\ $prefix/include \ /usr/local/include \ -+ /usr/local/include/tk8.0 \ ++ /usr/local/include/tk8.1 \ /usr/contrib/include \ /usr/include/tcl \ /usr/include\ @@ -1008,9 +1008,9 @@ - $PWD/../tk4.1 \ - /usr/src/local/tk4.1 \ - /import/tcl/include/tk4.1 \ -+ $PWD/../tk8.0 \ -+ /usr/src/local/tk8.0 \ -+ /import/tcl/include/tk8.0 \ ++ $PWD/../tk8.1 \ ++ /usr/src/local/tk8.1 \ ++ /import/tcl/include/tk8.1 \ " for dir in $places; do if test -r $dir/tk.h ; then @@ -1020,15 +1020,15 @@ fi - echo $ac_n "checking for -ltk4.1""... $ac_c" 1>&6 -ac_lib_var=`echo tk4.1'_'main | tr './+\055' '__p_'` -+ echo $ac_n "checking for main in -ltk8.0""... $ac_c" 1>&6 -+echo "configure:1857: checking for main in -ltk8.0" >&5 -+ac_lib_var=`echo tk8.0'_'main | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for main in -ltk8.1""... $ac_c" 1>&6 ++echo "configure:1857: checking for main in -ltk8.1" >&5 ++ac_lib_var=`echo tk8.1'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-ltk4.1 $LIBS" -+LIBS="-ltk8.0 $LIBS" ++LIBS="-ltk8.1 $LIBS" cat > conftest.$ac_ext <<EOF -#line 1745 "configure" +#line 1865 "configure" @@ -1055,7 +1055,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - V_LIB_TK="-ltk4.1" -+ V_LIB_TK="-ltk8.0" ++ V_LIB_TK="-ltk8.1" else echo "$ac_t""no" 1>&6 V_LIB_TK="FAIL" @@ -1065,15 +1065,15 @@ /import/tcl/lib \ - $PWD/../tk4.1 \ - /usr/src/local/tk4.1 \ -+ $PWD/../tk8.0 \ -+ /usr/src/local/tk8.0 \ ++ $PWD/../tk8.1 \ ++ /usr/src/local/tk8.1 \ $prefix/lib \ $x_libraries" for dir in $places; do - if test -r $dir/libtk4.1.so -o -r $dir/libtk4.1.a; then - V_LIB_TK="-L$dir -ltk4.1" -+ if test -r $dir/libtk80.so -o -r $dir/libtk80.a; then -+ V_LIB_TK="-L$dir -ltk80" ++ if test -r $dir/libtk81.so -o -r $dir/libtk81.a; then ++ V_LIB_TK="-L$dir -ltk81" break fi if test -r $dir/libtk.so -o -r $dir/libtk.a; then @@ -1090,15 +1090,15 @@ - $x_libraries/tk4.1 \ - $PWD/../tk4.1/library \ - /usr/src/local/tk4.1/library \ -+ places="/usr/local/lib/tk8.0 \ -+ /usr/contrib/lib/tk8.0 \ -+ /usr/lib/tk8.0 \ -+ /usr/lib/tk/tk8.0 \ -+ /import/tcl/lib/tk8.0 \ -+ $prefix/lib/tk8.0 \ -+ $x_libraries/tk8.0 \ -+ $PWD/../tk8.0/library \ -+ /usr/src/local/tk8.0/library \ ++ places="/usr/local/lib/tk8.1 \ ++ /usr/contrib/lib/tk8.1 \ ++ /usr/lib/tk8.1 \ ++ /usr/lib/tk/tk8.1 \ ++ /import/tcl/lib/tk8.1 \ ++ $prefix/lib/tk8.1 \ ++ $x_libraries/tk8.1 \ ++ $PWD/../tk8.1/library \ ++ /usr/src/local/tk8.1/library \ /usr/local/lib/tk \ /usr/lib/tk \ /usr/lib/tk/tk \ @@ -1345,8 +1345,8 @@ fi - places="$d/lib/libtcl7.5.so \ - $d/lib/libtcl7.5.a \ -+ places="$d/lib/libtcl8.0.so \ -+ $d/lib/libtcl8.0.a \ ++ places="$d/lib/libtcl8.1.so \ ++ $d/lib/libtcl8.1.a \ $d/lib/libtcl.so \ $d/lib/libtcl.a" V_LIB_TCL=FAIL @@ -1355,7 +1355,7 @@ exit 1 fi - places="$d/lib/tcl7.5 \ -+ places="$d/lib/tcl8.0 \ ++ places="$d/lib/tcl8.1 \ $d/lib/tcl" V_LIBRARY_TCL=FAIL for dir in $places; do @@ -1366,14 +1366,14 @@ - places="$PWD/../tcl7.5 \ - /usr/src/local/tcl7.5 \ - /import/tcl/include/tcl7.5 \ -+ places="$PWD/../tcl8.0 \ -+ /usr/src/local/tcl8.0 \ -+ /import/tcl/include/tcl8.0 \ ++ places="$PWD/../tcl8.1 \ ++ /usr/src/local/tcl8.1 \ ++ /import/tcl/include/tcl8.1 \ $prefix/include \ $x_includes/tk \ $x_includes \ /usr/local/include \ -+ /usr/local/include/tcl8.0 \ ++ /usr/local/include/tcl8.1 \ /usr/contrib/include \ /usr/include" for dir in $places; do @@ -1382,7 +1382,7 @@ fi fi - AC_CHECK_LIB(tcl7.5, main, V_LIB_TCL="-ltcl7.5", V_LIB_TCL="FAIL") -+ AC_CHECK_LIB(tcl8.0, main, V_LIB_TCL="-ltcl8.0", V_LIB_TCL="FAIL") ++ AC_CHECK_LIB(tcl8.1, main, V_LIB_TCL="-ltcl8.1", V_LIB_TCL="FAIL") if test "$V_LIB_TCL" = FAIL; then echo "checking for libtcl.a" places="\ @@ -1393,15 +1393,15 @@ - $PWD/../tcl7.5 \ - /usr/src/local/tcl7.5 \ - /import/tcl/lib/tcl7.5 \ -+ $PWD/../tcl8.0 \ -+ /usr/src/local/tcl8.0 \ -+ /import/tcl/lib/tcl8.0 \ ++ $PWD/../tcl8.1 \ ++ /usr/src/local/tcl8.1 \ ++ /import/tcl/lib/tcl8.1 \ " for dir in $places; do - if test -r $dir/libtcl7.5.so -o -r $dir/libtcl7.5.a; then - V_LIB_TCL="-L$dir -ltcl7.5" -+ if test -r $dir/libtcl80.so -o -r $dir/libtcl80.a; then -+ V_LIB_TCL="-L$dir -ltcl80" ++ if test -r $dir/libtcl81.so -o -r $dir/libtcl81.a; then ++ V_LIB_TCL="-L$dir -ltcl81" break fi if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then @@ -1416,13 +1416,13 @@ - /import/tcl/lib/tcl7.5 \ - $prefix/lib/tcl7.5 \ - $x_libraries/tcl7.5 \ -+ places="/usr/local/lib/tcl8.0 \ -+ /usr/contrib/lib/tcl8.0 \ -+ /usr/lib/tcl8.0 \ -+ /usr/lib/tk/tcl8.0 \ -+ /import/tcl/lib/tcl8.0 \ -+ $prefix/lib/tcl8.0 \ -+ $x_libraries/tcl8.0 \ ++ places="/usr/local/lib/tcl8.1 \ ++ /usr/contrib/lib/tcl8.1 \ ++ /usr/lib/tcl8.1 \ ++ /usr/lib/tk/tcl8.1 \ ++ /import/tcl/lib/tcl8.1 \ ++ $prefix/lib/tcl8.1 \ ++ $x_libraries/tcl8.1 \ /usr/local/lib/tcl \ /usr/lib/tcl \ /usr/lib/tk/tcl \ @@ -1432,8 +1432,8 @@ fi - places="$d/lib/libtk4.1.so \ - $d/lib/libtk4.1.a \ -+ places="$d/lib/libtk8.0.so \ -+ $d/lib/libtk8.0.a \ ++ places="$d/lib/libtk8.1.so \ ++ $d/lib/libtk8.1.a \ $d/lib/libtk.so \ $d/lib/libtk.a" V_LIB_TK=FAIL @@ -1442,7 +1442,7 @@ exit 1 fi - places="$d/lib/tk4.1 \ -+ places="$d/lib/tk8.0 \ ++ places="$d/lib/tk8.1 \ $d/lib/tk" V_LIBRARY_TK=FAIL for dir in $places; do @@ -1455,7 +1455,7 @@ places="\ $prefix/include \ /usr/local/include \ -+ /usr/local/include/tk8.0 \ ++ /usr/local/include/tk8.1 \ /usr/contrib/include \ /usr/include/tcl \ /usr/include\ @@ -1464,9 +1464,9 @@ - $PWD/../tk4.1 \ - /usr/src/local/tk4.1 \ - /import/tcl/include/tk4.1 \ -+ $PWD/../tk8.0 \ -+ /usr/src/local/tk8.0 \ -+ /import/tcl/include/tk8.0 \ ++ $PWD/../tk8.1 \ ++ /usr/src/local/tk8.1 \ ++ /import/tcl/include/tk8.1 \ " for dir in $places; do if test -r $dir/tk.h ; then @@ -1475,7 +1475,7 @@ fi fi - AC_CHECK_LIB(tk4.1, main, V_LIB_TK="-ltk4.1", V_LIB_TK="FAIL") -+ AC_CHECK_LIB(tk8.0, main, V_LIB_TK="-ltk8.0", V_LIB_TK="FAIL") ++ AC_CHECK_LIB(tk8.1, main, V_LIB_TK="-ltk8.1", V_LIB_TK="FAIL") if test "$V_LIB_TK" = FAIL; then echo "checking for libtk.a" places="/usr/local/lib \ @@ -1485,15 +1485,15 @@ /import/tcl/lib \ - $PWD/../tk4.1 \ - /usr/src/local/tk4.1 \ -+ $PWD/../tk8.0 \ -+ /usr/src/local/tk8.0 \ ++ $PWD/../tk8.1 \ ++ /usr/src/local/tk8.1 \ $prefix/lib \ $x_libraries" for dir in $places; do - if test -r $dir/libtk4.1.so -o -r $dir/libtk4.1.a; then - V_LIB_TK="-L$dir -ltk4.1" -+ if test -r $dir/libtk80.so -o -r $dir/libtk80.a; then -+ V_LIB_TK="-L$dir -ltk80" ++ if test -r $dir/libtk81.so -o -r $dir/libtk81.a; then ++ V_LIB_TK="-L$dir -ltk81" break fi if test -r $dir/libtk.so -o -r $dir/libtk.a; then @@ -1510,15 +1510,15 @@ - $x_libraries/tk4.1 \ - $PWD/../tk4.1/library \ - /usr/src/local/tk4.1/library \ -+ places="/usr/local/lib/tk8.0 \ -+ /usr/contrib/lib/tk8.0 \ -+ /usr/lib/tk8.0 \ -+ /usr/lib/tk/tk8.0 \ -+ /import/tcl/lib/tk8.0 \ -+ $prefix/lib/tk8.0 \ -+ $x_libraries/tk8.0 \ -+ $PWD/../tk8.0/library \ -+ /usr/src/local/tk8.0/library \ ++ places="/usr/local/lib/tk8.1 \ ++ /usr/contrib/lib/tk8.1 \ ++ /usr/lib/tk8.1 \ ++ /usr/lib/tk/tk8.1 \ ++ /import/tcl/lib/tk8.1 \ ++ $prefix/lib/tk8.1 \ ++ $x_libraries/tk8.1 \ ++ $PWD/../tk8.1/library \ ++ /usr/src/local/tk8.1/library \ /usr/local/lib/tk \ /usr/lib/tk \ /usr/lib/tk/tk \ diff --git a/net/imm/Makefile b/net/imm/Makefile index d435f69a2b9f..870683d5ad9c 100644 --- a/net/imm/Makefile +++ b/net/imm/Makefile @@ -3,18 +3,18 @@ # Date created: 13 October 1994 # Whom: wollman # -# $Id: Makefile,v 1.14 1997/09/12 16:39:31 fenner Exp $ +# $Id: Makefile,v 1.15 1997/09/13 16:58:21 fenner Exp $ # DISTNAME= imm-3.5a1 -CATEGORIES= mbone tk80 +CATEGORIES= mbone tk81 MASTER_SITES= ftp://ftp.hawaii.edu/paccom/imm-3.5a1/ DISTFILES= imm.source.tar.Z WRKSRC= ${WRKDIR}/mnm MAINTAINER= fenner@freebsd.org -LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80 +LIB_DEPENDS= tk81\\.1:${PORTSDIR}/x11/tk81 USE_X11= yes diff --git a/net/imm/files/Makefile.freebsd b/net/imm/files/Makefile.freebsd index 51724b551d01..c84e9af025f1 100644 --- a/net/imm/files/Makefile.freebsd +++ b/net/imm/files/Makefile.freebsd @@ -1,11 +1,11 @@ # Some versions of make, like SGI's, use the following variable to # determine which shell to use for executing commands: SHELL = /bin/sh -INCLUDE_DIR = -I${PREFIX}/include -I${LOCALBASE}/include/tcl8.0 -I${LOCALBASE}/include/tk8.0 +INCLUDE_DIR = -I${PREFIX}/include -I${LOCALBASE}/include/tcl8.1 -I${LOCALBASE}/include/tk8.1 # Libraries to use when linking: LIBS = -lm -TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk80 -ltcl80 -lX11 +TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk81 -ltcl81 -lX11 TARGET = ../freebsd diff --git a/x11-fm/filerunner/Makefile b/x11-fm/filerunner/Makefile index c536c63e6bb4..8af31c0e02c9 100644 --- a/x11-fm/filerunner/Makefile +++ b/x11-fm/filerunner/Makefile @@ -3,19 +3,19 @@ # Date created: 3 August 1996 # Whom: lukin # -# $Id: Makefile,v 1.10 1997/11/30 19:35:46 vanilla Exp $ +# $Id: Makefile,v 1.11 1998/01/19 13:21:37 vanilla Exp $ # DISTNAME= FileRunner_2.4.1 PKGNAME= filerunner-2.4.1 -CATEGORIES= x11 tk80 +CATEGORIES= x11 tk81 MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= X11/desktop EXTRACT_SUFX= .tgz MAINTAINER= vanilla@FreeBSD.ORG -LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80 +LIB_DEPENDS= tk81\\.1:${PORTSDIR}/x11/tk81 WRKSRC= ${WRKDIR}/FileRunner_2.4.1 MAKEFILE= Makefile.freebsd diff --git a/x11-fm/filerunner/files/patch-aa b/x11-fm/filerunner/files/patch-aa index 89fa1b2cfbba..692d074162e9 100644 --- a/x11-fm/filerunner/files/patch-aa +++ b/x11-fm/filerunner/files/patch-aa @@ -7,8 +7,8 @@ -TCLINC = /usr/local/lib/tcl8.0 -TKINC = /usr/local/lib/tk8.0 -X11INC = /usr/X11/include -+TCLINC = ${PREFIX}/include/tcl8.0 -+TKINC = ${PREFIX}/include/tk8.0 ++TCLINC = ${PREFIX}/include/tcl8.1 ++TKINC = ${PREFIX}/include/tk8.1 +X11INC = ${X11BASE}/include -CFLAGS = -Wall -fPIC -O3 -I$(TCLINC) -I$(TKINC) -I$(X11INC) diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile index a0c6ee6a554d..d702a9d93b3c 100644 --- a/x11-toolkits/tix/Makefile +++ b/x11-toolkits/tix/Makefile @@ -3,23 +3,23 @@ # Date created: 22 December 1996 # Whom: Thomas Gellekum <tg@freebsd.org> # -# $Id: Makefile,v 1.12 1997/10/01 12:19:40 tg Exp $ +# $Id: Makefile,v 1.13 1997/12/02 10:55:42 tg Exp $ # DISTNAME= Tix4.1.0.006 PKGNAME= tix-4.1.0.006 -CATEGORIES= x11 tk80 +CATEGORIES= x11 tk81 MASTER_SITES= ftp://ftp.xpi.com/pub/ MAINTAINER= ports@FreeBSD.ORG -LIB_DEPENDS= tk80\\.1\\.:${PORTSDIR}/x11/tk80 +LIB_DEPENDS= tk81\\.1\\.:${PORTSDIR}/x11/tk81 WRKSRC= ${WRKDIR}/Tix4.1.0/unix/tk8.0 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared --enable-sam \ - --with-tcl="${PREFIX}/include/tcl8.0" \ - --with-tk="${PREFIX}/include/tk8.0" + --with-tcl="${PREFIX}/include/tcl8.1" \ + --with-tk="${PREFIX}/include/tk8.1" # this should probably be added to bsd.port.mk CONFIGURE_ENV= PREFIX=${PREFIX} MAN1= tixwish.1 diff --git a/x11-toolkits/tix/files/patch-aa b/x11-toolkits/tix/files/patch-aa index 40baef032149..05268871410f 100644 --- a/x11-toolkits/tix/files/patch-aa +++ b/x11-toolkits/tix/files/patch-aa @@ -13,7 +13,7 @@ echo "$ac_t""$TCL_SRC_DIR" 1>&6 -TCL_BIN_DIR=$TCL_SRC_DIR/unix -+TCL_BIN_DIR=$TCL_SRC_DIR/../../lib/tcl8.0 ++TCL_BIN_DIR=$TCL_SRC_DIR/../../lib/tcl8.1 #-------------------------------------------------------------------- # See if there was a command-line option for where Tk is; if @@ -30,7 +30,7 @@ echo "$ac_t""$TK_SRC_DIR" 1>&6 -TK_BIN_DIR=$TK_SRC_DIR/unix -+TK_BIN_DIR=$TK_SRC_DIR/../../lib/tk8.0 ++TK_BIN_DIR=$TK_SRC_DIR/../../lib/tk8.1 #-------------------------------------------------------------------- # Find out the top level source directory of the Tix package. diff --git a/x11-toolkits/tix/files/patch-ac b/x11-toolkits/tix/files/patch-ac index 8590fb1890ad..fd861653c5d8 100644 --- a/x11-toolkits/tix/files/patch-ac +++ b/x11-toolkits/tix/files/patch-ac @@ -26,9 +26,9 @@ -RUN_TCLSH = TCL_LIBRARY=$(TCL_SRC_DIR)/library \ - TK_LIBRARY=$(TK_SRC_DIR)/library \ - $(TCL_SRC_DIR)/unix/tclsh -+RUN_TCLSH = TCL_LIBRARY=$(TCL_SRC_DIR)/../../lib/tcl8.0 \ -+ TK_LIBRARY=$(TK_SRC_DIR)/../../lib/tk8.0 \ -+ $(TCL_SRC_DIR)/../../bin/tclsh8.0 ++RUN_TCLSH = TCL_LIBRARY=$(TCL_SRC_DIR)/../../lib/tcl8.1 \ ++ TK_LIBRARY=$(TK_SRC_DIR)/../../lib/tk8.1 \ ++ $(TCL_SRC_DIR)/../../bin/tclsh8.1 #---------------------------------------------------------------- @@ -37,7 +37,7 @@ #---------------------------------------------------------------------- -TCL_SCRIPTS = $(TCL_SRC_DIR)/library/*.tcl -+TCL_SCRIPTS = $(TCL_SRC_DIR)/../../lib/tcl8.0/*.tcl ++TCL_SCRIPTS = $(TCL_SRC_DIR)/../../lib/tcl8.1/*.tcl TK_SCRIPTS = \ - $(TK_SRC_DIR)/library/bgerror.tcl \ @@ -60,26 +60,26 @@ - $(TK_SRC_DIR)/library/scale.tcl \ - $(TK_SRC_DIR)/library/scrlbar.tcl \ - $(TK_SRC_DIR)/library/text.tcl \ -+ $(TK_SRC_DIR)/../../lib/tk8.0/bgerror.tcl \ -+ $(TK_SRC_DIR)/../../lib/tk8.0/dialog.tcl \ -+ $(TK_SRC_DIR)/../../lib/tk8.0/focus.tcl \ -+ $(TK_SRC_DIR)/../../lib/tk8.0/obsolete.tcl \ -+ $(TK_SRC_DIR)/../../lib/tk8.0/optMenu.tcl \ -+ $(TK_SRC_DIR)/../../lib/tk8.0/palette.tcl \ -+ $(TK_SRC_DIR)/../../lib/tk8.0/tearoff.tcl \ -+ $(TK_SRC_DIR)/../../lib/tk8.0/clrpick.tcl \ -+ $(TK_SRC_DIR)/../../lib/tk8.0/comdlg.tcl \ -+ $(TK_SRC_DIR)/../../lib/tk8.0/msgbox.tcl \ -+ $(TK_SRC_DIR)/../../lib/tk8.0/tkfbox.tcl \ -+ $(TK_SRC_DIR)/../../lib/tk8.0/xmfbox.tcl \ -+ $(SRC_DIR)/generic/tk8.0/tk.tcl \ -+ $(TK_SRC_DIR)/../../lib/tk8.0/button.tcl \ -+ $(TK_SRC_DIR)/../../lib/tk8.0/entry.tcl \ -+ $(TK_SRC_DIR)/../../lib/tk8.0/listbox.tcl \ -+ $(TK_SRC_DIR)/../../lib/tk8.0/menu.tcl \ -+ $(TK_SRC_DIR)/../../lib/tk8.0/scale.tcl \ -+ $(TK_SRC_DIR)/../../lib/tk8.0/scrlbar.tcl \ -+ $(TK_SRC_DIR)/../../lib/tk8.0/text.tcl \ ++ $(TK_SRC_DIR)/../../lib/tk8.1/bgerror.tcl \ ++ $(TK_SRC_DIR)/../../lib/tk8.1/dialog.tcl \ ++ $(TK_SRC_DIR)/../../lib/tk8.1/focus.tcl \ ++ $(TK_SRC_DIR)/../../lib/tk8.1/obsolete.tcl \ ++ $(TK_SRC_DIR)/../../lib/tk8.1/optMenu.tcl \ ++ $(TK_SRC_DIR)/../../lib/tk8.1/palette.tcl \ ++ $(TK_SRC_DIR)/../../lib/tk8.1/tearoff.tcl \ ++ $(TK_SRC_DIR)/../../lib/tk8.1/clrpick.tcl \ ++ $(TK_SRC_DIR)/../../lib/tk8.1/comdlg.tcl \ ++ $(TK_SRC_DIR)/../../lib/tk8.1/msgbox.tcl \ ++ $(TK_SRC_DIR)/../../lib/tk8.1/tkfbox.tcl \ ++ $(TK_SRC_DIR)/../../lib/tk8.1/xmfbox.tcl \ ++ $(SRC_DIR)/generic/tk8.1/tk.tcl \ ++ $(TK_SRC_DIR)/../../lib/tk8.1/button.tcl \ ++ $(TK_SRC_DIR)/../../lib/tk8.1/entry.tcl \ ++ $(TK_SRC_DIR)/../../lib/tk8.1/listbox.tcl \ ++ $(TK_SRC_DIR)/../../lib/tk8.1/menu.tcl \ ++ $(TK_SRC_DIR)/../../lib/tk8.1/scale.tcl \ ++ $(TK_SRC_DIR)/../../lib/tk8.1/scrlbar.tcl \ ++ $(TK_SRC_DIR)/../../lib/tk8.1/text.tcl \ $(SRC_DIR)/generic/tk8.0/console.tcl TIX_SCRIPTS = \ |