Attachment #192182 for bug #227261

Lines 5-10 Link Here

(-)UPDATING (+9 lines)
5	You should get into the habit of checking this file for changes each time	5	You should get into the habit of checking this file for changes each time
6	you update your ports collection, before attempting any port upgrades.	6	you update your ports collection, before attempting any port upgrades.
7		7
		8	20180403:
		9	AFFECTS: users of mail/postgrey
		10	AUTHOR: ports.maintainer@evilphi.com
		11
		12	If you use any of the optional make.conf variables to specify the
		13	postgrey user, group, db dir, or run dir when building the port, you will
		14	need to change the prefix from PG_ to POSTGREY_*. The variables were
		15	renamed to solve a namespace collision with the PostgreSQL ports.
		16
8	20180401:	17	20180401:
9	AFFECTS: users of mail/dovecot and mail/dovecot-pigeonhole	18	AFFECTS: users of mail/dovecot and mail/dovecot-pigeonhole
10	AUTHOR: adamw@FreeBSD.org	19	AUTHOR: adamw@FreeBSD.org





PORTNAME=	postgrey
PORTVERSION=	1.37
PORTREVISION=	2
CATEGORIES=	mail
MASTER_SITES=	http://postgrey.schweikert.ch/pub/ \
		http://postgrey.schweikert.ch/pub/old/

POD2MAN?=	pod2man
PORTDOCS=	README Changes README.exim

POSTGREY_DBDIR?=	/var/db/postgrey
POSTGREY_GROUP?=	postgrey
POSTGREY_RUNDIR?=	/var/run/postgrey
POSTGREY_USER?=		postgrey

SUB_LIST=	POSTGREY_DBDIR=${POSTGREY_DBDIR} \
		POSTGREY_RUNDIR=${POSTGREY_RUNDIR}

PLIST_SUB+=	POSTGREY_DBDIR=${POSTGREY_DBDIR} \
		POSTGREY_GROUP=${POSTGREY_GROUP} \
		POSTGREY_RUNDIR=${POSTGREY_RUNDIR} \
		POSTGREY_USER=${POSTGREY_USER}

USERS=		${POSTGREY_USER}
GROUPS=		${POSTGREY_GROUP}

MANPAGES=	postgrey.1 policy-test.1 postgreyreport.1
ETCFILES=	whitelist_clients whitelist_recipients

OPTIONS_DEFINE=	DOCS

post-patch:
	@${REINPLACE_CMD} -e 's#nogroup#${POSTGREY_GROUP}#' \
		-e 's#/etc/main.cf#/etc/postfix/main.cf#' ${WRKSRC}/postgrey
	@${REINPLACE_CMD} -e 's#/etc/postfix#${PREFIX}&#' \
		${WRKSRC}/postgrey ${WRKSRC}/postgrey_whitelist_*
	@${REINPLACE_CMD} -e 's#/var/spool/postfix/postgrey#${POSTGREY_DBDIR}#' \
		${WRKSRC}/postgrey ${WRKSRC}/contrib/postgreyreport

do-install:

	${INSTALL_SCRIPT} ${WRKSRC}/policy-test ${STAGEDIR}${PREFIX}/sbin
	${INSTALL_SCRIPT} ${WRKSRC}/contrib/postgreyreport \
		${STAGEDIR}${PREFIX}/sbin
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/postfix ${STAGEDIR}${POSTGREY_DBDIR} \
		${STAGEDIR}${POSTGREY_RUNDIR}
.for i in ${ETCFILES}
	${INSTALL_DATA} ${WRKSRC}/postgrey_${i} \
		${STAGEDIR}${PREFIX}/etc/postfix/postgrey_${i}.sample

Lines 7-11 Link Here

(-)mail/postgrey/pkg-plist (-2 / +2 lines)
7	sbin/policy-test	7	sbin/policy-test
8	sbin/postgreyreport	8	sbin/postgreyreport
9	@dir etc/postfix	9	@dir etc/postfix
10	@dir(%%PG_USER%%,%%PG_GROUP%%,750) %%PG_DBDIR%%	10	@dir(%%POSTGREY_USER%%,%%POSTGREY_GROUP%%,750) %%POSTGREY_DBDIR%%
11	@dir(%%PG_USER%%,%%PG_GROUP%%,750) %%PG_RUNDIR%%	11	@dir(%%POSTGREY_USER%%,%%POSTGREY_GROUP%%,750) %%POSTGREY_RUNDIR%%

Return to bug 227261

Lines 3-9 Link Here

(-)mail/postgrey/Makefile (-17 / +17 lines)
3		3
4	PORTNAME= postgrey	4	PORTNAME= postgrey
5	PORTVERSION= 1.37	5	PORTVERSION= 1.37
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= mail	7	CATEGORIES= mail
8	MASTER_SITES= http://postgrey.schweikert.ch/pub/ \	8	MASTER_SITES= http://postgrey.schweikert.ch/pub/ \
9	http://postgrey.schweikert.ch/pub/old/	9	http://postgrey.schweikert.ch/pub/old/
Lines 30-50 Link Here
30	POD2MAN?= pod2man	30	POD2MAN?= pod2man
31	PORTDOCS= README Changes README.exim	31	PORTDOCS= README Changes README.exim
32		32
33	PG_DBDIR?= /var/db/postgrey	33	POSTGREY_DBDIR?= /var/db/postgrey
34	PG_GROUP?= postgrey	34	POSTGREY_GROUP?= postgrey
35	PG_RUNDIR?= /var/run/postgrey	35	POSTGREY_RUNDIR?= /var/run/postgrey
36	PG_USER?= postgrey	36	POSTGREY_USER?= postgrey
37		37
38	SUB_LIST= PG_DBDIR=${PG_DBDIR} \	38	SUB_LIST= POSTGREY_DBDIR=${POSTGREY_DBDIR} \
39	PG_RUNDIR=${PG_RUNDIR}	39	POSTGREY_RUNDIR=${POSTGREY_RUNDIR}
40		40
41	PLIST_SUB+= PG_DBDIR=${PG_DBDIR} \	41	PLIST_SUB+= POSTGREY_DBDIR=${POSTGREY_DBDIR} \
42	PG_GROUP=${PG_GROUP} \	42	POSTGREY_GROUP=${POSTGREY_GROUP} \
43	PG_RUNDIR=${PG_RUNDIR} \	43	POSTGREY_RUNDIR=${POSTGREY_RUNDIR} \
44	PG_USER=${PG_USER}	44	POSTGREY_USER=${POSTGREY_USER}
45		45
46	USERS= ${PG_USER}	46	USERS= ${POSTGREY_USER}
47	GROUPS= ${PG_GROUP}	47	GROUPS= ${POSTGREY_GROUP}
48		48
49	MANPAGES= postgrey.1 policy-test.1 postgreyreport.1	49	MANPAGES= postgrey.1 policy-test.1 postgreyreport.1
50	ETCFILES= whitelist_clients whitelist_recipients	50	ETCFILES= whitelist_clients whitelist_recipients
Lines 54-64 Link Here
54	OPTIONS_DEFINE= DOCS	54	OPTIONS_DEFINE= DOCS
55		55
56	post-patch:	56	post-patch:
57	@${REINPLACE_CMD} -e 's#nogroup#${PG_GROUP}#' \	57	@${REINPLACE_CMD} -e 's#nogroup#${POSTGREY_GROUP}#' \
58	-e 's#/etc/main.cf#/etc/postfix/main.cf#' ${WRKSRC}/postgrey	58	-e 's#/etc/main.cf#/etc/postfix/main.cf#' ${WRKSRC}/postgrey
59	@${REINPLACE_CMD} -e 's#/etc/postfix#${PREFIX}&#' \	59	@${REINPLACE_CMD} -e 's#/etc/postfix#${PREFIX}&#' \
60	${WRKSRC}/postgrey ${WRKSRC}/postgrey_whitelist_*	60	${WRKSRC}/postgrey ${WRKSRC}/postgrey_whitelist_*
61	@${REINPLACE_CMD} -e 's#/var/spool/postfix/postgrey#${PG_DBDIR}#' \	61	@${REINPLACE_CMD} -e 's#/var/spool/postfix/postgrey#${POSTGREY_DBDIR}#' \
62	${WRKSRC}/postgrey ${WRKSRC}/contrib/postgreyreport	62	${WRKSRC}/postgrey ${WRKSRC}/contrib/postgreyreport
63		63
64	do-install:	64	do-install:
Lines 69-76 Link Here
69	${INSTALL_SCRIPT} ${WRKSRC}/policy-test ${STAGEDIR}${PREFIX}/sbin	69	${INSTALL_SCRIPT} ${WRKSRC}/policy-test ${STAGEDIR}${PREFIX}/sbin
70	${INSTALL_SCRIPT} ${WRKSRC}/contrib/postgreyreport \	70	${INSTALL_SCRIPT} ${WRKSRC}/contrib/postgreyreport \
71	${STAGEDIR}${PREFIX}/sbin	71	${STAGEDIR}${PREFIX}/sbin
72	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/postfix ${STAGEDIR}${PG_DBDIR} \	72	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/postfix ${STAGEDIR}${POSTGREY_DBDIR} \
73	${STAGEDIR}${PG_RUNDIR}	73	${STAGEDIR}${POSTGREY_RUNDIR}
74	.for i in ${ETCFILES}	74	.for i in ${ETCFILES}
75	${INSTALL_DATA} ${WRKSRC}/postgrey_${i} \	75	${INSTALL_DATA} ${WRKSRC}/postgrey_${i} \
76	${STAGEDIR}${PREFIX}/etc/postfix/postgrey_${i}.sample	76	${STAGEDIR}${PREFIX}/etc/postfix/postgrey_${i}.sample