From 9a1b9294407511479c93f183874010f09be1004c Mon Sep 17 00:00:00 2001 From: salo Date: Mon, 17 Feb 2003 05:20:20 +0000 Subject: Improve: - use 1.0.0.7 as PKGVERSION, 1.00RC7 is invalid - USE_PKGINSTALL, don't include bsd.pkg.install.mk directly - use automatic rc.d scripts handling - install example mailer.conf - minor cleanups --- mail/nullmailer/MESSAGE | 21 ++++++++------------- mail/nullmailer/Makefile | 28 +++++++++++++++------------- mail/nullmailer/PLIST | 5 ++++- mail/nullmailer/files/mailer.conf | 7 +++++++ mail/nullmailer/files/nullmailer | 4 ++-- 5 files changed, 36 insertions(+), 29 deletions(-) create mode 100644 mail/nullmailer/files/mailer.conf (limited to 'mail/nullmailer') diff --git a/mail/nullmailer/MESSAGE b/mail/nullmailer/MESSAGE index 7305ffb871d..965d91f6c4b 100644 --- a/mail/nullmailer/MESSAGE +++ b/mail/nullmailer/MESSAGE @@ -1,24 +1,19 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1 2003/02/17 01:45:31 jtb Exp $ +$NetBSD: MESSAGE,v 1.2 2003/02/17 05:20:20 salo Exp $ To use nullmailer, you will need to perform the following steps: -1. Create a ${PKG_SYSCONFDIR}/nullmailer/remotes file. The file should - contain a line with the name of your relay host and the - relay protocol to be used, eg. +1. Create a ${PKG_SYSCONFDIR}/nullmailer/remotes file. + The file should contain a line with the name of your relay host + and the relay protocol to be used, eg. smtp.relayhost.domain smtp -2. Back up /etc/mailer.conf and create a new mailer.conf with the - following lines +2. Back up /etc/mailer.conf and copy nullmailer's own one from + ${PREFIX}/share/examples/nullmailer/mailer.conf - # Use "nullmailer" as replacement for "sendmail". - sendmail ${PREFIX}/libexec/nullmailer/sendmail - send-mail ${PREFIX}/libexec/nullmailer/sendmail - mailq ${PREFIX}/libexec/nullmailer/mailq - -3. Copy ${PKG_SYSCONFDIR}/rc.d/nullmailer to /etc/rc.d/nullmailer - and add +3. In case you don't have PKG_RCD_SCRIPTS set in your /etc/mk.conf, copy + ${PREFIX}etc/rc.d/nullmailer to /etc/rc.d/nullmailer and add nullmailer=YES diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile index e2c5411fe1e..f4ba8a7a8e5 100644 --- a/mail/nullmailer/Makefile +++ b/mail/nullmailer/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2003/02/17 02:12:44 jtb Exp $ +# $NetBSD: Makefile,v 1.7 2003/02/17 05:20:20 salo Exp $ DISTNAME= nullmailer-1.00RC7 +PKGNAME= ${DISTNAME:S/0RC7/.0.7/} CATEGORIES= mail MASTER_SITES= http://untroubled.org/nullmailer/ @@ -8,8 +9,10 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://untroubled.org/nullmailer/ COMMENT= Simple relay-only mail transport agent +USE_PKGINSTALL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} --localstatedir=/var/spool +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --localstatedir=/var/spool CONFIGURE_ARGS+= --bindir=${PREFIX}/libexec/nullmailer CONFIGURE_ARGS+= --sbindir=${PREFIX}/libexec/nullmailer @@ -28,23 +31,22 @@ MAKE_ENV+= NULLMAILER_USER=${NULLMAILER_USER} PLIST_SUBST+= NULLMAILER_GROUP=${NULLMAILER_GROUP} \ NULLMAILER_USER=${NULLMAILER_USER} -pre-configure: - for f in ${WRKSRC}/doc/nullmailer-send.8; do \ - ${SED} -e 's:@PREFIX@:${PREFIX}:g' \ - -e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:g' \ - $$f > $$f.tmp && ${MV} -f $$f.tmp $$f; \ - done +RCD_SCRIPTS= nullmailer +RCD_SCRIPT_SRC.nullmailer= ${FILESDIR}/nullmailer post-configure: - ${SED} -e 's:@PREFIX@:${PREFIX}:g' \ - -e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:g' \ - ${FILESDIR}/nullmailer > ${WRKDIR}/nullmailer + @${SED} ${FILES_SUBST_SED} ${FILESDIR}/mailer.conf > \ + ${WRKDIR}/mailer.conf + @${MV} ${WRKSRC}/doc/nullmailer-send.8 ${WRKDIR}/nullmailer-send.8 + @${SED} ${FILES_SUBST_SED} ${WRKDIR}/nullmailer-send.8 > \ + ${WRKSRC}/doc/nullmailer-send.8 post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nullmailer + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nullmailer cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS BUGS COPYING ChangeLog \ HOWTO NEWS README TODO ${PREFIX}/share/doc/nullmailer - ${INSTALL_SCRIPT} ${WRKDIR}/nullmailer ${PKG_SYSCONFDIR}/rc.d + ${INSTALL_DATA} ${WRKDIR}/mailer.conf \ + ${PREFIX}/share/examples/nullmailer/ -.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/nullmailer/PLIST b/mail/nullmailer/PLIST index 0847bee472a..84f7c172e3d 100644 --- a/mail/nullmailer/PLIST +++ b/mail/nullmailer/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.4 2003/02/17 01:45:31 jtb Exp $ +@comment $NetBSD: PLIST,v 1.5 2003/02/17 05:20:20 salo Exp $ +etc/rc.d/nullmailer libexec/nullmailer/mailq @exec ${CHMOD} u+s %D/libexec/nullmailer/mailq @exec ${CHOWN} ${NULLMAILER_USER}:${NULLMAILER_GROUP} %D/libexec/nullmailer/mailq @@ -23,6 +24,7 @@ share/doc/nullmailer/HOWTO share/doc/nullmailer/NEWS share/doc/nullmailer/README share/doc/nullmailer/TODO +share/examples/nullmailer/mailer.conf @exec ${MKDIR} /var/spool/nullmailer @exec ${MKDIR} /var/spool/nullmailer/queue @exec ${MKDIR} /var/spool/nullmailer/tmp @@ -30,6 +32,7 @@ share/doc/nullmailer/TODO @exec ${CHMOD} 600 /var/spool/nullmailer/trigger @exec ${CHOWN} -R ${NULLMAILER_USER}:${NULLMAILER_GROUP} /var/spool/nullmailer/* @dirrm libexec/nullmailer +@dirrm share/examples/nullmailer @dirrm share/doc/nullmailer @unexec ${RMDIR} ${PKG_SYSCONFDIR}/nullmailer 2>/dev/null || ${TRUE} @unexec ${RMDIR} /var/spool/nullmailer/queue 2>/dev/null || ${TRUE} diff --git a/mail/nullmailer/files/mailer.conf b/mail/nullmailer/files/mailer.conf new file mode 100644 index 00000000000..709ad35c994 --- /dev/null +++ b/mail/nullmailer/files/mailer.conf @@ -0,0 +1,7 @@ +# $NetBSD: mailer.conf,v 1.1 2003/02/17 05:20:21 salo Exp $ +# +# Use "nullmailer" as replacement for "sendmail". +# +sendmail @PREFIX@/libexec/nullmailer/sendmail +send-mail @PREFIX@/libexec/nullmailer/sendmail +mailq @PREFIX@/libexec/nullmailer/mailq diff --git a/mail/nullmailer/files/nullmailer b/mail/nullmailer/files/nullmailer index 4377bede2f2..005a9395201 100755 --- a/mail/nullmailer/files/nullmailer +++ b/mail/nullmailer/files/nullmailer @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: nullmailer,v 1.2 2003/02/17 02:12:44 jtb Exp $ +# $NetBSD: nullmailer,v 1.3 2003/02/17 05:20:21 salo Exp $ # # PROVIDE: mail # REQUIRE: LOGIN @@ -22,4 +22,4 @@ required_files="@PKG_SYSCONFDIR@/nullmailer/remotes /var/spool/nullmailer/trigge required_dirs="/var/spool/nullmailer/queue /var/spool/nullmailer/tmp" load_rc_config $name -run_rc_command "$1" \ No newline at end of file +run_rc_command "$1" -- cgit v1.2.3