From 9e089d43a8c109540afc4fce00306c53f0cdec9d Mon Sep 17 00:00:00 2001
From: schmonz <schmonz>
Date: Mon, 30 Aug 2004 14:34:11 +0000
Subject: Set USE_BUILDLINK3=yes and USE_LANGUAGES=c++. Use RCD_SCRIPTS in the
 canonical way.

---
 mail/nullmailer/Makefile            |  7 ++++---
 mail/nullmailer/files/nullmailer    | 25 -------------------------
 mail/nullmailer/files/nullmailer.sh | 25 +++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 28 deletions(-)
 delete mode 100755 mail/nullmailer/files/nullmailer
 create mode 100644 mail/nullmailer/files/nullmailer.sh

diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index 9edb3f8eea6..81a11ba0160 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 21:46:36 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/08/30 14:34:11 schmonz Exp $
 
 DISTNAME=		nullmailer-1.00RC7
 PKGNAME=		${DISTNAME:S/0RC7/.0rc7/}
@@ -9,6 +9,8 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://untroubled.org/nullmailer/
 COMMENT=		Simple relay-only mail transport agent
 
+USE_BUILDLINK3=		yes
+USE_LANGUAGES=		c++
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+= 	--sysconfdir=${PKG_SYSCONFDIR}
@@ -31,8 +33,7 @@ MAKE_ENV+=		NULLMAILER_USER=${NULLMAILER_USER}
 PLIST_SUBST+=		NULLMAILER_GROUP=${NULLMAILER_GROUP}		\
 			NULLMAILER_USER=${NULLMAILER_USER}
 
-RCD_SCRIPTS=			nullmailer
-RCD_SCRIPT_SRC.nullmailer=	${FILESDIR}/nullmailer
+RCD_SCRIPTS=		nullmailer
 
 post-configure:
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/mailer.conf	>	\
diff --git a/mail/nullmailer/files/nullmailer b/mail/nullmailer/files/nullmailer
deleted file mode 100755
index 005a9395201..00000000000
--- a/mail/nullmailer/files/nullmailer
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-#	$NetBSD: nullmailer,v 1.3 2003/02/17 05:20:21 salo Exp $
-#
-# PROVIDE: mail
-# REQUIRE: LOGIN
-
-if [ -f /etc/rc.subr ]; then
-    . /etc/rc.subr
-fi
-
-name="nullmailer"
-rcvar=$name
-
-nullmailer_user="nullmail"
-nullmailer_group="nullmail"
-
-command="@PREFIX@/libexec/nullmailer/nullmailer-send"
-command_args=" > /dev/null 2>&1 &"
-
-required_files="@PKG_SYSCONFDIR@/nullmailer/remotes /var/spool/nullmailer/trigger"
-required_dirs="/var/spool/nullmailer/queue /var/spool/nullmailer/tmp"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/nullmailer/files/nullmailer.sh b/mail/nullmailer/files/nullmailer.sh
new file mode 100644
index 00000000000..7c483ed95b2
--- /dev/null
+++ b/mail/nullmailer/files/nullmailer.sh
@@ -0,0 +1,25 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+#	$NetBSD: nullmailer.sh,v 1.1 2004/08/30 14:34:11 schmonz Exp $
+#
+# PROVIDE: mail
+# REQUIRE: LOGIN
+
+if [ -f /etc/rc.subr ]; then
+    . /etc/rc.subr
+fi
+
+name="nullmailer"
+rcvar=$name
+
+nullmailer_user="nullmail"
+nullmailer_group="nullmail"
+
+command="@PREFIX@/libexec/nullmailer/nullmailer-send"
+command_args=" > /dev/null 2>&1 &"
+
+required_files="@PKG_SYSCONFDIR@/nullmailer/remotes /var/spool/nullmailer/trigger"
+required_dirs="/var/spool/nullmailer/queue /var/spool/nullmailer/tmp"
+
+load_rc_config $name
+run_rc_command "$1"
-- 
cgit v1.2.3