diff options
| author | beech <beech@FreeBSD.org> | 2009-01-18 11:41:05 +0800 |
|---|---|---|
| committer | beech <beech@FreeBSD.org> | 2009-01-18 11:41:05 +0800 |
| commit | be6c3354cc8a61df985f30aa73b027c6b26cf357 (patch) | |
| tree | ba2cadb7bf488169dd210b39034b907a90afd5e4 | |
| parent | 2eabdcb190e88abdf37ce5005eb9d9db6eee2643 (diff) | |
| download | freebsd-ports-gnome-be6c3354cc8a61df985f30aa73b027c6b26cf357.tar.gz freebsd-ports-gnome-be6c3354cc8a61df985f30aa73b027c6b26cf357.tar.zst freebsd-ports-gnome-be6c3354cc8a61df985f30aa73b027c6b26cf357.zip | |
- Update to 1.1.8 [1]
- Fix rc.d [2]
PR: ports/130359 [1]
PR: ports/130598 [2]
Submitted by: Marcin Rzepecki <m.rzepecki@iem.pw.edu.pl> [1]
Submitted by: Craig Leres <leres@ee.lbl.gov> [2]
Approved by: Yarema <yds@CoolRat.org> (maintainer)
| -rw-r--r-- | mail/dovecot/Makefile | 9 | ||||
| -rw-r--r-- | mail/dovecot/distinfo | 12 | ||||
| -rw-r--r-- | mail/dovecot/files/dovecot.sh.in | 18 |
3 files changed, 20 insertions, 19 deletions
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 52e45f7cf3db..3a214889334d 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -6,8 +6,7 @@ # PORTNAME= dovecot -PORTVERSION= 1.1.7 -PORTREVISION= 1 +PORTVERSION= 1.1.8 CATEGORIES= mail ipv6 MASTER_SITES= http://www.dovecot.org/releases/1.1/ @@ -61,7 +60,7 @@ OPTIONS= KQUEUE "kqueue(2) support" on \ _REQUIRE= LOGIN # sed script for dovecot.conf -SED_CONF= s!%%PROTOCOLS%%!${PROTOCOLS}!g;\ +REINPLACE= s!%%PROTOCOLS%%!${PROTOCOLS}!g;\ s!/usr/!${PREFIX}/!g;\ s!=/usr!=${PREFIX}!g;\ s!=/etc !=${PREFIX}/etc !g;\ @@ -147,7 +146,7 @@ USE_BDB= yes CONFIGURE_ARGS+= --with-db CFLAGS+= -I${BDB_INCLUDE_DIR} -L${BDB_LIB_DIR} PLIST_SUB+= BDB="" -SED_CONF+= s!^\#(dict_db_config)!\1!; +REINPLACE+= s!^\#(dict_db_config)!\1!; .else PLIST_SUB+= BDB="@comment " .endif @@ -203,7 +202,7 @@ SUB_LIST+= REQUIRE="${_REQUIRE}" DOVECOT_UID=${DOVECOT_UID} DOVECOT_GID=${DOVEC SUB_FILES+= pkg-install pkg-deinstall pkg-message post-patch: - @${REINPLACE_CMD} -E -e '${SED_CONF}' \ + @${REINPLACE_CMD} -E -e '${REINPLACE}' \ ${WRKSRC}/dovecot-example.conf @${REINPLACE_CMD} -E -e'\ s!-example\.conf[[:>:]]!.conf!g;\ diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo index 91db5e342bec..bb26eb0eb71b 100644 --- a/mail/dovecot/distinfo +++ b/mail/dovecot/distinfo @@ -1,6 +1,6 @@ -MD5 (dovecot-1.1.7.tar.gz) = ea83ea2000a5b2e1744c7c97eb5585d1 -SHA256 (dovecot-1.1.7.tar.gz) = 915cae7684438c6335d0472ff20ec2fe44d620aa61f404ce91fd02a27434cf9f -SIZE (dovecot-1.1.7.tar.gz) = 2325617 -MD5 (dovecot-1.1.7-managesieve-0.10.4.diff.gz) = 57a751fb10ac3fcb700d5cc434546be2 -SHA256 (dovecot-1.1.7-managesieve-0.10.4.diff.gz) = dc13a3c231c7bd29a452e16f3654c941bfc2a89c31e6b392ac76ca47cd897a76 -SIZE (dovecot-1.1.7-managesieve-0.10.4.diff.gz) = 5912 +MD5 (dovecot-1.1.8.tar.gz) = bc23a919c7ad2b3c5ba69e19f1b46eb2 +SHA256 (dovecot-1.1.8.tar.gz) = 15e82f60b9116f592ade07bed218ff5aa0c7370f31e49f830241f37fcd2dbf48 +SIZE (dovecot-1.1.8.tar.gz) = 2353524 +MD5 (dovecot-1.1.8-managesieve-0.10.4.diff.gz) = a2f663940115e136db4bf3b1b760759b +SHA256 (dovecot-1.1.8-managesieve-0.10.4.diff.gz) = 937b55fafe722c81a1ec650ce03fb69957b22ccc9ac77091c08b93a6e7b40000 +SIZE (dovecot-1.1.8-managesieve-0.10.4.diff.gz) = 6215 diff --git a/mail/dovecot/files/dovecot.sh.in b/mail/dovecot/files/dovecot.sh.in index 176d647c657b..2f3a84a38ca8 100644 --- a/mail/dovecot/files/dovecot.sh.in +++ b/mail/dovecot/files/dovecot.sh.in @@ -49,11 +49,13 @@ restart_cmd() # To start multiple instances of dovecot set dovecot_config to # a space seperated list of configuration files. -for config in ${dovecot_config}; do - required_files="${config}" - command_args="-c ${config}" - base_dir=$(${command} ${command_args} -a | /usr/bin/awk -F ': ' '/^base_dir:/ { print $2 }') - login_dir=$(${command} ${command_args} -a | /usr/bin/awk -F ': ' '/^login_dir:/ { print $2 }') - pidfile="${base_dir}/master.pid" - run_rc_command "$1" -done +if checkyesno ${name}_enable; then + for config in ${dovecot_config}; do + required_files="${config}" + command_args="-c ${config}" + base_dir=$(${command} ${command_args} -a | /usr/bin/awk -F ': ' '/^base_dir:/ { print $2 }') + login_dir=$(${command} ${command_args} -a | /usr/bin/awk -F ': ' '/^login_dir:/ { print $2 }') + pidfile="${base_dir}/master.pid" + run_rc_command "$1" + done +fi |