Date: Tue, 6 Apr 2004 21:59:51 +0800 (CST) From: Xin LI <delphij@frontfree.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: mlaier@FreeBSD.org Subject: ports/65252: [PATCH] Make mail/spamd to follow hier(8) custom Message-ID: <20040406135951.EE30D124FE@beastie.frontfree.net> Resent-Message-ID: <200404061410.i36EAKLe027749@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040406135951.EE30D124FE>