Allow this port to use NMH if USE_NMH is set.

5 files changed, 228 insertions, 170 deletions

diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index f7d307f385e2..92cb422e0567 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.25 1998/02/15 05:36:54 peter Exp $
+# $Id: Makefile,v 1.26 1998/03/14 13:43:36 peter Exp $
 #
 
 DISTNAME=	exmh-2.0.2
@@ -40,7 +40,12 @@ WISH=		wish8.0
 TCLSH=		tclsh8.0
 
 # exmh is pretty useless without this, but it's not needed to build it.
+.if defined(USE_NMH)
+RUN_DEPENDS+=	repl:${PORTSDIR}/mail/nmh
+SCRIPTS_ENV+=	USE_NMH=YES
+.else
 RUN_DEPENDS+=	repl:${PORTSDIR}/mail/mh
+.endif
 
 # full mime support needs mmencode/mmdecode from metamail
 RUN_DEPENDS+=	mmencode:${PORTSDIR}/mail/metamail
@@ -57,7 +62,7 @@ MAN1=		exmh.1
 do-build:
 	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} TCLSH=${TCLSH} \
 		WISH=${PREFIX}/bin/${WISH} WRKSRC=${WRKSRC} \
-		FILESDIR=${FILESDIR} ${SH} ${SCRIPTDIR}/build
+		${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/build
 
 do-install:
 	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} \
diff --git a/mail/exmh2/files/config.mh b/mail/exmh2/files/config.mh
new file mode 100644
index 000000000000..5693fe1682e2
--- /dev/null
+++ b/mail/exmh2/files/config.mh
@@ -0,0 +1,24 @@
+set wish !!WISH!!
+set exmh(version) {version !!VERSION!! !!DATE!!}
+set exmh(name) exmh
+set exmh(maintainer) welch@acm.org
+set mh_path !!PREFIX!!/bin
+set exmh(slocal) !!PREFIX!!/lib/mh/slocal
+set mime(dir) !!PREFIX!!/bin
+set mailcap_default !!PREFIX!!/etc/mailcap
+set mimetypes_default !!PREFIX!!/lib/exmh-!!VERSION!!/mime.types
+set exmh(expect) !!EXPECT!!
+set exmh(expectk) !!EXPECTK!!
+set faces(dir) !!FACES!!
+set faces(set,user) {local users usenix misc}
+set faces(set,unknown) {domains unknown}
+set faces(set,news) {news}
+set faces(defaultDomain) !!DOMAIN!!
+set faces(suffix) {xpm gif xbm}
+set pgp(path) !!PGP!!
+set glimpse(path) !!GLIMPSE!!
+set sound(cmd) !!PLAY!!
+set exmh(library) !!PREFIX!!/lib/exmh-!!VERSION!!
+set install(dir,bin) !!PREFIX!!/bin
+set install(dir,man) !!PREFIX!!/man/man1
+set install(dir,lib) !!PREFIX!!/lib/exmh-!!VERSION!!
diff --git a/mail/exmh2/files/config.nmh b/mail/exmh2/files/config.nmh
new file mode 100644
index 000000000000..c9338be6c9e6
--- /dev/null
+++ b/mail/exmh2/files/config.nmh
@@ -0,0 +1,24 @@
+set wish !!WISH!!
+set exmh(version) {version !!VERSION!! !!DATE!!}
+set exmh(name) exmh
+set exmh(maintainer) welch@acm.org
+set mh_path !!PREFIX!!/bin
+set exmh(slocal) !!PREFIX!!/libexec/nmh/slocal
+set mime(dir) !!PREFIX!!/bin
+set mailcap_default !!PREFIX!!/etc/mailcap
+set mimetypes_default !!PREFIX!!/lib/exmh-!!VERSION!!/mime.types
+set exmh(expect) !!EXPECT!!
+set exmh(expectk) !!EXPECTK!!
+set faces(dir) !!FACES!!
+set faces(set,user) {local users usenix misc}
+set faces(set,unknown) {domains unknown}
+set faces(set,news) {news}
+set faces(defaultDomain) !!DOMAIN!!
+set faces(suffix) {xpm gif xbm}
+set pgp(path) !!PGP!!
+set glimpse(path) !!GLIMPSE!!
+set sound(cmd) !!PLAY!!
+set exmh(library) !!PREFIX!!/lib/exmh-!!VERSION!!
+set install(dir,bin) !!PREFIX!!/bin
+set install(dir,man) !!PREFIX!!/man/man1
+set install(dir,lib) !!PREFIX!!/lib/exmh-!!VERSION!!
diff --git a/mail/exmh2/pkg-plist b/mail/exmh2/pkg-plist
index a7d14a32aa6e..901d4b5d6a05 100644
--- a/mail/exmh2/pkg-plist
+++ b/mail/exmh2/pkg-plist
@@ -2,170 +2,170 @@ bin/exmh
 bin/exmh-async
 bin/exmh-bg
 bin/ftp.expect
-lib/exmh-2.0.1/addr.tcl
-lib/exmh-2.0.1/aliases.tcl
-lib/exmh-2.0.1/app-defaults
-lib/exmh-2.0.1/app-defaults-color
-lib/exmh-2.0.1/app-defaults-mono
-lib/exmh-2.0.1/audit.tcl
-lib/exmh-2.0.1/autorefile.tcl
-lib/exmh-2.0.1/background.tcl
-lib/exmh-2.0.1/base64.tcl
-lib/exmh-2.0.1/bindings.tcl
-lib/exmh-2.0.1/busy.tcl
-lib/exmh-2.0.1/buttons.tcl
-lib/exmh-2.0.1/clink.au
-lib/exmh-2.0.1/crypt.tcl
-lib/exmh-2.0.1/cutbuffer.tcl
-lib/exmh-2.0.1/dragNdrop.tcl
-lib/exmh-2.0.1/drip.au
-lib/exmh-2.0.1/editor.tcl
-lib/exmh-2.0.1/env.tcl
-lib/exmh-2.0.1/error.tcl
-lib/exmh-2.0.1/exec.tcl
-lib/exmh-2.0.1/exmh.bitmap
-lib/exmh-2.0.1/extrasInit.tcl
-lib/exmh-2.0.1/exwin.tcl
-lib/exmh-2.0.1/faces.tcl
-lib/exmh-2.0.1/fcache.tcl
-lib/exmh-2.0.1/fdisp.tcl
-lib/exmh-2.0.1/fdispColor.tcl
-lib/exmh-2.0.1/fdispPopup.tcl
-lib/exmh-2.0.1/fileselect.tcl
-lib/exmh-2.0.1/find.tcl
-lib/exmh-2.0.1/flag.tcl
-lib/exmh-2.0.1/flagdown.bitmap
-lib/exmh-2.0.1/flagup.bitmap
-lib/exmh-2.0.1/flist.tcl
-lib/exmh-2.0.1/folder.tcl
-lib/exmh-2.0.1/folderNew.tcl
-lib/exmh-2.0.1/fontsel.tcl
-lib/exmh-2.0.1/ftoc.tcl
-lib/exmh-2.0.1/ftocColor.tcl
-lib/exmh-2.0.1/ftocFind.tcl
-lib/exmh-2.0.1/getnews.tcl
-lib/exmh-2.0.1/glimpse.tcl
-lib/exmh-2.0.1/help.tcl
-lib/exmh-2.0.1/hourglass.bitmap
-lib/exmh-2.0.1/hourglass.mask
-lib/exmh-2.0.1/hourglass1.bitmap
-lib/exmh-2.0.1/hourglass2.bitmap
-lib/exmh-2.0.1/hourglass2.mask
-lib/exmh-2.0.1/html.tcl
-lib/exmh-2.0.1/html/AddrEdit.html
-lib/exmh-2.0.1/html/AddressBk.html
-lib/exmh-2.0.1/html/AliasAddr.html
-lib/exmh-2.0.1/html/Aliases.html
-lib/exmh-2.0.1/html/Bindings.html
-lib/exmh-2.0.1/html/Font.html
-lib/exmh-2.0.1/html/Import.html
-lib/exmh-2.0.1/html/Intro.html
-lib/exmh-2.0.1/html/Keys.html
-lib/exmh-2.0.1/html/Lists.html
-lib/exmh-2.0.1/html/PGP.html
-lib/exmh-2.0.1/html/Preferences.html
-lib/exmh-2.0.1/html/Reply.html
-lib/exmh-2.0.1/html/Search.html
-lib/exmh-2.0.1/html/Sedit.html
-lib/exmh-2.0.1/html/Seditpref.html
-lib/exmh-2.0.1/html/blu-ball.gif
-lib/exmh-2.0.1/html/copyright.html
-lib/exmh-2.0.1/html/exmh-custom.n.html
-lib/exmh-2.0.1/html/exmh-fans.html
-lib/exmh-2.0.1/html/exmh-faq.html
-lib/exmh-2.0.1/html/exmh-ref.n.html
-lib/exmh-2.0.1/html/exmh-use.n.html
-lib/exmh-2.0.1/html/exmh.README.html
-lib/exmh-2.0.1/html/exmh.n.html
-lib/exmh-2.0.1/html/exmh.pref.gif
-lib/exmh-2.0.1/html/exmh.snap1.gif
-lib/exmh-2.0.1/html/index.html
-lib/exmh-2.0.1/html/left-arrow.gif
-lib/exmh-2.0.1/html/maillist.html
-lib/exmh-2.0.1/html/overview.html
-lib/exmh-2.0.1/html/ppp.howto.html
-lib/exmh-2.0.1/html/red-ball.gif
-lib/exmh-2.0.1/html/right-arrow.gif
-lib/exmh-2.0.1/html/software.html
-lib/exmh-2.0.1/html/whatis.html
-lib/exmh-2.0.1/html/yel-ball.gif
-lib/exmh-2.0.1/html_cache.tcl
-lib/exmh-2.0.1/html_content.tcl
-lib/exmh-2.0.1/html_dpackage.tcl
-lib/exmh-2.0.1/html_formtag.tcl
-lib/exmh-2.0.1/html_frame.tcl
-lib/exmh-2.0.1/html_get_http.tcl
-lib/exmh-2.0.1/html_head.tcl
-lib/exmh-2.0.1/html_hr.tcl
-lib/exmh-2.0.1/html_images.tcl
-lib/exmh-2.0.1/html_links.tcl
-lib/exmh-2.0.1/html_maps.tcl
-lib/exmh-2.0.1/html_stubs.tcl
-lib/exmh-2.0.1/html_tags.tcl
-lib/exmh-2.0.1/html_text.tcl
-lib/exmh-2.0.1/http_proxy.tcl
-lib/exmh-2.0.1/import.tcl
-lib/exmh-2.0.1/inc.tcl
-lib/exmh-2.0.1/ispell.tcl
-lib/exmh-2.0.1/labels.tcl
-lib/exmh-2.0.1/linethru.bitmap
-lib/exmh-2.0.1/mailcap.tcl
-lib/exmh-2.0.1/main.tcl
-lib/exmh-2.0.1/mbempty.bitmap
-lib/exmh-2.0.1/mbtidy.bitmap
-lib/exmh-2.0.1/mbuntidy.bitmap
-lib/exmh-2.0.1/mh.tcl
-lib/exmh-2.0.1/mime.tcl
-lib/exmh-2.0.1/mime.types
-lib/exmh-2.0.1/mimeSun.tcl
-lib/exmh-2.0.1/mosaic.tcl
-lib/exmh-2.0.1/msg.tcl
-lib/exmh-2.0.1/msgShow.tcl
-lib/exmh-2.0.1/partial.tcl
-lib/exmh-2.0.1/pgp.tcl
-lib/exmh-2.0.1/pgpEWN.tcl
-lib/exmh-2.0.1/pgpExec.tcl
-lib/exmh-2.0.1/pgpMatch.tcl
-lib/exmh-2.0.1/pgpMisc.tcl
-lib/exmh-2.0.1/pgpwww.tcl
-lib/exmh-2.0.1/pick.tcl
-lib/exmh-2.0.1/post.tcl
-lib/exmh-2.0.1/preferences.tcl
-lib/exmh-2.0.1/print.tcl
-lib/exmh-2.0.1/ps.tcl
-lib/exmh-2.0.1/quote.tcl
-lib/exmh-2.0.1/receipt.tcl
-lib/exmh-2.0.1/report.tcl
-lib/exmh-2.0.1/rich2tk.tcl
-lib/exmh-2.0.1/scan.tcl
-lib/exmh-2.0.1/sedit.tcl
-lib/exmh-2.0.1/seditBind.tcl
-lib/exmh-2.0.1/seditCompose.tcl
-lib/exmh-2.0.1/seditEnriched.tcl
-lib/exmh-2.0.1/seditExtras.tcl
-lib/exmh-2.0.1/seditMime.tcl
-lib/exmh-2.0.1/seditQP.tcl
-lib/exmh-2.0.1/seditSel.tcl
-lib/exmh-2.0.1/select.tcl
-lib/exmh-2.0.1/send.tcl
-lib/exmh-2.0.1/sound.tcl
-lib/exmh-2.0.1/tclIndex
-lib/exmh-2.0.1/text.tcl
-lib/exmh-2.0.1/textButton.tcl
-lib/exmh-2.0.1/textSelect.tcl
-lib/exmh-2.0.1/thread.tcl
-lib/exmh-2.0.1/timer.bitmap
-lib/exmh-2.0.1/tioga.tcl
-lib/exmh-2.0.1/unseenwin.tcl
-lib/exmh-2.0.1/uri.tcl
-lib/exmh-2.0.1/url.bitmap
-lib/exmh-2.0.1/user.tcl
-lib/exmh-2.0.1/utils.tcl
-lib/exmh-2.0.1/widgetMenu.tcl
-lib/exmh-2.0.1/widgetText.tcl
-lib/exmh-2.0.1/widgets.tcl
-lib/exmh-2.0.1/xns.tcl
-lib/exmh-2.0.1/xnsgetmail.exp
+lib/exmh-2.0.2/addr.tcl
+lib/exmh-2.0.2/aliases.tcl
+lib/exmh-2.0.2/app-defaults
+lib/exmh-2.0.2/app-defaults-color
+lib/exmh-2.0.2/app-defaults-mono
+lib/exmh-2.0.2/audit.tcl
+lib/exmh-2.0.2/autorefile.tcl
+lib/exmh-2.0.2/background.tcl
+lib/exmh-2.0.2/base64.tcl
+lib/exmh-2.0.2/bindings.tcl
+lib/exmh-2.0.2/busy.tcl
+lib/exmh-2.0.2/buttons.tcl
+lib/exmh-2.0.2/clink.au
+lib/exmh-2.0.2/crypt.tcl
+lib/exmh-2.0.2/cutbuffer.tcl
+lib/exmh-2.0.2/dragNdrop.tcl
+lib/exmh-2.0.2/drip.au
+lib/exmh-2.0.2/editor.tcl
+lib/exmh-2.0.2/env.tcl
+lib/exmh-2.0.2/error.tcl
+lib/exmh-2.0.2/exec.tcl
+lib/exmh-2.0.2/exmh.bitmap
+lib/exmh-2.0.2/extrasInit.tcl
+lib/exmh-2.0.2/exwin.tcl
+lib/exmh-2.0.2/faces.tcl
+lib/exmh-2.0.2/fcache.tcl
+lib/exmh-2.0.2/fdisp.tcl
+lib/exmh-2.0.2/fdispColor.tcl
+lib/exmh-2.0.2/fdispPopup.tcl
+lib/exmh-2.0.2/fileselect.tcl
+lib/exmh-2.0.2/find.tcl
+lib/exmh-2.0.2/flag.tcl
+lib/exmh-2.0.2/flagdown.bitmap
+lib/exmh-2.0.2/flagup.bitmap
+lib/exmh-2.0.2/flist.tcl
+lib/exmh-2.0.2/folder.tcl
+lib/exmh-2.0.2/folderNew.tcl
+lib/exmh-2.0.2/fontsel.tcl
+lib/exmh-2.0.2/ftoc.tcl
+lib/exmh-2.0.2/ftocColor.tcl
+lib/exmh-2.0.2/ftocFind.tcl
+lib/exmh-2.0.2/getnews.tcl
+lib/exmh-2.0.2/glimpse.tcl
+lib/exmh-2.0.2/help.tcl
+lib/exmh-2.0.2/hourglass.bitmap
+lib/exmh-2.0.2/hourglass.mask
+lib/exmh-2.0.2/hourglass1.bitmap
+lib/exmh-2.0.2/hourglass2.bitmap
+lib/exmh-2.0.2/hourglass2.mask
+lib/exmh-2.0.2/html.tcl
+lib/exmh-2.0.2/html/AddrEdit.html
+lib/exmh-2.0.2/html/AddressBk.html
+lib/exmh-2.0.2/html/AliasAddr.html
+lib/exmh-2.0.2/html/Aliases.html
+lib/exmh-2.0.2/html/Bindings.html
+lib/exmh-2.0.2/html/Font.html
+lib/exmh-2.0.2/html/Import.html
+lib/exmh-2.0.2/html/Intro.html
+lib/exmh-2.0.2/html/Keys.html
+lib/exmh-2.0.2/html/Lists.html
+lib/exmh-2.0.2/html/PGP.html
+lib/exmh-2.0.2/html/Preferences.html
+lib/exmh-2.0.2/html/Reply.html
+lib/exmh-2.0.2/html/Search.html
+lib/exmh-2.0.2/html/Sedit.html
+lib/exmh-2.0.2/html/Seditpref.html
+lib/exmh-2.0.2/html/blu-ball.gif
+lib/exmh-2.0.2/html/copyright.html
+lib/exmh-2.0.2/html/exmh-custom.n.html
+lib/exmh-2.0.2/html/exmh-fans.html
+lib/exmh-2.0.2/html/exmh-faq.html
+lib/exmh-2.0.2/html/exmh-ref.n.html
+lib/exmh-2.0.2/html/exmh-use.n.html
+lib/exmh-2.0.2/html/exmh.README.html
+lib/exmh-2.0.2/html/exmh.n.html
+lib/exmh-2.0.2/html/exmh.pref.gif
+lib/exmh-2.0.2/html/exmh.snap1.gif
+lib/exmh-2.0.2/html/index.html
+lib/exmh-2.0.2/html/left-arrow.gif
+lib/exmh-2.0.2/html/maillist.html
+lib/exmh-2.0.2/html/overview.html
+lib/exmh-2.0.2/html/ppp.howto.html
+lib/exmh-2.0.2/html/red-ball.gif
+lib/exmh-2.0.2/html/right-arrow.gif
+lib/exmh-2.0.2/html/software.html
+lib/exmh-2.0.2/html/whatis.html
+lib/exmh-2.0.2/html/yel-ball.gif
+lib/exmh-2.0.2/html_cache.tcl
+lib/exmh-2.0.2/html_content.tcl
+lib/exmh-2.0.2/html_dpackage.tcl
+lib/exmh-2.0.2/html_formtag.tcl
+lib/exmh-2.0.2/html_frame.tcl
+lib/exmh-2.0.2/html_get_http.tcl
+lib/exmh-2.0.2/html_head.tcl
+lib/exmh-2.0.2/html_hr.tcl
+lib/exmh-2.0.2/html_images.tcl
+lib/exmh-2.0.2/html_links.tcl
+lib/exmh-2.0.2/html_maps.tcl
+lib/exmh-2.0.2/html_stubs.tcl
+lib/exmh-2.0.2/html_tags.tcl
+lib/exmh-2.0.2/html_text.tcl
+lib/exmh-2.0.2/http_proxy.tcl
+lib/exmh-2.0.2/import.tcl
+lib/exmh-2.0.2/inc.tcl
+lib/exmh-2.0.2/ispell.tcl
+lib/exmh-2.0.2/labels.tcl
+lib/exmh-2.0.2/linethru.bitmap
+lib/exmh-2.0.2/mailcap.tcl
+lib/exmh-2.0.2/main.tcl
+lib/exmh-2.0.2/mbempty.bitmap
+lib/exmh-2.0.2/mbtidy.bitmap
+lib/exmh-2.0.2/mbuntidy.bitmap
+lib/exmh-2.0.2/mh.tcl
+lib/exmh-2.0.2/mime.tcl
+lib/exmh-2.0.2/mime.types
+lib/exmh-2.0.2/mimeSun.tcl
+lib/exmh-2.0.2/mosaic.tcl
+lib/exmh-2.0.2/msg.tcl
+lib/exmh-2.0.2/msgShow.tcl
+lib/exmh-2.0.2/partial.tcl
+lib/exmh-2.0.2/pgp.tcl
+lib/exmh-2.0.2/pgpEWN.tcl
+lib/exmh-2.0.2/pgpExec.tcl
+lib/exmh-2.0.2/pgpMatch.tcl
+lib/exmh-2.0.2/pgpMisc.tcl
+lib/exmh-2.0.2/pgpwww.tcl
+lib/exmh-2.0.2/pick.tcl
+lib/exmh-2.0.2/post.tcl
+lib/exmh-2.0.2/preferences.tcl
+lib/exmh-2.0.2/print.tcl
+lib/exmh-2.0.2/ps.tcl
+lib/exmh-2.0.2/quote.tcl
+lib/exmh-2.0.2/receipt.tcl
+lib/exmh-2.0.2/report.tcl
+lib/exmh-2.0.2/rich2tk.tcl
+lib/exmh-2.0.2/scan.tcl
+lib/exmh-2.0.2/sedit.tcl
+lib/exmh-2.0.2/seditBind.tcl
+lib/exmh-2.0.2/seditCompose.tcl
+lib/exmh-2.0.2/seditEnriched.tcl
+lib/exmh-2.0.2/seditExtras.tcl
+lib/exmh-2.0.2/seditMime.tcl
+lib/exmh-2.0.2/seditQP.tcl
+lib/exmh-2.0.2/seditSel.tcl
+lib/exmh-2.0.2/select.tcl
+lib/exmh-2.0.2/send.tcl
+lib/exmh-2.0.2/sound.tcl
+lib/exmh-2.0.2/tclIndex
+lib/exmh-2.0.2/text.tcl
+lib/exmh-2.0.2/textButton.tcl
+lib/exmh-2.0.2/textSelect.tcl
+lib/exmh-2.0.2/thread.tcl
+lib/exmh-2.0.2/timer.bitmap
+lib/exmh-2.0.2/tioga.tcl
+lib/exmh-2.0.2/unseenwin.tcl
+lib/exmh-2.0.2/uri.tcl
+lib/exmh-2.0.2/url.bitmap
+lib/exmh-2.0.2/user.tcl
+lib/exmh-2.0.2/utils.tcl
+lib/exmh-2.0.2/widgetMenu.tcl
+lib/exmh-2.0.2/widgetText.tcl
+lib/exmh-2.0.2/widgets.tcl
+lib/exmh-2.0.2/xns.tcl
+lib/exmh-2.0.2/xnsgetmail.exp
 man/man1/exmh.1.gz
-@dirrm lib/exmh-2.0.1/html
-@dirrm lib/exmh-2.0.1
+@dirrm lib/exmh-2.0.2/html
+@dirrm lib/exmh-2.0.2
diff --git a/mail/exmh2/scripts/build b/mail/exmh2/scripts/build
index 7450c446b64c..536bcfa73819 100644
--- a/mail/exmh2/scripts/build
+++ b/mail/exmh2/scripts/build
@@ -1,12 +1,17 @@
 #! /bin/sh
 #
-# $Id: build,v 1.4 1997/08/14 03:44:30 peter Exp $
+# $Id: build,v 1.5 1997/08/21 08:09:56 peter Exp $
 #
 
 VERSION="`sed -ne 's/^set vers \(.*\)/\1/p' ${WRKSRC}/exmh.install`"
 DATE="`sed -ne 's/^set date \(.*\)/\1/p' ${WRKSRC}/exmh.install`"
 
 SEDFILE=sed.$$
+if [ x${USE_NMH} = xYES ] ; then
+  CONFIGFILE=config.nmh
+else
+  CONFIGFILE=config.mh
+fi
 
 EXPECT="{}"
 EXPECTK="{}"
@@ -50,7 +55,7 @@ if [ "${EXPECT}" != "{}" ]; then
 fi
 echo "/^#CONFIGURATION/a\\" >>${SEDFILE}
 
-sed <${FILESDIR}/config \
+sed <${FILESDIR}/${CONFIGFILE} \
 	-e "s+!!PREFIX!!+${PREFIX}+g" \
 	-e "s+!!WISH!!+${WISH}+g" \
 	-e "s+!!EXPECT!!+${EXPECT}+g" \