From 1da6f24bc5de50863d7a1199ec8cfe7689a57261 Mon Sep 17 00:00:00 2001
From: agc <agc@pkgsrc.org>
Date: Mon, 22 Oct 2001 21:46:50 +0000
Subject: Add empty declarations for pgp6 paths and variables, so that this
 package actually works again. Fixes a problem pointed out by Steve Bellovin.

---
 mail/exmh/files/config  | 3 ++-
 mail/exmh/scripts/build | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'mail/exmh')

diff --git a/mail/exmh/files/config b/mail/exmh/files/config
index 0b5e1b5bee5..5b853bbbe2d 100644
--- a/mail/exmh/files/config
+++ b/mail/exmh/files/config
@@ -1,4 +1,4 @@
-# $NetBSD: config,v 1.5 2000/03/06 10:23:24 wulf Exp $
+# $NetBSD: config,v 1.6 2001/10/22 21:46:50 agc Exp $
 
 set wish !!WISH!!
 set exmh(version) {version !!VERSION!! !!DATE!!}
@@ -19,6 +19,7 @@ set faces(defaultDomain) !!DOMAIN!!
 set faces(suffix) {xpm gif xbm}
 set pgp(pgp,path) !!PGP!!
 set pgp(pgp5,path) !!PGP5!!
+set pgp(pgp6,path) !!PGP6!!
 set pgp(gpg,path) !!GPG!!
 set glimpse(path) !!GLIMPSE!!
 set sound(cmd) !!PLAY!!
diff --git a/mail/exmh/scripts/build b/mail/exmh/scripts/build
index 958a11f1652..a8bdef655ec 100644
--- a/mail/exmh/scripts/build
+++ b/mail/exmh/scripts/build
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: build,v 1.3 2000/03/06 10:25:28 wulf Exp $
+# $NetBSD: build,v 1.4 2001/10/22 21:46:50 agc Exp $
 # FreeBSD Id: build,v 1.5 1997/08/21 08:09:56 peter Exp
 #
 
@@ -15,6 +15,7 @@ FACES="{}"
 DOMAIN="{}"
 PGP="{}"
 PGP5="{}"
+PGP6="{}"
 GPG="{}"
 GLIMPSE="{}"
 PLAY="{}"
@@ -43,6 +44,10 @@ if [ -f ${PREFIX}/bin/pgp5 ]; then
   PGP5=${PREFIX}/bin			#bindir
 fi
 
+if [ -f ${PREFIX}/bin/pgp6 ]; then
+  PGP6=${PREFIX}/bin			#bindir
+fi
+
 if [ -f ${PREFIX}/bin/gpg ]; then
   GPG=${PREFIX}/bin			#bindir
 fi
@@ -70,6 +75,7 @@ sed <${FILESDIR}/config \
 	-e "s+!!DOMAIN!!+${DOMAIN}+g" \
 	-e "s+!!PGP!!+${PGP}+g" \
 	-e "s+!!PGP5!!+${PGP5}+g" \
+	-e "s+!!PGP6!!+${PGP6}+g" \
 	-e "s+!!GPG!!+${GPG}+g" \
 	-e "s+!!GLIMPSE!!+${GLIMPSE}+g" \
 	-e "s+!!PLAY!!+${PLAY}+g" \
-- 
cgit v1.2.3