Update to 2.3-20060103

Add rcNG script to start postfix
Update pkg-message to reflect rcNG script

4 files changed, 54 insertions, 29 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 4ab8c29..e419611 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postfix
-DISTVERSION=	2.3-20051229
+DISTVERSION=	2.3-20060103
 PORTEPOCH=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
@@ -27,6 +27,7 @@ NO_LATEST_LINK=	yes
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
 USE_PERL5_BUILD=yes
+USE_RC_SUBR=	postfix.sh
 
 OPTIONS=	PCRE		"Perl Compatible Regular Expressions" 			on \
 		SASL		"Cyrus SASLv1 (Simple Auth. and Sec. Layer)"		off \
@@ -83,6 +84,9 @@ SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 
 .include <bsd.port.pre.mk>
 
+# Default requirement for postfix rcNG
+_REQUIRE=	DAEMON
+
 .if defined(WITH_PCRE)
 LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre
 POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
@@ -203,12 +207,14 @@ POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib/db43/ -ldb
 USE_MYSQL=YES
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib/mysql -lmysqlclient -lz -lcrypt -lm
+_REQUIRE+=		mysql
 .endif
 
 .if defined(WITH_PGSQL)
 USE_PGSQL=YES
 POSTFIX_CCARGS+=	-DHAS_PGSQL -I${LOCALBASE}/include -I${LOCALBASE}/pgsql/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/pgsql/lib -lpq -lcrypt
+_REQUIRE+=		postgresql
 .endif
 
 .if defined(WITH_OPENLDAP)
@@ -218,6 +224,7 @@ WANT_OPENLDAP_VER=${WITH_OPENLDAP_VER}
 .endif
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lldap -llber
+_REQUIRE+=		slapd
 .endif
 
 .if defined(WITH_CDB)
@@ -228,6 +235,7 @@ POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lcdb
 
 .if defined(WITH_NIS)
 POSTFIX_CCARGS+=	 -DHAS_NIS
+_REQUIRE+=		ypserv
 .endif
 
 .if defined(WITH_TEST)
@@ -245,6 +253,8 @@ READMEDIR=no
 READMEDIR=${PREFIX}/share/doc/postfix
 .endif
 
+SUB_LIST+=	REQUIRE="${_REQUIRE}"
+
 pre-patch:
 .	if defined(POSTFIX_OPTIONS)
 		@${ECHO_MSG}
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index 53f4f76..b91078b 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,3 +1,3 @@
-MD5 (postfix/postfix-2.3-20051229.tar.gz) = af154dd38a29edc02fbbebeb0354132c
-SHA256 (postfix/postfix-2.3-20051229.tar.gz) = adf52cc493a12833ccecb27e4a4bb71ab5758897619a864a483d02fc1565aac5
-SIZE (postfix/postfix-2.3-20051229.tar.gz) = 2574059
+MD5 (postfix/postfix-2.3-20060103.tar.gz) = f83719525f0d00a88662ed512bc94be2
+SHA256 (postfix/postfix-2.3-20060103.tar.gz) = 185c53763cec95bc966f74ac87d050611d76f021af2cf3ac45420b4401d91197
+SIZE (postfix/postfix-2.3-20060103.tar.gz) = 2576252
diff --git a/mail/postfix-current/files/postfix.sh.in b/mail/postfix-current/files/postfix.sh.in
new file mode 100644
index 0000000..8424abb
--- /dev/null
+++ b/mail/postfix-current/files/postfix.sh.in
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: postfix
+# REQUIRE: %%REQUIRE%%
+# KEYWORD: shutdown
+#
+# Define these postfix_* variables in one of these files:
+#	/etc/rc.conf
+#	/etc/rc.conf.local
+#	/etc/rc.conf.d/postfix
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+postfix_enable="${postfix_enable-NO}"
+
+. %%RC_SUBR%%
+
+name="postfix"
+rcvar=`set_rcvar`
+
+start_cmd=${name}_start
+stop_cmd=${name}_stop
+
+postfix_start() {
+	%%PREFIX%%/sbin/postfix start
+}
+
+postfix_stop() {
+	%%PREFIX%%/sbin/postfix stop
+}
+
+load_rc_config ${name}
+run_rc_command "$1"
diff --git a/mail/postfix-current/pkg-message b/mail/postfix-current/pkg-message
index f129b27..d4bc72bd 100644
--- a/mail/postfix-current/pkg-message
+++ b/mail/postfix-current/pkg-message
@@ -1,35 +1,15 @@
-If you have postfix configured in your /etc/mail/mailer.conf (answered yes to
-the previous question) and would like to enable postfix to start at boot time,
-please set these variables in your /etc/rc.conf file:
+To enable postfix rcNG startup script please add postfix_enable="YES" in
+your rc.conf
 
-sendmail_enable="YES"
-sendmail_flags="-bd"
-sendmail_pidfile="/var/spool/postfix/pid/master.pid"
-sendmail_procname="/usr/local/libexec/postfix/master"
-sendmail_outbound_enable="NO"
-sendmail_submit_enable="NO"
-sendmail_msp_queue_enable="NO"
-
-This will disable Sendmail completely, and allow you to use /etc/rc.d/sendmail
-to start and stop postfix (FreeBSD 5.x and up).  For FreeBSD 4.x, it will just
-cause the system boot scripts to start sendmail for you.
-
-Alternatively to the above settings, you can enable postfix to start with
-the other local services, for example, after your database server starts if
-you need it to be running for postfix.  To do this, set in your rc.conf file:
+If you not need sendmail anymore, please add in your rc.conf:
 
 sendmail_enable="NO"
 sendmail_submit_enable="NO"
 sendmail_outbound_enable="NO"
 sendmail_msp_queue_enable="NO"
 
-Then make the following symbolic link:
-
-cd /usr/local/etc/rc.d
-ln -s /usr/local/sbin/postfix postfix.sh
-
-With either startup configuration, you will want to disable some
-Sendmail-specific daily maintenance routines in your /etc/periodic.conf file:
+And you can disable some sendmail specific daily maintenance routines in your
+/etc/periodic.conf file:
 
 daily_clean_hoststat_enable="NO"
 daily_status_mail_rejects_enable="NO"