From owner-svn-ports-head@freebsd.org  Wed Nov 16 09:53:56 2016
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 DC3C3C438D2;
 Wed, 16 Nov 2016 09:53:56 +0000 (UTC)
 (envelope-from vsevolod@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 A07642FF;
 Wed, 16 Nov 2016 09:53:56 +0000 (UTC)
 (envelope-from vsevolod@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAG9rtKD072024;
 Wed, 16 Nov 2016 09:53:55 GMT (envelope-from vsevolod@FreeBSD.org)
Received: (from vsevolod@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAG9rtHx072023;
 Wed, 16 Nov 2016 09:53:55 GMT (envelope-from vsevolod@FreeBSD.org)
Message-Id: <201611160953.uAG9rtHx072023@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: vsevolod set sender to
 vsevolod@FreeBSD.org using -f
From: Vsevolod Stakhov <vsevolod@FreeBSD.org>
Date: Wed, 16 Nov 2016 09:53:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r426230 - head/mail/rmilter
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, 16 Nov 2016 09:53:57 -0000

Author: vsevolod
Date: Wed Nov 16 09:53:55 2016
New Revision: 426230
URL: https://svnweb.freebsd.org/changeset/ports/426230

Log:
  - Remove obsolete libmemcached dependency
  - Add DKIM signing option
  
  PR:		212302
  Submitted by:	Alexander Moisseev <moiseev at mezonplus.ru>

Modified:
  head/mail/rmilter/Makefile

Modified: head/mail/rmilter/Makefile
==============================================================================
--- head/mail/rmilter/Makefile	Wed Nov 16 09:50:06 2016	(r426229)
+++ head/mail/rmilter/Makefile	Wed Nov 16 09:53:55 2016	(r426230)
@@ -2,6 +2,7 @@
 
 PORTNAME=	rmilter
 PORTVERSION=	1.9.2
+PORTREVISION=	1
 CATEGORIES=	mail
 
 MAINTAINER=	vsevolod@FreeBSD.org
@@ -9,9 +10,7 @@ COMMENT=	Milter that performs rspamd, cl
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libpcre.so:devel/pcre \
-		libopendkim.so:mail/opendkim \
-		libmemcached.so:databases/libmemcached
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 BROKEN_armv6=		Fails to configure in cmake
 BROKEN_mips=		Fails to compile: error: Unsupported word size
@@ -27,16 +26,24 @@ USE_GNOME=	glib20
 USERS=		_rmilter
 GROUPS=		_rmilter
 
-CMAKE_ARGS+=	-DENABLE_DKIM=ON
-
 WITH_SENDMAIL_BASE=	yes
 
+OPTIONS_DEFINE=		DKIM
+OPTIONS_DEFAULT=	DKIM
+
+DKIM_DESC=		DKIM signing support
+DKIM_LIB_DEPENDS=	libopendkim.so:mail/opendkim
+
 .include <bsd.port.pre.mk>
 
 # Workaround to prevent bsd.milter.mk from breaking the build with the recent clang
 WITHOUT_MILTER_LDFLAGS=	yes
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
+.if ! ${PORT_OPTIONS:MDKIM}
+CMAKE_ARGS+=	-DENABLE_DKIM=OFF
+.endif
+
 post-patch:
 	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${WRKSRC}/freebsd/rmilter > ${WRKDIR}/rmilter