summaryrefslogtreecommitdiff
path: root/lang/tcl
diff options
context:
space:
mode:
authorjwise <jwise>2000-08-29 20:23:58 +0000
committerjwise <jwise>2000-08-29 20:23:58 +0000
commit0e491cdedb49d7b4ada62b39b36c658a0759f2bd (patch)
tree9a8b477a5afa1d2ea0a173f4e172432fca5198fc /lang/tcl
parent54daef934b6dfe23ebb2127e739a6348d7457c49 (diff)
downloadpkgsrc-0e491cdedb49d7b4ada62b39b36c658a0759f2bd.tar.gz
Restore RCS Id accidentally lost from a patch, and make this conflict with
tclman80-*, as this package installs tcl and it's documentation.
Diffstat (limited to 'lang/tcl')
-rw-r--r--lang/tcl/Makefile4
-rw-r--r--lang/tcl/patches/patch-ab1
2 files changed, 4 insertions, 1 deletions
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 @@