[pkgsrc/trunk]: pkgsrc/mail/mailagent Use variables instead of interactively ...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ae20b32077ab
branches:  trunk
changeset: 526119:ae20b32077ab
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Mar 01 18:04:48 2007 +0000

description:
Use variables instead of interactively asking the user to provide values.
Some pkglint cleanup while here.

diffstat:

 mail/mailagent/Makefile              |  35 ++++++++++++++++++++++++++-------
 mail/mailagent/scripts/pre-configure |  37 ------------------------------------
 2 files changed, 27 insertions(+), 45 deletions(-)

diffs (103 lines):

diff -r 76e399e06dd9 -r ae20b32077ab mail/mailagent/Makefile
--- a/mail/mailagent/Makefile   Thu Mar 01 18:03:02 2007 +0000
+++ b/mail/mailagent/Makefile   Thu Mar 01 18:04:48 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/04/22 09:22:11 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2007/03/01 18:04:48 wiz Exp $
 
 DISTNAME=              mailagent-3.0.73
 CATEGORIES=            mail
@@ -20,26 +20,45 @@
 CONFIGURE_ARGS+=       -Dprefix=${PREFIX:Q}
 CONFIGURE_ARGS+=       -Dmansrc=${PREFIX:Q}/man/man1
 CONFIGURE_ARGS+=       -Dnotifypatches='false'
-MAKE_ENV+=             PATH=`${DIRNAME} ${PERL5}`:${PATH}
+MAKE_ENV+=             PATH=`${DIRNAME} ${PERL5}`:${PATH:Q}
 INSTALL_TARGET=                install install.man
 
+MAILAGENT_DOMAIN?=             example.com
+MAILAGENT_EMAIL?=              testuser%example.com@localhost
+MAILAGENT_FQDN?=               test.example.com
+MAILAGENT_ORGANIZATION?=       Example Company
+
+BUILD_DEFS+=   MAILAGENT_DOMAIN MAILAGENT_EMAIL MAILAGENT_FQDN MAILAGENT_ORGANIZATION
+
+CF=                            ${WRKSRC}/config.sh
+
 pre-extract:
-       @if [ `${SH} -c umask` != 0022 ]; then \
+       if [ `${SH} -c umask` != 0022 ]; then \
          ${ECHO} "Please set umask to 022 before running make,"; \
          ${ECHO} "or mailagent will not build successfully."; \
          ${FALSE}; fi
-       @if [ `${ID} -u` = 0 ]; then \
+       if [ `${ID} -u` = 0 ]; then \
          ${ECHO} "Do not build mailagent as root or it won't pass the sanity tests."; \
          ${FALSE}; fi
 
 pre-configure:
-       cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/pre-configure
+       ${ECHO} "#!/bin/sh" > ${CF}
+       ${ECHO} "cf_email='${MAILAGENT_EMAIL}'" >> ${CF}
+       ${ECHO} "d_flockonly='define'" >> ${CF}
+       if [ `${ECHO} ${MAILAGENT_DOMAIN} | tr A-Z a-z` = `${ECHO} ${MAILAGENT_FQDN} | tr A-Z a-z` ]; then \
+               ${ECHO} "d_hidnet='undef'" >> ${CF}; \
+               ${ECHO} "hiddennet=''" >> ${CF}; \
+       else \
+               ${ECHO} "d_hidnet='define'" >> ${CF}; \
+               ${ECHO} "hiddennet='${MAILAGENT_DOMAIN}'" >> ${CF}; \
+       fi
+       ${ECHO} "orgname='${MAILAGENT_ORGANIZATION}'" >> ${CF}
 
 post-install:
-       @${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mailagent
-       @${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mailagent/misc
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mailagent
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mailagent/misc
        ${CP} -pR ${WRKSRC}/misc/* ${PREFIX}/share/examples/mailagent/misc
-       @${LN} -fs ${PREFIX}/lib/mailagent/examples \
+       ${LN} -fs ${PREFIX}/lib/mailagent/examples \
                ${PREFIX}/share/examples/mailagent/agent
 
 .include "../../mk/bsd.pkg.mk"
diff -r 76e399e06dd9 -r ae20b32077ab mail/mailagent/scripts/pre-configure
--- a/mail/mailagent/scripts/pre-configure      Thu Mar 01 18:03:02 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#!/bin/sh
-# Pre-configure script for mailagent.
-#   This script asks for information specific to the machine and writes
-#   given values to work/mailagent-3.0/config.sh to set the default
-#   values for COnfigure script so that Configure doesn't request any
-#   input.
-
-while [ X$addr = X ]; do
-    read -p "Enter your complete E-mail address> " addr
-done
-
-while [ X$host = X ]; do
-    read -p "Enter fully qualified name of this host (`hostname`)> " host
-    if [ X$host = X ]; then
-        host=`hostname`
-    fi
-done
-
-maildomain=`echo $addr | awk -F@ '{printf("%s", $2)}'`
-if [ `echo $maildomain | tr A-Z a-z` = `echo $host | tr A-Z a-z` ]; then
-    d_hidnet=undef
-    hiddennet=''
-else
-    d_hidnet=define
-    hiddennet=$maildomain
-fi
-
-read -p "Enter the name of your organization> " orgname
-
-cat >${WRKSRC}/config.sh <<EOM
-#!/bin/sh
-cf_email='$addr'
-d_flockonly='define'
-d_hidnet='$d_hidnet'
-hiddennet='$hiddennet'
-orgname='$orgname'
-EOM