From 0e491cdedb49d7b4ada62b39b36c658a0759f2bd Mon Sep 17 00:00:00 2001
From: jwise <jwise>
Date: Tue, 29 Aug 2000 20:23:58 +0000
Subject: Restore RCS Id accidentally lost from a patch, and make this conflict
 with tclman80-*, as this package installs tcl and it's documentation.

---
 lang/tcl/Makefile         | 4 +++-
 lang/tcl/patches/patch-ab | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index 130c1b19610..9deb7d71a49 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/08/24 19:53:32 jwise Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/29 20:23:58 jwise Exp $
 #
 
 DISTNAME=		tcl8.3.2
@@ -9,6 +9,8 @@ MASTER_SITES=		ftp://ftp.scriptics.com/pub/tcl/tcl8_3/
 MAINTAINER=		jwise@netbsd.org
 HOMEPAGE=		http://www.tcltk.com/
 
+CONFLICTS+=		tclman80-*
+
 WRKSRC=			${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=		yes
 
diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab
index 9de4a41df39..b66f28c8ebd 100644
--- a/lang/tcl/patches/patch-ab
+++ b/lang/tcl/patches/patch-ab
@@ -1,3 +1,4 @@
+$NetBSD: patch-ab,v 1.5 2000/08/29 20:23:59 jwise Exp $
 --- configure.orig	Tue Aug  8 15:17:11 2000
 +++ configure	Tue Aug 29 14:15:41 2000
 @@ -5789,7 +5789,7 @@
-- 
cgit v1.2.3