Attachment 92659 Details for Bug 130359 – dovecot.diff

[patch] dovecot.diff

dovecot.diff (text/plain; x-mac-type="0"; x-mac-creator="0"), 3.25 KB, created by Yarema on 2009-01-18 00:32:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yarema

Created: 2009-01-18 00:32:03 UTC

Size: 3.25 KB

patch

obsolete

>diff -u -r -N dovecot-1.1.7_1/Makefile dovecot/Makefile
>--- dovecot-1.1.7_1/Makefile	2008-12-13 01:56:30.000000000 -0500
>+++ dovecot/Makefile	2009-01-17 16:33:49.813961105 -0500
>@@ -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 @@
> _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 @@
> 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_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 -u -r -N dovecot-1.1.7_1/distinfo dovecot/distinfo
>--- dovecot-1.1.7_1/distinfo	2008-11-28 09:38:26.000000000 -0500
>+++ dovecot/distinfo	2009-01-17 16:50:50.020722538 -0500
>@@ -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 -u -r -N dovecot-1.1.7_1/files/dovecot.sh.in dovecot/files/dovecot.sh.in
>--- dovecot-1.1.7_1/files/dovecot.sh.in	2008-12-13 01:56:31.000000000 -0500
>+++ dovecot/files/dovecot.sh.in	2009-01-17 17:01:12.421022296 -0500
>@@ -49,11 +49,13 @@
> 
> # 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

Actions: View | Diff

Attachments on bug 130359: 92658 | 92659