View | Details | Raw Unified | Return to bug 187101 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-15 / +13 lines)
Lines 1-12 Link Here
1
# Created by: Petr Rehor <prehor@gmail.com>
1
# Created by: Petr Rehor <rx@rx.cz>
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	amavisd-milter
4
PORTNAME=	amavisd-milter
5
PORTVERSION=	1.6.0
5
PORTVERSION=	1.6.0
6
PORTREVISION=	1
6
CATEGORIES=	security mail
7
CATEGORIES=	security mail
7
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
8
9
9
MAINTAINER=	prehor@gmail.com
10
MAINTAINER=	rx@rx.cz
10
COMMENT=	Milter for amavisd-new
11
COMMENT=	Milter for amavisd-new
11
12
12
RUN_DEPENDS=	amavisd:${PORTSDIR}/security/amavisd-new
13
RUN_DEPENDS=	amavisd:${PORTSDIR}/security/amavisd-new
Lines 24-46 Link Here
24
25
25
# Shared defaults with security/amavisd-new
26
# Shared defaults with security/amavisd-new
26
AMAVISUSER?=	vscan
27
AMAVISUSER?=	vscan
28
AMAVISGROUP?=	vscan
27
AMAVISDIR?=	/var/amavis
29
AMAVISDIR?=	/var/amavis
28
30
31
RUNDIR=		/var/run/amavis
32
29
GNU_CONFIGURE=	yes
33
GNU_CONFIGURE=	yes
30
CONFIGURE_ARGS=	--localstatedir=${AMAVISDIR} --with-working-dir=tmp
34
CONFIGURE_ARGS=	--localstatedir=${RUNDIR} --with-working-dir=tmp
31
USE_RC_SUBR=	${PORTNAME}
35
USE_RC_SUBR=	${PORTNAME}
32
36
33
SUB_FILES=	pkg-message
34
SUB_LIST=	AMAVISUSER=${AMAVISUSER} \
37
SUB_LIST=	AMAVISUSER=${AMAVISUSER} \
35
		AMAVISDIR=${AMAVISDIR}
38
		AMAVISGROUP=${AMAVISGROUP} \
39
		AMAVISDIR=${AMAVISDIR} \
40
		RUNDIR=${RUNDIR}
41
PLIST_SUB=	${SUB_LIST}
36
42
37
PORTDOCS=	AUTHORS CHANGES INSTALL LICENSE README TODO
43
PORTDOCS=	AUTHORS CHANGES INSTALL LICENSE README TODO
38
44
39
NO_STAGE=	yes
40
PLIST_FILES=	sbin/amavisd-milter
41
PLIST_SUB=	RC_DIR=${RC_DIR} \
42
		RC_SUFX=${RC_SUFX}
43
44
MAN8=		amavisd-milter.8
45
MAN8=		amavisd-milter.8
45
46
46
.include <bsd.port.pre.mk>
47
.include <bsd.port.pre.mk>
Lines 72-83 Link Here
72
.endif
73
.endif
73
74
74
post-install:
75
post-install:
75
.if !defined(NOPORTDOCS)
76
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
76
	@${MKDIR} ${DOCSDIR}
77
.for f in ${PORTDOCS}
77
.for f in ${PORTDOCS}
78
	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
78
	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
79
.endfor
79
.endfor
80
.endif
81
	@${CAT} ${PKGMESSAGE}
82
80
83
.include <bsd.port.post.mk>
81
.include <bsd.port.post.mk>
(-)files/amavisd-milter.in (-3 / +4 lines)
Lines 25-36 Link Here
25
# Set defaults
25
# Set defaults
26
: ${amavisd_milter_enable:="NO"}
26
: ${amavisd_milter_enable:="NO"}
27
: ${amavisd_milter_user="%%AMAVISUSER%%"}
27
: ${amavisd_milter_user="%%AMAVISUSER%%"}
28
: ${amavisd_milter_socket:="%%AMAVISDIR%%/amavisd-milter.sock"}
28
: ${amavisd_milter_socket:="%%RUNDIR%%/amavisd-milter.sock"}
29
: ${amavisd_milter_socket_perm:="0666"}
29
: ${amavisd_milter_socket_perm:="0666"}
30
: ${amavisd_am_pdp_socket:="%%AMAVISDIR%%/amavisd.sock"}
30
31
31
pidfile="${amavisd_milter_pidfile:-%%AMAVISDIR%%/amavisd-milter.pid}"
32
pidfile="${amavisd_milter_pidfile:-%%RUNDIR%%/amavisd-milter.pid}"
32
command="%%PREFIX%%/sbin/amavisd-milter"
33
command="%%PREFIX%%/sbin/amavisd-milter"
33
command_args="-p ${pidfile} -s ${amavisd_milter_socket}"
34
command_args="-p ${pidfile} -s ${amavisd_milter_socket} -S ${amavisd_am_pdp_socket}"
34
required_files="%%PREFIX%%/etc/amavisd.conf"
35
required_files="%%PREFIX%%/etc/amavisd.conf"
35
start_postcmd="amavisd_milter_postcmd"
36
start_postcmd="amavisd_milter_postcmd"
36
37
(-)files/pkg-message.in (-12 lines)
Lines 1-12 Link Here
1
2
*******************************************************************
3
4
 To configure amavisd-milter, sendmail and amavisd-new point
5
 your browser to http://amavisd-milter.sourceforge.net
6
7
 Enable amavisd-milter in /etc/rc.conf with the following line:
8
9
	amavisd_milter_enable="YES"
10
11
*******************************************************************
12
(-)pkg-message (+12 lines)
Line 0 Link Here
1
2
*******************************************************************
3
4
 To configure amavisd-milter, sendmail and amavisd-new point
5
 your browser to http://amavisd-milter.sourceforge.net
6
7
 Enable amavisd-milter in /etc/rc.conf with the following line:
8
9
	amavisd_milter_enable="YES"
10
11
*******************************************************************
12
(-)pkg-plist (+8 lines)
Line 0 Link Here
1
@unexec if service amavisd-milter status | grep -q "amavisd-milter is running"; then service amavisd-milter stop; fi
2
3
sbin/amavisd-milter
4
5
@unexec rmdir %%RUNDIR%% 2>/dev/null || true
6
@exec mkdir -p %%RUNDIR%%
7
@exec chmod 755 %%RUNDIR%%
8
@exec chown %%AMAVISUSER%%:%%AMAVISGROUP%% %%RUNDIR%%

Return to bug 187101