From owner-svn-ports-head@freebsd.org  Wed Jan 11 01:53:13 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0BB3BCA9556;
 Wed, 11 Jan 2017 01:53:13 +0000 (UTC) (envelope-from ler@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B81131783;
 Wed, 11 Jan 2017 01:53:12 +0000 (UTC) (envelope-from ler@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0B1rBpA002040;
 Wed, 11 Jan 2017 01:53:11 GMT (envelope-from ler@FreeBSD.org)
Received: (from ler@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0B1rBlf002038;
 Wed, 11 Jan 2017 01:53:11 GMT (envelope-from ler@FreeBSD.org)
Message-Id: <201701110153.v0B1rBlf002038@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ler set sender to ler@FreeBSD.org
 using -f
From: Larry Rosenman <ler@FreeBSD.org>
Date: Wed, 11 Jan 2017 01:53:11 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r431152 - head/mail/smfsav
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Jan 2017 01:53:13 -0000

Author: ler
Date: Wed Jan 11 01:53:11 2017
New Revision: 431152
URL: https://svnweb.freebsd.org/changeset/ports/431152

Log:
  Use milter framework to handle libmilter correctly
  updated pkg-plist to use @sample, and changed SMF_RUN_DIR to be substituted
  in the plist otherwise packaging will fail it it's redefined.
  Bumped PORTREVISION.
  
  PR:	214722
  Submitted by:	sasaki@fcc.ad.jp (maintainer)
  Approved by:	adamw (mentor)
  Differential Revision:	https://reviews.freebsd.org/D9126

Modified:
  head/mail/smfsav/Makefile
  head/mail/smfsav/pkg-plist

Modified: head/mail/smfsav/Makefile
==============================================================================
--- head/mail/smfsav/Makefile	Wed Jan 11 01:41:36 2017	(r431151)
+++ head/mail/smfsav/Makefile	Wed Jan 11 01:53:11 2017	(r431152)
@@ -3,7 +3,7 @@
 
 PORTNAME=	smfsav
 PORTVERSION=	1.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	SF/smfs
 DISTNAME=	smf-sav-${PORTVERSION}
@@ -26,8 +26,12 @@ CPPFLAGS+=	-D_REENTRANT
 LDFLAGS+=	-lmilter -lpthread
 
 SMFSAV_RUN_DIR?=/var/run/smfs
+PLIST_SUB=	SMFSAV_RUN_DIR=${SMFSAV_RUN_DIR}
 SUB_FILES+=	pkg-message
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/readme
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/smf-sav.c
@@ -43,4 +47,4 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ChangeLog readme ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/mail/smfsav/pkg-plist
==============================================================================
--- head/mail/smfsav/pkg-plist	Wed Jan 11 01:41:36 2017	(r431151)
+++ head/mail/smfsav/pkg-plist	Wed Jan 11 01:53:11 2017	(r431152)
@@ -1,5 +1,5 @@
 sbin/smf-sav
-etc/smf-sav.conf.sample
+@sample etc/smf-sav.conf.sample
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/readme
-@dir(smfs,smfs,700) /var/run/smfs
+@dir(smfs,smfs,700) %%SMFSAV_RUN_DIR%%