From owner-freebsd-bugs@FreeBSD.ORG Tue Feb 22 13:20:07 2011 Return-Path: Delivered-To: freebsd-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 EEF91106566C for ; Tue, 22 Feb 2011 13:20:06 +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 A88608FC17 for ; Tue, 22 Feb 2011 13:20:06 +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 p1MDK6Ox096274 for ; Tue, 22 Feb 2011 13:20:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p1MDK6bY096273; Tue, 22 Feb 2011 13:20:06 GMT (envelope-from gnats) Resent-Date: Tue, 22 Feb 2011 13:20:06 GMT Resent-Message-Id: <201102221320.p1MDK6bY096273@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alex Deiter Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A5FCC1065672 for ; Tue, 22 Feb 2011 13:16:06 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 94BC88FC14 for ; Tue, 22 Feb 2011 13:16:06 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p1MDG6lE048193 for ; Tue, 22 Feb 2011 13:16:06 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p1MDG6Gt048192; Tue, 22 Feb 2011 13:16:06 GMT (envelope-from nobody) Message-Id: <201102221316.p1MDG6Gt048192@red.freebsd.org> Date: Tue, 22 Feb 2011 13:16:06 GMT From: Alex Deiter To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: misc/154956: [PATCH] default config file for mail/exim X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 13:20:07 -0000 >Number: 154956 >Category: misc >Synopsis: [PATCH] default config file for mail/exim >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Feb 22 13:20:06 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Alex Deiter >Release: 8.1-RELEASE >Organization: N/A >Environment: FreeBSD bbb.tune-it.ru 9.0-CURRENT FreeBSD 9.0-CURRENT #3: Wed Dec 22 18:53:26 MSK 2010 root@sunway:/usr/obj/usr/src/sys/sunway amd64 >Description: Port mail/exim does not provide way for specify default location of the configuration file: ${PREFIX}/etc/exim/configure Please review patch >How-To-Repeat: cd /usr/ports/mail/exim make install >Fix: cd /usr/ports/mail/exim patch -p0 < exim.txt make CFG_FILE_PATH=/path/to/exim/cfg install Patch attached with submission follows: --- Makefile.orig 2011-02-22 15:13:43.943379507 +0300 +++ Makefile 2011-02-22 15:21:43.197378364 +0300 @@ -125,6 +125,7 @@ LOGDIR?= /var/log/exim LOG_FILE_PATH?= ${LOGDIR}/%slog +CFG_FILE_PATH?= ${PREFIX}/etc/exim/configure SED_SCRIPT= -e 's,%%PREFIX%%,${PREFIX},g' \ -e 's,%%DOCSDIR%%,${DOCSDIR},g' \ @@ -173,6 +174,7 @@ -e 's,XX_PREFIX_XX,${PREFIX},' \ -e 's,XX_LOCALBASE_XX,${LOCALBASE},' \ -e 's,XX_LOG_FILE_PATH_XX,${LOG_FILE_PATH},' \ + -e 's,XX_CFG_FILE_PATH_XX,${CFG_FILE_PATH},' \ -e 's,XX_EXIM_USER_XX,${EXIM_USER},' \ -e 's,XX_EXIM_GROUP_XX,${EXIM_GROUP},' \ -e 's,XX_DEFAULT_CHARSET_XX,${WITH_DEFAULT_CHARSET},' --- files/patch-src::EDITME.orig 2011-02-22 15:22:53.968385506 +0300 +++ files/patch-src::EDITME 2011-02-22 15:24:00.345380187 +0300 @@ -14,7 +14,7 @@ # file does not exist. -CONFIGURE_FILE=/usr/exim/configure -+CONFIGURE_FILE=XX_PREFIX_XX/etc/exim/configure ++CONFIGURE_FILE=XX_CFG_FILE_PATH_XX # It is possible to specify a colon-separated list of files for CONFIGURE_FILE. # In this case, Exim will use the first of them that exists when it is run. >Release-Note: >Audit-Trail: >Unformatted: