From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Nov 29 22:00:26 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AB11E10656B4 for ; Mon, 29 Nov 2010 22:00:26 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 3D1848FC2D for ; Mon, 29 Nov 2010 22:00:23 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oATM0MEl036078 for ; Mon, 29 Nov 2010 22:00:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oATM0M1S036055; Mon, 29 Nov 2010 22:00:22 GMT (envelope-from gnats) Resent-Date: Mon, 29 Nov 2010 22:00:22 GMT Resent-Message-Id: <201011292200.oATM0M1S036055@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Lev A. Serebryakov" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23311106564A for ; Mon, 29 Nov 2010 21:51:22 +0000 (UTC) (envelope-from lev@ftp.translate.ru) Received: from ftp.translate.ru (ftp.translate.ru [80.249.188.42]) by mx1.freebsd.org (Postfix) with ESMTP id D77E48FC0A for ; Mon, 29 Nov 2010 21:51:21 +0000 (UTC) Received: by ftp.translate.ru (Postfix, from userid 1000) id A260913DF42; Tue, 30 Nov 2010 00:51:19 +0300 (MSK) Message-Id: <20101129215119.A260913DF42@ftp.translate.ru> Date: Tue, 30 Nov 2010 00:51:19 +0300 (MSK) From: "Lev A. Serebryakov" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: bra@fsn.hu Subject: ports/152684: [patch][mail/dovecot2] Many improvements to default config files of dovecot2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Lev A. Serebryakov" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Nov 2010 22:00:26 -0000 >Number: 152684 >Category: ports >Synopsis: [patch][mail/dovecot2] Many improvements to default config files of dovecot2 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Nov 29 22:00:22 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Lev A. Serebryakov >Release: FreeBSD 8.2-PRERELEASE amd64 >Organization: >Environment: System: FreeBSD blob.home.serebryakov.spb.ru 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #0: Thu Nov 25 23:43:53 MSK 2010 lev@blob.home.serebryakov.spb.ru:/usr/obj/usr/src/sys/BLOB amd64 >Description: dovecot2 has modular config with many small files. Now port installs them into "${DOCDIR}/example-config" which doesn't look right. Also, port replace example paths like "/etc/dovecot" with "${PREFIX}/etc/dovecot" only in "main" config, which doesn't look right too. This patch moves example config into ${EXAMPLESDIR} and makes paths ${PREFIX}-relative in ALL config files. >How-To-Repeat: Install dovecot2 port now :) >Fix: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/mail/dovecot2/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- Makefile 27 Nov 2010 05:53:35 -0000 1.1 +++ Makefile 29 Nov 2010 21:49:42 -0000 @@ -7,6 +7,7 @@ PORTNAME= dovecot PORTVERSION= 2.0.7 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= http://www.dovecot.org/releases/${DOVECOTVERSION}/ @@ -195,12 +196,14 @@ MAN7= doveadm-search-query.7 post-patch: - @${REINPLACE_CMD} -E -e '${REINPLACE}' \ - ${WRKSRC}/doc/example-config/dovecot.conf + @for cfg in `${FIND} ${WRKSRC}/doc/example-config -name '*.conf' -o -name '*.conf.ext'` ; do \ + ${REINPLACE_CMD} -E -e '${REINPLACE}' $$cfg ; \ + done @${REINPLACE_CMD} -E -e'\ s!-example\.conf[[:>:]]!.conf!g;\ s!^(confdir[[:space:]]+=[[:space:]]+)\$$\(sysconfdir\)!\1${EXAMPLESDIR}!g;\ - ' ${WRKSRC}/*/Makefile.in ${WRKSRC}/Makefile.in + s!^(exampledir[[:space:]]+=[[:space:]]+)\$$\(docdir\)!\1${EXAMPLESDIR}!g; \ + ' `find ${WRKSRC} -name Makefile.in` .if defined(WITH_GSSAPI) @${REINPLACE_CMD} -e '\ s!!!;\ >Release-Note: >Audit-Trail: >Unformatted: