summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/timidity/Makefile4
-rw-r--r--converters/xdeview/Makefile4
-rw-r--r--devel/tkcvs/Makefile4
-rw-r--r--graphics/cqcam/Makefile4
-rw-r--r--lang/expect/Makefile4
-rw-r--r--lang/tclX80/Makefile4
-rw-r--r--mbone/imm/Makefile4
-rw-r--r--mbone/nte/Makefile4
-rw-r--r--mbone/rat/Makefile4
-rw-r--r--mbone/sdr/Makefile4
-rw-r--r--mbone/vat/Makefile4
-rw-r--r--mbone/vic/Makefile4
-rw-r--r--misc/dotfile/Makefile4
-rw-r--r--misc/ical/Makefile4
-rw-r--r--misc/kp/Makefile4
-rw-r--r--misc/zorro/Makefile4
-rw-r--r--net/scotty/Makefile4
-rw-r--r--net/tkicb/Makefile4
-rw-r--r--net/tkirc/Makefile4
-rw-r--r--net/zircon/Makefile4
-rw-r--r--textproc/catdoc/Makefile4
-rw-r--r--x11/filerunner/Makefile4
-rw-r--r--x11/p5-Tk/Makefile4
-rw-r--r--x11/tix/Makefile4
-rw-r--r--x11/tk80/files/md54
-rw-r--r--x11/tk80/patches/patch-aa35
-rw-r--r--x11/tk80/patches/patch-ab47
-rw-r--r--x11/tk80/patches/patch-ad1143
-rw-r--r--x11/tkcron/Makefile8
-rw-r--r--x11/tkinfo/Makefile4
-rw-r--r--x11/tkman/Makefile4
31 files changed, 672 insertions, 669 deletions
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index 5392c2980e4..624d20446c0 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 1998/11/19 15:40:45 agc Exp $
+# $NetBSD: Makefile,v 1.19 1999/04/01 13:38:43 agc Exp $
#
DISTNAME= timidity-0.2i
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.cgs.fi/~tt/timidity/
BUILD_DEPENDS= unzip:../../archivers/unzip
DEPENDS+= ncurses-1.9.9g:../../devel/ncurses
-DEPENDS+= tk-8.0p2:../../x11/tk80
+DEPENDS+= tk-8.0.5:../../x11/tk80
NO_CDROM= "Uses copyrighted patches"
diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile
index 10913775360..d659e488303 100644
--- a/converters/xdeview/Makefile
+++ b/converters/xdeview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1999/01/30 23:18:45 agc Exp $
+# $NetBSD: Makefile,v 1.13 1999/04/01 13:38:43 agc Exp $
# FreeBSD Id: Makefile,v 1.11 1998/02/24 21:43:45 jseger Exp
#
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.informatik.uni-frankfurt.de/~fp/uudeview/Apps/frank/
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.informatik.uni-frankfurt.de/~fp/uudeview/
-DEPENDS+= tk-8.0p2:../../x11/tk80
+DEPENDS+= tk-8.0.5:../../x11/tk80
DEPENDS+= uulib-0.5.13:../../converters/uulib
USE_X11BASE= yes
diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index 090279acd0c..ff241cbeb3b 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/06/22 11:27:51 agc Exp $
+# $NetBSD: Makefile,v 1.9 1999/04/01 13:38:43 agc Exp $
# FreeBSD Id: Makefile,v 1.12 1998/02/24 21:43:24 jseger Exp
#
@@ -9,7 +9,7 @@ MASTER_SITES= http://www.neosoft.com/tcl/ftparchive/sorted/apps/tkcvs-6.0/ \
MAINTAINER= shanee@augusta.de
-DEPENDS+= tk-8.0p2:../../x11/tk80
+DEPENDS+= tk-8.0.5:../../x11/tk80
NO_BUILD= yes
diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile
index ab8ebc67998..6c1ed131835 100644
--- a/graphics/cqcam/Makefile
+++ b/graphics/cqcam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/08/24 11:45:17 frueauf Exp $
+# $NetBSD: Makefile,v 1.3 1999/04/01 13:38:43 agc Exp $
#
DISTNAME= cqcam-0.45a
@@ -13,7 +13,7 @@ HOMEPAGE= http://www.cs.virginia.edu/~patrick/cqcam/
ONLY_FOR_ARCHS= i386
DEPENDS+= jpeg-6b:../../graphics/jpeg
-DEPENDS+= tk-8.0p2:../../x11/tk80
+DEPENDS+= tk-8.0.5:../../x11/tk80
LICENSE= no-profit
diff --git a/lang/expect/Makefile b/lang/expect/Makefile
index 37fbc12893f..438f08d0b64 100644
--- a/lang/expect/Makefile
+++ b/lang/expect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 1999/03/08 10:53:56 agc Exp $
+# $NetBSD: Makefile,v 1.17 1999/04/01 13:38:44 agc Exp $
# FreeBSD Id: Makefile,v 1.29 1998/01/27 01:11:47 fenner Exp
#
@@ -10,7 +10,7 @@ MASTER_SITES= ${MASTER_SITE_BACKUP}
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://expect.nist.gov/
-DEPENDS+= tk-8.0p2:../../x11/tk80
+DEPENDS+= tk-8.0.5:../../x11/tk80
WRKSRC= ${WRKDIR}/expect-5.25
diff --git a/lang/tclX80/Makefile b/lang/tclX80/Makefile
index c30786733aa..b6deebb6d46 100644
--- a/lang/tclX80/Makefile
+++ b/lang/tclX80/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/08/20 15:17:08 tsarna Exp $
+# $NetBSD: Makefile,v 1.6 1999/04/01 13:38:44 agc Exp $
#
DISTNAME= tclX8.0.2
@@ -9,7 +9,7 @@ MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/tclx-distrib/
MAINTAINER= tron@netbsd.org
HOMEPAGE= http://www.neosoft.com/TclX/
-DEPENDS+= tk-8.0p2:../../x11/tk80
+DEPENDS+= tk-8.0.5:../../x11/tk80
WRKSRC= ${WRKDIR}/tclX8.0.2/unix
GNU_CONFIGURE= yes
diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile
index d369764c59d..82961cf32ee 100644
--- a/mbone/imm/Makefile
+++ b/mbone/imm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/04/22 14:22:45 agc Exp $
+# $NetBSD: Makefile,v 1.9 1999/04/01 13:38:44 agc Exp $
#
# NetBSD "imm" package
# The original was based on the imm-3.5a1 FreeBSD port maintained
@@ -13,7 +13,7 @@ DISTFILES= imm36a1.tar.Z
MAINTAINER= is@netbsd.org
-DEPENDS+= tk-8.0p2:../../x11/tk80
+DEPENDS+= tk-8.0.5:../../x11/tk80
ALL_TARGET= netbsd
MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}"
diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile
index 26b0c952020..82a3d8c0a05 100644
--- a/mbone/nte/Makefile
+++ b/mbone/nte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1999/03/22 09:38:23 agc Exp $
+# $NetBSD: Makefile,v 1.14 1999/04/01 13:38:44 agc Exp $
#
DISTNAME= nt.1.5a23
@@ -9,7 +9,7 @@ MASTER_SITES= ftp://cs.ucl.ac.uk/mice/nte/
MAINTAINER= mycroft@netbsd.org
BUILD_DEPENDS= ${BUILD_ROOT}/x11/tk80/${WRKDIR:T}/tk8.0/generic/default.h:${TK_DIR}:configure
-DEPENDS+= tk-8.0p2:../../x11/tk80
+DEPENDS+= tk-8.0.5:../../x11/tk80
TK_DIR= ${BUILD_ROOT}/x11/tk80
TK_SRC= ${TK_DIR}/${WRKDIR:T}/tk8.0
diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile
index 1bf57e2c576..83b9af123e0 100644
--- a/mbone/rat/Makefile
+++ b/mbone/rat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1999/02/20 22:48:35 hubertf Exp $
+# $NetBSD: Makefile,v 1.13 1999/04/01 13:38:44 agc Exp $
#
DISTNAME= rat-3.0.28
@@ -8,7 +8,7 @@ MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/3.0.28/
MAINTAINER= mycroft@netbsd.org
HOMEPAGE= http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/
-DEPENDS+= tk-8.0p2:../../x11/tk80
+DEPENDS+= tk-8.0.5:../../x11/tk80
RESTRICTED= "Contains DES encryption"
MIRROR_DISTFILE=no
diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index 8ca0dd5634a..9ad3baa37b8 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 1999/02/20 22:48:36 hubertf Exp $
+# $NetBSD: Makefile,v 1.19 1999/04/01 13:38:44 agc Exp $
#
DISTNAME= sdr-2.5.8
@@ -8,7 +8,7 @@ MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/experimental/
MAINTAINER= is@netbsd.org
HOMEPAGE= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/
-DEPENDS+= tk-8.0p2:../../x11/tk80
+DEPENDS+= tk-8.0.5:../../x11/tk80
MIRROR_DISTFILE= no
WRKSRC= ${WRKDIR}/sdr
diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile
index 2c27e62414c..7b87033df06 100644
--- a/mbone/vat/Makefile
+++ b/mbone/vat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 1999/03/22 09:38:24 agc Exp $
+# $NetBSD: Makefile,v 1.21 1999/04/01 13:38:44 agc Exp $
# FreeBSD Id: Makefile,v 1.4 1997/09/11 03:54:43 fenner Exp
#
@@ -14,7 +14,7 @@ HOMEPAGE= http://www-nrg.ee.lbl.gov/vat/
# we can use this first BUILD_DEPENDS and save some work.
#BUILD_DEPENDS= ${GSM_WORK}/inc/private.h:${GSM_DIR}:patch
BUILD_DEPENDS= ${GSM_WORK}/lib/libgsm.a:${GSM_DIR}:build
-DEPENDS+= tk-8.0p2:../../x11/tk80
+DEPENDS+= tk-8.0.5:../../x11/tk80
#DEPENDS+= gsm-1.0.10:${GSM_DIR}
NOT_FOR_ARCHS= alpha #filter.cc compiler error
diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile
index 1716db0ac2a..cba8ab633bf 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/01/30 23:18:53 agc Exp $
+# $NetBSD: Makefile,v 1.10 1999/04/01 13:38:44 agc Exp $
# FreeBSD Id: Makefile,v 1.12 1997/09/11 03:54:53 fenner Exp
#
@@ -10,7 +10,7 @@ DISTFILES= vicsrc-2.8.tar.gz
MAINTAINER= is@netbsd.org
HOMEPAGE= http://www-nrg.ee.lbl.gov/vic/
-DEPENDS+= tk-8.0p2:../../x11/tk80
+DEPENDS+= tk-8.0.5:../../x11/tk80
GNU_CONFIGURE= yes
USE_X11BASE= yes
diff --git a/misc/dotfile/Makefile b/misc/dotfile/Makefile
index 0c80bfd7c21..cab0b1f8e47 100644
--- a/misc/dotfile/Makefile
+++ b/misc/dotfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1998/11/19 15:40:46 agc Exp $
+# $NetBSD: Makefile,v 1.14 1999/04/01 13:38:44 agc Exp $
# FreeBSD Id: Makefile,v 1.5 1997/04/20 13:19:30 wosch Exp
#
@@ -9,7 +9,7 @@ MASTER_SITES= ftp://ftp.imada.ou.dk/pub/dotfile/
MAINTAINER= oly@world.std.com
HOMEPAGE= http://www.imada.ou.dk/~blackie/dotfile/
-DEPENDS+= tk-8.0p2:../../x11/tk80
+DEPENDS+= tk-8.0.5:../../x11/tk80
# this pkg opens some X connectin
IS_INTERACTIVE= yes
diff --git a/misc/ical/Makefile b/misc/ical/Makefile
index 9a6d7f33990..f1d1dd4d43f 100644
--- a/misc/ical/Makefile
+++ b/misc/ical/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/08/20 15:17:13 tsarna Exp $
+# $NetBSD: Makefile,v 1.8 1999/04/01 13:38:45 agc Exp $
# $FreeBSD Id: Makefile,v 1.15 1998/02/07 22:59:16 hoek Exp
#
@@ -9,7 +9,7 @@ MASTER_SITES= http://www.research.digital.com/SRC/personal/Sanjay_Ghemawat/ical/
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.research.digital.com/SRC/personal/Sanjay_Ghemawat/ical/
-DEPENDS+= tk-8.0p2:../../x11/tk80
+DEPENDS+= tk-8.0.5:../../x11/tk80
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \
diff --git a/misc/kp/Makefile b/misc/kp/Makefile
index e54037e5b82..799c71c282e 100644
--- a/misc/kp/Makefile
+++ b/misc/kp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/11/19 15:40:46 agc Exp $
+# $NetBSD: Makefile,v 1.10 1999/04/01 13:38:45 agc Exp $
# FreeBSD Id: Makefile,v 1.8 1997/04/20 13:19:32 wosch Exp
#
@@ -8,7 +8,7 @@ MASTER_SITES= ftp://stampede.cs.berkeley.edu/pub/kp/
MAINTAINER= packages@netbsd.org
-DEPENDS= tk-8.0p2:../../x11/tk80
+DEPENDS= tk-8.0.5:../../x11/tk80
pre-configure:
for f in `find ${WRKDIR}/. -type f -print|xargs ${GREP} -l '/usr/local'`; do \
diff --git a/misc/zorro/Makefile b/misc/zorro/Makefile
index 3e1e8be4228..e16b07ecfcd 100644
--- a/misc/zorro/Makefile
+++ b/misc/zorro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:46 agc Exp $
+# $NetBSD: Makefile,v 1.7 1999/04/01 13:38:45 agc Exp $
# FreeBSD Id: Makefile,v 1.9 1997/11/22 19:55:25 jseger Exp
#
@@ -9,7 +9,7 @@ MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/sorted/apps/zorro-1.1p8/
MAINTAINER= shanee@augusta.de
-DEPENDS+= tk-8.0p2:../../x11/tk80
+DEPENDS+= tk-8.0.5:../../x11/tk80
NO_BUILD= yes
diff --git a/net/scotty/Makefile b/net/scotty/Makefile
index b15a5d416e0..7e33c411e03 100644
--- a/net/scotty/Makefile
+++ b/net/scotty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 1999/03/08 10:53:57 agc Exp $
+# $NetBSD: Makefile,v 1.17 1999/04/01 13:38:45 agc Exp $
# FreeBSD Id: Makefile,v 1.21 1997/08/27 23:01:53 cwt Exp
#
@@ -9,7 +9,7 @@ MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://wwwhome.cs.utwente.nl/~schoenw/scotty/
-DEPENDS+= tk-8.0p2:../../x11/tk80
+DEPENDS+= tk-8.0.5:../../x11/tk80
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-tcl-config=${PREFIX}/lib/tcl8.0 \
diff --git a/net/tkicb/Makefile b/net/tkicb/Makefile
index 3d99f47b7f9..e88f5d7f084 100644
--- a/net/tkicb/Makefile
+++ b/net/tkicb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/01/29 19:31:12 tron Exp $
+# $NetBSD: Makefile,v 1.6 1999/04/01 13:38:45 agc Exp $
#
DISTNAME= icb.2.1.4
@@ -10,7 +10,7 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= jwise@netbsd.org
HOMEPAGE= http://www.icb.net/
-DEPENDS= tk-8.0p2:../../x11/tk80
+DEPENDS= tk-8.0.5:../../x11/tk80
NO_PATCH= yes
NO_CONFIGURE= yes
diff --git a/net/tkirc/Makefile b/net/tkirc/Makefile
index af46f662f25..f5338ac86a4 100644
--- a/net/tkirc/Makefile
+++ b/net/tkirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1999/01/29 19:24:13 tron Exp $
+# $NetBSD: Makefile,v 1.11 1999/04/01 13:38:45 agc Exp $
DISTNAME= tkirc1.202
PKGNAME= tkirc-1.202
@@ -9,7 +9,7 @@ MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://www.north.de/~atte/tkirc/
DEPENDS+= ircII-4.4:../../net/ircII
-DEPENDS+= tk-8.0p2:../../x11/tk80
+DEPENDS+= tk-8.0.5:../../x11/tk80
NO_CONFIGURE= yes
NO_BUILD= yes
diff --git a/net/zircon/Makefile b/net/zircon/Makefile
index eda9b010dd4..c2f0d7f7aae 100644
--- a/net/zircon/Makefile
+++ b/net/zircon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/03/28 00:14:32 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1999/04/01 13:38:45 agc Exp $
#
DISTNAME= zircon-1.18.213
@@ -8,7 +8,7 @@ MASTER_SITES= ftp://catless.ncl.ac.uk/pub/
MAINTAINER= frueauf@netbsd.org
HOMEPAGE= http://catless.ncl.ac.uk/Programs/Zircon/
-DEPENDS+= tk-8.0p2:../../x11/tk80
+DEPENDS+= tk-8.0.5:../../x11/tk80
IS_INTERACTIVE= yes
NO_BUILD= yes
diff --git a/textproc/catdoc/Makefile b/textproc/catdoc/Makefile
index b02fdc98eba..094cfcf06bb 100644
--- a/textproc/catdoc/Makefile
+++ b/textproc/catdoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/10/20 22:28:44 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1999/04/01 13:38:45 agc Exp $
#
DISTNAME= catdoc-0.35
@@ -7,7 +7,7 @@ MASTER_SITES= http://www.go.dlr.de/fresh/unix/src/contrib/
MAINTAINER= packages@netbsd.org
-DEPENDS= tk-8.0p2:../../x11/tk80
+DEPENDS= tk-8.0.5:../../x11/tk80
.include "../../mk/bsd.prefs.mk"
diff --git a/x11/filerunner/Makefile b/x11/filerunner/Makefile
index 87e0b4920a6..e9aa2243e6b 100644
--- a/x11/filerunner/Makefile
+++ b/x11/filerunner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/01/30 23:18:55 agc Exp $
+# $NetBSD: Makefile,v 1.9 1999/04/01 13:38:45 agc Exp $
# $FreeBSD Id: Makefile,v 1.12 1998/02/24 21:43:11 jseger Exp
#
@@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR= X11/desktop
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.cd.chalmers.se/~hch/filerunner.html
-DEPENDS+= tk-8.0p2:../../x11/tk80
+DEPENDS+= tk-8.0.5:../../x11/tk80
USE_X11BASE= yes
diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile
index 2cee9a404bd..1f6985a8fde 100644
--- a/x11/p5-Tk/Makefile
+++ b/x11/p5-Tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1998/08/20 15:17:35 tsarna Exp $
+# $NetBSD: Makefile,v 1.11 1999/04/01 13:38:46 agc Exp $
# FreeBSD Id: Makefile,v 1.14 1997/09/14 04:00:00 jfitz Exp
#
@@ -12,7 +12,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://theory.uwinnipeg.ca/CPAN/data/Tk/pod/overview.html
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/HTML/Parse.pm:../../www/p5-libwww
-DEPENDS+= tk-8.0p2:../../x11/tk80
+DEPENDS+= tk-8.0.5:../../x11/tk80
USE_PERL5= YES
diff --git a/x11/tix/Makefile b/x11/tix/Makefile
index 6bfa5bd8dc8..19614632a13 100644
--- a/x11/tix/Makefile
+++ b/x11/tix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/07/15 10:56:58 agc Exp $
+# $NetBSD: Makefile,v 1.6 1999/04/01 13:38:46 agc Exp $
# $FreeBSD Id: Makefile,v 1.15 1998/03/17 07:55:17 tg Exp
DISTNAME= Tix4.1.0.006
@@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.xpi.com/pub/
MAINTAINER= rh@vip.at
-DEPENDS+= tk-8.0p2:../../x11/tk80
+DEPENDS+= tk-8.0.5:../../x11/tk80
WRKSRC= ${WRKDIR}/Tix4.1.0/unix/tk8.0
GNU_CONFIGURE= yes
diff --git a/x11/tk80/files/md5 b/x11/tk80/files/md5
index 4728ec4411f..4a16bc8a79f 100644
--- a/x11/tk80/files/md5
+++ b/x11/tk80/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/08/07 13:29:07 agc Exp $
+$NetBSD: md5,v 1.4 1999/04/01 13:38:46 agc Exp $
-MD5 (tk8.0p2.tar.gz) = e7711ce7e584bf1c0388cdbb86ffe7cc
+MD5 (tk8.0.5.tar.gz) = 3ae92b86c01ec99a1872697294839e64
diff --git a/x11/tk80/patches/patch-aa b/x11/tk80/patches/patch-aa
index 0e6cf41338a..660b458e0dd 100644
--- a/x11/tk80/patches/patch-aa
+++ b/x11/tk80/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.4 1999/04/01 10:23:36 agc Exp $
+$NetBSD: patch-aa,v 1.5 1999/04/01 13:38:46 agc Exp $
---- configure.orig Tue Nov 25 17:41:56 1997
-+++ configure Sat Feb 14 00:58:41 1998
-@@ -662,14 +662,14 @@
- if test -n "$withval"; then
+--- configure.orig Tue Mar 9 06:53:50 1999
++++ configure Thu Apr 1 13:19:46 1999
+@@ -874,15 +874,12 @@
+ withval="$with_tcl"
TCL_BIN_DIR=$withval
else
-- TCL_BIN_DIR=`cd ../../tcl8.0/unix; pwd`
+- TCL_BIN_DIR=`cd ../../tcl8.0$TK_PATCH_LEVEL/unix; pwd`
+ TCL_BIN_DIR=${prefix}/lib/tcl8.0
fi
@@ -15,23 +15,22 @@ $NetBSD: patch-aa,v 1.4 1999/04/01 10:23:36 agc Exp $
fi
-if test ! -f $TCL_BIN_DIR/Makefile; then
- { echo "configure: error: There's no Makefile in $TCL_BIN_DIR; perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; }
-+if test ! -f $TCL_BIN_DIR/tclConfig.sh; then
-+ { echo "configure: error: There's no tclConfig.sh in $TCL_BIN_DIR; perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; }
- fi
+-fi
#--------------------------------------------------------------------
-@@ -688,6 +688,8 @@
- DL_LIBS=$TCL_DL_LIBS
- LD_FLAGS=$TCL_LD_FLAGS
+ # Read in configuration information generated by Tcl for shared
+@@ -922,6 +919,8 @@
+ CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
+ EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
+TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION}
+
LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
# If Tcl and Tk are installed in different places, adjust the library
-@@ -2107,6 +2109,9 @@
- MAKE_LIB="ar cr ${TK_LIB_FILE} \${OBJS}"
- fi
+@@ -2400,6 +2399,9 @@
+ DBGX='${TK_DBGX}'
+ eval "TK_LIB_FILE=${TK_LIB_FILE}"
+# Force the issue
+TK_SHARED_BUILD=1
@@ -39,11 +38,11 @@ $NetBSD: patch-aa,v 1.4 1999/04/01 10:23:36 agc Exp $
# Note: in the following variable, it's important to use the absolute
# path name of the Tcl directory rather than "..": this is because
# AIX remembers this path and will attempt to use it at run-time to look
-@@ -2276,6 +2281,7 @@
+@@ -2598,6 +2600,7 @@
s%@SHLIB_VERSION@%$SHLIB_VERSION%g
s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
+s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
+ s%@TCL_DBGX@%$TCL_DBGX%g
+ s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g
s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g
- s%@TCL_VERSION@%$TCL_VERSION%g
- s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g
diff --git a/x11/tk80/patches/patch-ab b/x11/tk80/patches/patch-ab
index eec5f0a30c9..08898a052f6 100644
--- a/x11/tk80/patches/patch-ab
+++ b/x11/tk80/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.8 1999/04/01 10:48:03 agc Exp $
+$NetBSD: patch-ab,v 1.9 1999/04/01 13:38:46 agc Exp $
Adjust for libtool operation.
---- Makefile.in.orig Tue Nov 25 09:41:56 1997
-+++ Makefile.in Sat Sep 12 14:07:20 1998
+--- Makefile.in.orig Tue Mar 9 06:53:50 1999
++++ Makefile.in Thu Apr 1 13:47:14 1999
@@ -56,7 +56,9 @@
BIN_DIR = $(exec_prefix)/bin
@@ -15,21 +15,16 @@ Adjust for libtool operation.
# Top-level directory for manual entries:
MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
-@@ -94,11 +96,11 @@
+@@ -112,7 +114,7 @@
# Libraries to use when linking. This definition is determined by the
# configure script.
-LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
+LIBS = -L${.CURDIR}/.libs -L${prefix}/lib -ltcl80 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
- # To change the compiler switches, for example to change from -O
- # to -g, change the following line:
--CFLAGS = -O
-+CFLAGS = @CFLAGS@
-
# To turn off the security checks that disallow incoming sends when
# the X server appears to be insecure, reverse the comments on the
-@@ -134,7 +136,7 @@
+@@ -148,7 +150,7 @@
# "install" around; better to use the install-sh script that comes
# with the distribution, which is slower but guaranteed to work.
@@ -38,18 +33,18 @@ Adjust for libtool operation.
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
-@@ -286,9 +288,7 @@
+@@ -307,9 +309,7 @@
# The following target is configured by autoconf to generate either
# a shared library or non-shared library for Tk.
- @TK_LIB_FILE@: ${OBJS}
-- rm -f @TK_LIB_FILE@
+ ${TK_LIB_FILE}: ${OBJS}
+- rm -f ${TK_LIB_FILE}
- @MAKE_LIB@
-- $(RANLIB) @TK_LIB_FILE@
+- $(RANLIB) ${TK_LIB_FILE}
+ ${LIBTOOL} --mode=link cc -o ${.TARGET:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:0
# Make target which outputs the list of the .o contained in the Tk lib
# usefull to build a single big shared library containing Tcl/Tk and other
-@@ -299,17 +299,18 @@
+@@ -320,18 +320,21 @@
# case
objs: ${OBJS}
@@ -57,21 +52,25 @@ Adjust for libtool operation.
wish: $(WISH_OBJS) $(TK_LIB_FILE)
- $(CC) @LD_FLAGS@ $(WISH_OBJS) @TK_BUILD_LIB_SPEC@ $(LIBS) \
-+ ${LIBTOOL} --mode=link $(CC) @LD_FLAGS@ $(RPATH) $(WISH_OBJS) @TK_BUILD_LIB_SPEC@ $(LIBS) \
++ ${LIBTOOL} --mode=link $(CC) @LD_FLAGS@ $(RPATH) $(WISH_OBJS) \
++ ${TK_LIB_FILE:.a=.la} $(LIBS) \
$(TK_CC_SEARCH_FLAGS) -o wish
tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
- ${CC} @LD_FLAGS@ $(TKTEST_OBJS) @TK_BUILD_LIB_SPEC@ $(LIBS) \
-+ ${LIBTOOL} --mode=link ${CC} @LD_FLAGS@ $(RPATH) $(TKTEST_OBJS) @TK_BUILD_LIB_SPEC@ $(LIBS) \
++ ${LIBTOOL} --mode=link ${CC} @LD_FLAGS@ $(RPATH) $(TKTEST_OBJS) \
++ ${TK_LIB_FILE:.a=.la} $(LIBS) \
$(TK_CC_SEARCH_FLAGS) -o tktest
xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
- ${CC} @LD_FLAGS@ test.o tkTest.o tkSquare.o \
+- @TK_BUILD_LIB_SPEC@ $(LIBS) \
+ ${LIBTOOL} --mode=link ${CC} @LD_FLAGS@ $(RPATH) test.o tkTest.o tkSquare.o \
- @TK_BUILD_LIB_SPEC@ $(LIBS) \
++ ${TK_LIB_FILE:.a=.la} $(LIBS) \
@TK_LD_SEARCH_FLAGS@ -lXt -o xttest
-@@ -351,16 +352,17 @@
+ # Note, in the target below TCL_LIBRARY needs to be set or else
+@@ -376,16 +379,17 @@
fi; \
done;
@echo "Installing $(TK_LIB_FILE)"
@@ -92,7 +91,7 @@ Adjust for libtool operation.
$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
do \
if [ ! -d $$i ] ; then \
-@@ -370,8 +372,19 @@
+@@ -395,8 +399,19 @@
else true; \
fi; \
done;
@@ -114,7 +113,7 @@ Adjust for libtool operation.
for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(SRC_DIR)/library/prolog.ps $(UNIX_DIR)/tkAppInit.c; \
do \
echo "Installing $$i"; \
-@@ -430,7 +443,7 @@
+@@ -455,7 +470,7 @@
@cd $(SRC_DIR)/doc; for i in *.1; \
do \
echo "Installing doc/$$i"; \
@@ -123,7 +122,7 @@ Adjust for libtool operation.
sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
$$i > $(MAN1_INSTALL_DIR)/$$i; \
chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
-@@ -439,7 +452,7 @@
+@@ -464,7 +479,7 @@
@cd $(SRC_DIR)/doc; for i in *.3; \
do \
echo "Installing doc/$$i"; \
@@ -132,7 +131,7 @@ Adjust for libtool operation.
sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
$$i > $(MAN3_INSTALL_DIR)/$$i; \
chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
-@@ -448,7 +461,7 @@
+@@ -473,7 +488,7 @@
@cd $(SRC_DIR)/doc; for i in *.n; \
do \
echo "Installing doc/$$i"; \
@@ -141,7 +140,7 @@ Adjust for libtool operation.
sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
$$i > $(MANN_INSTALL_DIR)/$$i; \
chmod 444 $(MANN_INSTALL_DIR)/$$i; \
-@@ -474,275 +487,267 @@
+@@ -499,275 +514,267 @@
# because this doesn't work on some strange compilers (e.g. UnixWare).
tkTestInit.o: $(UNIX_DIR)/tkAppInit.c
diff --git a/x11/tk80/patches/patch-ad b/x11/tk80/patches/patch-ad
index 8ca5de0e055..17d903cf020 100644
--- a/x11/tk80/patches/patch-ad
+++ b/x11/tk80/patches/patch-ad
@@ -1,8 +1,55 @@
-$NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
+$NetBSD: patch-ad,v 1.5 1999/04/01 13:38:46 agc Exp $
---- mkLinks.orig Tue Nov 25 17:42:01 1997
-+++ mkLinks Sun Mar 1 17:36:37 1998
-@@ -29,850 +29,850 @@
+Use symbolic links
+
+--- mkLinks.orig Tue Mar 9 06:53:53 1999
++++ mkLinks Thu Apr 1 13:29:13 1999
+@@ -30,854 +30,854 @@
+
+ if test -r 3DBorder.3; then
+ rm -f Tk_Get3DBorder.3
+- ln 3DBorder.3 Tk_Get3DBorder.3
++ ln -s 3DBorder.3 Tk_Get3DBorder.3
+ fi
+ if test -r 3DBorder.3; then
+ rm -f Tk_Draw3DRectangle.3
+- ln 3DBorder.3 Tk_Draw3DRectangle.3
++ ln -s 3DBorder.3 Tk_Draw3DRectangle.3
+ fi
+ if test -r 3DBorder.3; then
+ rm -f Tk_Fill3DRectangle.3
+- ln 3DBorder.3 Tk_Fill3DRectangle.3
++ ln -s 3DBorder.3 Tk_Fill3DRectangle.3
+ fi
+ if test -r 3DBorder.3; then
+ rm -f Tk_Draw3DPolygon.3
+- ln 3DBorder.3 Tk_Draw3DPolygon.3
++ ln -s 3DBorder.3 Tk_Draw3DPolygon.3
+ fi
+ if test -r 3DBorder.3; then
+ rm -f Tk_Fill3DPolygon.3
+- ln 3DBorder.3 Tk_Fill3DPolygon.3
++ ln -s 3DBorder.3 Tk_Fill3DPolygon.3
+ fi
+ if test -r 3DBorder.3; then
+ rm -f Tk_3DVerticalBevel.3
+- ln 3DBorder.3 Tk_3DVerticalBevel.3
++ ln -s 3DBorder.3 Tk_3DVerticalBevel.3
+ fi
+ if test -r 3DBorder.3; then
+ rm -f Tk_3DHorizontalBevel.3
+- ln 3DBorder.3 Tk_3DHorizontalBevel.3
++ ln -s 3DBorder.3 Tk_3DHorizontalBevel.3
+ fi
+ if test -r 3DBorder.3; then
+ rm -f Tk_SetBackgroundFromBorder.3
+- ln 3DBorder.3 Tk_SetBackgroundFromBorder.3
++ ln -s 3DBorder.3 Tk_SetBackgroundFromBorder.3
+ fi
+ if test -r 3DBorder.3; then
+ rm -f Tk_NameOf3DBorder.3
+- ln 3DBorder.3 Tk_NameOf3DBorder.3
++ ln -s 3DBorder.3 Tk_NameOf3DBorder.3
fi
if test -r 3DBorder.3; then
rm -f Tk_3DBorderColor.3
@@ -15,39 +62,54 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
+ ln -s 3DBorder.3 Tk_3DBorderGC.3
fi
if test -r 3DBorder.3; then
- rm -f Tk_3DHorizontalBevel.3
-- ln 3DBorder.3 Tk_3DHorizontalBevel.3
-+ ln -s 3DBorder.3 Tk_3DHorizontalBevel.3
+ rm -f Tk_Free3DBorder.3
+- ln 3DBorder.3 Tk_Free3DBorder.3
++ ln -s 3DBorder.3 Tk_Free3DBorder.3
fi
- if test -r 3DBorder.3; then
- rm -f Tk_3DVerticalBevel.3
-- ln 3DBorder.3 Tk_3DVerticalBevel.3
-+ ln -s 3DBorder.3 Tk_3DVerticalBevel.3
+ if test -r BindTable.3; then
+ rm -f Tk_CreateBindingTable.3
+- ln BindTable.3 Tk_CreateBindingTable.3
++ ln -s BindTable.3 Tk_CreateBindingTable.3
fi
- if test -r WindowId.3; then
- rm -f Tk_Attributes.3
-- ln WindowId.3 Tk_Attributes.3
-+ ln -s WindowId.3 Tk_Attributes.3
+ if test -r BindTable.3; then
+ rm -f Tk_DeleteBindingTable.3
+- ln BindTable.3 Tk_DeleteBindingTable.3
++ ln -s BindTable.3 Tk_DeleteBindingTable.3
+ fi
+ if test -r BindTable.3; then
+ rm -f Tk_CreateBinding.3
+- ln BindTable.3 Tk_CreateBinding.3
++ ln -s BindTable.3 Tk_CreateBinding.3
+ fi
+ if test -r BindTable.3; then
+ rm -f Tk_DeleteBinding.3
+- ln BindTable.3 Tk_DeleteBinding.3
++ ln -s BindTable.3 Tk_DeleteBinding.3
+ fi
+ if test -r BindTable.3; then
+ rm -f Tk_GetBinding.3
+- ln BindTable.3 Tk_GetBinding.3
++ ln -s BindTable.3 Tk_GetBinding.3
+ fi
+ if test -r BindTable.3; then
+ rm -f Tk_GetAllBindings.3
+- ln BindTable.3 Tk_GetAllBindings.3
++ ln -s BindTable.3 Tk_GetAllBindings.3
+ fi
+ if test -r BindTable.3; then
+ rm -f Tk_DeleteAllBindings.3
+- ln BindTable.3 Tk_DeleteAllBindings.3
++ ln -s BindTable.3 Tk_DeleteAllBindings.3
fi
if test -r BindTable.3; then
rm -f Tk_BindEvent.3
- ln BindTable.3 Tk_BindEvent.3
+ ln -s BindTable.3 Tk_BindEvent.3
fi
- if test -r CanvTkwin.3; then
- rm -f Tk_CanvasDrawableCoords.3
-- ln CanvTkwin.3 Tk_CanvasDrawableCoords.3
-+ ln -s CanvTkwin.3 Tk_CanvasDrawableCoords.3
- fi
- if test -r CanvTkwin.3; then
- rm -f Tk_CanvasEventuallyRedraw.3
-- ln CanvTkwin.3 Tk_CanvasEventuallyRedraw.3
-+ ln -s CanvTkwin.3 Tk_CanvasEventuallyRedraw.3
- fi
- if test -r CanvTkwin.3; then
- rm -f Tk_CanvasGetCoord.3
-- ln CanvTkwin.3 Tk_CanvasGetCoord.3
-+ ln -s CanvTkwin.3 Tk_CanvasGetCoord.3
+ if test -r CanvPsY.3; then
+ rm -f Tk_CanvasPsY.3
+- ln CanvPsY.3 Tk_CanvasPsY.3
++ ln -s CanvPsY.3 Tk_CanvasPsY.3
fi
if test -r CanvPsY.3; then
rm -f Tk_CanvasPsBitmap.3
@@ -74,10 +136,20 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
- ln CanvPsY.3 Tk_CanvasPsStipple.3
+ ln -s CanvPsY.3 Tk_CanvasPsStipple.3
fi
- if test -r CanvPsY.3; then
- rm -f Tk_CanvasPsY.3
-- ln CanvPsY.3 Tk_CanvasPsY.3
-+ ln -s CanvPsY.3 Tk_CanvasPsY.3
+ if test -r CanvTkwin.3; then
+ rm -f Tk_CanvasTkwin.3
+- ln CanvTkwin.3 Tk_CanvasTkwin.3
++ ln -s CanvTkwin.3 Tk_CanvasTkwin.3
+ fi
+ if test -r CanvTkwin.3; then
+ rm -f Tk_CanvasGetCoord.3
+- ln CanvTkwin.3 Tk_CanvasGetCoord.3
++ ln -s CanvTkwin.3 Tk_CanvasGetCoord.3
+ fi
+ if test -r CanvTkwin.3; then
+ rm -f Tk_CanvasDrawableCoords.3
+- ln CanvTkwin.3 Tk_CanvasDrawableCoords.3
++ ln -s CanvTkwin.3 Tk_CanvasDrawableCoords.3
fi
if test -r CanvTkwin.3; then
rm -f Tk_CanvasSetStippleOrigin.3
@@ -85,6 +157,16 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
+ ln -s CanvTkwin.3 Tk_CanvasSetStippleOrigin.3
fi
if test -r CanvTkwin.3; then
+ rm -f Tk_CanvasWindowCoords.3
+- ln CanvTkwin.3 Tk_CanvasWindowCoords.3
++ ln -s CanvTkwin.3 Tk_CanvasWindowCoords.3
+ fi
+ if test -r CanvTkwin.3; then
+ rm -f Tk_CanvasEventuallyRedraw.3
+- ln CanvTkwin.3 Tk_CanvasEventuallyRedraw.3
++ ln -s CanvTkwin.3 Tk_CanvasEventuallyRedraw.3
+ fi
+ if test -r CanvTkwin.3; then
rm -f Tk_CanvasTagsOption.3
- ln CanvTkwin.3 Tk_CanvasTagsOption.3
+ ln -s CanvTkwin.3 Tk_CanvasTagsOption.3
@@ -94,60 +176,30 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
- ln CanvTxtInfo.3 Tk_CanvasTextInfo.3
+ ln -s CanvTxtInfo.3 Tk_CanvasTextInfo.3
fi
- if test -r CanvTkwin.3; then
- rm -f Tk_CanvasTkwin.3
-- ln CanvTkwin.3 Tk_CanvasTkwin.3
-+ ln -s CanvTkwin.3 Tk_CanvasTkwin.3
- fi
- if test -r CanvTkwin.3; then
- rm -f Tk_CanvasWindowCoords.3
-- ln CanvTkwin.3 Tk_CanvasWindowCoords.3
-+ ln -s CanvTkwin.3 Tk_CanvasWindowCoords.3
- fi
- if test -r ConfigWind.3; then
- rm -f Tk_ChangeWindowAttributes.3
-- ln ConfigWind.3 Tk_ChangeWindowAttributes.3
-+ ln -s ConfigWind.3 Tk_ChangeWindowAttributes.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_Changes.3
-- ln WindowId.3 Tk_Changes.3
-+ ln -s WindowId.3 Tk_Changes.3
- fi
- if test -r TextLayout.3; then
- rm -f Tk_CharBbox.3
-- ln TextLayout.3 Tk_CharBbox.3
-+ ln -s TextLayout.3 Tk_CharBbox.3
- fi
- if test -r SetClass.3; then
- rm -f Tk_Class.3
-- ln SetClass.3 Tk_Class.3
-+ ln -s SetClass.3 Tk_Class.3
- fi
- if test -r ClrSelect.3; then
- rm -f Tk_ClearSelection.3
-- ln ClrSelect.3 Tk_ClearSelection.3
-+ ln -s ClrSelect.3 Tk_ClearSelection.3
+ if test -r Clipboard.3; then
+ rm -f Tk_ClipboardClear.3
+- ln Clipboard.3 Tk_ClipboardClear.3
++ ln -s Clipboard.3 Tk_ClipboardClear.3
fi
if test -r Clipboard.3; then
rm -f Tk_ClipboardAppend.3
- ln Clipboard.3 Tk_ClipboardAppend.3
+ ln -s Clipboard.3 Tk_ClipboardAppend.3
fi
- if test -r Clipboard.3; then
- rm -f Tk_ClipboardClear.3
-- ln Clipboard.3 Tk_ClipboardClear.3
-+ ln -s Clipboard.3 Tk_ClipboardClear.3
+ if test -r ClrSelect.3; then
+ rm -f Tk_ClearSelection.3
+- ln ClrSelect.3 Tk_ClearSelection.3
++ ln -s ClrSelect.3 Tk_ClearSelection.3
fi
- if test -r WindowId.3; then
- rm -f Tk_Colormap.3
-- ln WindowId.3 Tk_Colormap.3
-+ ln -s WindowId.3 Tk_Colormap.3
+ if test -r ConfigWidg.3; then
+ rm -f Tk_ConfigureWidget.3
+- ln ConfigWidg.3 Tk_ConfigureWidget.3
++ ln -s ConfigWidg.3 Tk_ConfigureWidget.3
fi
- if test -r TextLayout.3; then
- rm -f Tk_ComputeTextLayout.3
-- ln TextLayout.3 Tk_ComputeTextLayout.3
-+ ln -s TextLayout.3 Tk_ComputeTextLayout.3
+ if test -r ConfigWidg.3; then
+ rm -f Tk_Offset.3
+- ln ConfigWidg.3 Tk_Offset.3
++ ln -s ConfigWidg.3 Tk_Offset.3
fi
if test -r ConfigWidg.3; then
rm -f Tk_ConfigureInfo.3
@@ -160,55 +212,120 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
+ ln -s ConfigWidg.3 Tk_ConfigureValue.3
fi
if test -r ConfigWidg.3; then
- rm -f Tk_ConfigureWidget.3
-- ln ConfigWidg.3 Tk_ConfigureWidget.3
-+ ln -s ConfigWidg.3 Tk_ConfigureWidget.3
+ rm -f Tk_FreeOptions.3
+- ln ConfigWidg.3 Tk_FreeOptions.3
++ ln -s ConfigWidg.3 Tk_FreeOptions.3
fi
if test -r ConfigWind.3; then
rm -f Tk_ConfigureWindow.3
- ln ConfigWind.3 Tk_ConfigureWindow.3
+ ln -s ConfigWind.3 Tk_ConfigureWindow.3
fi
+ if test -r ConfigWind.3; then
+ rm -f Tk_MoveWindow.3
+- ln ConfigWind.3 Tk_MoveWindow.3
++ ln -s ConfigWind.3 Tk_MoveWindow.3
+ fi
+ if test -r ConfigWind.3; then
+ rm -f Tk_ResizeWindow.3
+- ln ConfigWind.3 Tk_ResizeWindow.3
++ ln -s ConfigWind.3 Tk_ResizeWindow.3
+ fi
+ if test -r ConfigWind.3; then
+ rm -f Tk_MoveResizeWindow.3
+- ln ConfigWind.3 Tk_MoveResizeWindow.3
++ ln -s ConfigWind.3 Tk_MoveResizeWindow.3
+ fi
+ if test -r ConfigWind.3; then
+ rm -f Tk_SetWindowBorderWidth.3
+- ln ConfigWind.3 Tk_SetWindowBorderWidth.3
++ ln -s ConfigWind.3 Tk_SetWindowBorderWidth.3
+ fi
+ if test -r ConfigWind.3; then
+ rm -f Tk_ChangeWindowAttributes.3
+- ln ConfigWind.3 Tk_ChangeWindowAttributes.3
++ ln -s ConfigWind.3 Tk_ChangeWindowAttributes.3
+ fi
+ if test -r ConfigWind.3; then
+ rm -f Tk_SetWindowBackground.3
+- ln ConfigWind.3 Tk_SetWindowBackground.3
++ ln -s ConfigWind.3 Tk_SetWindowBackground.3
+ fi
+ if test -r ConfigWind.3; then
+ rm -f Tk_SetWindowBackgroundPixmap.3
+- ln ConfigWind.3 Tk_SetWindowBackgroundPixmap.3
++ ln -s ConfigWind.3 Tk_SetWindowBackgroundPixmap.3
+ fi
+ if test -r ConfigWind.3; then
+ rm -f Tk_SetWindowBorder.3
+- ln ConfigWind.3 Tk_SetWindowBorder.3
++ ln -s ConfigWind.3 Tk_SetWindowBorder.3
+ fi
+ if test -r ConfigWind.3; then
+ rm -f Tk_SetWindowBorderPixmap.3
+- ln ConfigWind.3 Tk_SetWindowBorderPixmap.3
++ ln -s ConfigWind.3 Tk_SetWindowBorderPixmap.3
+ fi
+ if test -r ConfigWind.3; then
+ rm -f Tk_SetWindowColormap.3
+- ln ConfigWind.3 Tk_SetWindowColormap.3
++ ln -s ConfigWind.3 Tk_SetWindowColormap.3
+ fi
+ if test -r ConfigWind.3; then
+ rm -f Tk_DefineCursor.3
+- ln ConfigWind.3 Tk_DefineCursor.3
++ ln -s ConfigWind.3 Tk_DefineCursor.3
+ fi
+ if test -r ConfigWind.3; then
+ rm -f Tk_UndefineCursor.3
+- ln ConfigWind.3 Tk_UndefineCursor.3
++ ln -s ConfigWind.3 Tk_UndefineCursor.3
+ fi
if test -r CoordToWin.3; then
rm -f Tk_CoordsToWindow.3
- ln CoordToWin.3 Tk_CoordsToWindow.3
+ ln -s CoordToWin.3 Tk_CoordsToWindow.3
fi
- if test -r BindTable.3; then
- rm -f Tk_CreateBinding.3
-- ln BindTable.3 Tk_CreateBinding.3
-+ ln -s BindTable.3 Tk_CreateBinding.3
- fi
- if test -r BindTable.3; then
- rm -f Tk_CreateBindingTable.3
-- ln BindTable.3 Tk_CreateBindingTable.3
-+ ln -s BindTable.3 Tk_CreateBindingTable.3
- fi
if test -r CrtErrHdlr.3; then
rm -f Tk_CreateErrorHandler.3
- ln CrtErrHdlr.3 Tk_CreateErrorHandler.3
+ ln -s CrtErrHdlr.3 Tk_CreateErrorHandler.3
fi
- if test -r EventHndlr.3; then
- rm -f Tk_CreateEventHandler.3
-- ln EventHndlr.3 Tk_CreateEventHandler.3
-+ ln -s EventHndlr.3 Tk_CreateEventHandler.3
+ if test -r CrtErrHdlr.3; then
+ rm -f Tk_DeleteErrorHandler.3
+- ln CrtErrHdlr.3 Tk_DeleteErrorHandler.3
++ ln -s CrtErrHdlr.3 Tk_DeleteErrorHandler.3
fi
if test -r CrtGenHdlr.3; then
rm -f Tk_CreateGenericHandler.3
- ln CrtGenHdlr.3 Tk_CreateGenericHandler.3
+ ln -s CrtGenHdlr.3 Tk_CreateGenericHandler.3
fi
+ if test -r CrtGenHdlr.3; then
+ rm -f Tk_DeleteGenericHandler.3
+- ln CrtGenHdlr.3 Tk_DeleteGenericHandler.3
++ ln -s CrtGenHdlr.3 Tk_DeleteGenericHandler.3
+ fi
if test -r CrtImgType.3; then
rm -f Tk_CreateImageType.3
- ln CrtImgType.3 Tk_CreateImageType.3
+ ln -s CrtImgType.3 Tk_CreateImageType.3
fi
+ if test -r CrtImgType.3; then
+ rm -f Tk_GetImageMasterData.3
+- ln CrtImgType.3 Tk_GetImageMasterData.3
++ ln -s CrtImgType.3 Tk_GetImageMasterData.3
+ fi
if test -r CrtItemType.3; then
rm -f Tk_CreateItemType.3
- ln CrtItemType.3 Tk_CreateItemType.3
+ ln -s CrtItemType.3 Tk_CreateItemType.3
fi
+ if test -r CrtItemType.3; then
+ rm -f Tk_GetItemTypes.3
+- ln CrtItemType.3 Tk_GetItemTypes.3
++ ln -s CrtItemType.3 Tk_GetItemTypes.3
+ fi
if test -r CrtPhImgFmt.3; then
rm -f Tk_CreatePhotoImageFormat.3
- ln CrtPhImgFmt.3 Tk_CreatePhotoImageFormat.3
@@ -219,6 +336,11 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
- ln CrtSelHdlr.3 Tk_CreateSelHandler.3
+ ln -s CrtSelHdlr.3 Tk_CreateSelHandler.3
fi
+ if test -r CrtSelHdlr.3; then
+ rm -f Tk_DeleteSelHandler.3
+- ln CrtSelHdlr.3 Tk_DeleteSelHandler.3
++ ln -s CrtSelHdlr.3 Tk_DeleteSelHandler.3
+ fi
if test -r CrtWindow.3; then
rm -f Tk_CreateWindow.3
- ln CrtWindow.3 Tk_CreateWindow.3
@@ -229,121 +351,76 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
- ln CrtWindow.3 Tk_CreateWindowFromPath.3
+ ln -s CrtWindow.3 Tk_CreateWindowFromPath.3
fi
- if test -r GetBitmap.3; then
- rm -f Tk_DefineBitmap.3
-- ln GetBitmap.3 Tk_DefineBitmap.3
-+ ln -s GetBitmap.3 Tk_DefineBitmap.3
- fi
- if test -r ConfigWind.3; then
- rm -f Tk_DefineCursor.3
-- ln ConfigWind.3 Tk_DefineCursor.3
-+ ln -s ConfigWind.3 Tk_DefineCursor.3
- fi
- if test -r BindTable.3; then
- rm -f Tk_DeleteAllBindings.3
-- ln BindTable.3 Tk_DeleteAllBindings.3
-+ ln -s BindTable.3 Tk_DeleteAllBindings.3
- fi
- if test -r BindTable.3; then
- rm -f Tk_DeleteBinding.3
-- ln BindTable.3 Tk_DeleteBinding.3
-+ ln -s BindTable.3 Tk_DeleteBinding.3
- fi
- if test -r BindTable.3; then
- rm -f Tk_DeleteBindingTable.3
-- ln BindTable.3 Tk_DeleteBindingTable.3
-+ ln -s BindTable.3 Tk_DeleteBindingTable.3
- fi
- if test -r CrtErrHdlr.3; then
- rm -f Tk_DeleteErrorHandler.3
-- ln CrtErrHdlr.3 Tk_DeleteErrorHandler.3
-+ ln -s CrtErrHdlr.3 Tk_DeleteErrorHandler.3
- fi
- if test -r EventHndlr.3; then
- rm -f Tk_DeleteEventHandler.3
-- ln EventHndlr.3 Tk_DeleteEventHandler.3
-+ ln -s EventHndlr.3 Tk_DeleteEventHandler.3
- fi
- if test -r CrtGenHdlr.3; then
- rm -f Tk_DeleteGenericHandler.3
-- ln CrtGenHdlr.3 Tk_DeleteGenericHandler.3
-+ ln -s CrtGenHdlr.3 Tk_DeleteGenericHandler.3
- fi
- if test -r DeleteImg.3; then
- rm -f Tk_DeleteImage.3
-- ln DeleteImg.3 Tk_DeleteImage.3
-+ ln -s DeleteImg.3 Tk_DeleteImage.3
- fi
- if test -r CrtSelHdlr.3; then
- rm -f Tk_DeleteSelHandler.3
-- ln CrtSelHdlr.3 Tk_DeleteSelHandler.3
-+ ln -s CrtSelHdlr.3 Tk_DeleteSelHandler.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_Depth.3
-- ln WindowId.3 Tk_Depth.3
-+ ln -s WindowId.3 Tk_Depth.3
- fi
if test -r CrtWindow.3; then
rm -f Tk_DestroyWindow.3
- ln CrtWindow.3 Tk_DestroyWindow.3
+ ln -s CrtWindow.3 Tk_DestroyWindow.3
fi
- if test -r WindowId.3; then
- rm -f Tk_Display.3
-- ln WindowId.3 Tk_Display.3
-+ ln -s WindowId.3 Tk_Display.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_DisplayName.3
-- ln WindowId.3 Tk_DisplayName.3
-+ ln -s WindowId.3 Tk_DisplayName.3
- fi
- if test -r TextLayout.3; then
- rm -f Tk_DistanceToTextLayout.3
-- ln TextLayout.3 Tk_DistanceToTextLayout.3
-+ ln -s TextLayout.3 Tk_DistanceToTextLayout.3
- fi
- if test -r 3DBorder.3; then
- rm -f Tk_Draw3DPolygon.3
-- ln 3DBorder.3 Tk_Draw3DPolygon.3
-+ ln -s 3DBorder.3 Tk_Draw3DPolygon.3
- fi
- if test -r 3DBorder.3; then
- rm -f Tk_Draw3DRectangle.3
-- ln 3DBorder.3 Tk_Draw3DRectangle.3
-+ ln -s 3DBorder.3 Tk_Draw3DRectangle.3
+ if test -r CrtWindow.3; then
+ rm -f Tk_MakeWindowExist.3
+- ln CrtWindow.3 Tk_MakeWindowExist.3
++ ln -s CrtWindow.3 Tk_MakeWindowExist.3
fi
- if test -r MeasureChar.3; then
- rm -f Tk_DrawChars.3
-- ln MeasureChar.3 Tk_DrawChars.3
-+ ln -s MeasureChar.3 Tk_DrawChars.3
+ if test -r DeleteImg.3; then
+ rm -f Tk_DeleteImage.3
+- ln DeleteImg.3 Tk_DeleteImage.3
++ ln -s DeleteImg.3 Tk_DeleteImage.3
fi
if test -r DrawFocHlt.3; then
rm -f Tk_DrawFocusHighlight.3
- ln DrawFocHlt.3 Tk_DrawFocusHighlight.3
+ ln -s DrawFocHlt.3 Tk_DrawFocusHighlight.3
fi
- if test -r TextLayout.3; then
- rm -f Tk_DrawTextLayout.3
-- ln TextLayout.3 Tk_DrawTextLayout.3
-+ ln -s TextLayout.3 Tk_DrawTextLayout.3
- fi
- if test -r 3DBorder.3; then
- rm -f Tk_Fill3DPolygon.3
-- ln 3DBorder.3 Tk_Fill3DPolygon.3
-+ ln -s 3DBorder.3 Tk_Fill3DPolygon.3
+ if test -r EventHndlr.3; then
+ rm -f Tk_CreateEventHandler.3
+- ln EventHndlr.3 Tk_CreateEventHandler.3
++ ln -s EventHndlr.3 Tk_CreateEventHandler.3
fi
- if test -r 3DBorder.3; then
- rm -f Tk_Fill3DRectangle.3
-- ln 3DBorder.3 Tk_Fill3DRectangle.3
-+ ln -s 3DBorder.3 Tk_Fill3DRectangle.3
+ if test -r EventHndlr.3; then
+ rm -f Tk_DeleteEventHandler.3
+- ln EventHndlr.3 Tk_DeleteEventHandler.3
++ ln -s EventHndlr.3 Tk_DeleteEventHandler.3
fi
if test -r FindPhoto.3; then
rm -f Tk_FindPhoto.3
- ln FindPhoto.3 Tk_FindPhoto.3
+ ln -s FindPhoto.3 Tk_FindPhoto.3
fi
+ if test -r FindPhoto.3; then
+ rm -f Tk_PhotoPutBlock.3
+- ln FindPhoto.3 Tk_PhotoPutBlock.3
++ ln -s FindPhoto.3 Tk_PhotoPutBlock.3
+ fi
+ if test -r FindPhoto.3; then
+ rm -f Tk_PhotoPutZoomedBlock.3
+- ln FindPhoto.3 Tk_PhotoPutZoomedBlock.3
++ ln -s FindPhoto.3 Tk_PhotoPutZoomedBlock.3
+ fi
+ if test -r FindPhoto.3; then
+ rm -f Tk_PhotoGetImage.3
+- ln FindPhoto.3 Tk_PhotoGetImage.3
++ ln -s FindPhoto.3 Tk_PhotoGetImage.3
+ fi
+ if test -r FindPhoto.3; then
+ rm -f Tk_PhotoBlank.3
+- ln FindPhoto.3 Tk_PhotoBlank.3
++ ln -s FindPhoto.3 Tk_PhotoBlank.3
+ fi
+ if test -r FindPhoto.3; then
+ rm -f Tk_PhotoExpand.3
+- ln FindPhoto.3 Tk_PhotoExpand.3
++ ln -s FindPhoto.3 Tk_PhotoExpand.3
+ fi
+ if test -r FindPhoto.3; then
+ rm -f Tk_PhotoGetSize.3
+- ln FindPhoto.3 Tk_PhotoGetSize.3
++ ln -s FindPhoto.3 Tk_PhotoGetSize.3
+ fi
+ if test -r FindPhoto.3; then
+ rm -f Tk_PhotoSetSize.3
+- ln FindPhoto.3 Tk_PhotoSetSize.3
++ ln -s FindPhoto.3 Tk_PhotoSetSize.3
+ fi
if test -r FontId.3; then
rm -f Tk_FontId.3
- ln FontId.3 Tk_FontId.3
@@ -354,60 +431,10 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
- ln FontId.3 Tk_FontMetrics.3
+ ln -s FontId.3 Tk_FontMetrics.3
fi
- if test -r 3DBorder.3; then
- rm -f Tk_Free3DBorder.3
-- ln 3DBorder.3 Tk_Free3DBorder.3
-+ ln -s 3DBorder.3 Tk_Free3DBorder.3
- fi
- if test -r GetBitmap.3; then
- rm -f Tk_FreeBitmap.3
-- ln GetBitmap.3 Tk_FreeBitmap.3
-+ ln -s GetBitmap.3 Tk_FreeBitmap.3
- fi
- if test -r GetColor.3; then
- rm -f Tk_FreeColor.3
-- ln GetColor.3 Tk_FreeColor.3
-+ ln -s GetColor.3 Tk_FreeColor.3
- fi
- if test -r GetClrmap.3; then
- rm -f Tk_FreeColormap.3
-- ln GetClrmap.3 Tk_FreeColormap.3
-+ ln -s GetClrmap.3 Tk_FreeColormap.3
- fi
- if test -r GetCursor.3; then
- rm -f Tk_FreeCursor.3
-- ln GetCursor.3 Tk_FreeCursor.3
-+ ln -s GetCursor.3 Tk_FreeCursor.3
- fi
- if test -r GetFont.3; then
- rm -f Tk_FreeFont.3
-- ln GetFont.3 Tk_FreeFont.3
-+ ln -s GetFont.3 Tk_FreeFont.3
- fi
- if test -r GetGC.3; then
- rm -f Tk_FreeGC.3
-- ln GetGC.3 Tk_FreeGC.3
-+ ln -s GetGC.3 Tk_FreeGC.3
- fi
- if test -r GetImage.3; then
- rm -f Tk_FreeImage.3
-- ln GetImage.3 Tk_FreeImage.3
-+ ln -s GetImage.3 Tk_FreeImage.3
- fi
- if test -r ConfigWidg.3; then
- rm -f Tk_FreeOptions.3
-- ln ConfigWidg.3 Tk_FreeOptions.3
-+ ln -s ConfigWidg.3 Tk_FreeOptions.3
- fi
- if test -r GetPixmap.3; then
- rm -f Tk_FreePixmap.3
-- ln GetPixmap.3 Tk_FreePixmap.3
-+ ln -s GetPixmap.3 Tk_FreePixmap.3
- fi
- if test -r TextLayout.3; then
- rm -f Tk_FreeTextLayout.3
-- ln TextLayout.3 Tk_FreeTextLayout.3
-+ ln -s TextLayout.3 Tk_FreeTextLayout.3
+ if test -r FontId.3; then
+ rm -f Tk_PostscriptFontName.3
+- ln FontId.3 Tk_PostscriptFontName.3
++ ln -s FontId.3 Tk_PostscriptFontName.3
fi
if test -r FreeXId.3; then
rm -f Tk_FreeXId.3
@@ -419,30 +446,20 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
- ln GeomReq.3 Tk_GeometryRequest.3
+ ln -s GeomReq.3 Tk_GeometryRequest.3
fi
- if test -r 3DBorder.3; then
- rm -f Tk_Get3DBorder.3
-- ln 3DBorder.3 Tk_Get3DBorder.3
-+ ln -s 3DBorder.3 Tk_Get3DBorder.3
- fi
- if test -r BindTable.3; then
- rm -f Tk_GetAllBindings.3
-- ln BindTable.3 Tk_GetAllBindings.3
-+ ln -s BindTable.3 Tk_GetAllBindings.3
+ if test -r GeomReq.3; then
+ rm -f Tk_SetInternalBorder.3
+- ln GeomReq.3 Tk_SetInternalBorder.3
++ ln -s GeomReq.3 Tk_SetInternalBorder.3
fi
if test -r GetAnchor.3; then
rm -f Tk_GetAnchor.3
- ln GetAnchor.3 Tk_GetAnchor.3
+ ln -s GetAnchor.3 Tk_GetAnchor.3
fi
- if test -r InternAtom.3; then
- rm -f Tk_GetAtomName.3
-- ln InternAtom.3 Tk_GetAtomName.3
-+ ln -s InternAtom.3 Tk_GetAtomName.3
- fi
- if test -r BindTable.3; then
- rm -f Tk_GetBinding.3
-- ln BindTable.3 Tk_GetBinding.3
-+ ln -s BindTable.3 Tk_GetBinding.3
+ if test -r GetAnchor.3; then
+ rm -f Tk_NameOfAnchor.3
+- ln GetAnchor.3 Tk_NameOfAnchor.3
++ ln -s GetAnchor.3 Tk_NameOfAnchor.3
fi
if test -r GetBitmap.3; then
rm -f Tk_GetBitmap.3
@@ -450,6 +467,26 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
+ ln -s GetBitmap.3 Tk_GetBitmap.3
fi
if test -r GetBitmap.3; then
+ rm -f Tk_DefineBitmap.3
+- ln GetBitmap.3 Tk_DefineBitmap.3
++ ln -s GetBitmap.3 Tk_DefineBitmap.3
+ fi
+ if test -r GetBitmap.3; then
+ rm -f Tk_NameOfBitmap.3
+- ln GetBitmap.3 Tk_NameOfBitmap.3
++ ln -s GetBitmap.3 Tk_NameOfBitmap.3
+ fi
+ if test -r GetBitmap.3; then
+ rm -f Tk_SizeOfBitmap.3
+- ln GetBitmap.3 Tk_SizeOfBitmap.3
++ ln -s GetBitmap.3 Tk_SizeOfBitmap.3
+ fi
+ if test -r GetBitmap.3; then
+ rm -f Tk_FreeBitmap.3
+- ln GetBitmap.3 Tk_FreeBitmap.3
++ ln -s GetBitmap.3 Tk_FreeBitmap.3
+ fi
+ if test -r GetBitmap.3; then
rm -f Tk_GetBitmapFromData.3
- ln GetBitmap.3 Tk_GetBitmapFromData.3
+ ln -s GetBitmap.3 Tk_GetBitmapFromData.3
@@ -459,6 +496,21 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
- ln GetCapStyl.3 Tk_GetCapStyle.3
+ ln -s GetCapStyl.3 Tk_GetCapStyle.3
fi
+ if test -r GetCapStyl.3; then
+ rm -f Tk_NameOfCapStyle.3
+- ln GetCapStyl.3 Tk_NameOfCapStyle.3
++ ln -s GetCapStyl.3 Tk_NameOfCapStyle.3
+ fi
+ if test -r GetClrmap.3; then
+ rm -f Tk_GetColormap.3
+- ln GetClrmap.3 Tk_GetColormap.3
++ ln -s GetClrmap.3 Tk_GetColormap.3
+ fi
+ if test -r GetClrmap.3; then
+ rm -f Tk_FreeColormap.3
+- ln GetClrmap.3 Tk_FreeColormap.3
++ ln -s GetClrmap.3 Tk_FreeColormap.3
+ fi
if test -r GetColor.3; then
rm -f Tk_GetColor.3
- ln GetColor.3 Tk_GetColor.3
@@ -469,10 +521,15 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
- ln GetColor.3 Tk_GetColorByValue.3
+ ln -s GetColor.3 Tk_GetColorByValue.3
fi
- if test -r GetClrmap.3; then
- rm -f Tk_GetColormap.3
-- ln GetClrmap.3 Tk_GetColormap.3
-+ ln -s GetClrmap.3 Tk_GetColormap.3
+ if test -r GetColor.3; then
+ rm -f Tk_NameOfColor.3
+- ln GetColor.3 Tk_NameOfColor.3
++ ln -s GetColor.3 Tk_NameOfColor.3
+ fi
+ if test -r GetColor.3; then
+ rm -f Tk_FreeColor.3
+- ln GetColor.3 Tk_FreeColor.3
++ ln -s GetColor.3 Tk_FreeColor.3
fi
if test -r GetCursor.3; then
rm -f Tk_GetCursor.3
@@ -484,41 +541,81 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
- ln GetCursor.3 Tk_GetCursorFromData.3
+ ln -s GetCursor.3 Tk_GetCursorFromData.3
fi
+ if test -r GetCursor.3; then
+ rm -f Tk_NameOfCursor.3
+- ln GetCursor.3 Tk_NameOfCursor.3
++ ln -s GetCursor.3 Tk_NameOfCursor.3
+ fi
+ if test -r GetCursor.3; then
+ rm -f Tk_FreeCursor.3
+- ln GetCursor.3 Tk_FreeCursor.3
++ ln -s GetCursor.3 Tk_FreeCursor.3
+ fi
if test -r GetFont.3; then
rm -f Tk_GetFont.3
- ln GetFont.3 Tk_GetFont.3
+ ln -s GetFont.3 Tk_GetFont.3
fi
+ if test -r GetFont.3; then
+ rm -f Tk_NameOfFont.3
+- ln GetFont.3 Tk_NameOfFont.3
++ ln -s GetFont.3 Tk_NameOfFont.3
+ fi
+ if test -r GetFont.3; then
+ rm -f Tk_FreeFont.3
+- ln GetFont.3 Tk_FreeFont.3
++ ln -s GetFont.3 Tk_FreeFont.3
+ fi
if test -r GetGC.3; then
rm -f Tk_GetGC.3
- ln GetGC.3 Tk_GetGC.3
+ ln -s GetGC.3 Tk_GetGC.3
fi
+ if test -r GetGC.3; then
+ rm -f Tk_FreeGC.3
+- ln GetGC.3 Tk_FreeGC.3
++ ln -s GetGC.3 Tk_FreeGC.3
+ fi
if test -r GetImage.3; then
rm -f Tk_GetImage.3
- ln GetImage.3 Tk_GetImage.3
+ ln -s GetImage.3 Tk_GetImage.3
fi
- if test -r CrtImgType.3; then
- rm -f Tk_GetImageMasterData.3
-- ln CrtImgType.3 Tk_GetImageMasterData.3
-+ ln -s CrtImgType.3 Tk_GetImageMasterData.3
+ if test -r GetImage.3; then
+ rm -f Tk_RedrawImage.3
+- ln GetImage.3 Tk_RedrawImage.3
++ ln -s GetImage.3 Tk_RedrawImage.3
fi
- if test -r CrtItemType.3; then
- rm -f Tk_GetItemTypes.3
-- ln CrtItemType.3 Tk_GetItemTypes.3
-+ ln -s CrtItemType.3 Tk_GetItemTypes.3
+ if test -r GetImage.3; then
+ rm -f Tk_SizeOfImage.3
+- ln GetImage.3 Tk_SizeOfImage.3
++ ln -s GetImage.3 Tk_SizeOfImage.3
+ fi
+ if test -r GetImage.3; then
+ rm -f Tk_FreeImage.3
+- ln GetImage.3 Tk_FreeImage.3
++ ln -s GetImage.3 Tk_FreeImage.3
fi
if test -r GetJoinStl.3; then
rm -f Tk_GetJoinStyle.3
- ln GetJoinStl.3 Tk_GetJoinStyle.3
+ ln -s GetJoinStl.3 Tk_GetJoinStyle.3
fi
+ if test -r GetJoinStl.3; then
+ rm -f Tk_NameOfJoinStyle.3
+- ln GetJoinStl.3 Tk_NameOfJoinStyle.3
++ ln -s GetJoinStl.3 Tk_NameOfJoinStyle.3
+ fi
if test -r GetJustify.3; then
rm -f Tk_GetJustify.3
- ln GetJustify.3 Tk_GetJustify.3
+ ln -s GetJustify.3 Tk_GetJustify.3
fi
+ if test -r GetJustify.3; then
+ rm -f Tk_NameOfJustify.3
+- ln GetJustify.3 Tk_NameOfJustify.3
++ ln -s GetJustify.3 Tk_NameOfJustify.3
+ fi
if test -r GetOption.3; then
rm -f Tk_GetOption.3
- ln GetOption.3 Tk_GetOption.3
@@ -529,26 +626,36 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
- ln GetPixels.3 Tk_GetPixels.3
+ ln -s GetPixels.3 Tk_GetPixels.3
fi
+ if test -r GetPixels.3; then
+ rm -f Tk_GetScreenMM.3
+- ln GetPixels.3 Tk_GetScreenMM.3
++ ln -s GetPixels.3 Tk_GetScreenMM.3
+ fi
if test -r GetPixmap.3; then
rm -f Tk_GetPixmap.3
- ln GetPixmap.3 Tk_GetPixmap.3
+ ln -s GetPixmap.3 Tk_GetPixmap.3
fi
+ if test -r GetPixmap.3; then
+ rm -f Tk_FreePixmap.3
+- ln GetPixmap.3 Tk_FreePixmap.3
++ ln -s GetPixmap.3 Tk_FreePixmap.3
+ fi
if test -r GetRelief.3; then
rm -f Tk_GetRelief.3
- ln GetRelief.3 Tk_GetRelief.3
+ ln -s GetRelief.3 Tk_GetRelief.3
fi
+ if test -r GetRelief.3; then
+ rm -f Tk_NameOfRelief.3
+- ln GetRelief.3 Tk_NameOfRelief.3
++ ln -s GetRelief.3 Tk_NameOfRelief.3
+ fi
if test -r GetRootCrd.3; then
rm -f Tk_GetRootCoords.3
- ln GetRootCrd.3 Tk_GetRootCoords.3
+ ln -s GetRootCrd.3 Tk_GetRootCoords.3
fi
- if test -r GetPixels.3; then
- rm -f Tk_GetScreenMM.3
-- ln GetPixels.3 Tk_GetScreenMM.3
-+ ln -s GetPixels.3 Tk_GetScreenMM.3
- fi
if test -r GetScroll.3; then
rm -f Tk_GetScrollInfo.3
- ln GetScroll.3 Tk_GetScrollInfo.3
@@ -564,6 +671,11 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
- ln GetUid.3 Tk_GetUid.3
+ ln -s GetUid.3 Tk_GetUid.3
fi
+ if test -r GetUid.3; then
+ rm -f Tk_Uid.3
+- ln GetUid.3 Tk_Uid.3
++ ln -s GetUid.3 Tk_Uid.3
+ fi
if test -r GetVRoot.3; then
rm -f Tk_GetVRootGeometry.3
- ln GetVRoot.3 Tk_GetVRootGeometry.3
@@ -579,11 +691,6 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
- ln HandleEvent.3 Tk_HandleEvent.3
+ ln -s HandleEvent.3 Tk_HandleEvent.3
fi
- if test -r WindowId.3; then
- rm -f Tk_Height.3
-- ln WindowId.3 Tk_Height.3
-+ ln -s WindowId.3 Tk_Height.3
- fi
if test -r IdToWindow.3; then
rm -f Tk_IdToWindow.3
- ln IdToWindow.3 Tk_IdToWindow.3
@@ -599,25 +706,10 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
- ln InternAtom.3 Tk_InternAtom.3
+ ln -s InternAtom.3 Tk_InternAtom.3
fi
- if test -r WindowId.3; then
- rm -f Tk_InternalBorderWidth.3
-- ln WindowId.3 Tk_InternalBorderWidth.3
-+ ln -s WindowId.3 Tk_InternalBorderWidth.3
- fi
- if test -r TextLayout.3; then
- rm -f Tk_IntersectTextLayout.3
-- ln TextLayout.3 Tk_IntersectTextLayout.3
-+ ln -s TextLayout.3 Tk_IntersectTextLayout.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_IsMapped.3
-- ln WindowId.3 Tk_IsMapped.3
-+ ln -s WindowId.3 Tk_IsMapped.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_IsTopLevel.3
-- ln WindowId.3 Tk_IsTopLevel.3
-+ ln -s WindowId.3 Tk_IsTopLevel.3
+ if test -r InternAtom.3; then
+ rm -f Tk_GetAtomName.3
+- ln InternAtom.3 Tk_GetAtomName.3
++ ln -s InternAtom.3 Tk_GetAtomName.3
fi
if test -r MainLoop.3; then
rm -f Tk_MainLoop.3
@@ -634,10 +726,10 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
- ln MaintGeom.3 Tk_MaintainGeometry.3
+ ln -s MaintGeom.3 Tk_MaintainGeometry.3
fi
- if test -r CrtWindow.3; then
- rm -f Tk_MakeWindowExist.3
-- ln CrtWindow.3 Tk_MakeWindowExist.3
-+ ln -s CrtWindow.3 Tk_MakeWindowExist.3
+ if test -r MaintGeom.3; then
+ rm -f Tk_UnmaintainGeometry.3
+- ln MaintGeom.3 Tk_UnmaintainGeometry.3
++ ln -s MaintGeom.3 Tk_UnmaintainGeometry.3
fi
if test -r ManageGeom.3; then
rm -f Tk_ManageGeometry.3
@@ -649,186 +741,71 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
- ln MapWindow.3 Tk_MapWindow.3
+ ln -s MapWindow.3 Tk_MapWindow.3
fi
+ if test -r MapWindow.3; then
+ rm -f Tk_UnmapWindow.3
+- ln MapWindow.3 Tk_UnmapWindow.3
++ ln -s MapWindow.3 Tk_UnmapWindow.3
+ fi
if test -r MeasureChar.3; then
rm -f Tk_MeasureChars.3
- ln MeasureChar.3 Tk_MeasureChars.3
+ ln -s MeasureChar.3 Tk_MeasureChars.3
fi
- if test -r ConfigWind.3; then
- rm -f Tk_MoveResizeWindow.3
-- ln ConfigWind.3 Tk_MoveResizeWindow.3
-+ ln -s ConfigWind.3 Tk_MoveResizeWindow.3
+ if test -r MeasureChar.3; then
+ rm -f Tk_TextWidth.3
+- ln MeasureChar.3 Tk_TextWidth.3
++ ln -s MeasureChar.3 Tk_TextWidth.3
+ fi
+ if test -r MeasureChar.3; then
+ rm -f Tk_DrawChars.3
+- ln MeasureChar.3 Tk_DrawChars.3
++ ln -s MeasureChar.3 Tk_DrawChars.3
+ fi
+ if test -r MeasureChar.3; then
+ rm -f Tk_UnderlineChars.3
+- ln MeasureChar.3 Tk_UnderlineChars.3
++ ln -s MeasureChar.3 Tk_UnderlineChars.3
fi
if test -r MoveToplev.3; then
rm -f Tk_MoveToplevelWindow.3
- ln MoveToplev.3 Tk_MoveToplevelWindow.3
+ ln -s MoveToplev.3 Tk_MoveToplevelWindow.3
fi
- if test -r ConfigWind.3; then
- rm -f Tk_MoveWindow.3
-- ln ConfigWind.3 Tk_MoveWindow.3
-+ ln -s ConfigWind.3 Tk_MoveWindow.3
- fi
if test -r Name.3; then
rm -f Tk_Name.3
- ln Name.3 Tk_Name.3
+ ln -s Name.3 Tk_Name.3
fi
- if test -r 3DBorder.3; then
- rm -f Tk_NameOf3DBorder.3
-- ln 3DBorder.3 Tk_NameOf3DBorder.3
-+ ln -s 3DBorder.3 Tk_NameOf3DBorder.3
- fi
- if test -r GetAnchor.3; then
- rm -f Tk_NameOfAnchor.3
-- ln GetAnchor.3 Tk_NameOfAnchor.3
-+ ln -s GetAnchor.3 Tk_NameOfAnchor.3
- fi
- if test -r GetBitmap.3; then
- rm -f Tk_NameOfBitmap.3
-- ln GetBitmap.3 Tk_NameOfBitmap.3
-+ ln -s GetBitmap.3 Tk_NameOfBitmap.3
- fi
- if test -r GetCapStyl.3; then
- rm -f Tk_NameOfCapStyle.3
-- ln GetCapStyl.3 Tk_NameOfCapStyle.3
-+ ln -s GetCapStyl.3 Tk_NameOfCapStyle.3
- fi
- if test -r GetColor.3; then
- rm -f Tk_NameOfColor.3
-- ln GetColor.3 Tk_NameOfColor.3
-+ ln -s GetColor.3 Tk_NameOfColor.3
- fi
- if test -r GetCursor.3; then
- rm -f Tk_NameOfCursor.3
-- ln GetCursor.3 Tk_NameOfCursor.3
-+ ln -s GetCursor.3 Tk_NameOfCursor.3
- fi
- if test -r GetFont.3; then
- rm -f Tk_NameOfFont.3
-- ln GetFont.3 Tk_NameOfFont.3
-+ ln -s GetFont.3 Tk_NameOfFont.3
- fi
- if test -r NameOfImg.3; then
- rm -f Tk_NameOfImage.3
-- ln NameOfImg.3 Tk_NameOfImage.3
-+ ln -s NameOfImg.3 Tk_NameOfImage.3
- fi
- if test -r GetJoinStl.3; then
- rm -f Tk_NameOfJoinStyle.3
-- ln GetJoinStl.3 Tk_NameOfJoinStyle.3
-+ ln -s GetJoinStl.3 Tk_NameOfJoinStyle.3
- fi
- if test -r GetJustify.3; then
- rm -f Tk_NameOfJustify.3
-- ln GetJustify.3 Tk_NameOfJustify.3
-+ ln -s GetJustify.3 Tk_NameOfJustify.3
- fi
- if test -r GetRelief.3; then
- rm -f Tk_NameOfRelief.3
-- ln GetRelief.3 Tk_NameOfRelief.3
-+ ln -s GetRelief.3 Tk_NameOfRelief.3
+ if test -r Name.3; then
+ rm -f Tk_PathName.3
+- ln Name.3 Tk_PathName.3
++ ln -s Name.3 Tk_PathName.3
fi
if test -r Name.3; then
rm -f Tk_NameToWindow.3
- ln Name.3 Tk_NameToWindow.3
+ ln -s Name.3 Tk_NameToWindow.3
fi
- if test -r ConfigWidg.3; then
- rm -f Tk_Offset.3
-- ln ConfigWidg.3 Tk_Offset.3
-+ ln -s ConfigWidg.3 Tk_Offset.3
+ if test -r NameOfImg.3; then
+ rm -f Tk_NameOfImage.3
+- ln NameOfImg.3 Tk_NameOfImage.3
++ ln -s NameOfImg.3 Tk_NameOfImage.3
fi
if test -r OwnSelect.3; then
rm -f Tk_OwnSelection.3
- ln OwnSelect.3 Tk_OwnSelection.3
+ ln -s OwnSelect.3 Tk_OwnSelection.3
fi
- if test -r WindowId.3; then
- rm -f Tk_Parent.3
-- ln WindowId.3 Tk_Parent.3
-+ ln -s WindowId.3 Tk_Parent.3
- fi
if test -r ParseArgv.3; then
rm -f Tk_ParseArgv.3
- ln ParseArgv.3 Tk_ParseArgv.3
+ ln -s ParseArgv.3 Tk_ParseArgv.3
fi
- if test -r Name.3; then
- rm -f Tk_PathName.3
-- ln Name.3 Tk_PathName.3
-+ ln -s Name.3 Tk_PathName.3
- fi
- if test -r FindPhoto.3; then
- rm -f Tk_PhotoBlank.3
-- ln FindPhoto.3 Tk_PhotoBlank.3
-+ ln -s FindPhoto.3 Tk_PhotoBlank.3
- fi
- if test -r FindPhoto.3; then
- rm -f Tk_PhotoExpand.3
-- ln FindPhoto.3 Tk_PhotoExpand.3
-+ ln -s FindPhoto.3 Tk_PhotoExpand.3
- fi
- if test -r FindPhoto.3; then
- rm -f Tk_PhotoGetImage.3
-- ln FindPhoto.3 Tk_PhotoGetImage.3
-+ ln -s FindPhoto.3 Tk_PhotoGetImage.3
- fi
- if test -r FindPhoto.3; then
- rm -f Tk_PhotoGetSize.3
-- ln FindPhoto.3 Tk_PhotoGetSize.3
-+ ln -s FindPhoto.3 Tk_PhotoGetSize.3
- fi
- if test -r FindPhoto.3; then
- rm -f Tk_PhotoPutBlock.3
-- ln FindPhoto.3 Tk_PhotoPutBlock.3
-+ ln -s FindPhoto.3 Tk_PhotoPutBlock.3
- fi
- if test -r FindPhoto.3; then
- rm -f Tk_PhotoPutZoomedBlock.3
-- ln FindPhoto.3 Tk_PhotoPutZoomedBlock.3
-+ ln -s FindPhoto.3 Tk_PhotoPutZoomedBlock.3
- fi
- if test -r FindPhoto.3; then
- rm -f Tk_PhotoSetSize.3
-- ln FindPhoto.3 Tk_PhotoSetSize.3
-+ ln -s FindPhoto.3 Tk_PhotoSetSize.3
- fi
- if test -r TextLayout.3; then
- rm -f Tk_PointToChar.3
-- ln TextLayout.3 Tk_PointToChar.3
-+ ln -s TextLayout.3 Tk_PointToChar.3
- fi
- if test -r FontId.3; then
- rm -f Tk_PostscriptFontName.3
-- ln FontId.3 Tk_PostscriptFontName.3
-+ ln -s FontId.3 Tk_PostscriptFontName.3
- fi
if test -r QWinEvent.3; then
rm -f Tk_QueueWindowEvent.3
- ln QWinEvent.3 Tk_QueueWindowEvent.3
+ ln -s QWinEvent.3 Tk_QueueWindowEvent.3
fi
- if test -r GetImage.3; then
- rm -f Tk_RedrawImage.3
-- ln GetImage.3 Tk_RedrawImage.3
-+ ln -s GetImage.3 Tk_RedrawImage.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_ReqHeight.3
-- ln WindowId.3 Tk_ReqHeight.3
-+ ln -s WindowId.3 Tk_ReqHeight.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_ReqWidth.3
-- ln WindowId.3 Tk_ReqWidth.3
-+ ln -s WindowId.3 Tk_ReqWidth.3
- fi
- if test -r ConfigWind.3; then
- rm -f Tk_ResizeWindow.3
-- ln ConfigWind.3 Tk_ResizeWindow.3
-+ ln -s ConfigWind.3 Tk_ResizeWindow.3
- fi
if test -r Restack.3; then
rm -f Tk_RestackWindow.3
- ln Restack.3 Tk_RestackWindow.3
@@ -839,145 +816,85 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
- ln RestrictEv.3 Tk_RestrictEvents.3
+ ln -s RestrictEv.3 Tk_RestrictEvents.3
fi
- if test -r WindowId.3; then
- rm -f Tk_Screen.3
-- ln WindowId.3 Tk_Screen.3
-+ ln -s WindowId.3 Tk_Screen.3
- fi
- if test -r WindowId.3; then
- rm -f Tk_ScreenNumber.3
-- ln WindowId.3 Tk_ScreenNumber.3
-+ ln -s WindowId.3 Tk_ScreenNumber.3
- fi
if test -r SetAppName.3; then
rm -f Tk_SetAppName.3
- ln SetAppName.3 Tk_SetAppName.3
+ ln -s SetAppName.3 Tk_SetAppName.3
fi
- if test -r 3DBorder.3; then
- rm -f Tk_SetBackgroundFromBorder.3
-- ln 3DBorder.3 Tk_SetBackgroundFromBorder.3
-+ ln -s 3DBorder.3 Tk_SetBackgroundFromBorder.3
- fi
if test -r SetClass.3; then
rm -f Tk_SetClass.3
- ln SetClass.3 Tk_SetClass.3
+ ln -s SetClass.3 Tk_SetClass.3
fi
+ if test -r SetClass.3; then
+ rm -f Tk_Class.3
+- ln SetClass.3 Tk_Class.3
++ ln -s SetClass.3 Tk_Class.3
+ fi
if test -r SetGrid.3; then
rm -f Tk_SetGrid.3
- ln SetGrid.3 Tk_SetGrid.3
+ ln -s SetGrid.3 Tk_SetGrid.3
fi
- if test -r GeomReq.3; then
- rm -f Tk_SetInternalBorder.3
-- ln GeomReq.3 Tk_SetInternalBorder.3
-+ ln -s GeomReq.3 Tk_SetInternalBorder.3
- fi
- if test -r ConfigWind.3; then
- rm -f Tk_SetWindowBackground.3
-- ln ConfigWind.3 Tk_SetWindowBackground.3
-+ ln -s ConfigWind.3 Tk_SetWindowBackground.3
- fi
- if test -r ConfigWind.3; then
- rm -f Tk_SetWindowBackgroundPixmap.3
-- ln ConfigWind.3 Tk_SetWindowBackgroundPixmap.3
-+ ln -s ConfigWind.3 Tk_SetWindowBackgroundPixmap.3
- fi
- if test -r ConfigWind.3; then
- rm -f Tk_SetWindowBorder.3
-- ln ConfigWind.3 Tk_SetWindowBorder.3
-+ ln -s ConfigWind.3 Tk_SetWindowBorder.3
- fi
- if test -r ConfigWind.3; then
- rm -f Tk_SetWindowBorderPixmap.3
-- ln ConfigWind.3 Tk_SetWindowBorderPixmap.3
-+ ln -s ConfigWind.3 Tk_SetWindowBorderPixmap.3
- fi
- if test -r ConfigWind.3; then
- rm -f Tk_SetWindowBorderWidth.3
-- ln ConfigWind.3 Tk_SetWindowBorderWidth.3
-+ ln -s ConfigWind.3 Tk_SetWindowBorderWidth.3
- fi
- if test -r ConfigWind.3; then
- rm -f Tk_SetWindowColormap.3
-- ln ConfigWind.3 Tk_SetWindowColormap.3
-+ ln -s ConfigWind.3 Tk_SetWindowColormap.3
+ if test -r SetGrid.3; then
+ rm -f Tk_UnsetGrid.3
+- ln SetGrid.3 Tk_UnsetGrid.3
++ ln -s SetGrid.3 Tk_UnsetGrid.3
fi
if test -r SetVisual.3; then
rm -f Tk_SetWindowVisual.3
- ln SetVisual.3 Tk_SetWindowVisual.3
+ ln -s SetVisual.3 Tk_SetWindowVisual.3
fi
- if test -r GetBitmap.3; then
- rm -f Tk_SizeOfBitmap.3
-- ln GetBitmap.3 Tk_SizeOfBitmap.3
-+ ln -s GetBitmap.3 Tk_SizeOfBitmap.3
- fi
- if test -r GetImage.3; then
- rm -f Tk_SizeOfImage.3
-- ln GetImage.3 Tk_SizeOfImage.3
-+ ln -s GetImage.3 Tk_SizeOfImage.3
- fi
if test -r StrictMotif.3; then
rm -f Tk_StrictMotif.3
- ln StrictMotif.3 Tk_StrictMotif.3
+ ln -s StrictMotif.3 Tk_StrictMotif.3
fi
if test -r TextLayout.3; then
- rm -f Tk_TextLayoutToPostscript.3
-- ln TextLayout.3 Tk_TextLayoutToPostscript.3
-+ ln -s TextLayout.3 Tk_TextLayoutToPostscript.3
- fi
- if test -r MeasureChar.3; then
- rm -f Tk_TextWidth.3
-- ln MeasureChar.3 Tk_TextWidth.3
-+ ln -s MeasureChar.3 Tk_TextWidth.3
- fi
- if test -r GetUid.3; then
- rm -f Tk_Uid.3
-- ln GetUid.3 Tk_Uid.3
-+ ln -s GetUid.3 Tk_Uid.3
+ rm -f Tk_ComputeTextLayout.3
+- ln TextLayout.3 Tk_ComputeTextLayout.3
++ ln -s TextLayout.3 Tk_ComputeTextLayout.3
fi
- if test -r ConfigWind.3; then
- rm -f Tk_UndefineCursor.3
-- ln ConfigWind.3 Tk_UndefineCursor.3
-+ ln -s ConfigWind.3 Tk_UndefineCursor.3
+ if test -r TextLayout.3; then
+ rm -f Tk_FreeTextLayout.3
+- ln TextLayout.3 Tk_FreeTextLayout.3
++ ln -s TextLayout.3 Tk_FreeTextLayout.3
fi
- if test -r MeasureChar.3; then
- rm -f Tk_UnderlineChars.3
-- ln MeasureChar.3 Tk_UnderlineChars.3
-+ ln -s MeasureChar.3 Tk_UnderlineChars.3
+ if test -r TextLayout.3; then
+ rm -f Tk_DrawTextLayout.3
+- ln TextLayout.3 Tk_DrawTextLayout.3
++ ln -s TextLayout.3 Tk_DrawTextLayout.3
fi
if test -r TextLayout.3; then
rm -f Tk_UnderlineTextLayout.3
- ln TextLayout.3 Tk_UnderlineTextLayout.3
+ ln -s TextLayout.3 Tk_UnderlineTextLayout.3
fi
- if test -r MaintGeom.3; then
- rm -f Tk_UnmaintainGeometry.3
-- ln MaintGeom.3 Tk_UnmaintainGeometry.3
-+ ln -s MaintGeom.3 Tk_UnmaintainGeometry.3
+ if test -r TextLayout.3; then
+ rm -f Tk_PointToChar.3
+- ln TextLayout.3 Tk_PointToChar.3
++ ln -s TextLayout.3 Tk_PointToChar.3
fi
- if test -r MapWindow.3; then
- rm -f Tk_UnmapWindow.3
-- ln MapWindow.3 Tk_UnmapWindow.3
-+ ln -s MapWindow.3 Tk_UnmapWindow.3
+ if test -r TextLayout.3; then
+ rm -f Tk_CharBbox.3
+- ln TextLayout.3 Tk_CharBbox.3
++ ln -s TextLayout.3 Tk_CharBbox.3
fi
- if test -r SetGrid.3; then
- rm -f Tk_UnsetGrid.3
-- ln SetGrid.3 Tk_UnsetGrid.3
-+ ln -s SetGrid.3 Tk_UnsetGrid.3
+ if test -r TextLayout.3; then
+ rm -f Tk_DistanceToTextLayout.3
+- ln TextLayout.3 Tk_DistanceToTextLayout.3
++ ln -s TextLayout.3 Tk_DistanceToTextLayout.3
fi
- if test -r WindowId.3; then
- rm -f Tk_Visual.3
-- ln WindowId.3 Tk_Visual.3
-+ ln -s WindowId.3 Tk_Visual.3
+ if test -r TextLayout.3; then
+ rm -f Tk_IntersectTextLayout.3
+- ln TextLayout.3 Tk_IntersectTextLayout.3
++ ln -s TextLayout.3 Tk_IntersectTextLayout.3
fi
- if test -r WindowId.3; then
- rm -f Tk_Width.3
-- ln WindowId.3 Tk_Width.3
-+ ln -s WindowId.3 Tk_Width.3
+ if test -r TextLayout.3; then
+ rm -f Tk_TextLayoutToPostscript.3
+- ln TextLayout.3 Tk_TextLayoutToPostscript.3
++ ln -s TextLayout.3 Tk_TextLayoutToPostscript.3
fi
if test -r WindowId.3; then
rm -f Tk_WindowId.3
@@ -985,6 +902,31 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
+ ln -s WindowId.3 Tk_WindowId.3
fi
if test -r WindowId.3; then
+ rm -f Tk_Parent.3
+- ln WindowId.3 Tk_Parent.3
++ ln -s WindowId.3 Tk_Parent.3
+ fi
+ if test -r WindowId.3; then
+ rm -f Tk_Display.3
+- ln WindowId.3 Tk_Display.3
++ ln -s WindowId.3 Tk_Display.3
+ fi
+ if test -r WindowId.3; then
+ rm -f Tk_DisplayName.3
+- ln WindowId.3 Tk_DisplayName.3
++ ln -s WindowId.3 Tk_DisplayName.3
+ fi
+ if test -r WindowId.3; then
+ rm -f Tk_ScreenNumber.3
+- ln WindowId.3 Tk_ScreenNumber.3
++ ln -s WindowId.3 Tk_ScreenNumber.3
+ fi
+ if test -r WindowId.3; then
+ rm -f Tk_Screen.3
+- ln WindowId.3 Tk_Screen.3
++ ln -s WindowId.3 Tk_Screen.3
+ fi
+ if test -r WindowId.3; then
rm -f Tk_X.3
- ln WindowId.3 Tk_X.3
+ ln -s WindowId.3 Tk_X.3
@@ -994,15 +936,65 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
- ln WindowId.3 Tk_Y.3
+ ln -s WindowId.3 Tk_Y.3
fi
- if test -r menubar.n; then
- rm -f tk_bindForTraversal.n
-- ln menubar.n tk_bindForTraversal.n
-+ ln -s menubar.n tk_bindForTraversal.n
+ if test -r WindowId.3; then
+ rm -f Tk_Width.3
+- ln WindowId.3 Tk_Width.3
++ ln -s WindowId.3 Tk_Width.3
fi
- if test -r palette.n; then
- rm -f tk_bisque.n
-- ln palette.n tk_bisque.n
-+ ln -s palette.n tk_bisque.n
+ if test -r WindowId.3; then
+ rm -f Tk_Height.3
+- ln WindowId.3 Tk_Height.3
++ ln -s WindowId.3 Tk_Height.3
+ fi
+ if test -r WindowId.3; then
+ rm -f Tk_Changes.3
+- ln WindowId.3 Tk_Changes.3
++ ln -s WindowId.3 Tk_Changes.3
+ fi
+ if test -r WindowId.3; then
+ rm -f Tk_Attributes.3
+- ln WindowId.3 Tk_Attributes.3
++ ln -s WindowId.3 Tk_Attributes.3
+ fi
+ if test -r WindowId.3; then
+ rm -f Tk_IsMapped.3
+- ln WindowId.3 Tk_IsMapped.3
++ ln -s WindowId.3 Tk_IsMapped.3
+ fi
+ if test -r WindowId.3; then
+ rm -f Tk_IsTopLevel.3
+- ln WindowId.3 Tk_IsTopLevel.3
++ ln -s WindowId.3 Tk_IsTopLevel.3
+ fi
+ if test -r WindowId.3; then
+ rm -f Tk_ReqWidth.3
+- ln WindowId.3 Tk_ReqWidth.3
++ ln -s WindowId.3 Tk_ReqWidth.3
+ fi
+ if test -r WindowId.3; then
+ rm -f Tk_ReqHeight.3
+- ln WindowId.3 Tk_ReqHeight.3
++ ln -s WindowId.3 Tk_ReqHeight.3
+ fi
+ if test -r WindowId.3; then
+ rm -f Tk_InternalBorderWidth.3
+- ln WindowId.3 Tk_InternalBorderWidth.3
++ ln -s WindowId.3 Tk_InternalBorderWidth.3
+ fi
+ if test -r WindowId.3; then
+ rm -f Tk_Visual.3
+- ln WindowId.3 Tk_Visual.3
++ ln -s WindowId.3 Tk_Visual.3
+ fi
+ if test -r WindowId.3; then
+ rm -f Tk_Depth.3
+- ln WindowId.3 Tk_Depth.3
++ ln -s WindowId.3 Tk_Depth.3
+ fi
+ if test -r WindowId.3; then
+ rm -f Tk_Colormap.3
+- ln WindowId.3 Tk_Colormap.3
++ ln -s WindowId.3 Tk_Colormap.3
fi
if test -r chooseColor.n; then
rm -f tk_chooseColor.n
@@ -1015,11 +1007,6 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
+ ln -s dialog.n tk_dialog.n
fi
if test -r focusNext.n; then
- rm -f tk_focusFollowsMouse.n
-- ln focusNext.n tk_focusFollowsMouse.n
-+ ln -s focusNext.n tk_focusFollowsMouse.n
- fi
- if test -r focusNext.n; then
rm -f tk_focusNext.n
- ln focusNext.n tk_focusNext.n
+ ln -s focusNext.n tk_focusNext.n
@@ -1029,6 +1016,11 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
- ln focusNext.n tk_focusPrev.n
+ ln -s focusNext.n tk_focusPrev.n
fi
+ if test -r focusNext.n; then
+ rm -f tk_focusFollowsMouse.n
+- ln focusNext.n tk_focusFollowsMouse.n
++ ln -s focusNext.n tk_focusFollowsMouse.n
+ fi
if test -r getOpenFile.n; then
rm -f tk_getOpenFile.n
- ln getOpenFile.n tk_getOpenFile.n
@@ -1044,6 +1036,11 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
- ln menubar.n tk_menuBar.n
+ ln -s menubar.n tk_menuBar.n
fi
+ if test -r menubar.n; then
+ rm -f tk_bindForTraversal.n
+- ln menubar.n tk_bindForTraversal.n
++ ln -s menubar.n tk_bindForTraversal.n
+ fi
if test -r messageBox.n; then
rm -f tk_messageBox.n
- ln messageBox.n tk_messageBox.n
@@ -1054,14 +1051,24 @@ $NetBSD: patch-ad,v 1.4 1998/08/07 11:18:17 agc Exp $
- ln optionMenu.n tk_optionMenu.n
+ ln -s optionMenu.n tk_optionMenu.n
fi
- if test -r popup.n; then
- rm -f tk_popup.n
-- ln popup.n tk_popup.n
-+ ln -s popup.n tk_popup.n
+ if test -r pack-old.n; then
+ rm -f pack.n
+- ln pack-old.n pack.n
++ ln -s pack-old.n pack.n
fi
if test -r palette.n; then
rm -f tk_setPalette.n
- ln palette.n tk_setPalette.n
+ ln -s palette.n tk_setPalette.n
fi
+ if test -r palette.n; then
+ rm -f tk_bisque.n
+- ln palette.n tk_bisque.n
++ ln -s palette.n tk_bisque.n
+ fi
+ if test -r popup.n; then
+ rm -f tk_popup.n
+- ln popup.n tk_popup.n
++ ln -s popup.n tk_popup.n
+ fi
exit 0
diff --git a/x11/tkcron/Makefile b/x11/tkcron/Makefile
index 46117436e23..2ea6f824012 100644
--- a/x11/tkcron/Makefile
+++ b/x11/tkcron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/11/19 15:40:47 agc Exp $
+# $NetBSD: Makefile,v 1.8 1999/04/01 13:38:46 agc Exp $
# FreeBSD Id: Makefile,v 1.5 1997/11/22 20:10:39 jseger Exp
#
@@ -9,11 +9,9 @@ EXTRACT_SUFX= .tcl.gz
MAINTAINER= sander@haldjas.folklore.ee
-DEPENDS+= tk-8.0p2:../../x11/tk80
+DEPENDS+= tk-8.0.5:../../x11/tk80
-EXTRACT_CMD= ${GZIP_CMD}
-EXTRACT_BEFORE_ARGS= -cd
-EXTRACT_AFTER_ARGS= > tkcron.tcl
+EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} > tkcron.tcl
NO_WRKSUBDIR= yes
post-extract:
diff --git a/x11/tkinfo/Makefile b/x11/tkinfo/Makefile
index 6688d67cad8..84baf3a42a5 100644
--- a/x11/tkinfo/Makefile
+++ b/x11/tkinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/11/19 15:40:47 agc Exp $
+# $NetBSD: Makefile,v 1.10 1999/04/01 13:38:46 agc Exp $
# FreeBSD Id: Makefile,v 1.15 1997/12/16 09:26:12 tg Exp
#
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.math.ucsb.edu/~boldt/tkinfo/ \
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://math-www.uni-paderborn.de/~axel/tkinfo/
-DEPENDS= tk-8.0p2:../../x11/tk80
+DEPENDS= tk-8.0.5:../../x11/tk80
NO_BUILD= yes
diff --git a/x11/tkman/Makefile b/x11/tkman/Makefile
index 1226a7dab6d..92082614100 100644
--- a/x11/tkman/Makefile
+++ b/x11/tkman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 1998/12/03 13:09:11 frueauf Exp $
+# $NetBSD: Makefile,v 1.19 1999/04/01 13:38:46 agc Exp $
# FreeBSD Id: Makefile,v 1.28 1997/12/08 15:51:20 tg Exp
#
@@ -9,7 +9,7 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= packages@netbsd.org
-DEPENDS+= tk-8.0p2:../../x11/tk80
+DEPENDS+= tk-8.0.5:../../x11/tk80
DEPENDS+= rman-3.0.6:../../textproc/rman
DEPENDS+= glimpse-4.1:../../textproc/glimpse