diff options
Diffstat (limited to 'mail/exmh2')
| -rw-r--r-- | mail/exmh2/Makefile | 5 | ||||
| -rw-r--r-- | mail/exmh2/distinfo | 2 | ||||
| -rw-r--r-- | mail/exmh2/files/config.mh | 7 | ||||
| -rw-r--r-- | mail/exmh2/files/config.nmh | 7 | ||||
| -rw-r--r-- | mail/exmh2/pkg-descr | 3 | ||||
| -rw-r--r-- | mail/exmh2/pkg-plist | 1 | ||||
| -rw-r--r-- | mail/exmh2/scripts/build | 6 |
7 files changed, 22 insertions, 9 deletions
diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile index 936630376283..a590081da21d 100644 --- a/mail/exmh2/Makefile +++ b/mail/exmh2/Makefile @@ -7,11 +7,11 @@ # "+=" and "?=" lines are for sharing this Makefile with japanese/exmh2. PORTNAME= exmh -PORTVERSION= 2.1.1 +PORTVERSION= 2.2 CATEGORIES+= mail tk82 MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/exmh/ -MAINTAINER?= markm@FreeBSD.org +MAINTAINER?= bmah@FreeBSD.org .if defined(JAPANESE_EXMH) RUN_DEPENDS= wish8.0jp:${PORTSDIR}/japanese/tk80 @@ -46,6 +46,7 @@ RUN_DEPENDS+= mmencode:${PORTSDIR}/mail/metamail # security/gnupg # security/pgp # security/pgp5 +# security/pgp6 # mail/faces # audio/rplay diff --git a/mail/exmh2/distinfo b/mail/exmh2/distinfo index 9df6fc13a18c..261ead0737f1 100644 --- a/mail/exmh2/distinfo +++ b/mail/exmh2/distinfo @@ -1 +1 @@ -MD5 (exmh-2.1.1.tar.gz) = f3c6eedfa5720e236389e22234a57c24 +MD5 (exmh-2.2.tar.gz) = 513e824b7eb0bfd1ec76b837b8f74de9 diff --git a/mail/exmh2/files/config.mh b/mail/exmh2/files/config.mh index 7fd7281d9871..5a1f52b85bdb 100644 --- a/mail/exmh2/files/config.mh +++ b/mail/exmh2/files/config.mh @@ -15,9 +15,10 @@ set faces(set,unknown) {domains unknown} set faces(set,news) {news} set faces(defaultDomain) !!DOMAIN!! set faces(suffix) {xpm gif xbm} -set gpg(path) !!GPG!! -set pgp(path) !!PGP!! -set pgp5(path) !!PGP5!! +set pgp(gpg,path) !!GPG!! +set pgp(pgp,path) !!PGP!! +set pgp(pgp5,path) !!PGP5!! +set pgp(pgp6,path) !!PGP6!! set glimpse(path) !!GLIMPSE!! set sound(cmd) !!PLAY!! set exmh(library) !!PREFIX!!/lib/exmh-!!VERSION!! diff --git a/mail/exmh2/files/config.nmh b/mail/exmh2/files/config.nmh index 6aa44310ad90..a595ffbea417 100644 --- a/mail/exmh2/files/config.nmh +++ b/mail/exmh2/files/config.nmh @@ -15,9 +15,10 @@ set faces(set,unknown) {domains unknown} set faces(set,news) {news} set faces(defaultDomain) !!DOMAIN!! set faces(suffix) {xpm gif xbm} -set gpg(path) !!GPG!! -set pgp(path) !!PGP!! -set pgp5(path) !!PGP5!! +set pgp(gpg,path) !!GPG!! +set pgp(pgp,path) !!PGP!! +set pgp(pgp5,path) !!PGP5!! +set pgp(pgp6,path) !!PGP6!! set glimpse(path) !!GLIMPSE!! set sound(cmd) !!PLAY!! set exmh(library) !!PREFIX!!/lib/exmh-!!VERSION!! diff --git a/mail/exmh2/pkg-descr b/mail/exmh2/pkg-descr index eb4536d950d6..5f5fc8f6f4b7 100644 --- a/mail/exmh2/pkg-descr +++ b/mail/exmh2/pkg-descr @@ -21,3 +21,6 @@ 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** must run xdm to start your Xserver. + +WWW: http://www.beedub.com/exmh/ + diff --git a/mail/exmh2/pkg-plist b/mail/exmh2/pkg-plist index d0b6f5038b4c..4841df30fcc7 100644 --- a/mail/exmh2/pkg-plist +++ b/mail/exmh2/pkg-plist @@ -150,6 +150,7 @@ lib/exmh-%%EXMH_VERSION%%/pgpMisc.tcl lib/exmh-%%EXMH_VERSION%%/pgpOld.tcl lib/exmh-%%EXMH_VERSION%%/pgpPgp2.tcl lib/exmh-%%EXMH_VERSION%%/pgpPgp5.tcl +lib/exmh-%%EXMH_VERSION%%/pgpPgp65.tcl lib/exmh-%%EXMH_VERSION%%/pgpShared.tcl lib/exmh-%%EXMH_VERSION%%/pgpWWW.tcl lib/exmh-%%EXMH_VERSION%%/pick.tcl diff --git a/mail/exmh2/scripts/build b/mail/exmh2/scripts/build index 400d7e2a1bc9..272083613718 100644 --- a/mail/exmh2/scripts/build +++ b/mail/exmh2/scripts/build @@ -20,6 +20,7 @@ DOMAIN="{}" GPG="{}" PGP="{}" PGP5="{}" +PGP6="{}" GLIMPSE="{}" PLAY="{}" @@ -51,6 +52,10 @@ if [ -f ${PREFIX}/bin/pgp5 ]; then PGP5=${PREFIX}/bin #bindir fi +if [ -f ${PREFIX}/bin/pgp ]; then + PGP6=${PREFIX}/bin #bindir +fi + if [ -f ${PREFIX}/bin/glimpse ]; then GLIMPSE=${PREFIX}/bin #bindir fi @@ -75,6 +80,7 @@ sed <${FILESDIR}/${CONFIGFILE} \ -e "s+!!GPG!!+${GPG}+g" \ -e "s+!!PGP!!+${PGP}+g" \ -e "s+!!PGP5!!+${PGP5}+g" \ + -e "s+!!PGP6!!+${PGP6}+g" \ -e "s+!!GLIMPSE!!+${GLIMPSE}+g" \ -e "s+!!PLAY!!+${PLAY}+g" \ -e "s+!!VERSION!!+${VERSION}+g" \ |