diff options
Diffstat (limited to 'mail')
32 files changed, 424 insertions, 216 deletions
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 207c0f76f7c1..b8c05f737602 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -16,6 +16,7 @@ PORTNAME= postfix PORTVERSION= 2.2.8 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -36,6 +37,7 @@ CONFLICTS= courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \ sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* USE_SUBMAKE= yes USE_REINPLACE= yes +USE_RC_SUBR= postfix.sh MAN1= postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \ postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1 @@ -70,6 +72,9 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ MKDIR="${MKDIR}" \ POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" +# Default requirement for postfix rcNG +_REQUIRE= DAEMON + pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix @@ -80,7 +85,7 @@ pre-fetch: .if defined(WITHOUT_PCRE) POSTFIX_CCARGS+= -DNO_PCRE .else -LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre +LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre .endif @@ -91,6 +96,8 @@ READMEDIR=no READMEDIR=${PREFIX}/share/doc/postfix .endif +SUB_LIST+= REQUIRE="${_REQUIRE}" + pre-patch: @${ECHO} "<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>" \ > ${WRKSRC}/html/body_checks.5.html diff --git a/mail/postfix/files/postfix.sh.in b/mail/postfix/files/postfix.sh.in new file mode 100644 index 000000000000..8424abbe123b --- /dev/null +++ b/mail/postfix/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/pkg-message b/mail/postfix/pkg-message index f129b27a8375..d4bc72bd9c7d 100644 --- a/mail/postfix/pkg-message +++ b/mail/postfix/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" diff --git a/mail/postfix/scripts/configure.postfix b/mail/postfix/scripts/configure.postfix index 20b81d7663e3..df1a1b5ae14b 100644 --- a/mail/postfix/scripts/configure.postfix +++ b/mail/postfix/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.69 2005-11-30 22:25:35 mnag Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.70 2006-01-12 16:23:59 mnag Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -196,6 +196,7 @@ while [ "$1" ]; do fi fi echo "MYSQL_SUFFIX= +mysql" + echo "_REQUIRE+= mysql" MYSQL_SELECTED="YES" ;; PgSQL) @@ -203,12 +204,14 @@ while [ "$1" ]; do echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PGSQL_SUFFIX= +pgsql" + echo "_REQUIRE+= postgresql" ;; OpenLDAP) echo "USE_OPENLDAP=YES" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap" + echo "_REQUIRE+= slapd" echo ".if defined(WITH_OPENLDAP_VER)" echo "WANT_OPENLDAP_VER=\${WITH_OPENLDAP_VER}" echo ".endif" @@ -222,6 +225,7 @@ while [ "$1" ]; do NIS) echo "POSTFIX_CCARGS+= -DHAS_NIS" echo "NIS_SUFFIX= +nis" + echo "_REQUIRE+= ypserv" ;; VDA) echo "PATCH_SITES+= http://web.onda.com.br/nadal/postfix/VDA/" diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile index 207c0f76f7c1..b8c05f737602 100644 --- a/mail/postfix22/Makefile +++ b/mail/postfix22/Makefile @@ -16,6 +16,7 @@ PORTNAME= postfix PORTVERSION= 2.2.8 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -36,6 +37,7 @@ CONFLICTS= courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \ sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* USE_SUBMAKE= yes USE_REINPLACE= yes +USE_RC_SUBR= postfix.sh MAN1= postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \ postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1 @@ -70,6 +72,9 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ MKDIR="${MKDIR}" \ POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" +# Default requirement for postfix rcNG +_REQUIRE= DAEMON + pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix @@ -80,7 +85,7 @@ pre-fetch: .if defined(WITHOUT_PCRE) POSTFIX_CCARGS+= -DNO_PCRE .else -LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre +LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre .endif @@ -91,6 +96,8 @@ READMEDIR=no READMEDIR=${PREFIX}/share/doc/postfix .endif +SUB_LIST+= REQUIRE="${_REQUIRE}" + pre-patch: @${ECHO} "<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>" \ > ${WRKSRC}/html/body_checks.5.html diff --git a/mail/postfix22/files/postfix.sh.in b/mail/postfix22/files/postfix.sh.in new file mode 100644 index 000000000000..8424abbe123b --- /dev/null +++ b/mail/postfix22/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/postfix22/pkg-message b/mail/postfix22/pkg-message index f129b27a8375..d4bc72bd9c7d 100644 --- a/mail/postfix22/pkg-message +++ b/mail/postfix22/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" diff --git a/mail/postfix22/scripts/configure.postfix b/mail/postfix22/scripts/configure.postfix index 9c4efcf4f411..a35237fd08f9 100644 --- a/mail/postfix22/scripts/configure.postfix +++ b/mail/postfix22/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.69 2005-11-30 22:25:35 mnag Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.70 2006-01-12 16:23:59 mnag Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -196,6 +196,7 @@ while [ "$1" ]; do fi fi echo "MYSQL_SUFFIX= +mysql" + echo "_REQUIRE+= mysql" MYSQL_SELECTED="YES" ;; PgSQL) @@ -203,12 +204,14 @@ while [ "$1" ]; do echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PGSQL_SUFFIX= +pgsql" + echo "_REQUIRE+= postgresql" ;; OpenLDAP) echo "USE_OPENLDAP=YES" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap" + echo "_REQUIRE+= slapd" echo ".if defined(WITH_OPENLDAP_VER)" echo "WANT_OPENLDAP_VER=\${WITH_OPENLDAP_VER}" echo ".endif" @@ -222,6 +225,7 @@ while [ "$1" ]; do NIS) echo "POSTFIX_CCARGS+= -DHAS_NIS" echo "NIS_SUFFIX= +nis" + echo "_REQUIRE+= ypserv" ;; VDA) echo "PATCH_SITES+= http://web.onda.com.br/nadal/postfix/VDA/" diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile index 207c0f76f7c1..b8c05f737602 100644 --- a/mail/postfix23/Makefile +++ b/mail/postfix23/Makefile @@ -16,6 +16,7 @@ PORTNAME= postfix PORTVERSION= 2.2.8 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -36,6 +37,7 @@ CONFLICTS= courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \ sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* USE_SUBMAKE= yes USE_REINPLACE= yes +USE_RC_SUBR= postfix.sh MAN1= postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \ postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1 @@ -70,6 +72,9 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ MKDIR="${MKDIR}" \ POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" +# Default requirement for postfix rcNG +_REQUIRE= DAEMON + pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix @@ -80,7 +85,7 @@ pre-fetch: .if defined(WITHOUT_PCRE) POSTFIX_CCARGS+= -DNO_PCRE .else -LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre +LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre .endif @@ -91,6 +96,8 @@ READMEDIR=no READMEDIR=${PREFIX}/share/doc/postfix .endif +SUB_LIST+= REQUIRE="${_REQUIRE}" + pre-patch: @${ECHO} "<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>" \ > ${WRKSRC}/html/body_checks.5.html diff --git a/mail/postfix23/files/postfix.sh.in b/mail/postfix23/files/postfix.sh.in new file mode 100644 index 000000000000..8424abbe123b --- /dev/null +++ b/mail/postfix23/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/postfix23/pkg-message b/mail/postfix23/pkg-message index f129b27a8375..d4bc72bd9c7d 100644 --- a/mail/postfix23/pkg-message +++ b/mail/postfix23/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" diff --git a/mail/postfix23/scripts/configure.postfix b/mail/postfix23/scripts/configure.postfix index 27400d2b9db2..87b3a3c64d75 100644 --- a/mail/postfix23/scripts/configure.postfix +++ b/mail/postfix23/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.69 2005-11-30 22:25:35 mnag Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.70 2006-01-12 16:23:59 mnag Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -196,6 +196,7 @@ while [ "$1" ]; do fi fi echo "MYSQL_SUFFIX= +mysql" + echo "_REQUIRE+= mysql" MYSQL_SELECTED="YES" ;; PgSQL) @@ -203,12 +204,14 @@ while [ "$1" ]; do echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PGSQL_SUFFIX= +pgsql" + echo "_REQUIRE+= postgresql" ;; OpenLDAP) echo "USE_OPENLDAP=YES" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap" + echo "_REQUIRE+= slapd" echo ".if defined(WITH_OPENLDAP_VER)" echo "WANT_OPENLDAP_VER=\${WITH_OPENLDAP_VER}" echo ".endif" @@ -222,6 +225,7 @@ while [ "$1" ]; do NIS) echo "POSTFIX_CCARGS+= -DHAS_NIS" echo "NIS_SUFFIX= +nis" + echo "_REQUIRE+= ypserv" ;; VDA) echo "PATCH_SITES+= http://web.onda.com.br/nadal/postfix/VDA/" diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile index 207c0f76f7c1..b8c05f737602 100644 --- a/mail/postfix24/Makefile +++ b/mail/postfix24/Makefile @@ -16,6 +16,7 @@ PORTNAME= postfix PORTVERSION= 2.2.8 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -36,6 +37,7 @@ CONFLICTS= courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \ sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* USE_SUBMAKE= yes USE_REINPLACE= yes +USE_RC_SUBR= postfix.sh MAN1= postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \ postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1 @@ -70,6 +72,9 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ MKDIR="${MKDIR}" \ POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" +# Default requirement for postfix rcNG +_REQUIRE= DAEMON + pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix @@ -80,7 +85,7 @@ pre-fetch: .if defined(WITHOUT_PCRE) POSTFIX_CCARGS+= -DNO_PCRE .else -LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre +LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre .endif @@ -91,6 +96,8 @@ READMEDIR=no READMEDIR=${PREFIX}/share/doc/postfix .endif +SUB_LIST+= REQUIRE="${_REQUIRE}" + pre-patch: @${ECHO} "<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>" \ > ${WRKSRC}/html/body_checks.5.html diff --git a/mail/postfix24/files/postfix.sh.in b/mail/postfix24/files/postfix.sh.in new file mode 100644 index 000000000000..8424abbe123b --- /dev/null +++ b/mail/postfix24/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/postfix24/pkg-message b/mail/postfix24/pkg-message index f129b27a8375..d4bc72bd9c7d 100644 --- a/mail/postfix24/pkg-message +++ b/mail/postfix24/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" diff --git a/mail/postfix24/scripts/configure.postfix b/mail/postfix24/scripts/configure.postfix index 92e3e3400b42..e0922597056f 100644 --- a/mail/postfix24/scripts/configure.postfix +++ b/mail/postfix24/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.69 2005-11-30 22:25:35 mnag Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.70 2006-01-12 16:23:59 mnag Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -196,6 +196,7 @@ while [ "$1" ]; do fi fi echo "MYSQL_SUFFIX= +mysql" + echo "_REQUIRE+= mysql" MYSQL_SELECTED="YES" ;; PgSQL) @@ -203,12 +204,14 @@ while [ "$1" ]; do echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PGSQL_SUFFIX= +pgsql" + echo "_REQUIRE+= postgresql" ;; OpenLDAP) echo "USE_OPENLDAP=YES" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap" + echo "_REQUIRE+= slapd" echo ".if defined(WITH_OPENLDAP_VER)" echo "WANT_OPENLDAP_VER=\${WITH_OPENLDAP_VER}" echo ".endif" @@ -222,6 +225,7 @@ while [ "$1" ]; do NIS) echo "POSTFIX_CCARGS+= -DHAS_NIS" echo "NIS_SUFFIX= +nis" + echo "_REQUIRE+= ypserv" ;; VDA) echo "PATCH_SITES+= http://web.onda.com.br/nadal/postfix/VDA/" diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile index 207c0f76f7c1..b8c05f737602 100644 --- a/mail/postfix25/Makefile +++ b/mail/postfix25/Makefile @@ -16,6 +16,7 @@ PORTNAME= postfix PORTVERSION= 2.2.8 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -36,6 +37,7 @@ CONFLICTS= courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \ sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* USE_SUBMAKE= yes USE_REINPLACE= yes +USE_RC_SUBR= postfix.sh MAN1= postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \ postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1 @@ -70,6 +72,9 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ MKDIR="${MKDIR}" \ POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" +# Default requirement for postfix rcNG +_REQUIRE= DAEMON + pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix @@ -80,7 +85,7 @@ pre-fetch: .if defined(WITHOUT_PCRE) POSTFIX_CCARGS+= -DNO_PCRE .else -LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre +LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre .endif @@ -91,6 +96,8 @@ READMEDIR=no READMEDIR=${PREFIX}/share/doc/postfix .endif +SUB_LIST+= REQUIRE="${_REQUIRE}" + pre-patch: @${ECHO} "<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>" \ > ${WRKSRC}/html/body_checks.5.html diff --git a/mail/postfix25/files/postfix.sh.in b/mail/postfix25/files/postfix.sh.in new file mode 100644 index 000000000000..8424abbe123b --- /dev/null +++ b/mail/postfix25/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/postfix25/pkg-message b/mail/postfix25/pkg-message index f129b27a8375..d4bc72bd9c7d 100644 --- a/mail/postfix25/pkg-message +++ b/mail/postfix25/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" diff --git a/mail/postfix25/scripts/configure.postfix b/mail/postfix25/scripts/configure.postfix index 25d6ffc2797f..02ec70804163 100644 --- a/mail/postfix25/scripts/configure.postfix +++ b/mail/postfix25/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.69 2005-11-30 22:25:35 mnag Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.70 2006-01-12 16:23:59 mnag Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -196,6 +196,7 @@ while [ "$1" ]; do fi fi echo "MYSQL_SUFFIX= +mysql" + echo "_REQUIRE+= mysql" MYSQL_SELECTED="YES" ;; PgSQL) @@ -203,12 +204,14 @@ while [ "$1" ]; do echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PGSQL_SUFFIX= +pgsql" + echo "_REQUIRE+= postgresql" ;; OpenLDAP) echo "USE_OPENLDAP=YES" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap" + echo "_REQUIRE+= slapd" echo ".if defined(WITH_OPENLDAP_VER)" echo "WANT_OPENLDAP_VER=\${WITH_OPENLDAP_VER}" echo ".endif" @@ -222,6 +225,7 @@ while [ "$1" ]; do NIS) echo "POSTFIX_CCARGS+= -DHAS_NIS" echo "NIS_SUFFIX= +nis" + echo "_REQUIRE+= ypserv" ;; VDA) echo "PATCH_SITES+= http://web.onda.com.br/nadal/postfix/VDA/" diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile index 207c0f76f7c1..b8c05f737602 100644 --- a/mail/postfix26/Makefile +++ b/mail/postfix26/Makefile @@ -16,6 +16,7 @@ PORTNAME= postfix PORTVERSION= 2.2.8 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -36,6 +37,7 @@ CONFLICTS= courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \ sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* USE_SUBMAKE= yes USE_REINPLACE= yes +USE_RC_SUBR= postfix.sh MAN1= postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \ postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1 @@ -70,6 +72,9 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ MKDIR="${MKDIR}" \ POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" +# Default requirement for postfix rcNG +_REQUIRE= DAEMON + pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix @@ -80,7 +85,7 @@ pre-fetch: .if defined(WITHOUT_PCRE) POSTFIX_CCARGS+= -DNO_PCRE .else -LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre +LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre .endif @@ -91,6 +96,8 @@ READMEDIR=no READMEDIR=${PREFIX}/share/doc/postfix .endif +SUB_LIST+= REQUIRE="${_REQUIRE}" + pre-patch: @${ECHO} "<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>" \ > ${WRKSRC}/html/body_checks.5.html diff --git a/mail/postfix26/files/postfix.sh.in b/mail/postfix26/files/postfix.sh.in new file mode 100644 index 000000000000..8424abbe123b --- /dev/null +++ b/mail/postfix26/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/postfix26/pkg-message b/mail/postfix26/pkg-message index f129b27a8375..d4bc72bd9c7d 100644 --- a/mail/postfix26/pkg-message +++ b/mail/postfix26/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" diff --git a/mail/postfix26/scripts/configure.postfix b/mail/postfix26/scripts/configure.postfix index 8224ebe7a079..089b3ea8bab3 100644 --- a/mail/postfix26/scripts/configure.postfix +++ b/mail/postfix26/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.69 2005-11-30 22:25:35 mnag Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.70 2006-01-12 16:23:59 mnag Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -196,6 +196,7 @@ while [ "$1" ]; do fi fi echo "MYSQL_SUFFIX= +mysql" + echo "_REQUIRE+= mysql" MYSQL_SELECTED="YES" ;; PgSQL) @@ -203,12 +204,14 @@ while [ "$1" ]; do echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PGSQL_SUFFIX= +pgsql" + echo "_REQUIRE+= postgresql" ;; OpenLDAP) echo "USE_OPENLDAP=YES" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap" + echo "_REQUIRE+= slapd" echo ".if defined(WITH_OPENLDAP_VER)" echo "WANT_OPENLDAP_VER=\${WITH_OPENLDAP_VER}" echo ".endif" @@ -222,6 +225,7 @@ while [ "$1" ]; do NIS) echo "POSTFIX_CCARGS+= -DHAS_NIS" echo "NIS_SUFFIX= +nis" + echo "_REQUIRE+= ypserv" ;; VDA) echo "PATCH_SITES+= http://web.onda.com.br/nadal/postfix/VDA/" diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile index 207c0f76f7c1..b8c05f737602 100644 --- a/mail/postfix27/Makefile +++ b/mail/postfix27/Makefile @@ -16,6 +16,7 @@ PORTNAME= postfix PORTVERSION= 2.2.8 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -36,6 +37,7 @@ CONFLICTS= courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \ sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* USE_SUBMAKE= yes USE_REINPLACE= yes +USE_RC_SUBR= postfix.sh MAN1= postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \ postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1 @@ -70,6 +72,9 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ MKDIR="${MKDIR}" \ POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" +# Default requirement for postfix rcNG +_REQUIRE= DAEMON + pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix @@ -80,7 +85,7 @@ pre-fetch: .if defined(WITHOUT_PCRE) POSTFIX_CCARGS+= -DNO_PCRE .else -LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre +LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre .endif @@ -91,6 +96,8 @@ READMEDIR=no READMEDIR=${PREFIX}/share/doc/postfix .endif +SUB_LIST+= REQUIRE="${_REQUIRE}" + pre-patch: @${ECHO} "<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>" \ > ${WRKSRC}/html/body_checks.5.html diff --git a/mail/postfix27/files/postfix.sh.in b/mail/postfix27/files/postfix.sh.in new file mode 100644 index 000000000000..8424abbe123b --- /dev/null +++ b/mail/postfix27/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/postfix27/pkg-message b/mail/postfix27/pkg-message index f129b27a8375..d4bc72bd9c7d 100644 --- a/mail/postfix27/pkg-message +++ b/mail/postfix27/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" diff --git a/mail/postfix27/scripts/configure.postfix b/mail/postfix27/scripts/configure.postfix index 1e81ba3eb51c..30eb98d90545 100644 --- a/mail/postfix27/scripts/configure.postfix +++ b/mail/postfix27/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.69 2005-11-30 22:25:35 mnag Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.70 2006-01-12 16:23:59 mnag Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -196,6 +196,7 @@ while [ "$1" ]; do fi fi echo "MYSQL_SUFFIX= +mysql" + echo "_REQUIRE+= mysql" MYSQL_SELECTED="YES" ;; PgSQL) @@ -203,12 +204,14 @@ while [ "$1" ]; do echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PGSQL_SUFFIX= +pgsql" + echo "_REQUIRE+= postgresql" ;; OpenLDAP) echo "USE_OPENLDAP=YES" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap" + echo "_REQUIRE+= slapd" echo ".if defined(WITH_OPENLDAP_VER)" echo "WANT_OPENLDAP_VER=\${WITH_OPENLDAP_VER}" echo ".endif" @@ -222,6 +225,7 @@ while [ "$1" ]; do NIS) echo "POSTFIX_CCARGS+= -DHAS_NIS" echo "NIS_SUFFIX= +nis" + echo "_REQUIRE+= ypserv" ;; VDA) echo "PATCH_SITES+= http://web.onda.com.br/nadal/postfix/VDA/" diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile index 207c0f76f7c1..b8c05f737602 100644 --- a/mail/postfix28/Makefile +++ b/mail/postfix28/Makefile @@ -16,6 +16,7 @@ PORTNAME= postfix PORTVERSION= 2.2.8 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -36,6 +37,7 @@ CONFLICTS= courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \ sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* USE_SUBMAKE= yes USE_REINPLACE= yes +USE_RC_SUBR= postfix.sh MAN1= postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \ postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1 @@ -70,6 +72,9 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ MKDIR="${MKDIR}" \ POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" +# Default requirement for postfix rcNG +_REQUIRE= DAEMON + pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix @@ -80,7 +85,7 @@ pre-fetch: .if defined(WITHOUT_PCRE) POSTFIX_CCARGS+= -DNO_PCRE .else -LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre +LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre .endif @@ -91,6 +96,8 @@ READMEDIR=no READMEDIR=${PREFIX}/share/doc/postfix .endif +SUB_LIST+= REQUIRE="${_REQUIRE}" + pre-patch: @${ECHO} "<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>" \ > ${WRKSRC}/html/body_checks.5.html diff --git a/mail/postfix28/files/postfix.sh.in b/mail/postfix28/files/postfix.sh.in new file mode 100644 index 000000000000..8424abbe123b --- /dev/null +++ b/mail/postfix28/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/postfix28/pkg-message b/mail/postfix28/pkg-message index f129b27a8375..d4bc72bd9c7d 100644 --- a/mail/postfix28/pkg-message +++ b/mail/postfix28/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" diff --git a/mail/postfix28/scripts/configure.postfix b/mail/postfix28/scripts/configure.postfix index 9bab0bf4e3ad..e7c5a0c20e6c 100644 --- a/mail/postfix28/scripts/configure.postfix +++ b/mail/postfix28/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.69 2005-11-30 22:25:35 mnag Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.70 2006-01-12 16:23:59 mnag Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -196,6 +196,7 @@ while [ "$1" ]; do fi fi echo "MYSQL_SUFFIX= +mysql" + echo "_REQUIRE+= mysql" MYSQL_SELECTED="YES" ;; PgSQL) @@ -203,12 +204,14 @@ while [ "$1" ]; do echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PGSQL_SUFFIX= +pgsql" + echo "_REQUIRE+= postgresql" ;; OpenLDAP) echo "USE_OPENLDAP=YES" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap" + echo "_REQUIRE+= slapd" echo ".if defined(WITH_OPENLDAP_VER)" echo "WANT_OPENLDAP_VER=\${WITH_OPENLDAP_VER}" echo ".endif" @@ -222,6 +225,7 @@ while [ "$1" ]; do NIS) echo "POSTFIX_CCARGS+= -DHAS_NIS" echo "NIS_SUFFIX= +nis" + echo "_REQUIRE+= ypserv" ;; VDA) echo "PATCH_SITES+= http://web.onda.com.br/nadal/postfix/VDA/" |