Honor PREFIX setting.

PR:		15120
Submitted by:	Matt Behrens <matt@zigg.com>

5 files changed, 19 insertions, 10 deletions

diff --git a/mail/pine4/Makefile b/mail/pine4/Makefile
index c7b22074f562..c3e3ae471a46 100644
--- a/mail/pine4/Makefile
+++ b/mail/pine4/Makefile
@@ -46,10 +46,19 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/pico ${PREFIX}/bin/pico
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/pilot ${PREFIX}/bin/pilot
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/pine ${PREFIX}/bin/pine
-	${INSTALL_SCRIPT} ${FILESDIR}/pgpencrypt ${PREFIX}/bin/pgpencrypt
-	${INSTALL_SCRIPT} ${FILESDIR}/pgpdecode ${PREFIX}/bin/pgpdecode
-	${INSTALL_SCRIPT} ${FILESDIR}/pgpsign ${PREFIX}/bin/pgpsign
-	${INSTALL_DATA} ${FILESDIR}/dot.pinerc.pgp.sample \
+	${SED} -e 's,@@PREFIX@@,${PREFIX},g' \
+		< ${FILESDIR}/pgpdecode > ${WRKSRC}/bin/pgpdecode
+	${SED} -e 's,@@PREFIX@@,${PREFIX},g' \
+		< ${FILESDIR}/pgpencrypt > ${WRKSRC}/bin/pgpencrypt
+	${SED} -e 's,@@PREFIX@@,${PREFIX},g' \
+		< ${FILESDIR}/pgpsign > ${WRKSRC}/bin/pgpsign
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/pgpencrypt ${PREFIX}/bin/pgpencrypt
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/pgpdecode ${PREFIX}/bin/pgpdecode
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/pgpsign ${PREFIX}/bin/pgpsign
+	${SED} -e 's,@@PREFIX@@,${PREFIX},g' \
+		< ${FILESDIR}/dot.pinerc.pgp.sample \
+		> ${WRKSRC}/dot.pinerc.pgp.sample
+	${INSTALL_DATA} ${WRKSRC}/dot.pinerc.pgp.sample \
 			${PREFIX}/etc/dot.pinerc.pgp.sample
 	${INSTALL_MAN} ${WRKSRC}/doc/pico.1 ${PREFIX}/man/man1/pico.1
 	${INSTALL_MAN} ${WRKSRC}/doc/pilot.1 ${PREFIX}/man/man1/pilot.1
diff --git a/mail/pine4/files/dot.pinerc.pgp.sample b/mail/pine4/files/dot.pinerc.pgp.sample
index 1f7df9e4fe2b..512509a30448 100644
--- a/mail/pine4/files/dot.pinerc.pgp.sample
+++ b/mail/pine4/files/dot.pinerc.pgp.sample
@@ -5,12 +5,12 @@ feature-list=compose-send-offers-first-filter
 
 # This variable takes a list of programs that message text is piped into
 # after MIME decoding, prior to display.
-display-filters="-----BEGIN PGP" /usr/local/bin/pgpdecode
+display-filters="-----BEGIN PGP" @@PREFIX@@/bin/pgpdecode
 
 # This defines a program that message text is piped into before MIME
 # encoding, prior to sending
-sending-filters=/usr/local/bin/pgpsign,
-        /usr/local/bin/pgpencrypt _RECIPIENTS_
+sending-filters=@@PREFIX@@/bin/pgpsign,
+        @@PREFIX@@/bin/pgpencrypt _RECIPIENTS_
 
 # hook, to get rid of the sucking 'quoted printable' ;-))
 # enable-8bit-esmtp-negotiation
diff --git a/mail/pine4/files/pgpdecode b/mail/pine4/files/pgpdecode
index 40625939c37c..1849ed714a5f 100644
--- a/mail/pine4/files/pgpdecode
+++ b/mail/pine4/files/pgpdecode
@@ -32,7 +32,7 @@ fi
 
 trap "rm -f $STDOUT $STDERR; exit" 0 1 2 15
 
-if [ -x /usr/local/bin/pgpv ]
+if [ -x @@PREFIX@@/bin/pgpv ]
 then
   pgpv 2>&1 > $STDOUT |tee $STDERR > /dev/tty
 else
diff --git a/mail/pine4/files/pgpencrypt b/mail/pine4/files/pgpencrypt
index 3baa1d2739eb..c1d821479a0c 100644
--- a/mail/pine4/files/pgpencrypt
+++ b/mail/pine4/files/pgpencrypt
@@ -3,7 +3,7 @@
 # 21.03.96 Roland Rosenfeld <roland@spinnaker.rhein.de>
 # Wed 16 Sep 1998 23:46:43 WST Anthony Di Pietro <anthony@dino.omen.com.au>
 # Modified to work with both PGP v2 and PGP v5.
-if [ -x /usr/local/bin/pgpe ]
+if [ -x @@PREFIX@@/bin/pgpe ]
 then
   pgpe -s -a -r $*
 else
diff --git a/mail/pine4/files/pgpsign b/mail/pine4/files/pgpsign
index 6eff395c89c0..e938b0b6d63d 100644
--- a/mail/pine4/files/pgpsign
+++ b/mail/pine4/files/pgpsign
@@ -3,7 +3,7 @@
 # 21.03.96 Roland Rosenfeld <roland@spinnaker.rhein.de>
 # Wed 16 Sep 1998 23:48:51 WST Anthony Di Pietro <anthony@dino.omen.com.au>
 # Modified to work with both PGP v2 and PGP v5.
-if [ -x /usr/local/bin/pgps ]
+if [ -x @@PREFIX@@/bin/pgps ]
 then
   pgps -a -t
 else