Attachment 40904 Details for Bug 64174 – spamd.diff

[patch] spamd.diff

spamd.diff (text/x-diff; charset="us-ascii"), 3.25 KB, created by Max Laier on 2004-04-02 03:13:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Max Laier

Created: 2004-04-02 03:13:18 UTC

Size: 3.25 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/mail/spamd/Makefile,v
>retrieving revision 1.3
>diff -u -r1.3 Makefile
>--- Makefile	14 Mar 2004 11:46:59 -0000	1.3
>+++ Makefile	2 Apr 2004 02:01:01 -0000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	spamd
>-PORTVERSION=	3.4
>+PORTVERSION=	3.5
> CATEGORIES=	mail
> MASTER_SITES=	http://pf4freebsd.love2party.net/
> DISTNAME=	${PORTNAME}_${PORTVERSION}
>@@ -18,12 +18,10 @@
> IS_INTERACTIVE=	yes
> .endif
> 
>-MAN5=		spamd.conf.5
>-MAN8=		spamd.8 spamd-setup.8
>-
>-MANCOMPRESSED=	maybe
>+USE_REINPLACE=	yes
> 
>-MAKE_ARGS=	MANDIR="${PREFIX}/man/man"
>+MAN5=		spamd.conf.5
>+MAN8=		spamd.8 spamd-setup.8 spamdb.8 spamlogd.8
> 
> SAMPLE_SPAMD_CONF=	${PREFIX}/etc/spamd.conf.sample
> SAMPLE_SPAMD_RC=	${PREFIX}/etc/rc.d/spamd.sh
>@@ -36,19 +34,31 @@
> 
> .if ${OSVERSION} < 502106
> RUN_DEPENDS=	${LOCALBASE}/sbin/pfctl:${PORTSDIR}/security/pf
>+LOCAL_PFCTL=	${PREFIX}/sbin/pfctl
>+.else
>+LOCAL_PFCTL=	/sbin/pfctl
> .endif
> 
> post-patch:
>-	${SED} -e 's!%%LOCALBASE%%!${LOCALBASE}!'	\
>-		${PATCHDIR}/local-patch.sed | ${PATCH} 	\
>-		${WRKSRC}/spamd-setup/spamd-setup.c
>+	@${REINPLACE_CMD} -e 's|%%LOCAL_PFCTL%%|${LOCAL_PFCTL}|;	\
>+	    s|%%LOCAL_SPAMD_CONF%%|${PREFIX}/etc/spamd.conf|'		\
>+	    ${WRKSRC}/spamd-setup/spamd-setup.c
> 
> pre-su-install:
> .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
> 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
> .endif
> 
>-post-install:
>+do-install:
>+	${INSTALL_PROGRAM} ${WRKSRC}/spamd/spamd ${PREFIX}/libexec
>+	${INSTALL_PROGRAM} ${WRKSRC}/spamlogd/spamlogd ${PREFIX}/libexec
>+	${INSTALL_PROGRAM} ${WRKSRC}/spamd-setup/spamd-setup ${PREFIX}/sbin
>+	${INSTALL_PROGRAM} ${WRKSRC}/spamdb/spamdb ${PREFIX}/sbin
>+	${INSTALL_MAN} ${WRKSRC}/doc/spamd.conf.5 ${PREFIX}/man/man5
>+	${INSTALL_MAN} ${WRKSRC}/spamd/spamd.8 ${PREFIX}/man/man8
>+	${INSTALL_MAN} ${WRKSRC}/spamd-setup/spamd-setup.8 ${PREFIX}/man/man8
>+	${INSTALL_MAN} ${WRKSRC}/spamdb/spamdb.8 ${PREFIX}/man/man8
>+	${INSTALL_MAN} ${WRKSRC}/spamlogd/spamlogd.8 ${PREFIX}/man/man8
> 	@if [ ! -f ${SAMPLE_SPAMD_RC} ]; then			\
> 		${ECHO_MSG} "Installing ${SAMPLE_SPAMD_RC} startup file."; \
> 		${INSTALL_SCRIPT} ${FILESDIR}/spamd.sh.sample	\
>@@ -56,7 +66,7 @@
> 	fi
> 	@if [ ! -f ${SAMPLE_SPAMD_CONF} ]; then			\
> 		${ECHO_MSG} "Installing ${SAMPLE_SPAMD_CONF} file."; \
>-		${INSTALL_DATA} ${WRKSRC}/spamd/spamd.conf	\
>+		${INSTALL_DATA} ${WRKSRC}/doc/spamd.conf	\
> 		${SAMPLE_SPAMD_CONF};				\
> 	fi
> 
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/mail/spamd/distinfo,v
>retrieving revision 1.2
>diff -u -r1.2 distinfo
>--- distinfo	19 Mar 2004 01:51:10 -0000	1.2
>+++ distinfo	2 Apr 2004 01:22:22 -0000
>@@ -1,2 +1,2 @@
>-MD5 (spamd_3.4.tar.gz) = 628d0e0672b7bebb7bf6c562958480a6
>-SIZE (spamd_3.4.tar.gz) = 19900
>+MD5 (spamd_3.5.tar.gz) = 2d25ce07efff7c836ced1b284d00c693
>+SIZE (spamd_3.5.tar.gz) = 30664
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/mail/spamd/pkg-plist,v
>retrieving revision 1.1
>diff -u -r1.1 pkg-plist
>--- pkg-plist	29 Sep 2003 23:01:21 -0000	1.1
>+++ pkg-plist	2 Apr 2004 01:24:54 -0000
>@@ -1,4 +1,6 @@
> libexec/spamd
>+libexec/spamlogd
> sbin/spamd-setup
>+sbin/spamdb
> etc/rc.d/spamd.sh
> etc/spamd.conf.sample

Actions: View | Diff

Attachments on bug 64174: 40904