diff options
Diffstat (limited to 'mail/exmh2')
-rw-r--r-- | mail/exmh2/Makefile | 23 | ||||
-rw-r--r-- | mail/exmh2/distinfo | 15 | ||||
-rw-r--r-- | mail/exmh2/pkg-descr | 6 | ||||
-rw-r--r-- | mail/exmh2/pkg-plist | 326 | ||||
-rw-r--r-- | mail/exmh2/scripts/build | 6 |
5 files changed, 207 insertions, 169 deletions
diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile index 6158c73b0c20..0add4aa589bc 100644 --- a/mail/exmh2/Makefile +++ b/mail/exmh2/Makefile @@ -1,19 +1,32 @@ # New ports collection Makefile for: exmh2 -# Version required: 2.0gamma +# Version required: 2.0delta # Date released: 1 Jan 97 # Whom: Peter Wemm <peter@freebsd.org> # -# $Id: Makefile,v 1.7 1997/02/03 16:27:23 peter Exp $ +# $Id: Makefile,v 1.8 1997/04/20 13:19:17 wosch Exp $ # -DISTNAME= exmh-2.0gamma -PKGNAME= exmh-2.0g +DISTNAME= exmh-2.0delta +PKGNAME= exmh-2.0d CATEGORIES= mail tk41 MASTER_SITES= ftp://ftp.sunlabs.com/pub/tcl/exmh/ EXTRACT_SUFX= .tar.Z +# Note: due to apparent weaknesses in bsd.port.mk, we have to override the +# PATCH_DIST_ARGS variable *after* .include <bsd.port.mk> in order to supply +# second "-d directory" arg to patch (to override the one that's not optional +# and unusable for us here). These patches are relative to the ${WRKSRC}/lib +# subdir, bsd.port.mk can't handle that. +PATCH_SITES= http://www.sunlabs.com/~bwelch/exmh/patches/2.0delta/ +PATCHFILES= getnews.patch ispell.patch addr.patch post.patch \ + fontsel.patch html_get_http.patch sedit.patch \ + html_formtag.patch editor.patch thread.patch \ + pgp.patch mime.patch fcache.patch + MAINTAINER= peter@FreeBSD.org +DIST_SUBDIR= ${PKGNAME} + RUN_DEPENDS= wish4.1:${PORTSDIR}/x11/tk41 WISH= wish4.1 @@ -42,3 +55,5 @@ do-install: WRKSRC=${WRKSRC} ${SCRIPTDIR}/install .include <bsd.port.mk> + +PATCH_DIST_ARGS+= -d ${WRKSRC}/lib diff --git a/mail/exmh2/distinfo b/mail/exmh2/distinfo index b845de812c54..629aeae0df56 100644 --- a/mail/exmh2/distinfo +++ b/mail/exmh2/distinfo @@ -1 +1,14 @@ -MD5 (exmh-2.0gamma.tar.Z) = 310342d1a04257c0f796f19fc33533fd +MD5 (exmh-2.0d/exmh-2.0delta.tar.Z) = a856e60cd671a76eaa770e280dbd0d30 +MD5 (exmh-2.0d/getnews.patch) = 55cb97f488b9d26f8166ba59bf556042 +MD5 (exmh-2.0d/ispell.patch) = 68f25074ce837105a3ca64bccf807d48 +MD5 (exmh-2.0d/addr.patch) = b5ce2d4cea9228b072b65e0ebcdcce95 +MD5 (exmh-2.0d/post.patch) = 457c4f912c4e4495c5666a9933e32a53 +MD5 (exmh-2.0d/fontsel.patch) = 78f08ad1da12f6f12b7f7840ac6a9541 +MD5 (exmh-2.0d/html_get_http.patch) = 79dc19c9f3f47c78d295efd799ebef43 +MD5 (exmh-2.0d/sedit.patch) = da804c9c09dacaa9fa93d9d84c485b0c +MD5 (exmh-2.0d/html_formtag.patch) = 358a8ed6f332b42975b7e0e350c1595a +MD5 (exmh-2.0d/editor.patch) = b4fb5bf58a7175e685e755ddf3ec0e03 +MD5 (exmh-2.0d/thread.patch) = 55ed36be3edb9a3494c71f6143e16482 +MD5 (exmh-2.0d/pgp.patch) = 2fdb708f68018cae29b3d23830758a47 +MD5 (exmh-2.0d/mime.patch) = 9e267a9adfebea32adea90eb84615206 +MD5 (exmh-2.0d/fcache.patch) = f461c5b17eaa44eb6a1bbb6fce1b07f6 diff --git a/mail/exmh2/pkg-descr b/mail/exmh2/pkg-descr index 120901ba3c46..456b9847cde6 100644 --- a/mail/exmh2/pkg-descr +++ b/mail/exmh2/pkg-descr @@ -3,7 +3,7 @@ exmh is a TCL/TK based interface to the MH mail system. IMPORTANT: exmh depends on the TK send facility for its background processing. With TK 3.3, send now uses xauthority mechanisms by default, unless you compile TK with -DTK_NO_SECURITY. Generally, this means that -you must run xdm to start your Xserver. +you **MUST** must run xdm to start your Xserver. FEATURES: As well as providing the usual layer on top of MH commands, exmh has a number of other features: @@ -11,8 +11,8 @@ has a number of other features: MIME support! Displays richtext and enriched directly. Color feedback in the scan listing. A colour coded folder display with one label per folder. - Smart scan caching. - Facesaver bitmap display. + Smart scan caching. News read/post. koi8-r support. + Facesaver bitmap display. Ispell support. Background inc. You can set exmh to run inc periodically. Searching over folder listing and message body. A dialog-box interface to MH pick. diff --git a/mail/exmh2/pkg-plist b/mail/exmh2/pkg-plist index c0005b521cc6..28a7c299979f 100644 --- a/mail/exmh2/pkg-plist +++ b/mail/exmh2/pkg-plist @@ -2,164 +2,170 @@ bin/exmh bin/exmh-async bin/exmh-bg bin/ftp.expect -lib/exmh-2.0gamma/SeditSelFmt.tcl -lib/exmh-2.0gamma/SeditSelSpell.tcl -lib/exmh-2.0gamma/addr.tcl -lib/exmh-2.0gamma/aliases.tcl -lib/exmh-2.0gamma/app-defaults -lib/exmh-2.0gamma/app-defaults.orig -lib/exmh-2.0gamma/app-defaults-color -lib/exmh-2.0gamma/app-defaults-mono -lib/exmh-2.0gamma/audit.tcl -lib/exmh-2.0gamma/autorefile.tcl -lib/exmh-2.0gamma/background.tcl -lib/exmh-2.0gamma/bindings.tcl -lib/exmh-2.0gamma/busy.tcl -lib/exmh-2.0gamma/buttons.tcl -lib/exmh-2.0gamma/clink.au -lib/exmh-2.0gamma/crypt.tcl -lib/exmh-2.0gamma/cutbuffer.tcl -lib/exmh-2.0gamma/dragNdrop.tcl -lib/exmh-2.0gamma/drip.au -lib/exmh-2.0gamma/editor.tcl -lib/exmh-2.0gamma/env.tcl -lib/exmh-2.0gamma/error.tcl -lib/exmh-2.0gamma/exmh.bitmap -lib/exmh-2.0gamma/extrasInit.tcl -lib/exmh-2.0gamma/exwin.tcl -lib/exmh-2.0gamma/faces.tcl -lib/exmh-2.0gamma/fcache.tcl -lib/exmh-2.0gamma/fdisp.tcl -lib/exmh-2.0gamma/fdispColor.tcl -lib/exmh-2.0gamma/fdispPopup.tcl -lib/exmh-2.0gamma/fileselect.tcl -lib/exmh-2.0gamma/find.tcl -lib/exmh-2.0gamma/flag.tcl -lib/exmh-2.0gamma/flagdown.bitmap -lib/exmh-2.0gamma/flagup.bitmap -lib/exmh-2.0gamma/flist.tcl -lib/exmh-2.0gamma/folder.tcl -lib/exmh-2.0gamma/folderNew.tcl -lib/exmh-2.0gamma/fontsel.tcl -lib/exmh-2.0gamma/ftoc.tcl -lib/exmh-2.0gamma/ftocColor.tcl -lib/exmh-2.0gamma/ftocFind.tcl -lib/exmh-2.0gamma/glimpse.tcl -lib/exmh-2.0gamma/help.tcl -lib/exmh-2.0gamma/hourglass.bitmap -lib/exmh-2.0gamma/hourglass.mask -lib/exmh-2.0gamma/hourglass1.bitmap -lib/exmh-2.0gamma/hourglass2.bitmap -lib/exmh-2.0gamma/hourglass2.mask -lib/exmh-2.0gamma/html.tcl -lib/exmh-2.0gamma/html/Aliases.html -lib/exmh-2.0gamma/html/Bindings.html -lib/exmh-2.0gamma/html/Font.html -lib/exmh-2.0gamma/html/Import.html -lib/exmh-2.0gamma/html/Intro.html -lib/exmh-2.0gamma/html/Keys.html -lib/exmh-2.0gamma/html/Lists.html -lib/exmh-2.0gamma/html/PGP.html -lib/exmh-2.0gamma/html/Preferences.html -lib/exmh-2.0gamma/html/Reply.html -lib/exmh-2.0gamma/html/Search.html -lib/exmh-2.0gamma/html/Sedit.html -lib/exmh-2.0gamma/html/Seditpref.html -lib/exmh-2.0gamma/html/blu-ball.gif -lib/exmh-2.0gamma/html/copyright.html -lib/exmh-2.0gamma/html/exmh-custom.n.html -lib/exmh-2.0gamma/html/exmh-fans.html -lib/exmh-2.0gamma/html/exmh-faq.html -lib/exmh-2.0gamma/html/exmh-ref.n.html -lib/exmh-2.0gamma/html/exmh-use.n.html -lib/exmh-2.0gamma/html/exmh.README.html -lib/exmh-2.0gamma/html/exmh.n.html -lib/exmh-2.0gamma/html/exmh.pref.gif -lib/exmh-2.0gamma/html/exmh.snap1.gif -lib/exmh-2.0gamma/html/index.html -lib/exmh-2.0gamma/html/left-arrow.gif -lib/exmh-2.0gamma/html/maillist.html -lib/exmh-2.0gamma/html/overview.html -lib/exmh-2.0gamma/html/red-ball.gif -lib/exmh-2.0gamma/html/right-arrow.gif -lib/exmh-2.0gamma/html/software.html -lib/exmh-2.0gamma/html/whatis.html -lib/exmh-2.0gamma/html/yel-ball.gif -lib/exmh-2.0gamma/html_cache.tcl -lib/exmh-2.0gamma/html_content.tcl -lib/exmh-2.0gamma/html_dpackage.tcl -lib/exmh-2.0gamma/html_formtag.tcl -lib/exmh-2.0gamma/html_frame.tcl -lib/exmh-2.0gamma/html_get_http.tcl -lib/exmh-2.0gamma/html_head.tcl -lib/exmh-2.0gamma/html_hr.tcl -lib/exmh-2.0gamma/html_images.tcl -lib/exmh-2.0gamma/html_links.tcl -lib/exmh-2.0gamma/html_maps.tcl -lib/exmh-2.0gamma/html_stubs.tcl -lib/exmh-2.0gamma/html_tags.tcl -lib/exmh-2.0gamma/html_text.tcl -lib/exmh-2.0gamma/http_proxy.tcl -lib/exmh-2.0gamma/import.tcl -lib/exmh-2.0gamma/inc.tcl -lib/exmh-2.0gamma/labels.tcl -lib/exmh-2.0gamma/linethru.bitmap -lib/exmh-2.0gamma/mailcap.tcl -lib/exmh-2.0gamma/main.tcl -lib/exmh-2.0gamma/mbempty.bitmap -lib/exmh-2.0gamma/mbtidy.bitmap -lib/exmh-2.0gamma/mbuntidy.bitmap -lib/exmh-2.0gamma/mh.tcl -lib/exmh-2.0gamma/mime.tcl -lib/exmh-2.0gamma/mime.types -lib/exmh-2.0gamma/mimeSun.tcl -lib/exmh-2.0gamma/mosaic.tcl -lib/exmh-2.0gamma/msg.tcl -lib/exmh-2.0gamma/msgShow.tcl -lib/exmh-2.0gamma/partial.tcl -lib/exmh-2.0gamma/pgp.tcl -lib/exmh-2.0gamma/pgpEWN.tcl -lib/exmh-2.0gamma/pgpExec.tcl -lib/exmh-2.0gamma/pgpMatch.tcl -lib/exmh-2.0gamma/pgpMisc.tcl -lib/exmh-2.0gamma/pgpwww.tcl -lib/exmh-2.0gamma/pick.tcl -lib/exmh-2.0gamma/post.tcl -lib/exmh-2.0gamma/preferences.tcl -lib/exmh-2.0gamma/print.tcl -lib/exmh-2.0gamma/ps.tcl -lib/exmh-2.0gamma/quote.tcl -lib/exmh-2.0gamma/receipt.tcl -lib/exmh-2.0gamma/report.tcl -lib/exmh-2.0gamma/rich2tk.tcl -lib/exmh-2.0gamma/scan.tcl -lib/exmh-2.0gamma/sedit.tcl -lib/exmh-2.0gamma/seditBind.tcl -lib/exmh-2.0gamma/seditCompose.tcl -lib/exmh-2.0gamma/seditEnriched.tcl -lib/exmh-2.0gamma/seditExtras.tcl -lib/exmh-2.0gamma/seditMime.tcl -lib/exmh-2.0gamma/seditQP.tcl -lib/exmh-2.0gamma/select.tcl -lib/exmh-2.0gamma/send.tcl -lib/exmh-2.0gamma/sound.tcl -lib/exmh-2.0gamma/tclIndex -lib/exmh-2.0gamma/text.tcl -lib/exmh-2.0gamma/textButton.tcl -lib/exmh-2.0gamma/textSelect.tcl -lib/exmh-2.0gamma/thread.tcl -lib/exmh-2.0gamma/timer.bitmap -lib/exmh-2.0gamma/tioga.tcl -lib/exmh-2.0gamma/unseenwin.tcl -lib/exmh-2.0gamma/uri.tcl -lib/exmh-2.0gamma/url.bitmap -lib/exmh-2.0gamma/user.tcl -lib/exmh-2.0gamma/utils.tcl -lib/exmh-2.0gamma/widgetMenu.tcl -lib/exmh-2.0gamma/widgetText.tcl -lib/exmh-2.0gamma/widgets.tcl -lib/exmh-2.0gamma/xns.tcl -lib/exmh-2.0gamma/xnsgetmail.exp +lib/exmh-2.0delta/SeditSelFmt.tcl +lib/exmh-2.0delta/SeditSelSpell.tcl +lib/exmh-2.0delta/addr.tcl +lib/exmh-2.0delta/aliases.tcl +lib/exmh-2.0delta/app-defaults +lib/exmh-2.0delta/app-defaults-color +lib/exmh-2.0delta/app-defaults-mono +lib/exmh-2.0delta/app-defaults.orig +lib/exmh-2.0delta/audit.tcl +lib/exmh-2.0delta/autorefile.tcl +lib/exmh-2.0delta/background.tcl +lib/exmh-2.0delta/bindings.tcl +lib/exmh-2.0delta/busy.tcl +lib/exmh-2.0delta/buttons.tcl +lib/exmh-2.0delta/clink.au +lib/exmh-2.0delta/crypt.tcl +lib/exmh-2.0delta/cutbuffer.tcl +lib/exmh-2.0delta/dragNdrop.tcl +lib/exmh-2.0delta/drip.au +lib/exmh-2.0delta/editor.tcl +lib/exmh-2.0delta/env.tcl +lib/exmh-2.0delta/error.tcl +lib/exmh-2.0delta/exmh.bitmap +lib/exmh-2.0delta/extrasInit.tcl +lib/exmh-2.0delta/exwin.tcl +lib/exmh-2.0delta/faces.tcl +lib/exmh-2.0delta/fcache.tcl +lib/exmh-2.0delta/fdisp.tcl +lib/exmh-2.0delta/fdispColor.tcl +lib/exmh-2.0delta/fdispPopup.tcl +lib/exmh-2.0delta/fileselect.tcl +lib/exmh-2.0delta/find.tcl +lib/exmh-2.0delta/flag.tcl +lib/exmh-2.0delta/flagdown.bitmap +lib/exmh-2.0delta/flagup.bitmap +lib/exmh-2.0delta/flist.tcl +lib/exmh-2.0delta/folder.tcl +lib/exmh-2.0delta/folderNew.tcl +lib/exmh-2.0delta/fontsel.tcl +lib/exmh-2.0delta/ftoc.tcl +lib/exmh-2.0delta/ftocColor.tcl +lib/exmh-2.0delta/ftocFind.tcl +lib/exmh-2.0delta/getnews.tcl +lib/exmh-2.0delta/glimpse.tcl +lib/exmh-2.0delta/help.tcl +lib/exmh-2.0delta/hourglass.bitmap +lib/exmh-2.0delta/hourglass.mask +lib/exmh-2.0delta/hourglass1.bitmap +lib/exmh-2.0delta/hourglass2.bitmap +lib/exmh-2.0delta/hourglass2.mask +lib/exmh-2.0delta/html.tcl +lib/exmh-2.0delta/html/AddrEdit.html +lib/exmh-2.0delta/html/AddressBk.html +lib/exmh-2.0delta/html/AliasAddr.html +lib/exmh-2.0delta/html/Aliases.html +lib/exmh-2.0delta/html/Bindings.html +lib/exmh-2.0delta/html/Font.html +lib/exmh-2.0delta/html/Import.html +lib/exmh-2.0delta/html/Intro.html +lib/exmh-2.0delta/html/Keys.html +lib/exmh-2.0delta/html/Lists.html +lib/exmh-2.0delta/html/PGP.html +lib/exmh-2.0delta/html/Preferences.html +lib/exmh-2.0delta/html/Reply.html +lib/exmh-2.0delta/html/Search.html +lib/exmh-2.0delta/html/Sedit.html +lib/exmh-2.0delta/html/Seditpref.html +lib/exmh-2.0delta/html/blu-ball.gif +lib/exmh-2.0delta/html/copyright.html +lib/exmh-2.0delta/html/exmh-custom.n.html +lib/exmh-2.0delta/html/exmh-fans.html +lib/exmh-2.0delta/html/exmh-faq.html +lib/exmh-2.0delta/html/exmh-ref.n.html +lib/exmh-2.0delta/html/exmh-use.n.html +lib/exmh-2.0delta/html/exmh.README.html +lib/exmh-2.0delta/html/exmh.n.html +lib/exmh-2.0delta/html/exmh.pref.gif +lib/exmh-2.0delta/html/exmh.snap1.gif +lib/exmh-2.0delta/html/index.html +lib/exmh-2.0delta/html/left-arrow.gif +lib/exmh-2.0delta/html/maillist.html +lib/exmh-2.0delta/html/overview.html +lib/exmh-2.0delta/html/red-ball.gif +lib/exmh-2.0delta/html/right-arrow.gif +lib/exmh-2.0delta/html/software.html +lib/exmh-2.0delta/html/whatis.html +lib/exmh-2.0delta/html/yel-ball.gif +lib/exmh-2.0delta/html_cache.tcl +lib/exmh-2.0delta/html_content.tcl +lib/exmh-2.0delta/html_dpackage.tcl +lib/exmh-2.0delta/html_formtag.tcl +lib/exmh-2.0delta/html_frame.tcl +lib/exmh-2.0delta/html_get_http.tcl +lib/exmh-2.0delta/html_head.tcl +lib/exmh-2.0delta/html_hr.tcl +lib/exmh-2.0delta/html_images.tcl +lib/exmh-2.0delta/html_links.tcl +lib/exmh-2.0delta/html_maps.tcl +lib/exmh-2.0delta/html_stubs.tcl +lib/exmh-2.0delta/html_tags.tcl +lib/exmh-2.0delta/html_text.tcl +lib/exmh-2.0delta/http_proxy.tcl +lib/exmh-2.0delta/import.tcl +lib/exmh-2.0delta/inc.tcl +lib/exmh-2.0delta/ispell.tcl +lib/exmh-2.0delta/labels.tcl +lib/exmh-2.0delta/linethru.bitmap +lib/exmh-2.0delta/mailcap.tcl +lib/exmh-2.0delta/main.tcl +lib/exmh-2.0delta/mbempty.bitmap +lib/exmh-2.0delta/mbtidy.bitmap +lib/exmh-2.0delta/mbuntidy.bitmap +lib/exmh-2.0delta/mh.tcl +lib/exmh-2.0delta/mime.tcl +lib/exmh-2.0delta/mime.types +lib/exmh-2.0delta/mimeSun.tcl +lib/exmh-2.0delta/mosaic.tcl +lib/exmh-2.0delta/msg.tcl +lib/exmh-2.0delta/msgShow.tcl +lib/exmh-2.0delta/partial.tcl +lib/exmh-2.0delta/pgp.tcl +lib/exmh-2.0delta/pgpEWN.tcl +lib/exmh-2.0delta/pgpExec.tcl +lib/exmh-2.0delta/pgpMatch.tcl +lib/exmh-2.0delta/pgpMisc.tcl +lib/exmh-2.0delta/pgpwww.tcl +lib/exmh-2.0delta/pick.tcl +lib/exmh-2.0delta/post.tcl +lib/exmh-2.0delta/preferences.tcl +lib/exmh-2.0delta/print.tcl +lib/exmh-2.0delta/ps.tcl +lib/exmh-2.0delta/quote.tcl +lib/exmh-2.0delta/receipt.tcl +lib/exmh-2.0delta/report.tcl +lib/exmh-2.0delta/rich2tk.tcl +lib/exmh-2.0delta/scan.tcl +lib/exmh-2.0delta/sedit.tcl +lib/exmh-2.0delta/seditBind.tcl +lib/exmh-2.0delta/seditCompose.tcl +lib/exmh-2.0delta/seditEnriched.tcl +lib/exmh-2.0delta/seditExtras.tcl +lib/exmh-2.0delta/seditMime.tcl +lib/exmh-2.0delta/seditQP.tcl +lib/exmh-2.0delta/seditSel.tcl +lib/exmh-2.0delta/select.tcl +lib/exmh-2.0delta/send.tcl +lib/exmh-2.0delta/sound.tcl +lib/exmh-2.0delta/tclIndex +lib/exmh-2.0delta/text.tcl +lib/exmh-2.0delta/textButton.tcl +lib/exmh-2.0delta/textSelect.tcl +lib/exmh-2.0delta/thread.tcl +lib/exmh-2.0delta/timer.bitmap +lib/exmh-2.0delta/tioga.tcl +lib/exmh-2.0delta/unseenwin.tcl +lib/exmh-2.0delta/uri.tcl +lib/exmh-2.0delta/url.bitmap +lib/exmh-2.0delta/user.tcl +lib/exmh-2.0delta/utils.tcl +lib/exmh-2.0delta/widgetMenu.tcl +lib/exmh-2.0delta/widgetText.tcl +lib/exmh-2.0delta/widgets.tcl +lib/exmh-2.0delta/xns.tcl +lib/exmh-2.0delta/xnsgetmail.exp man/man1/exmh.1.gz -@dirrm lib/exmh-2.0gamma/html -@dirrm lib/exmh-2.0gamma +@dirrm lib/exmh-2.0delta/html +@dirrm lib/exmh-2.0delta diff --git a/mail/exmh2/scripts/build b/mail/exmh2/scripts/build index 9a1f98158e98..5315b344193e 100644 --- a/mail/exmh2/scripts/build +++ b/mail/exmh2/scripts/build @@ -1,6 +1,6 @@ #! /bin/sh # -# $Id: build,v 1.1.1.1 1996/10/10 15:00:53 peter Exp $ +# $Id: build,v 1.2 1996/12/31 21:27:02 peter Exp $ # VERSION="`sed -ne 's/^set vers \(.*\)/\1/p' ${WRKSRC}/exmh.install`" @@ -18,6 +18,9 @@ PLAY="{}" if [ -f ${PREFIX}/bin/expect ]; then EXPECT=${PREFIX}/bin/expect #executable fi +if [ -f ${PREFIX}/bin/expectk ]; then + EXPECTK=${PREFIX}/bin/expectk #executable +fi if [ -d ${PREFIX}/share/faces ]; then FACES=${PREFIX}/share/faces #dir @@ -50,6 +53,7 @@ sed <${FILESDIR}/config \ -e "s+!!PREFIX!!+${PREFIX}+g" \ -e "s+!!WISH!!+${WISH}+g" \ -e "s+!!EXPECT!!+${EXPECT}+g" \ + -e "s+!!EXPECTK!!+${EXPECTK}+g" \ -e "s+!!FACES!!+${FACES}+g" \ -e "s+!!DOMAIN!!+${DOMAIN}+g" \ -e "s+!!PGP!!+${PGP}+g" \ |