diff options
| author | Peter Wemm <peter@FreeBSD.org> | 1997-08-21 08:09:56 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 1997-08-21 08:09:56 +0000 |
| commit | 4708bcf966551ca50ba3905fa588312624f177e5 (patch) | |
| tree | 446d260ace973a17beac1aedb08fd6ccb0db580a /mail/exmh2 | |
| parent | ddbd7c0b92b35faba5b184a8bb213b97580eb89e (diff) | |
| download | ports-4708bcf966551ca50ba3905fa588312624f177e5.tar.gz ports-4708bcf966551ca50ba3905fa588312624f177e5.zip | |
Notes
Diffstat (limited to 'mail/exmh2')
| -rw-r--r-- | mail/exmh2/Makefile | 22 | ||||
| -rw-r--r-- | mail/exmh2/scripts/build | 6 |
2 files changed, 9 insertions, 19 deletions
diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile index 66a5120e9328..e725d01e93ca 100644 --- a/mail/exmh2/Makefile +++ b/mail/exmh2/Makefile @@ -3,7 +3,7 @@ # Date released: 1 Jan 97 # Whom: Peter Wemm <peter@freebsd.org> # -# $Id: Makefile,v 1.14 1997/08/12 05:58:47 peter Exp $ +# $Id: Makefile,v 1.15 1997/08/12 06:37:36 peter Exp $ # DISTNAME= exmh-2.0zeta @@ -25,9 +25,10 @@ MAINTAINER= peter@FreeBSD.org DIST_SUBDIR= ${PKGNAME} -# Uses wish8.0 if present (major speed improvement), else it depends on -# the tk4.1 port. The glue for this is at the end of the file due to -# bmake quirks. +RUN_DEPENDS= wish8.0:${PORTSDIR}/x11/tk80 +BUILD_DEPENDS= tclsh8.0:${PORTSDIR}/lang/tcl80 +WISH= wish8.0 +TCLSH= tclsh8.0 # exmh is pretty useless without this, but it's not needed to build it. RUN_DEPENDS+= repl:${PORTSDIR}/mail/mh @@ -45,7 +46,7 @@ RUN_DEPENDS+= mmencode:${PORTSDIR}/mail/metamail MAN1= exmh.1 do-build: - @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} \ + @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} TCLSH=${TCLSH} \ WISH=${PREFIX}/bin/${WISH} WRKSRC=${WRKSRC} \ FILESDIR=${FILESDIR} ${SH} ${SCRIPTDIR}/build @@ -54,14 +55,3 @@ do-install: WRKSRC=${WRKSRC} ${SH} ${SCRIPTDIR}/install .include <bsd.port.mk> - -# Must come after bsd.port.mk since .if is expanded on the first pass -# before $PREFIX is defined. - -.if exists($(PREFIX)/bin/wish8.0) -WISH= wish8.0 -.else -RUN_DEPENDS= wish4.1:${PORTSDIR}/x11/tk41 -WISH= wish4.1 -.endif - diff --git a/mail/exmh2/scripts/build b/mail/exmh2/scripts/build index 133db86edc56..7450c446b64c 100644 --- a/mail/exmh2/scripts/build +++ b/mail/exmh2/scripts/build @@ -1,6 +1,6 @@ #! /bin/sh # -# $Id: build,v 1.3 1997/07/02 04:59:54 peter Exp $ +# $Id: build,v 1.4 1997/08/14 03:44:30 peter Exp $ # VERSION="`sed -ne 's/^set vers \(.*\)/\1/p' ${WRKSRC}/exmh.install`" @@ -72,5 +72,5 @@ done rm -f ${SEDFILE} -echo "cd lib ; echo 'auto_mkindex . *.tcl ; exit' | tclsh" -cd lib ; echo 'auto_mkindex . *.tcl ; exit' | tclsh +echo "cd lib ; echo 'auto_mkindex . *.tcl ; exit' | ${TCLSH}" +cd lib ; echo 'auto_mkindex . *.tcl ; exit' | ${TCLSH} |