Date: Tue, 30 Nov 2010 00:51:19 +0300 (MSK) From: "Lev A. Serebryakov" <lev@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: bra@fsn.hu Subject: ports/152684: [patch][mail/dovecot2] Many improvements to default config files of dovecot2 Message-ID: <20101129215119.A260913DF42@ftp.translate.ru> Resent-Message-ID: <201011292200.oATM0M1S036055@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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!<gssapi/gssapi\.h>!<gssapi.h>!;\
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20101129215119.A260913DF42>