Index: branches/2016Q1/mail/milter-greylist-devel/Makefile
===================================================================
--- branches/2016Q1/mail/milter-greylist-devel/Makefile	(revision 408949)
+++ branches/2016Q1/mail/milter-greylist-devel/Makefile	(revision 408950)
@@ -1,114 +1,115 @@
 # Created by: Cyril Guibourg
 # $FreeBSD$
 
 PORTNAME=	milter-greylist
 PORTVERSION=	4.5.12
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.espci.fr/pub/milter-greylist/ \
 		http://fossies.org/unix/privat/ \
 		ftp://ftpmirror.uk/freebsd-ports/milter-greylist/
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER= 	freebsd-ports@dan.me.uk
 COMMENT=	Unstable (dev) greylist milter for sendmail and postfix
 
 LICENSE=	BSD3CLAUSE
 
 CONFLICTS=	milter-greylist-[0-9]*.*
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 USES=		tar:tgz
 
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	SPF GEOIP CURL LDAP P0F POSTFIX DOCS EXAMPLES
 SPF_DESC=	Include SPF support
 CURL_DESC=	curl support
 P0F_DESC=	P0F support
 POSTFIX_DESC=	Use Postfix instead of Sendmail
 
 P0F_RUN_DEPENDS+=	p0f:${PORTSDIR}/net-mgmt/p0f
 SPF_BUILD_DEPENDS=	libspf2>=1.2.5:${PORTSDIR}/mail/libspf2
 CURL_BUILD_DEPENDS+=	curl>=7.18:${PORTSDIR}/ftp/curl
 GEOIP_BUILD_DEPENDS=	GeoIP>=1.4.4:${PORTSDIR}/net/GeoIP
 
 POSTFIX_CONFIGURE_ENABLE=	postfix
 P0F_CONFIGURE_ENABLE=		p0f306
 
 .include <bsd.port.options.mk>
 
 ##
 # Use the following quirks to choose which sendmail to use (ports or system):
 #
 #   WITH_SENDMAIL_BASE=yes
 # or
 #   WITH_SENDMAIL_PORT=yes
 #
 # If unspecified, check for an up-to-date system version but give an
 # installed port preference over it.
 ##
 
 ##
 # If you have a reentrant resolver (starting with RELENG_5_2) you can use SPF
 ##
 
 .if ${PORT_OPTIONS:MSPF}
 CONFIGURE_ARGS+=	--with-libspf2=${LOCALBASE}
 .endif
 
 .if ${PORT_OPTIONS:MGEOIP}
 CONFIGURE_ARGS+=	--with-libGeoIP=${LOCALBASE}
 .endif
 
 .if ${PORT_OPTIONS:MCURL}
 CONFIGURE_ARGS+=	--with-libcurl=${LOCALBASE}
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
 # We can't use LDAP_CONFIGURE_WITH because configure script is buggy
 CONFIGURE_ARGS+=	--with-openldap
 USE_OPENLDAP=		yes
 .endif
 
 .if ! ${PORT_OPTIONS:MPOSTFIX}
 LDFLAGS+=	${SENDMAIL_LDFLAGS}
 LIBS+=		${SENDMAIL_LDADD}
 .endif
 
 LIBS+=		-lpthread
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-user=mailnull \
 		--with-libmilter=${MILTERBASE} \
 		--enable-dnsrbl \
 		--with-thread-safe-resolver \
 		--with-dumpfile=/var/milter-greylist/greylist.db
 
 ALL_TARGET=	milter-greylist
 SUB_FILES+=	pkg-message
 USE_RC_SUBR=	milter-greylist
 PORTDOCS=	README
 PORTEXAMPLES=	greylist.conf
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail
 	${INSTALL_MAN} ${WRKSRC}/greylist.conf.5 \
 		${STAGEDIR}${PREFIX}/man/man5
 	${INSTALL_MAN} ${WRKSRC}/milter-greylist.8 \
 		${STAGEDIR}${PREFIX}/man/man8
 	${INSTALL_PROGRAM} ${WRKSRC}/milter-greylist \
 		${STAGEDIR}${PREFIX}/libexec/
 	${INSTALL_DATA} ${WRKSRC}/greylist.conf \
 		${STAGEDIR}${PREFIX}/etc/mail/greylist.conf.sample
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/greylist.conf ${STAGEDIR}${EXAMPLESDIR}
 .endif
 	@${MKDIR} ${STAGEDIR}/var/milter-greylist
 
 .include "${.CURDIR}/../sendmail/bsd.milter.mk"
 .include <bsd.port.mk>
Index: branches/2016Q1/mail/milter-greylist-devel/files/milter-greylist.in
===================================================================
--- branches/2016Q1/mail/milter-greylist-devel/files/milter-greylist.in	(revision 408949)
+++ branches/2016Q1/mail/milter-greylist-devel/files/milter-greylist.in	(revision 408950)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # $FreeBSD$
 
 # PROVIDE: miltergreylist
 # REQUIRE: LOGIN
 # BEFORE: sendmail
 # KEYWORD: milter-greylist
 
 # Define these miltergreylist_* variables in one of these files:
 #       /etc/rc.conf
 #       /etc/rc.conf.local
 #       /etc/rc.conf.d/miltergreylist
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
 
 . /etc/rc.subr
 
 name="miltergreylist"
 rcvar=miltergreylist_enable
-command="%%PREFIX%%/bin/milter-greylist"
+command="%%PREFIX%%/libexec/milter-greylist"
 
 load_rc_config $name
 
 miltergreylist_enable=${miltergreylist_enable-"NO"}
 miltergreylist_runas=${miltergreylist_runas-"smmsp"}
 miltergreylist_pidfile=${miltergreylist_pidfile-"/var/run/milter-greylist.pid"}
 miltergreylist_sockfile=${miltergreylist_sockfile-"/var/milter-greylist/milter-greylist.sock"}
 miltergreylist_cfgfile=${miltergreylist_cfgfile-"%%PREFIX%%/etc/mail/greylist.conf"}
 miltergreylist_flags=${miltergreylist_flags-"-P $miltergreylist_pidfile \
 -f $miltergreylist_cfgfile -p $miltergreylist_sockfile -u $miltergreylist_runas"}
 
 run_rc_command "$1"
Index: branches/2016Q1
===================================================================
--- branches/2016Q1	(revision 408949)
+++ branches/2016Q1	(revision 408950)

Property changes on: branches/2016Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r408935