CVS commit: pkgsrc/mail/elm

["Johnny C. Lam" <jlam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jlam
Date:           Sat Aug 19 00:20:25 UTC 2017

Modified Files:
        pkgsrc/mail/elm: Makefile
        pkgsrc/mail/elm/files: config.sh

Log Message:
mail/elm: Install manpages into ${PKGMANDIR}.

This project uses a Perl-style Configure script that can use a
custom config.sh to provide default answers to questions that it
asks as part of the configuration process.  Modify the custom
${FILESDIR}/config.sh to allow substituting for @PKGMANDIR@ in the
default location for unformatted manpages.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/mail/elm/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/mail/elm/files/config.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/elm/Makefile
diff -u pkgsrc/mail/elm/Makefile:1.51 pkgsrc/mail/elm/Makefile:1.52
--- pkgsrc/mail/elm/Makefile:1.51       Tue May 17 10:32:07 2016
+++ pkgsrc/mail/elm/Makefile    Sat Aug 19 00:20:25 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2016/05/17 10:32:07 fhajny Exp $
+# $NetBSD: Makefile,v 1.52 2017/08/19 00:20:25 jlam Exp $
 
 DISTNAME=              elm2.5.8
 PKGNAME=               elm-2.5.8
@@ -32,12 +32,12 @@ LIBC.*=                     /usr/lib/libc.so
 SPECIAL_PERMS+=                bin/elm ${REAL_ROOT_USER} mail 2755
 
 pre-configure:
-       ${CP} ${FILESDIR}/config.sh ${WRKSRC}/config.sh.orig
        ${SED} -e 's:@PREFIX@:${PREFIX}:g' \
          -e 's:@DESTDIR@:${DESTDIR}:g' \
          -e 's:@LOCALBASE@:${LOCALBASE}:g' \
+         -e 's:@PKGMANDIR@:${PKGMANDIR}:g' \
          -e 's:@LIBC@:${LIBC}:g' \
-         ${WRKSRC}/config.sh.orig > ${WRKSRC}/config.sh
+         ${FILESDIR}/config.sh > ${WRKSRC}/config.sh
        ${MV} ${WRKSRC}/nls/LANGS ${WRKSRC}/nls/LANGS.tmpl
        ${SED} -e 's:__PREFIX:'${PREFIX}':g' < ${WRKSRC}/nls/LANGS.tmpl > ${WRKSRC}/nls/LANGS
 

Index: pkgsrc/mail/elm/files/config.sh
diff -u pkgsrc/mail/elm/files/config.sh:1.9 pkgsrc/mail/elm/files/config.sh:1.10
--- pkgsrc/mail/elm/files/config.sh:1.9 Sat Mar  3 23:55:35 2012
+++ pkgsrc/mail/elm/files/config.sh     Sat Aug 19 00:20:25 2017
@@ -240,7 +240,7 @@ linepr='/usr/bin/lp'
 maildir='/var/mail'
 mailer='/usr/sbin/sendmail'
 mailgrp='wheel'
-mansrc='@DESTDIR@@PREFIX@/man/man1'
+mansrc='@DESTDIR@@PREFIX@/@PKGMANDIR@/man1'
 catmansrc='none'
 manext='.1'
 manext_choice='.1'