From owner-freebsd-ports  Wed Jan 28 04:32:37 1998
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id EAA22348
          for freebsd-ports-outgoing; Wed, 28 Jan 1998 04:32:37 -0800 (PST)
          (envelope-from owner-freebsd-ports@FreeBSD.ORG)
Received: from silvia.HIP.Berkeley.EDU (wck-ca22-16.ix.netcom.com [207.92.174.144])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id EAA22338;
          Wed, 28 Jan 1998 04:32:34 -0800 (PST)
          (envelope-from asami@vader.cs.berkeley.edu)
Received: (from asami@localhost) by silvia.HIP.Berkeley.EDU (8.8.8/8.6.9) id EAA06006; Wed, 28 Jan 1998 04:32:22 -0800 (PST)
Date: Wed, 28 Jan 1998 04:32:22 -0800 (PST)
Message-Id: <199801281232.EAA06006@silvia.HIP.Berkeley.EDU>
To: perlsta@sunyit.edu
CC: ports@FreeBSD.ORG, current@FreeBSD.ORG
Reply-to: ports@FreeBSD.ORG
In-reply-to: <199801262227.WAA27084@fang.cs.sunyit.edu> (perlsta@sunyit.edu)
Subject: Re: what's up with this TCL port error?
From: asami@cs.berkeley.edu (Satoshi Asami)
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org

 * >  * ===>  rumba-0.4 : You have an old tcl installation on your machine.
 * Remove
 * >  * everything that matches /usr/local/*/*tcl* first.

 * no:
 * 
 * # cd /usr/local/include/
 * # ls -l tcl.h
 * ls: tcl.h: No such file or directory

Actually there is also /usr/local/lib/tclConfig.h that triggers the
check.  Maybe that's why.

Anyway, here's an updated version for all to test.  It will now tell
you exactly which file it's complaining about.  It will only tell you
one at a time, but I didn't want to overcomplicate bsd.port.mk trying
to say too many things at the same time.

Satoshi
-------
Index: bsd.port.mk
===================================================================
RCS file: /usr/cvs/src/share/mk/bsd.port.mk,v
retrieving revision 1.227.2.30
diff -u -r1.227.2.30 bsd.port.mk
--- bsd.port.mk	1998/01/02 10:38:06	1.227.2.30
+++ bsd.port.mk	1998/01/28 09:57:36
@@ -756,6 +759,23 @@
 # Don't build a port if it's broken.
 ################################################################
 
+OLDSYSTCL!=	${ECHO} /usr/include/tcl.h /usr/lib/libtcl??.so.*.*
+OLDTCL!=	${ECHO} ${LOCALBASE}/include/tcl.h ${LOCALBASE}/lib/tclConfig.sh
+OLDTK!=		${ECHO} ${LOCALBASE}/include/tk.h ${LOCALBASE}/lib/tkConfig.sh
+
+.if !defined(NO_IGNORE)
+.for file in ${OLDSYSTCL} ${OLDTCL}
+.if exists(${file})
+IGNORE=	": You have an old file \(${file}\) that could cause problems for some ports to compile.  Please remove it and try again.  You may have to reinstall tcl from the ports tree."
+.endif
+.endfor
+.for file in ${OLDTK}
+.if exists(${file})
+IGNORE=	": You have an old file \(${file}\) that could cause problems for some ports to compile.  Please remove it and try again.  You may have to reinstall tk from the ports tree afterwards."
+.endif
+.endfor
+.endif
+
 .if !defined(NO_IGNORE)
 .if (defined(IS_INTERACTIVE) && defined(BATCH))
 IGNORE=	"is an interactive port"
@@ -771,12 +791,6 @@
 IGNORE=	"is restricted: ${RESTRICTED}"
 .elif (defined(USE_X11) && !exists(${X11BASE}))
 IGNORE=	"uses X11, but ${X11BASE} not found"
-.elif exists(/usr/include/tcl.h)
-IGNORE=	": You have an old tcl installation on your machine.  Remove everything that matches '/usr/*/*tcl*' first"
-.elif exists(${LOCALBASE}/include/tcl.h) || exists(${LOCALBASE}/lib/tclConfig.sh)
-IGNORE=	": You have an old tcl installation on your machine.  Remove everything that matches '${PREFIX}/*/*tcl*' first"
-.elif exists(${LOCALBASE}/include/tk.h) || exists(${LOCALBASE}/lib/tkConfig.sh)
-IGNORE=	": You have an old tk installation on your machine.  Remove everything that matches '${PREFIX}/*/*tk*' first"
 .elif defined(BROKEN)
 IGNORE=	"is marked as broken: ${BROKEN}"
 .endif