From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Apr 6 07:11:01 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 69D0116A4CE for ; Tue, 6 Apr 2004 07:11:01 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4DE2B43D5F for ; Tue, 6 Apr 2004 07:11:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i36EAKbv027750 for ; Tue, 6 Apr 2004 07:10:20 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i36EAKLe027749; Tue, 6 Apr 2004 07:10:20 -0700 (PDT) (envelope-from gnats) Resent-Date: Tue, 6 Apr 2004 07:10:20 -0700 (PDT) Resent-Message-Id: <200404061410.i36EAKLe027749@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, Xin LI Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 62DDB16A4CE; Tue, 6 Apr 2004 07:00:53 -0700 (PDT) Received: from ftp.bjpu.edu.cn (ftp.bjpu.edu.cn [202.112.78.5]) by mx1.FreeBSD.org (Postfix) with ESMTP id 08F0F43D1D; Tue, 6 Apr 2004 07:00:53 -0700 (PDT) (envelope-from delphij@frontfree.net) Received: from localhost (localhost [127.0.0.1]) by ftp.bjpu.edu.cn (Postfix) with ESMTP id A570E539C; Tue, 6 Apr 2004 22:00:00 +0800 (CST) Received: from ftp.bjpu.edu.cn ([127.0.0.1]) by localhost (ftp.bjpu.edu.cn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 81607-01; Tue, 6 Apr 2004 21:59:57 +0800 (CST) Received: from beastie.frontfree.net (beastie.frontfree.net [218.107.145.7]) by ftp.bjpu.edu.cn (Postfix) with ESMTP id 7546E529C; Tue, 6 Apr 2004 21:59:56 +0800 (CST) Received: from localhost (localhost [127.0.0.1]) by beastie.frontfree.net (Postfix) with ESMTP id BA93612509; Tue, 6 Apr 2004 21:59:55 +0800 (CST) Received: from beastie.frontfree.net ([127.0.0.1]) by localhost (beastie.frontfree.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 00386-08; Tue, 6 Apr 2004 21:59:52 +0800 (CST) Received: by beastie.frontfree.net (Postfix, from userid 1001) id EE30D124FE; Tue, 6 Apr 2004 21:59:51 +0800 (CST) Message-Id: <20040406135951.EE30D124FE@beastie.frontfree.net> Date: Tue, 6 Apr 2004 21:59:51 +0800 (CST) From: Xin LI To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: mlaier@FreeBSD.org Subject: ports/65252: [PATCH] Make mail/spamd to follow hier(8) custom X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Xin LI List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2004 14:11:01 -0000 >Number: 65252 >Category: ports >Synopsis: [PATCH] Make mail/spamd to follow hier(8) custom >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Apr 06 07:10:19 PDT 2004 >Closed-Date: >Last-Modified: >Originator: Xin LI >Release: FreeBSD 5.2-CURRENT i386 >Organization: The FreeBSD Simplified Chinese Project >Environment: System: FreeBSD beastie.frontfree.net 5.2-CURRENT FreeBSD 5.2-CURRENT #58: Fri Mar 19 12:18:47 CST 2004 delphij@beastie.frontfree.net:/usr/obj/usr/src/sys/BEASTIE i386 >Description: The spamd port installs its configuration, spamd.conf into {PREFIX}/etc/, however, both spamd and spamd-setup locates it in /etc. To make it more conformant with hier(8), we should have the manpages and binaries patched to follow hier(8). The proposaled patch will automatically patch spamd's source code and manpages. As it changes the default location of spamd.conf, I think a headsup should be sent to ports@, and it will be good to have a ports/UPDATING entry for this, if the patch was accepted. Please review the patch and consider committing it. >How-To-Repeat: man 8 spamd.conf >Fix: Apply the following patch against ports/mail/spamd. I think it will be good to have a PORTREVISION bump for this, as it changes the location of configuration file. --- patch-spamd begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/mail/spamd/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- Makefile 3 Apr 2004 16:42:37 -0000 1.4 +++ Makefile 6 Apr 2004 13:32:09 -0000 @@ -39,6 +39,16 @@ LOCAL_PFCTL= /sbin/pfctl .endif +do-patch: +.for ii in c 8 + ${CP} -p ${WRKSRC}/spamd/spamd.${ii} ${WRKSRC}/spamd/spamd.${ii}.orig + ${SED} -e "s:/etc/spamd.conf:${PREFIX}/etc/spamd.conf:" < ${WRKSRC}/spamd/spamd.${ii}.orig \ + > ${WRKSRC}/spamd/spamd.${ii} + ${CP} -p ${WRKSRC}/spamd-setup/spamd-setup.${ii} ${WRKSRC}/spamd-setup/spamd-setup.${ii}.orig + ${SED} -e "s:/etc/spamd.conf:${PREFIX}/etc/spamd.conf:" < ${WRKSRC}/spamd-setup/spamd-setup.${ii}.orig \ + > ${WRKSRC}/spamd-setup/spamd-setup.${ii} +.endfor + post-patch: @${REINPLACE_CMD} -e 's|%%LOCAL_PFCTL%%|${LOCAL_PFCTL}|; \ s|%%LOCAL_SPAMD_CONF%%|${PREFIX}/etc/spamd.conf|' \ --- patch-spamd ends here --- >Release-Note: >Audit-Trail: >Unformatted: