ports/162177: mail/opendkim - make dependency to Sendmail optional

[Michele Mazzucchi]

The following reply was made to PR ports/162177; it has been noted by GNATS.

From: Michele Mazzucchi <m.mazzucchi at frontdam.com>
To: bug-followup at FreeBSD.org,
 m.mazzucchi at frontdam.com
Cc: umq at ueo.co.jp
Subject: Re: ports/162177: mail/opendkim - make dependency to Sendmail optional
Date: Mon, 31 Oct 2011 00:55:59 +0100

 --Apple-Mail-2-261859212
 Content-Transfer-Encoding: 7bit
 Content-Type: text/plain;
 	charset=us-ascii
 
 This patch improves on the former, including PORTREVISION and @comment-ing
 the relevant missing components from pkg-plist.
 
 --
 http://www.frontdam.com
 
 
 
 --Apple-Mail-2-261859212
 Content-Disposition: attachment;
 	filename=patch.txt
 Content-Type: text/plain;
 	name="patch.txt"
 Content-Transfer-Encoding: quoted-printable
 
 diff -ruN opendkim-orig/Makefile opendkim/Makefile
 --- opendkim-orig/Makefile	2011-07-02 13:55:27.000000000 +0200
 +++ opendkim/Makefile	2011-10-30 23:57:45.118832722 +0100
 @@ -7,6 +7,7 @@
 =20
  PORTNAME=3D	opendkim
  PORTVERSION=3D	2.4.1
 +PORTREVISION=3D	1
  CATEGORIES=3D	mail security
  MASTER_SITES=3D	SF
  MASTER_SITE_SUBDIR=3D	${PORTNAME}
 @@ -25,18 +26,13 @@
 =20
  GNU_CONFIGURE=3D	yes
  USE_OPENSSL=3D	yes
 -USE_RC_SUBR=3D	milter-opendkim
  USE_LDCONFIG=3D	yes
 =20
 -MAN5=3D		opendkim.conf.5
 -MAN8=3D		opendkim-genkey.8 opendkim-genzone.8 \
 -		opendkim-testadsp.8 opendkim-testkey.8 \
 -		opendkim.8
 -
  SUB_FILES=3D	pkg-message
 =20
 -OPTIONS=3D \
 +OPTIONS=3D	\
  	ARLIB		"Asynchronous thread-safe DNS library"	On  \
 +	FILTER		"opendkim filter, requires libmilter/Sendmail"	=
 On \
  	GNUTLS		"Use GnuTLS instead of OpenSSL"		Off \
  	LUA		"Describe filter policy with lua"	Off \
  	MEMCACHED	"Use memcached as a data set"		Off \
 @@ -50,10 +46,23 @@
 =20
  .include <bsd.port.pre.mk>
 =20
 +.if defined(WITH_FILTER) && !defined(WITHOUT_FILTER)
 +USE_RC_SUBR=3D	milter-opendkim
 +# man pages
 +MAN5+=3D		opendkim.conf.5
 +MAN8+=3D		opendkim-genkey.8 opendkim-genzone.8 \
 +		opendkim-testadsp.8 opendkim-testkey.8 \
 +		opendkim.8
 +# installed opendkim* binaries
 +PLIST_SUB+=3D		FILTER=3D""
 +# milter options
  WITHOUT_MILTER_CFLAGS=3D	yes
  WITHOUT_MILTER_LDFLAGS=3D	yes
  .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
  CONFIGURE_ARGS+=3D	--with-milter=3D${MILTERBASE}
 +.else
 +PLIST_SUB+=3D		FILTER=3D"@comment "
 +.endif
 =20
  .if defined(WITH_GNUTLS)
  LIB_DEPENDS+=3D	gnutls.47:${PORTSDIR}/security/gnutls
 diff -ruN opendkim-orig/Makefile.features opendkim/Makefile.features
 --- opendkim-orig/Makefile.features	2011-07-02 13:55:27.000000000 =
 +0200
 +++ opendkim/Makefile.features	2011-10-30 21:52:29.000000000 +0100
 @@ -11,6 +11,10 @@
  CONFIGURE_ARGS+=3D	--enable-adsp_lists
  .endif
 =20
 +.if !defined(WITH_FILTER) && defined(WITHOUT_FILTER)
 +CONFIGURE_ARGS+=3D    --disable-filter
 +.endif
 +
  .if defined(WITH_ALLSYMBOLS) && !defined(WITHOUT_ALLSYMBOLS)
  CONFIGURE_ARGS+=3D	--enable-allsymbols
  .endif
 Files opendkim-orig/opendkim-2.4.1.tbz and opendkim/opendkim-2.4.1.tbz =
 differ
 Files opendkim-orig/opendkim-2.4.1_1.tbz and =
 opendkim/opendkim-2.4.1_1.tbz differ
 diff -ruN opendkim-orig/pkg-plist opendkim/pkg-plist
 --- opendkim-orig/pkg-plist	2011-07-02 13:55:27.000000000 +0200
 +++ opendkim/pkg-plist	2011-10-30 23:44:23.878792592 +0100
 @@ -1,11 +1,11 @@
  @comment $FreeBSD: ports/mail/opendkim/pkg-plist,v 1.6 2011/07/02 =
 11:55:27 swills Exp $
  %%LUA%%bin/miltertest
 -bin/opendkim-genkey
 -bin/opendkim-genzone
 -%%STATS%%bin/opendkim-stats
 -bin/opendkim-testadsp
 -bin/opendkim-testkey
 -etc/mail/opendkim.conf.sample
 +%%FILTER%%bin/opendkim-genkey
 +%%FILTER%%bin/opendkim-genzone
 +%%FILTER%%%%STATS%%bin/opendkim-stats
 +%%FILTER%%bin/opendkim-testadsp
 +%%FILTER%%bin/opendkim-testkey
 +%%FILTER%%etc/mail/opendkim.conf.sample
  %%ARLIB%%include/ar/ar.h
  include/opendkim/dkim.h
  %%ARLIB%%lib/libar.a
 @@ -18,7 +18,7 @@
  lib/libopendkim.so.5
  %%ARLIB%%libdata/pkgconfig/ar.pc
  libdata/pkgconfig/opendkim.pc
 -sbin/opendkim
 +%%FILTER%%sbin/opendkim
  @dirrm include/opendkim
  %%ARLIB%%@dirrm include/ar
  @dirrmtry etc/mail
 
 --Apple-Mail-2-261859212--