From 0b7d484b09f341b278394fb397af62d84f7c4bce Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Sun, 24 Oct 2010 12:17:01 +0000
Subject: [PATCH] Tell the build infrastructure to find nroff in
 ${LOCALBASE}/bin rather than in /usr/bin.  While here, also change a few
 other PREFIX references into LOCALBASE.

No bump: PREFIX/LOCALBASE both expand to /usr/local here, and the
nroff path doesn't make it into the binaries.
---
 mail/elm/Makefile        |  5 +++--
 mail/elm/files/config.sh | 24 ++++++++++++------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 8800161ff96..b04d24a40a1 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2010/10/18 19:59:15 espie Exp $
+# $OpenBSD: Makefile,v 1.22 2010/10/24 12:17:01 naddy Exp $
 
 COMMENT=	once-popular mail user agent
 
@@ -18,7 +18,8 @@ WANTLIB=		c termlib
 CONFIGURE_STYLE=	simple
 CONFIGURE_SCRIPT= Configure
 CONFIGURE_ARGS+= -S -d
-CONFIGURE_ENV+=	PREFIX='$${DESTDIR}${PREFIX}'
+CONFIGURE_ENV+=	PREFIX='$${DESTDIR}${PREFIX}' \
+		LOCALBASE='${LOCALBASE}'
 USE_GROFF =	Yes
 
 WRKDIST=	${WRKDIR}/elm2.4.ME+.66
diff --git a/mail/elm/files/config.sh b/mail/elm/files/config.sh
index 1e0c237a28b..a90d9aef58a 100644
--- a/mail/elm/files/config.sh
+++ b/mail/elm/files/config.sh
@@ -102,7 +102,7 @@ vi
 '
 test='test'
 inews=''
-ispell="${PREFIX}/bin/ispell"
+ispell="${LOCALBASE}/bin/ispell"
 egrep='/usr/bin/egrep'
 more='/usr/bin/more'
 pg='pg'
@@ -112,16 +112,16 @@ mailx='/usr/bin/mailx'
 mail=''
 cpp='/usr/bin/cpp'
 perl=''
-emacs="${PREFIX}/bin/emacs"
+emacs="${LOCALBASE}/bin/emacs"
 ls='/bin/ls'
 rmail='/bin/rmail'
 sendmail='/usr/sbin/sendmail'
 shar='/usr/bin/shar'
 smail='smail'
 submit=''
-tbl='/usr/bin/tbl'
-troff='/usr/bin/troff'
-nroff='/usr/bin/nroff'
+tbl="${LOCALBASE}/bin/tbl"
+troff="${LOCALBASE}/bin/troff"
+nroff="${LOCALBASE}/bin/nroff"
 uname='/usr/bin/uname'
 uuname='/usr/bin/uuname'
 line='line'
@@ -175,7 +175,7 @@ termlib='-ltermlib'
 d_index='undef'
 d_internet=''
 d_ispell='define'
-ispell_path="${PREFIX}/bin/ispell"
+ispell_path="${LOCALBASE}/bin/ispell"
 ispell_options='-x'
 d_locale='define'
 d_nl_types='define'
@@ -259,7 +259,7 @@ manext_choice=''
 catmanext='.0'
 catmanext_choice='.0'
 packed='n'
-manroff='/usr/bin/nroff'
+manroff="${LOCALBASE}/bin/nroff"
 manroffopts=''
 suffix=''
 packer=''
@@ -275,7 +275,7 @@ d_berknames='define'
 d_usgnames='undef'
 # passcat=''
 rmttape='unknown-remote-tape-unit'
-roff='/usr/bin/troff'
+roff="${LOCALBASE}/bin/troff"
 roffopts=''
 sigtype='void'
 spitshell='cat'
@@ -290,9 +290,9 @@ d_xenix='undef'
 d_bsd='define'
 locale='locale'
 d_pgp='define'
-pgp="${PREFIX}/bin/pgp"
-pgp2_path="${PREFIX}/bin/pgp"
-pgp5_dir="${PREFIX}/bin"
-gpg_path="${PREFIX}/bin/gpg"
+pgp="${LOCALBASE}/bin/pgp"
+pgp2_path="${LOCALBASE}/bin/pgp"
+pgp5_dir="${LOCALBASE}/bin"
+gpg_path="${LOCALBASE}/bin/gpg"
 special_path='/usr/bin'
 CONFIG=true