summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1996-08-17 11:07:53 +0000
committerpeter <peter@FreeBSD.org>1996-08-17 11:07:53 +0000
commit04c632e8c6e5e1a6c7c1405d49f5d193fc6f525c (patch)
tree733dabe239476414c7e101e2177b9b6cbcbf3c25
parenta23b054744aa1694992bd19fb08ae547a69fa724 (diff)
downloadFreeBSD-ports-04c632e8c6e5e1a6c7c1405d49f5d193fc6f525c.zip
FreeBSD-ports-04c632e8c6e5e1a6c7c1405d49f5d193fc6f525c.tar.gz
Adjust the tclDP hack so that it doesn't depend on it being pre-installed
if USE_DPWISH is set. Make the build work without making an X11 connection (groan!) by using tclsh instead of "wish -notk" to build the indexes. Requested by: asami
-rw-r--r--irc/zircon/Makefile12
1 files changed, 10 insertions, 2 deletions
diff --git a/irc/zircon/Makefile b/irc/zircon/Makefile
index af7de60..b8716e6 100644
--- a/irc/zircon/Makefile
+++ b/irc/zircon/Makefile
@@ -3,7 +3,7 @@
# Date created: 19 Aug 1995
# Whom: jkh / pst
#
-# $Id: Makefile,v 1.6 1995/11/27 04:06:03 asami Exp $
+# $Id: Makefile,v 1.7 1996/08/16 12:24:55 peter Exp $
#
DISTNAME= zircon-1.17p3
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://catless.ncl.ac.uk/pub/
# tcl7.3/tk3.6/tclDP code. The author strongly reccomends using
# tcl7.5/tk4.1 instead, and the tclDP wont be supported for long.
#
-.if defined(USE_DPWISH) && ${USE_DPWISH} == YES && exists(${PREFIX}/bin/dpwish)
+.if defined(USE_DPWISH) && ${USE_DPWISH} == YES
BUILD_DEPENDS= dpwish:${PORTSDIR}/net/tclDP
RUN_DEPENDS= dpwish:${PORTSDIR}/net/tclDP
MAKE_ENV= WISH=${PREFIX}/bin/dpwish
@@ -25,6 +25,14 @@ RUN_DEPENDS= wish4.1:${PORTSDIR}/x11/tk41
MAKE_ENV= WISH=${PREFIX}/bin/wish4.1
.endif
+# In case the port is built not on FreeBSD-2.2+ (which has tcl standard)
+.if exists(/usr/bin/tclsh)
+MAKE_ENV+= TCLSH=tclsh
+.else
+BUILD_DEPENDS+= tclsh7.5:${PORTSDIR}/lang/tcl75
+MAKE_ENV+= TCLSH=tclsh7.5
+.endif
+
MAKEFILE= Makefile.FreeBSD
pre-patch:
OpenPOWER on IntegriCloud