From nobody@FreeBSD.org  Tue Jul  6 04:20:19 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 290891065673
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  6 Jul 2010 04:20:19 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 1779D8FC16
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  6 Jul 2010 04:20:19 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o664KIui045388
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 6 Jul 2010 04:20:18 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o664KI4O045387;
	Tue, 6 Jul 2010 04:20:18 GMT
	(envelope-from nobody)
Message-Id: <201007060420.o664KI4O045387@www.freebsd.org>
Date: Tue, 6 Jul 2010 04:20:18 GMT
From: "Murray S. Kucherawy" <msk@opendkim.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Please update ports/mail/opendkim to latest version
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: umq@ueo.co.jp

>Number:         148397
>Category:       ports
>Synopsis:       Please update ports/mail/opendkim to latest version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sahil
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 06 04:30:01 UTC 2010
>Closed-Date:    Thu Jul 22 02:30:47 UTC 2010
>Last-Modified:  Thu Jul 22 02:40:01 UTC 2010
>Originator:     Murray S. Kucherawy
>Release:        6.2
>Organization:
The OpenDKIM Project
>Environment:
FreeBSD medusa 6.2-RELEASE FreeBSD 6.2-RELEASE #0: Fri Jan 12 08:43:30 UTC 2007     root@portnoy.cse.buffalo.edu:/usr/obj/usr/src/sys/SMP  amd64

>Description:
The current ports/mail/opendkim entry is quite old (v1.1.2, last November).  The current version is v2.1.1 dated last month, with another patch release imminent.

Email to the current maintainer has gotten no response for many months.

http://sourceforge.net/projects/opendkim

Thanks,
-MSK
>How-To-Repeat:
medusa[49954]% fgrep PORTVERSION /usr/ports/mail/opendkim/Makefile
PORTVERSION=    1.1.2

>Fix:
Unfortunately I'm not skilled at FreeBSD port maintenance, so this will have to be assigned to someone who is.

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Jul 6 04:30:11 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148397 
Responsible-Changed-From-To: freebsd-ports-bugs->sahil 
Responsible-Changed-By: sahil 
Responsible-Changed-When: Tue Jul 6 04:35:15 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148397 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: umq@ueo.co.jp
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/148397: Please update ports/mail/opendkim to latest version
Date: Tue, 6 Jul 2010 04:30:08 UT

 Maintainer of mail/opendkim,
 
 Please note that PR ports/148397 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/148397
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Sahil Tandon <sahil@FreeBSD.org>
To: "Murray S. Kucherawy" <msk@blackops.org>,
	Hirohisa Yamaguchi <umq@ueo.co.jp>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/148397: Please update ports/mail/opendkim to latest
 version
Date: Wed, 7 Jul 2010 21:51:43 -0400

 --PEIAKu/WMn1b1Hv9
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Murray and Hirohisa,
 
 Because the last PR for this port resulted in a maintainer timeout, I
 have attached a preliminary patch that brings mail/opendkim to 2.1.2.  I
 also made some other changes that are easily evident when reviewing the
 diff.
 
 Things to consider:
 
 1) I am not a user of this port; thus, no runtime testing was performed.
 I just made sure it compiles, installs, and respects NOPORTDOCS.  Please
 apply the patch, test and report your results.
 
 2) Because of 1, does my patch remove something that is required?
 
 3) The upstream has been through several versions since the last port
 update; are there any deprecated CONFIGURE_ARGS in Makefile (or
 Makefile.features)?  Relatedly, are there new options we should now
 support in Makefile.features?
 
 4) Are the instructions in pkg-message still accurate?
 
 4) Since we are going from 1.x -> 2.x, are there any compatibility
 gotchas with previous versions that merit an entry in UPDATING?
 
 Thanks,
 -- 
 Sahil Tandon <sahil@FreeBSD.org>
 
 --PEIAKu/WMn1b1Hv9
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="opendkim.diff"
 
 Index: Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/mail/opendkim/Makefile,v
 retrieving revision 1.3
 diff -u -r1.3 Makefile
 --- Makefile	22 Dec 2009 11:36:22 -0000	1.3
 +++ Makefile	8 Jul 2010 01:39:41 -0000
 @@ -1,13 +1,12 @@
  # New ports collection makefile for:	opendkim
 -# Date created:		2009-08-26
 -# Whom:			Hirohisa Yamaguchi <umq@ueo.co.jp>
 +# Date created:				2009-08-26
 +# Whom:					Hirohisa Yamaguchi <umq@ueo.co.jp>
  #
  # $FreeBSD: ports/mail/opendkim/Makefile,v 1.3 2009/12/22 11:36:22 miwi Exp $
  #
  
  PORTNAME=	opendkim
 -PORTVERSION=	1.1.2
 -PORTREVISION=	1
 +PORTVERSION=	2.1.2
  CATEGORIES=	mail security
  MASTER_SITES=	SF/opendkim
  
 @@ -19,16 +18,16 @@
  USE_RC_SUBR=	milter-opendkim
  USE_LDCONFIG=	yes
  
 -MAN_COMPRESSED=	no
  MAN3=		ar.3
  MAN5=		opendkim.conf.5
 -MAN8=		opendkim-genkey.8 opendkim-testadsp.8 \
 -		opendkim-testkey.8 opendkim.8
 -PORTDOCS0=	FEATURES INSTALL KNOWNBUGS LICENSE LICENSE.Sendmail \
 -		README RELEASE_NOTES RELEASE_NOTES.Sendmail
 -PORTDOCS=	docs/*
 +MAN8=		opendkim-genkey.8 opendkim-genzone.8 \
 +		opendkim-testadsp.8 opendkim-testkey.8 \
 +		opendkim.8
 +
  SUB_FILES=	pkg-message
  
 +MAKE_ARGS+=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
 +
  .include <bsd.port.pre.mk>
  
  WITHOUT_MILTER_CFLAGS=	yes
 @@ -48,14 +47,19 @@
  CONFIGURE_ARGS+=	--enable-debug
  .endif
  
 +.if !defined(NOPORTDOCS)
 +PORTDOCS=	*
 +.else
 +CONFIGURE_ARGS+=--docdir=${WRKDIR}/doc
 +.endif
 +
  .if (defined(WITH_POPAUTH) \
  	|| defined(WITH_QUERY_CACHE) \
  	|| defined(WITH_BODYLENGTH_DB) \
  	|| defined(WITH_STATS)) \
  	&& !defined(WITH_BDB_BASE)
 -#BROKEN=		LIBDB_INCDIR nor LIBDB_LIBDIRS cannot be set individually
  CONFIGURE_ARGS+=	--with-db
 -USE_BDB=	41+
 +USE_BDB=		41+
  .endif
  .if defined(WITH_UNBOUND) && !defined(WITHOUT_UNBOUND)
  BROKEN=		configure fails since arlib cannot be disabled
 @@ -64,7 +68,7 @@
  .endif
  CONFIGURE_ARGS+=	--with-unbound \
  			--disable-arlib
 -LIB_DEPENDS+=	unbound:${PORTSDIR}/dns/unbound
 +LIB_DEPENDS+=		unbound:${PORTSDIR}/dns/unbound
  PLIST_SUB+=		ARLIB="@comment "
  .else
  .if !defined(WITHOUT_ARLIB)
 @@ -82,24 +86,12 @@
  CONFIGURE_ARGS+=	--enable-querycache
  .endif
  
 -post-extract:
 -.for f in ${PORTDOCS0}
 -	@${CP} ${WRKSRC}/${f} ${WRKSRC}/docs/
 -.endfor
 -
  post-install:
  .if !defined(WITH_DEBUG)
  	@${STRIP_CMD} ${PREFIX}/sbin/opendkim
  .endif
  	@${MKDIR} ${PREFIX}/etc/mail
  	${INSTALL_DATA} ${WRKSRC}/opendkim/opendkim.conf.sample ${PREFIX}/etc/mail/
 -.if !defined(NOPORTDOCS)
 -.for f in ${PORTDOCS}
 -	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 -.endfor
 -.else
 -	@${RM} -rf ${DOCSDIR}
 -.endif
  	@${CAT} ${PKGMESSAGE}
  
  .include <bsd.port.post.mk>
 Index: Makefile.features
 ===================================================================
 RCS file: /home/pcvs/ports/mail/opendkim/Makefile.features,v
 retrieving revision 1.1
 diff -u -r1.1 Makefile.features
 --- Makefile.features	21 Sep 2009 12:25:21 -0000	1.1
 +++ Makefile.features	8 Jul 2010 01:39:41 -0000
 @@ -57,10 +57,6 @@
  CONFIGURE_ARGS+=	--enable-selectorheader
  .endif
  
 -.if defined(WITH_SENDER_HEADERS) && !defined(WITHOUT_SENDER_HEADERS)
 -CONFIGURE_ARGS+=	--enable-senderheaders
 -.endif
 -
  .if defined(WITH_STATS) && !defined(WITHOUT_STATS)
  CONFIGURE_ARGS+=	--enable-stats
  MAN8+=			opendkim-stats.8
 Index: distinfo
 ===================================================================
 RCS file: /home/pcvs/ports/mail/opendkim/distinfo,v
 retrieving revision 1.2
 diff -u -r1.2 distinfo
 --- distinfo	21 Nov 2009 14:42:46 -0000	1.2
 +++ distinfo	8 Jul 2010 01:39:41 -0000
 @@ -1,3 +1,3 @@
 -MD5 (opendkim-1.1.2.tar.gz) = f869f90aad3561a01b377e9ca61dedc3
 -SHA256 (opendkim-1.1.2.tar.gz) = 5f11526c9a490b6649794b0e5910cb6e6c9b3fe815cf8b731dbed8ddb077d078
 -SIZE (opendkim-1.1.2.tar.gz) = 856455
 +MD5 (opendkim-2.1.2.tar.gz) = 7860684aaa3e17c9272081891a856092
 +SHA256 (opendkim-2.1.2.tar.gz) = 5f9e8c6447cfba022378e2cf54cfc82516319a745f01e457a6903c61a2295f93
 +SIZE (opendkim-2.1.2.tar.gz) = 1010010
 Index: pkg-descr
 ===================================================================
 RCS file: /home/pcvs/ports/mail/opendkim/pkg-descr,v
 retrieving revision 1.1
 diff -u -r1.1 pkg-descr
 --- pkg-descr	21 Sep 2009 12:25:21 -0000	1.1
 +++ pkg-descr	8 Jul 2010 01:39:41 -0000
 @@ -1,10 +1,12 @@
 -OpenDKIM is an open source implementation of the DKIM sender authentication
 -system proposed by the E-mail Signing Technology Group (ESTG), now a proposed
 -standard of the IETF (RFC4871).
 +OpenDKIM is an open source implementation of the DKIM (Domain Keys Identified 
 +Mail) sender authentication system proposed by the E-mail Signing Technology 
 +Group (ESTG), now standardized by the IETF (RFC4871). It also includes 
 +implementations of the Author Domain Signing Practises (ADSP, RFC5617) and 
 +Vouch By Reference (VBR, RFC5518) proposed standards.
  
  The OpenDKIM package consists of a library that implements the DKIM service
  and a milter-based filter application that can plug in to any milter-aware
  MTA to provide that service to sufficiently recent sendmail MTAs and other
  MTAs that support the milter protocol. 
  
 -WWW:	http://opendkim.org/
 +WWW: http://opendkim.org/
 Index: pkg-plist
 ===================================================================
 RCS file: /home/pcvs/ports/mail/opendkim/pkg-plist,v
 retrieving revision 1.2
 diff -u -r1.2 pkg-plist
 --- pkg-plist	21 Nov 2009 14:42:46 -0000	1.2
 +++ pkg-plist	8 Jul 2010 01:39:41 -0000
 @@ -10,119 +10,15 @@
  lib/libopendkim.a
  lib/libopendkim.la
  lib/libopendkim.so
 -lib/libopendkim.so.0
 +lib/libopendkim.so.2
 +libdata/pkgconfig/ar.pc
 +libdata/pkgconfig/opendkim.pc
  sbin/opendkim
  sbin/opendkim-genkey.sh
 +sbin/opendkim-genzone
  %%STATS%%sbin/opendkim-stats
  sbin/opendkim-testadsp
  sbin/opendkim-testkey
 -%%PORTDOCS%%%%DOCSDIR%%/FEATURES
 -%%PORTDOCS%%%%DOCSDIR%%/INSTALL
 -%%PORTDOCS%%%%DOCSDIR%%/KNOWNBUGS
 -%%PORTDOCS%%%%DOCSDIR%%/LICENSE
 -%%PORTDOCS%%%%DOCSDIR%%/LICENSE.Sendmail
 -%%PORTDOCS%%%%DOCSDIR%%/README
 -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES.Sendmail
 -%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-dkim-deployment-09.txt
 -%%PORTDOCS%%%%DOCSDIR%%/draft-kucherawy-dkim-reporting-06.txt
 -%%PORTDOCS%%%%DOCSDIR%%/draft-shafranovich-feedback-report-08.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc4686.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc4871.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc5016.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc5451.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc5518.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc5585.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc5617.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc5672.txt
 -%%DATADIR%%/dkim.html
 -%%DATADIR%%/dkim_alg_t.html
 -%%DATADIR%%/dkim_body.html
 -%%DATADIR%%/dkim_canon_t.html
 -%%DATADIR%%/dkim_cbstat.html
 -%%DATADIR%%/dkim_chunk.html
 -%%DATADIR%%/dkim_close.html
 -%%DATADIR%%/dkim_diffheaders.html
 -%%DATADIR%%/dkim_dnssec.html
 -%%DATADIR%%/dkim_eoh.html
 -%%DATADIR%%/dkim_eom.html
 -%%DATADIR%%/dkim_flush_cache.html
 -%%DATADIR%%/dkim_free.html
 -%%DATADIR%%/dkim_get_user_context.html
 -%%DATADIR%%/dkim_getcachestats.html
 -%%DATADIR%%/dkim_getdomain.html
 -%%DATADIR%%/dkim_geterror.html
 -%%DATADIR%%/dkim_getmode.html
 -%%DATADIR%%/dkim_get_msgdate.html
 -%%DATADIR%%/dkim_getpartial.html
 -%%DATADIR%%/dkim_getpolicystr.html
 -%%DATADIR%%/dkim_getpresult.html
 -%%DATADIR%%/dkim_getpresultstr.html
 -%%DATADIR%%/dkim_get_reputation.html
 -%%DATADIR%%/dkim_getresultstr.html
 -%%DATADIR%%/dkim_getsighdr.html
 -%%DATADIR%%/dkim_getsiglist.html
 -%%DATADIR%%/dkim_getsignature.html
 -%%DATADIR%%/dkim_header.html
 -%%DATADIR%%/dkim_init.html
 -%%DATADIR%%/dkim_key_syntax.html
 -%%DATADIR%%/dkim_lib.html
 -%%DATADIR%%/dkim_minbody.html
 -%%DATADIR%%/dkim_ohdrs.html
 -%%DATADIR%%/dkim_options.html
 -%%DATADIR%%/dkim_param_t.html
 -%%DATADIR%%/dkim_policy.html
 -%%DATADIR%%/dkim_policy_getdnssec.html
 -%%DATADIR%%/dkim_policy_getreportinfo.html
 -%%DATADIR%%/dkim_policy_syntax.html
 -%%DATADIR%%/dkim_policy_t.html
 -%%DATADIR%%/dkim_presult.html
 -%%DATADIR%%/dkim_pstate.html
 -%%DATADIR%%/dkim_query_t.html
 -%%DATADIR%%/dkim_set_dns_callback.html
 -%%DATADIR%%/dkim_set_final.html
 -%%DATADIR%%/dkim_set_key_lookup.html
 -%%DATADIR%%/dkim_set_margin.html
 -%%DATADIR%%/dkim_set_policy_lookup.html
 -%%DATADIR%%/dkim_setpartial.html
 -%%DATADIR%%/dkim_set_prescreen.html
 -%%DATADIR%%/dkim_set_signature_handle.html
 -%%DATADIR%%/dkim_set_signature_handle_free.html
 -%%DATADIR%%/dkim_set_signature_tagvalues.html
 -%%DATADIR%%/dkim_set_signer.html
 -%%DATADIR%%/dkim_set_trust_anchor.html
 -%%DATADIR%%/dkim_set_user_context.html
 -%%DATADIR%%/dkim_sig_getbh.html
 -%%DATADIR%%/dkim_sig_getcanonlen.html
 -%%DATADIR%%/dkim_sig_getcanons.html
 -%%DATADIR%%/dkim_sig_getcontext.html
 -%%DATADIR%%/dkim_sig_getdnssec.html
 -%%DATADIR%%/dkim_sig_getdomain.html
 -%%DATADIR%%/dkim_sig_geterror.html
 -%%DATADIR%%/dkim_sig_geterrorstr.html
 -%%DATADIR%%/dkim_sig_getflags.html
 -%%DATADIR%%/dkim_sig_getidentity.html
 -%%DATADIR%%/dkim_sig_getkeysize.html
 -%%DATADIR%%/dkim_sig_getreportinfo.html
 -%%DATADIR%%/dkim_sig_getselector.html
 -%%DATADIR%%/dkim_sig_getsignalg.html
 -%%DATADIR%%/dkim_sig_getsigntime.html
 -%%DATADIR%%/dkim_sig_hdrsigned.html
 -%%DATADIR%%/dkim_sig_ignore.html
 -%%DATADIR%%/dkim_sig_process.html
 -%%DATADIR%%/dkim_sig_syntax.html
 -%%DATADIR%%/dkim_sigerror.html
 -%%DATADIR%%/dkim_siginfo.html
 -%%DATADIR%%/dkim_sigkey_t.html
 -%%DATADIR%%/dkim_sign.html
 -%%DATADIR%%/dkim_libfeature.html
 -%%DATADIR%%/dkim_ssl_version.html
 -%%DATADIR%%/dkim_stat.html
 -%%DATADIR%%/dkim_verify.html
 -%%DATADIR%%/index.html
 -%%DATADIR%%/overview.html
 -%%DATADIR%%/rfc2822_mailbox_split.html
 -@dirrm %%DATADIR%%
  @dirrm include/opendkim
  @dirrm include/ar
  @dirrmtry etc/mail
 Index: files/patch-FEATURES
 ===================================================================
 RCS file: files/patch-FEATURES
 diff -N files/patch-FEATURES
 --- files/patch-FEATURES	21 Sep 2009 12:25:21 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,12 +0,0 @@
 ---- ./FEATURES.orig	2009-08-04 06:31:48.000000000 +0900
 -+++ ./FEATURES	2009-08-27 20:35:42.000000000 +0900
 -@@ -74,6 +74,9 @@
 - 		to use when signing based on the contents of an arbitrary
 - 		header.  (opendkim)
 - 
 -+senderheaders	Optional control over which headers are used by the filter
 -+		to make the sign vs. verify decision.  (opendkim)
 -+
 - stats		Optional generation of statistics about pass/fail sorted
 - 		by domain and canonicalization.  Requires Sleepycat DB.
 - 		(opendkim, libopendkim)
 Index: files/patch-opendkim__Makefile.in
 ===================================================================
 RCS file: files/patch-opendkim__Makefile.in
 diff -N files/patch-opendkim__Makefile.in
 --- files/patch-opendkim__Makefile.in	21 Sep 2009 12:25:21 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,11 +0,0 @@
 ---- ./opendkim/Makefile.in.orig	2009-08-15 01:44:49.000000000 +0900
 -+++ ./opendkim/Makefile.in	2009-08-27 20:36:49.000000000 +0900
 -@@ -327,7 +327,7 @@
 - AM_LDFLAGS = -pthread
 - sbin_SCRIPTS = opendkim-genkey.sh
 - exampledir = $(datarootdir)/doc/@PACKAGE@
 --example_DATA = opendkim.conf.sample
 -+example_DATA = 
 - @BUILD_FILTER_TRUE@opendkim_SOURCES = opendkim.c opendkim.h opendkim-ar.c opendkim-ar.h opendkim-arf.c opendkim-arf.h opendkim-config.h opendkim-crypto.c opendkim-crypto.h opendkim-db.c opendkim-db.h config.c config.h stats.c stats.h test.c test.h util.c util.h
 - @BUILD_FILTER_TRUE@opendkim_CFLAGS = $(am__append_2) $(am__append_6) \
 - @BUILD_FILTER_TRUE@	$(am__append_7) $(am__append_8) \
 
 --PEIAKu/WMn1b1Hv9--

From: "Murray S. Kucherawy" <msk@blackops.org>
To: Sahil Tandon <sahil@FreeBSD.org>
Cc: Hirohisa Yamaguchi <umq@ueo.co.jp>, bug-followup@FreeBSD.org
Subject: Re: ports/148397: Please update ports/mail/opendkim to latest version
Date: Fri, 9 Jul 2010 11:30:26 -0700 (PDT)

 On Wed, 7 Jul 2010, Sahil Tandon wrote:
 > 1) I am not a user of this port; thus, no runtime testing was performed.
 > I just made sure it compiles, installs, and respects NOPORTDOCS.  Please
 > apply the patch, test and report your results.
 
 On visual inspection the patch looks fine.  I'll try it this weekend.
 
 > 2) Because of 1, does my patch remove something that is required?
 
 It didn't appear to do so.
 
 > 3) The upstream has been through several versions since the last port
 > update; are there any deprecated CONFIGURE_ARGS in Makefile (or
 > Makefile.features)?  Relatedly, are there new options we should now
 > support in Makefile.features?
 
 Nothing has been deprecated recently but I'll make sure all of the newer 
 stuff is appropriately covered.
 
 > 4) Are the instructions in pkg-message still accurate?
 
 Will verify.
 
 > 4) Since we are going from 1.x -> 2.x, are there any compatibility 
 > gotchas with previous versions that merit an entry in UPDATING?
 
 There were isolated changes to the configuration file and command line 
 arguments, but they may have been concealed by the port-provided 
 start/stop script.  I'll confirm this and advise.
 
 Thanks!
 
 -MSK

From: Hirohisa Yamaguchi <umq@ueo.co.jp>
To: sahil@FreeBSD.org
Cc: msk@blackops.org, bug-followup@FreeBSD.org
Subject: Re: ports/148397: Please update ports/mail/opendkim to latest version
Date: Mon, 12 Jul 2010 05:12:34 +0900

 Hi,
 Thanks for the patch, Sahil.
 
  # I've been away from packaging work over eight months. I got no
  # spare time.
 
 At Wed, 7 Jul 2010 21:51:43 -0400,
 Sahil Tandon wrote:
 > Murray and Hirohisa,
 
 > Things to consider:
 
 > 3) The upstream has been through several versions since the last port
 > update; are there any deprecated CONFIGURE_ARGS in Makefile (or
 > Makefile.features)?  Relatedly, are there new options we should now
 > support in Makefile.features?
 I'm just making a patch for this.
 
 I found some configure option causes build error.
 please give me some days to fix those.
 
 
 Regards,
 -- 
 
 	Hirohisa Yamaguchi
 	  umq@ueo.co.jp

From: Hirohisa Yamaguchi <umq@ueo.co.jp>
To: sahil@FreeBSD.org, msk@blackops.org
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/148397: Please update ports/mail/opendkim to latest version
Date: Mon, 12 Jul 2010 09:34:23 +0900

 --pgp-sign-Multipart_Mon_Jul_12_09:34:16_2010-1
 Content-Type: multipart/mixed;
  boundary="Multipart_Mon_Jul_12_09:34:16_2010-1"
 
 --Multipart_Mon_Jul_12_09:34:16_2010-1
 Content-Type: text/plain; charset=US-ASCII
 
 Hi,
 
 I made a revised patch for the PR.
 
 At Fri, 9 Jul 2010 11:30:26 -0700 (PDT),
 Murray S. Kucherawy wrote:
 > > 3) The upstream has been through several versions since the last port
 > > update; are there any deprecated CONFIGURE_ARGS in Makefile (or
 > > Makefile.features)?  Relatedly, are there new options we should now
 > > support in Makefile.features?
 > Nothing has been deprecated recently but I'll make sure all of the
 > newer stuff is appropriately covered.
 
 lua support, OpenBDX support, and OpenLDAP support are added in the
 patch attached.
  # they built okay, but not checked them thoroughly whether really work :(
 
 > There were isolated changes to the configuration file and command line
 > arguments, but they may have been concealed by the port-provided
 > start/stop script.  I'll confirm this and advise.
 
 We've lost pid file(-P) option, so users will have to take care of
 PidFile line in opendkim.conf, only when they run multiple instance of
 the milter using the script provided with the port.
  #  this is written in pkg-message
 
 
 Regards,
 --
 
 	Hirohisa Yamaguchi
 	  umq@ueo.co.jp
 
 --Multipart_Mon_Jul_12_09:34:16_2010-1
 Content-Type: application/octet-stream; type=patch
 Content-Disposition: attachment; filename="opendkim-148397.patch"
 Content-Transfer-Encoding: 7bit
 
 diff -Npru ports.orig/mail/opendkim/Makefile ports/mail/opendkim/Makefile
 --- ports.orig/mail/opendkim/Makefile	2010-07-12 09:21:04.000000000 +0900
 +++ ports/mail/opendkim/Makefile	2010-07-12 09:15:46.000000000 +0900
 @@ -1,34 +1,42 @@
  # New ports collection makefile for:	opendkim
 -# Date created:		2009-08-26
 -# Whom:			Hirohisa Yamaguchi <umq@ueo.co.jp>
 +# Date created:				2009-08-26
 +# Whom:					Hirohisa Yamaguchi <umq@ueo.co.jp>
  #
  # $FreeBSD: ports/mail/opendkim/Makefile,v 1.3 2009/12/22 11:36:22 miwi Exp $
  #
 
  PORTNAME=	opendkim
 -PORTVERSION=	1.1.2
 -PORTREVISION=	1
 +PORTVERSION=	2.1.2
  CATEGORIES=	mail security
  MASTER_SITES=	SF/opendkim
 
  MAINTAINER=	umq@ueo.co.jp
 -COMMENT=	DKIM milter implimentation
 +COMMENT=	DKIM library and milter implimentation
 
  GNU_CONFIGURE=	yes
  USE_OPENSSL=	yes
  USE_RC_SUBR=	milter-opendkim
  USE_LDCONFIG=	yes
 
 -MAN_COMPRESSED=	no
 -MAN3=		ar.3
  MAN5=		opendkim.conf.5
 -MAN8=		opendkim-genkey.8 opendkim-testadsp.8 \
 -		opendkim-testkey.8 opendkim.8
 -PORTDOCS0=	FEATURES INSTALL KNOWNBUGS LICENSE LICENSE.Sendmail \
 -		README RELEASE_NOTES RELEASE_NOTES.Sendmail
 -PORTDOCS=	docs/*
 +MAN8=		opendkim-genkey.8 opendkim-genzone.8 \
 +		opendkim-testadsp.8 opendkim-testkey.8 \
 +		opendkim.8
 +
  SUB_FILES=	pkg-message
 
 +OPTIONS= \
 +	ARLIB		"Asynchronous thread-safe DNS library"	On \
 +	LUA		"Describe filter policy with lua"	Off \
 +	OPENDBX		"Store filter policies via OpenDBX"	Off \
 +	OPENLDAP	"Store filter policies in LDAP"		Off \
 +	OPENSSL_PORT	"Use OpenSSL in ports"			Off \
 +	POPAUTH		"Use POP authentication DB"		Off \
 +	QUERY_CACHE	"Cache DNS query results locally"	Off \
 +	UNBOUND		"Use unbound DNS library"		Off
 +
 +MAKE_ARGS+=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
 +
  .include <bsd.port.pre.mk>
 
  WITHOUT_MILTER_CFLAGS=	yes
 @@ -48,14 +56,20 @@ CONFIGURE_ARGS+=	--with-openssl=${OPENSS
  CONFIGURE_ARGS+=	--enable-debug
  .endif
 
 +.if !defined(NOPORTDOCS)
 +PORTDOCS=	*
 +.else
 +CONFIGURE_ARGS+=--docdir=${WRKDIR}/doc
 +.endif
 +
  .if (defined(WITH_POPAUTH) \
  	|| defined(WITH_QUERY_CACHE) \
  	|| defined(WITH_BODYLENGTH_DB) \
 +	|| defined(WITH_LDAP_CACHING) \
  	|| defined(WITH_STATS)) \
  	&& !defined(WITH_BDB_BASE)
 -#BROKEN=		LIBDB_INCDIR nor LIBDB_LIBDIRS cannot be set individually
  CONFIGURE_ARGS+=	--with-db
 -USE_BDB=	41+
 +USE_BDB=		41+
  .endif
  .if defined(WITH_UNBOUND) && !defined(WITHOUT_UNBOUND)
  BROKEN=		configure fails since arlib cannot be disabled
 @@ -64,12 +78,13 @@ IGNORE=		libar cannot be used simultaneo
  .endif
  CONFIGURE_ARGS+=	--with-unbound \
  			--disable-arlib
 -LIB_DEPENDS+=	unbound:${PORTSDIR}/dns/unbound
 +LIB_DEPENDS+=		unbound:${PORTSDIR}/dns/unbound
  PLIST_SUB+=		ARLIB="@comment "
  .else
 -.if !defined(WITHOUT_ARLIB)
 +.if defined(WITH_ARLIB)
  PLIST_SUB+=		ARLIB=""
  CONFIGURE_ARGS+=	--enable-arlib
 +MAN3=			ar.3
  .else
  CONFIGURE_ARGS+=	--disable-arlib
  PLIST_SUB+=		ARLIB="@comment "
 @@ -81,11 +96,23 @@ CONFIGURE_ARGS+=	--enable-popauth
  .if defined(WITH_QUERY_CACHE) && !defined(WITHOUT_QUERY_CACHE)
  CONFIGURE_ARGS+=	--enable-querycache
  .endif
 -
 -post-extract:
 -.for f in ${PORTDOCS0}
 -	@${CP} ${WRKSRC}/${f} ${WRKSRC}/docs/
 -.endfor
 +.if defined(WITH_OPENDBX)
 +CONFIGURE_ARGS+=	--with-odbx
 +LIB_DEPENDS+=		opendbx:${PORTSDIR}/databases/opendbx
 +.endif
 +.if defined(WITH_OPENLDAP)
 +CONFIGURE_ARGS+=	--with-openldap
 +USE_OPENLDAP=		yes
 +.endif
 +.if defined(WITH_LUA)
 +CONFIGURE_ARGS+=	--with-lua
 +MAN3+=			opendkim-lua.3
 +MAN8+=			miltertest.8
 +PLIST_SUB+=		LUA=""
 +USE_LUA=		5.1
 +.else
 +PLIST_SUB+=		LUA="@comment "
 +.endif
 
  post-install:
  .if !defined(WITH_DEBUG)
 @@ -93,13 +120,6 @@ post-install:
  .endif
  	@${MKDIR} ${PREFIX}/etc/mail
  	${INSTALL_DATA} ${WRKSRC}/opendkim/opendkim.conf.sample ${PREFIX}/etc/mail/
 -.if !defined(NOPORTDOCS)
 -.for f in ${PORTDOCS}
 -	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 -.endfor
 -.else
 -	@${RM} -rf ${DOCSDIR}
 -.endif
  	@${CAT} ${PKGMESSAGE}
 
  .include <bsd.port.post.mk>
 diff -Npru ports.orig/mail/opendkim/Makefile.features ports/mail/opendkim/Makefile.features
 --- ports.orig/mail/opendkim/Makefile.features	2010-07-12 09:21:04.000000000 +0900
 +++ ports/mail/opendkim/Makefile.features	2010-07-12 09:10:49.000000000 +0900
 @@ -7,6 +7,10 @@
  # $FreeBSD: ports/mail/opendkim/Makefile.features,v 1.1 2009/09/21 12:25:21 pav Exp $
  #
 
 +.if defined(WITH_ALLSYMBOLS) && !defined(WITHOUT_ALLSYMBOLS)
 +CONFIGURE_ARGS+=	--enable-allsymbols
 +.endif
 +
  .if defined(WITH_BODYLENGTH_DB) && !defined(WITHOUT_BODYLENGTH_DB)
  CONFIGURE_ARGS+=	--enable-bodylengthdb
  .endif
 @@ -15,8 +19,8 @@ CONFIGURE_ARGS+=	--enable-bodylengthdb
  CONFIGURE_ARGS+=	--enable-captureerrors
  .endif
 
 -.if defined(WITH_COMMAIZE) && !defined(WITHOUT_COMMAIZE)
 -CONFIGURE_ARGS+=	--enable-commaize
 +.if defined(WITH_CODECOVERAGE) && !defined(WITHOUT_CODECOVERAGE)
 +CONFIGURE_ARGS+=	--enable-codecoverage
  .endif
 
  .if defined(WITH_DIFFHEADERS) && !defined(WITHOUT_DIFFHEADERS)
 @@ -32,6 +36,15 @@ CONFIGURE_ARGS+=	--enable-dkimreputation
  CONFIGURE_ARGS+=	--enable-dnsupgrade
  .endif
 
 +.if defined(WITH_IDENTITY_HEADER) && !defined(WITHOUT_IDENTITY_HEADER)
 +CONFIGURE_ARGS+=	--enable-identity_header
 +.endif
 +
 +.if defined(WITH_LDAP_CACHING) && !defined(WITHOUT_LDAP_CACHING)
 +WITH_OPENLDAP=		yes
 +CONFIGURE_ARGS+=	--enable-ldap_caching
 +.endif
 +
  .if defined(WITH_MULTIPLE_SIGNATURES) && !defined(WITHOUT_MULTIPLE_SIGNATURES)
  CONFIGURE_ARGS+=	--enable-multiplesigs
  .endif
 @@ -41,6 +54,10 @@ BROKEN=		The feature ``_FFR_PARSE_TIME''
  CONFIGURE_ARGS+=	--enable-parsetime
  .endif
 
 +.if defined(WITH_REDIRECT) && !defined(WITHOUT_REDIRECT)
 +CONFIGURE_ARGS+=	-enable-redirect
 +.endif
 +
  .if defined(WITH_REPLACE_RULES) && !defined(WITHOUT_REPLACE_RULES)
  CONFIGURE_ARGS+=	-enable-replacerules
  .endif
 @@ -49,6 +66,10 @@ CONFIGURE_ARGS+=	-enable-replacerules
  CONFIGURE_ARGS+=	--enable-reportintervals
  .endif
 
 +.if defined(WITH_RESIGN) && !defined(WITHOUT_RESIGN)
 +CONFIGURE_ARGS+=	--enable-resign
 +.endif
 +
  .if defined(WITH_SELECT_CANONICALIZATION) && !defined(WITHOUT_SELECT_CANONICALIZATION)
  CONFIGURE_ARGS+=	--enable-selectcanon
  .endif
 @@ -57,8 +78,8 @@ CONFIGURE_ARGS+=	--enable-selectcanon
  CONFIGURE_ARGS+=	--enable-selectorheader
  .endif
 
 -.if defined(WITH_SENDER_HEADERS) && !defined(WITHOUT_SENDER_HEADERS)
 -CONFIGURE_ARGS+=	--enable-senderheaders
 +.if defined(WITH_SENDER_MACRO) && !defined(WITHOUT_SENDER_MACRO)
 +CONFIGURE_ARGS+=	--enable-sender_macro
  .endif
 
  .if defined(WITH_STATS) && !defined(WITHOUT_STATS)
 diff -Npru ports.orig/mail/opendkim/distinfo ports/mail/opendkim/distinfo
 --- ports.orig/mail/opendkim/distinfo	2010-07-12 09:21:04.000000000 +0900
 +++ ports/mail/opendkim/distinfo	2010-07-11 03:12:36.000000000 +0900
 @@ -1,3 +1,3 @@
 -MD5 (opendkim-1.1.2.tar.gz) = f869f90aad3561a01b377e9ca61dedc3
 -SHA256 (opendkim-1.1.2.tar.gz) = 5f11526c9a490b6649794b0e5910cb6e6c9b3fe815cf8b731dbed8ddb077d078
 -SIZE (opendkim-1.1.2.tar.gz) = 856455
 +MD5 (opendkim-2.1.2.tar.gz) = 7860684aaa3e17c9272081891a856092
 +SHA256 (opendkim-2.1.2.tar.gz) = 5f9e8c6447cfba022378e2cf54cfc82516319a745f01e457a6903c61a2295f93
 +SIZE (opendkim-2.1.2.tar.gz) = 1010010
 diff -Npru ports.orig/mail/opendkim/files/milter-opendkim.in ports/mail/opendkim/files/milter-opendkim.in
 --- ports.orig/mail/opendkim/files/milter-opendkim.in	2010-07-12 09:21:05.000000000 +0900
 +++ ports/mail/opendkim/files/milter-opendkim.in	2010-07-12 09:01:14.000000000 +0900
 @@ -22,6 +22,9 @@
  #
  # milteropendkim_${profile}_* :   Variables per profile.
  #                             Sockets must be different from each other.
 +#                             PidFile option in opendkim.conf(5) should be
 +#                             /var/run/milteropendkim/${profile}.pid
 +#                             to start/stop using this script
  #
  #  all parameters below now can be set in opendkim.conf(5).
  # milteropendkim_socket (str):    Path to the milter socket.
 @@ -99,7 +102,7 @@ if [ -n "$2" ]; then
  	if [ "x${milteropendkim_alg}" != "x" ];then
  	    milteropendkim_alg="-S ${milteropendkim_alg}"
  	fi
 -	command_args="-l ${_socket_prefix} ${milteropendkim_socket} ${_uid_prefix} ${milteropendkim_uid} -P ${pidfile} ${milteropendkim_cfgfile} ${milteropendkim_domain} ${milteropendkim_key} ${milteropendkim_selector} ${milteropendkim_alg}"
 +	command_args="-l ${_socket_prefix} ${milteropendkim_socket} ${_uid_prefix} ${milteropendkim_uid} ${milteropendkim_cfgfile} ${milteropendkim_domain} ${milteropendkim_key} ${milteropendkim_selector} ${milteropendkim_alg}"
      else
  	echo "$0: extra argument ignored"
      fi
 @@ -144,7 +147,7 @@ else
  	if [ "x${milteropendkim_alg}" != "x" ];then
  	    milteropendkim_alg="-S ${milteropendkim_alg}"
  	fi
 -	command_args="-l ${_socket_prefix} ${milteropendkim_socket} ${_uid_prefix} ${milteropendkim_uid} -P ${pidfile} ${milteropendkim_cfgfile} ${milteropendkim_domain} ${milteropendkim_key} ${milteropendkim_selector} ${milteropendkim_alg}"
 +	command_args="-l ${_socket_prefix} ${milteropendkim_socket} ${_uid_prefix} ${milteropendkim_uid} ${milteropendkim_cfgfile} ${milteropendkim_domain} ${milteropendkim_key} ${milteropendkim_selector} ${milteropendkim_alg}"
      fi
  fi
 
 diff -Npru ports.orig/mail/opendkim/files/patch-FEATURES ports/mail/opendkim/files/patch-FEATURES
 --- ports.orig/mail/opendkim/files/patch-FEATURES	2010-07-12 09:21:05.000000000 +0900
 +++ ports/mail/opendkim/files/patch-FEATURES	1970-01-01 09:00:00.000000000 +0900
 @@ -1,12 +0,0 @@
 ---- ./FEATURES.orig	2009-08-04 06:31:48.000000000 +0900
 -+++ ./FEATURES	2009-08-27 20:35:42.000000000 +0900
 -@@ -74,6 +74,9 @@
 - 		to use when signing based on the contents of an arbitrary
 - 		header.  (opendkim)
 -
 -+senderheaders	Optional control over which headers are used by the filter
 -+		to make the sign vs. verify decision.  (opendkim)
 -+
 - stats		Optional generation of statistics about pass/fail sorted
 - 		by domain and canonicalization.  Requires Sleepycat DB.
 - 		(opendkim, libopendkim)
 diff -Npru ports.orig/mail/opendkim/files/patch-opendkim__Makefile.in ports/mail/opendkim/files/patch-opendkim__Makefile.in
 --- ports.orig/mail/opendkim/files/patch-opendkim__Makefile.in	2010-07-12 09:21:05.000000000 +0900
 +++ ports/mail/opendkim/files/patch-opendkim__Makefile.in	1970-01-01 09:00:00.000000000 +0900
 @@ -1,11 +0,0 @@
 ---- ./opendkim/Makefile.in.orig	2009-08-15 01:44:49.000000000 +0900
 -+++ ./opendkim/Makefile.in	2009-08-27 20:36:49.000000000 +0900
 -@@ -327,7 +327,7 @@
 - AM_LDFLAGS = -pthread
 - sbin_SCRIPTS = opendkim-genkey.sh
 - exampledir = $(datarootdir)/doc/@PACKAGE@
 --example_DATA = opendkim.conf.sample
 -+example_DATA =
 - @BUILD_FILTER_TRUE@opendkim_SOURCES = opendkim.c opendkim.h opendkim-ar.c opendkim-ar.h opendkim-arf.c opendkim-arf.h opendkim-config.h opendkim-crypto.c opendkim-crypto.h opendkim-db.c opendkim-db.h config.c config.h stats.c stats.h test.c test.h util.c util.h
 - @BUILD_FILTER_TRUE@opendkim_CFLAGS = $(am__append_2) $(am__append_6) \
 - @BUILD_FILTER_TRUE@	$(am__append_7) $(am__append_8) \
 diff -Npru ports.orig/mail/opendkim/files/patch-opendkim__opendkim-db.c ports/mail/opendkim/files/patch-opendkim__opendkim-db.c
 --- ports.orig/mail/opendkim/files/patch-opendkim__opendkim-db.c	1970-01-01 09:00:00.000000000 +0900
 +++ ports/mail/opendkim/files/patch-opendkim__opendkim-db.c	2010-07-12 07:14:30.000000000 +0900
 @@ -0,0 +1,167 @@
 +--- ./opendkim/opendkim-db.c.orig	2010-07-07 04:54:31.000000000 +0900
 ++++ ./opendkim/opendkim-db.c	2010-07-12 07:14:26.000000000 +0900
 +@@ -1254,7 +1254,7 @@
 + 		if (status != 0)
 + 		{
 + 			if (err != NULL)
 +-				*err = db_strerror(status);
 ++				*err = DB_STRERROR(status);
 + 			free(new);
 + 			return 3;
 + 		}
 +@@ -1504,7 +1504,7 @@
 + 		_Bool found;
 + 		_Bool usetls = FALSE;
 + 		int c;
 +-		int err;
 ++		int lderr;
 + 		int v = LDAP_VERSION3;
 + 		size_t rem;
 + 		size_t plen;
 +@@ -1576,11 +1576,11 @@
 + 		**  first one.
 + 		*/
 +
 +-		err = ldap_url_parse(uris[0], &ldap->ldap_descr);
 +-		if (err != 0)
 ++		lderr = ldap_url_parse(uris[0], &ldap->ldap_descr);
 ++		if (lderr != 0)
 + 		{
 + 			if (err != NULL)
 +-				*err = ldap_err2string(err);
 ++				*err = ldap_err2string(lderr);
 + 			free(ldap);
 + 			free(p);
 + 			free(new);
 +@@ -1626,11 +1626,11 @@
 + 		}
 +
 + 		/* create LDAP handle */
 +-		err = ldap_initialize(&ld, ldap->ldap_urilist);
 +-		if (err != LDAP_SUCCESS)
 ++		lderr = ldap_initialize(&ld, ldap->ldap_urilist);
 ++		if (lderr != LDAP_SUCCESS)
 + 		{
 + 			if (err != NULL)
 +-				*err = ldap_err2string(err);
 ++				*err = ldap_err2string(lderr);
 + 			free(ldap);
 + 			free(p);
 + 			free(new);
 +@@ -1638,11 +1638,11 @@
 + 		}
 +
 + 		/* set LDAP version */
 +-		err = ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &v);
 +-		if (err != LDAP_OPT_SUCCESS)
 ++		lderr = ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &v);
 ++		if (lderr != LDAP_OPT_SUCCESS)
 + 		{
 + 			if (err != NULL)
 +-				*err = ldap_err2string(err);
 ++				*err = ldap_err2string(lderr);
 + 			ldap_unbind_ext(ld, NULL, NULL);
 + 			free(ldap);
 + 			free(p);
 +@@ -1656,11 +1656,11 @@
 + 		    strcasecmp(ldap->ldap_descr->lud_scheme, "ldapi") != 0 &&
 + 		    strcasecmp(ldap->ldap_descr->lud_scheme, "ldaps") != 0)
 + 		{
 +-			err = ldap_start_tls_s(ld, NULL, NULL);
 +-			if (err != LDAP_SUCCESS)
 ++			lderr = ldap_start_tls_s(ld, NULL, NULL);
 ++			if (lderr != LDAP_SUCCESS)
 + 			{
 + 				if (err != NULL)
 +-					*err = ldap_err2string(err);
 ++					*err = ldap_err2string(lderr);
 + 				ldap_unbind_ext(ld, NULL, NULL);
 + 				free(ldap);
 + 				free(p);
 +@@ -1689,12 +1689,12 @@
 + 				passwd.bv_len = 0;
 + 			}
 +
 +-			err = ldap_sasl_bind_s(ld, u, q, &passwd,
 +-			                       NULL, NULL, NULL);
 +-			if (err != LDAP_SUCCESS)
 ++			lderr = ldap_sasl_bind_s(ld, u, q, &passwd,
 ++			                         NULL, NULL, NULL);
 ++			if (lderr != LDAP_SUCCESS)
 + 			{
 + 				if (err != NULL)
 +-					*err = ldap_err2string(err);
 ++					*err = ldap_err2string(lderr);
 + 				ldap_unbind_ext(ld, NULL, NULL);
 + 				free(ldap);
 + 				free(p);
 +@@ -1705,18 +1705,18 @@
 + 		else
 + 		{
 + # ifdef USE_SASL
 +-			err = ldap_sasl_interactive_bind_s(ld,
 +-			                                   u,	/* bind user */
 +-			                                   q,	/* SASL mech */
 +-			                                   NULL, /* controls */
 +-			                                   NULL, /* controls */
 +-			                                   LDAP_SASL_QUIET, /* flags */
 +-			                                   dkimf_db_saslinteract, /* callback */
 +-			                                   NULL);
 +-			if (err != LDAP_SUCCESS)
 ++			lderr = ldap_sasl_interactive_bind_s(ld,
 ++			                                     u,	/* bind user */
 ++			                                     q,	/* SASL mech */
 ++			                                     NULL, /* controls */
 ++			                                     NULL, /* controls */
 ++			                                     LDAP_SASL_QUIET, /* flags */
 ++			                                     dkimf_db_saslinteract, /* callback */
 ++			                                     NULL);
 ++			if (lderr != LDAP_SUCCESS)
 + 			{
 + 				if (err != NULL)
 +-					*err = ldap_err2string(err);
 ++					*err = ldap_err2string(lderr);
 + 				ldap_unbind_ext(ld, NULL, NULL);
 + 				free(ldap);
 + 				free(p);
 +@@ -1740,30 +1740,30 @@
 + # ifdef _FFR_LDAP_CACHING
 + #  ifdef USE_DB
 + 		/* establish LDAP cache DB */
 +-		err = 0;
 ++		lderr = 0;
 +
 + #   if DB_VERSION_CHECK(3,0,0)
 +-		err = db_create(&newdb, NULL, 0);
 +-		if (err == 0)
 ++		lderr = db_create(&newdb, NULL, 0);
 ++		if (lderr == 0)
 + 		{
 + #    if DB_VERSION_CHECK(4,1,25)
 +- 			err = newdb->open(newdb, NULL, NULL, NULL,
 +-			                     DB_HASH, 0, 0);
 ++ 			lderr = newdb->open(newdb, NULL, NULL, NULL,
 ++			                    DB_HASH, 0, 0);
 + #    else /* DB_VERSION_CHECK(4,1,25) */
 +-			err = newdb->open(newdb, NULL, NULL, DB_HASH, 0, 0);
 ++			lderr = newdb->open(newdb, NULL, NULL, DB_HASH, 0, 0);
 + #    endif /* DB_VERSION_CHECK(4,1,25) */
 + 		}
 + #   elif DB_VERSION_CHECK(2,0,0)
 +-		err = db_open(NULL, DB_HASH, 0, DKIMF_DB_MODE,
 +-		                 NULL, NULL, &newdb);
 ++		lderr = db_open(NULL, DB_HASH, 0, DKIMF_DB_MODE,
 ++		                NULL, NULL, &newdb);
 + #   else /* DB_VERSION_CHECK(2,0,0) */
 + 		newdb = dbopen(NULL, (O_CREAT|O_RDWR),
 + 		               DKIMF_DB_MODE, DB_HASH, NULL);
 + 		if (newdb == NULL)
 +-			err = errno;
 ++			lderr = errno;
 + #   endif /* DB_VERSION_CHECK */
 +
 +-		if (err == 0)
 ++		if (lderr == 0)
 + 		{
 + 			DKIMF_DB cachedb;
 +
 diff -Npru ports.orig/mail/opendkim/files/patch-opendkim__opendkim.conf.sample ports/mail/opendkim/files/patch-opendkim__opendkim.conf.sample
 --- ports.orig/mail/opendkim/files/patch-opendkim__opendkim.conf.sample	1970-01-01 09:00:00.000000000 +0900
 +++ ports/mail/opendkim/files/patch-opendkim__opendkim.conf.sample	2010-07-12 08:46:15.000000000 +0900
 @@ -0,0 +1,10 @@
 +--- ./opendkim/opendkim.conf.sample.orig	2010-05-24 14:19:35.000000000 +0900
 ++++ ./opendkim/opendkim.conf.sample	2010-07-12 08:44:51.000000000 +0900
 +@@ -373,6 +373,7 @@
 + ##  normal operations.
 +
 + # PidFile		filename
 ++PidFile			/var/run/milteropendkim/pid
 +
 + ##  POPDBFile dataset
 + ##  	default (none)
 diff -Npru ports.orig/mail/opendkim/files/pkg-message.in ports/mail/opendkim/files/pkg-message.in
 --- ports.orig/mail/opendkim/files/pkg-message.in	2010-07-12 09:21:05.000000000 +0900
 +++ ports/mail/opendkim/files/pkg-message.in	2010-07-12 08:59:14.000000000 +0900
 @@ -15,6 +15,8 @@ smtpd_milters = _YOUR_SOCKET_SPEC_
 
  And to run the milter from startup, add milteropendkim_enable="YES" in
  your /etc/rc.conf.
 +If you run the milter more than one instance, PidFile name must be set
 +precisely.
  Extra options can be found in startup script.
 
  Note: milter sockets must be accessible from postfix/smtpd;
 diff -Npru ports.orig/mail/opendkim/pkg-descr ports/mail/opendkim/pkg-descr
 --- ports.orig/mail/opendkim/pkg-descr	2010-07-12 09:21:04.000000000 +0900
 +++ ports/mail/opendkim/pkg-descr	2010-07-11 03:12:36.000000000 +0900
 @@ -1,10 +1,12 @@
 -OpenDKIM is an open source implementation of the DKIM sender authentication
 -system proposed by the E-mail Signing Technology Group (ESTG), now a proposed
 -standard of the IETF (RFC4871).
 +OpenDKIM is an open source implementation of the DKIM (Domain Keys Identified
 +Mail) sender authentication system proposed by the E-mail Signing Technology
 +Group (ESTG), now standardized by the IETF (RFC4871). It also includes
 +implementations of the Author Domain Signing Practises (ADSP, RFC5617) and
 +Vouch By Reference (VBR, RFC5518) proposed standards.
 
  The OpenDKIM package consists of a library that implements the DKIM service
  and a milter-based filter application that can plug in to any milter-aware
  MTA to provide that service to sufficiently recent sendmail MTAs and other
  MTAs that support the milter protocol.
 
 -WWW:	http://opendkim.org/
 +WWW: http://opendkim.org/
 diff -Npru ports.orig/mail/opendkim/pkg-plist ports/mail/opendkim/pkg-plist
 --- ports.orig/mail/opendkim/pkg-plist	2010-07-12 09:21:05.000000000 +0900
 +++ ports/mail/opendkim/pkg-plist	2010-07-12 08:03:06.000000000 +0900
 @@ -10,119 +10,16 @@ include/opendkim/dkim.h
  lib/libopendkim.a
  lib/libopendkim.la
  lib/libopendkim.so
 -lib/libopendkim.so.0
 +lib/libopendkim.so.2
 +%%ARLIB%%libdata/pkgconfig/ar.pc
 +libdata/pkgconfig/opendkim.pc
 +%%LUA%%sbin/miltertest
  sbin/opendkim
  sbin/opendkim-genkey.sh
 +sbin/opendkim-genzone
  %%STATS%%sbin/opendkim-stats
  sbin/opendkim-testadsp
  sbin/opendkim-testkey
 -%%PORTDOCS%%%%DOCSDIR%%/FEATURES
 -%%PORTDOCS%%%%DOCSDIR%%/INSTALL
 -%%PORTDOCS%%%%DOCSDIR%%/KNOWNBUGS
 -%%PORTDOCS%%%%DOCSDIR%%/LICENSE
 -%%PORTDOCS%%%%DOCSDIR%%/LICENSE.Sendmail
 -%%PORTDOCS%%%%DOCSDIR%%/README
 -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES.Sendmail
 -%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-dkim-deployment-09.txt
 -%%PORTDOCS%%%%DOCSDIR%%/draft-kucherawy-dkim-reporting-06.txt
 -%%PORTDOCS%%%%DOCSDIR%%/draft-shafranovich-feedback-report-08.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc4686.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc4871.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc5016.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc5451.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc5518.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc5585.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc5617.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc5672.txt
 -%%DATADIR%%/dkim.html
 -%%DATADIR%%/dkim_alg_t.html
 -%%DATADIR%%/dkim_body.html
 -%%DATADIR%%/dkim_canon_t.html
 -%%DATADIR%%/dkim_cbstat.html
 -%%DATADIR%%/dkim_chunk.html
 -%%DATADIR%%/dkim_close.html
 -%%DATADIR%%/dkim_diffheaders.html
 -%%DATADIR%%/dkim_dnssec.html
 -%%DATADIR%%/dkim_eoh.html
 -%%DATADIR%%/dkim_eom.html
 -%%DATADIR%%/dkim_flush_cache.html
 -%%DATADIR%%/dkim_free.html
 -%%DATADIR%%/dkim_get_user_context.html
 -%%DATADIR%%/dkim_getcachestats.html
 -%%DATADIR%%/dkim_getdomain.html
 -%%DATADIR%%/dkim_geterror.html
 -%%DATADIR%%/dkim_getmode.html
 -%%DATADIR%%/dkim_get_msgdate.html
 -%%DATADIR%%/dkim_getpartial.html
 -%%DATADIR%%/dkim_getpolicystr.html
 -%%DATADIR%%/dkim_getpresult.html
 -%%DATADIR%%/dkim_getpresultstr.html
 -%%DATADIR%%/dkim_get_reputation.html
 -%%DATADIR%%/dkim_getresultstr.html
 -%%DATADIR%%/dkim_getsighdr.html
 -%%DATADIR%%/dkim_getsiglist.html
 -%%DATADIR%%/dkim_getsignature.html
 -%%DATADIR%%/dkim_header.html
 -%%DATADIR%%/dkim_init.html
 -%%DATADIR%%/dkim_key_syntax.html
 -%%DATADIR%%/dkim_lib.html
 -%%DATADIR%%/dkim_minbody.html
 -%%DATADIR%%/dkim_ohdrs.html
 -%%DATADIR%%/dkim_options.html
 -%%DATADIR%%/dkim_param_t.html
 -%%DATADIR%%/dkim_policy.html
 -%%DATADIR%%/dkim_policy_getdnssec.html
 -%%DATADIR%%/dkim_policy_getreportinfo.html
 -%%DATADIR%%/dkim_policy_syntax.html
 -%%DATADIR%%/dkim_policy_t.html
 -%%DATADIR%%/dkim_presult.html
 -%%DATADIR%%/dkim_pstate.html
 -%%DATADIR%%/dkim_query_t.html
 -%%DATADIR%%/dkim_set_dns_callback.html
 -%%DATADIR%%/dkim_set_final.html
 -%%DATADIR%%/dkim_set_key_lookup.html
 -%%DATADIR%%/dkim_set_margin.html
 -%%DATADIR%%/dkim_set_policy_lookup.html
 -%%DATADIR%%/dkim_setpartial.html
 -%%DATADIR%%/dkim_set_prescreen.html
 -%%DATADIR%%/dkim_set_signature_handle.html
 -%%DATADIR%%/dkim_set_signature_handle_free.html
 -%%DATADIR%%/dkim_set_signature_tagvalues.html
 -%%DATADIR%%/dkim_set_signer.html
 -%%DATADIR%%/dkim_set_trust_anchor.html
 -%%DATADIR%%/dkim_set_user_context.html
 -%%DATADIR%%/dkim_sig_getbh.html
 -%%DATADIR%%/dkim_sig_getcanonlen.html
 -%%DATADIR%%/dkim_sig_getcanons.html
 -%%DATADIR%%/dkim_sig_getcontext.html
 -%%DATADIR%%/dkim_sig_getdnssec.html
 -%%DATADIR%%/dkim_sig_getdomain.html
 -%%DATADIR%%/dkim_sig_geterror.html
 -%%DATADIR%%/dkim_sig_geterrorstr.html
 -%%DATADIR%%/dkim_sig_getflags.html
 -%%DATADIR%%/dkim_sig_getidentity.html
 -%%DATADIR%%/dkim_sig_getkeysize.html
 -%%DATADIR%%/dkim_sig_getreportinfo.html
 -%%DATADIR%%/dkim_sig_getselector.html
 -%%DATADIR%%/dkim_sig_getsignalg.html
 -%%DATADIR%%/dkim_sig_getsigntime.html
 -%%DATADIR%%/dkim_sig_hdrsigned.html
 -%%DATADIR%%/dkim_sig_ignore.html
 -%%DATADIR%%/dkim_sig_process.html
 -%%DATADIR%%/dkim_sig_syntax.html
 -%%DATADIR%%/dkim_sigerror.html
 -%%DATADIR%%/dkim_siginfo.html
 -%%DATADIR%%/dkim_sigkey_t.html
 -%%DATADIR%%/dkim_sign.html
 -%%DATADIR%%/dkim_libfeature.html
 -%%DATADIR%%/dkim_ssl_version.html
 -%%DATADIR%%/dkim_stat.html
 -%%DATADIR%%/dkim_verify.html
 -%%DATADIR%%/index.html
 -%%DATADIR%%/overview.html
 -%%DATADIR%%/rfc2822_mailbox_split.html
 -@dirrm %%DATADIR%%
  @dirrm include/opendkim
 -@dirrm include/ar
 +%%ARLIB%%@dirrm include/ar
  @dirrmtry etc/mail
 
 --Multipart_Mon_Jul_12_09:34:16_2010-1--
 
 --pgp-sign-Multipart_Mon_Jul_12_09:34:16_2010-1
 Content-Type: application/pgp-signature
 Content-Transfer-Encoding: 7bit
 Content-Description: OpenPGP Digital Signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (FreeBSD)
 
 iQEcBAABAgAGBQJMOmMNAAoJEML/cja+Xi6+FBgH/0CszC7wTroy40UIfjJMtAuT
 AWR8eZjdpgyAXUrFXVDgTHzptYm3f4PUONOs6dcFhNVMHxD/6IGFYnx9q1UPJ/33
 Jka1BWEJcOdd7pSD/SHPFbCFguUsUUXDGFIndbfGhOt6gWpE/JEn8ZsvS/fAXqgY
 1ob73dPymYz4+qMT/wxVKevm/NXC0hvd/9bOtooSjKUX7F1PVoHBlOeLJ1XB+iuW
 KFDVnEAfOo0yan4PMLymXfW8Qr6pK7l9JNAae3WE1zed8swb+WCDo8F06VlMSmxm
 b2/Dw+Bv78K7XEQ34KolLrRk86xPRl6dn6VwK3I9Vnx8MWhybwsuZzI80OgbkWw=
 =ed0s
 -----END PGP SIGNATURE-----
 
 --pgp-sign-Multipart_Mon_Jul_12_09:34:16_2010-1--

From: Hirohisa Yamaguchi <umq@ueo.co.jp>
To: sahil@FreeBSD.org
Cc: msk@blackops.org, bug-followup@FreeBSD.org
Subject: Re: ports/148397: Please update ports/mail/opendkim to latest version
Date: Tue, 13 Jul 2010 07:31:17 +0900

 --pgp-sign-Multipart_Tue_Jul_13_07:31:11_2010-1
 Content-Type: multipart/mixed;
  boundary="Multipart_Tue_Jul_13_07:31:11_2010-1"
 
 --Multipart_Tue_Jul_13_07:31:11_2010-1
 Content-Type: text/plain; charset=US-ASCII
 
 
 Reattaching a patch due to typographical error.
 
 --
 
 	Hirohisa Yamaguchi
 	  umq@ueo.co.jp
 
 --Multipart_Tue_Jul_13_07:31:11_2010-1
 Content-Type: application/octet-stream; type=patch
 Content-Disposition: attachment; filename="opendkim-148397.patch"
 Content-Transfer-Encoding: 7bit
 
 diff -Npru ports.orig/mail/opendkim/Makefile ports/mail/opendkim/Makefile
 --- ports.orig/mail/opendkim/Makefile	2010-07-12 09:21:04.000000000 +0900
 +++ ports/mail/opendkim/Makefile	2010-07-12 09:15:46.000000000 +0900
 @@ -1,34 +1,42 @@
  # New ports collection makefile for:	opendkim
 -# Date created:		2009-08-26
 -# Whom:			Hirohisa Yamaguchi <umq@ueo.co.jp>
 +# Date created:				2009-08-26
 +# Whom:					Hirohisa Yamaguchi <umq@ueo.co.jp>
  #
  # $FreeBSD: ports/mail/opendkim/Makefile,v 1.3 2009/12/22 11:36:22 miwi Exp $
  #
 
  PORTNAME=	opendkim
 -PORTVERSION=	1.1.2
 -PORTREVISION=	1
 +PORTVERSION=	2.1.2
  CATEGORIES=	mail security
  MASTER_SITES=	SF/opendkim
 
  MAINTAINER=	umq@ueo.co.jp
 -COMMENT=	DKIM milter implimentation
 +COMMENT=	DKIM library and milter implimentation
 
  GNU_CONFIGURE=	yes
  USE_OPENSSL=	yes
  USE_RC_SUBR=	milter-opendkim
  USE_LDCONFIG=	yes
 
 -MAN_COMPRESSED=	no
 -MAN3=		ar.3
  MAN5=		opendkim.conf.5
 -MAN8=		opendkim-genkey.8 opendkim-testadsp.8 \
 -		opendkim-testkey.8 opendkim.8
 -PORTDOCS0=	FEATURES INSTALL KNOWNBUGS LICENSE LICENSE.Sendmail \
 -		README RELEASE_NOTES RELEASE_NOTES.Sendmail
 -PORTDOCS=	docs/*
 +MAN8=		opendkim-genkey.8 opendkim-genzone.8 \
 +		opendkim-testadsp.8 opendkim-testkey.8 \
 +		opendkim.8
 +
  SUB_FILES=	pkg-message
 
 +OPTIONS= \
 +	ARLIB		"Asynchronous thread-safe DNS library"	On \
 +	LUA		"Describe filter policy with lua"	Off \
 +	OPENDBX		"Store filter policies via OpenDBX"	Off \
 +	OPENLDAP	"Store filter policies in LDAP"		Off \
 +	OPENSSL_PORT	"Use OpenSSL in ports"			Off \
 +	POPAUTH		"Use POP authentication DB"		Off \
 +	QUERY_CACHE	"Cache DNS query results locally"	Off \
 +	UNBOUND		"Use unbound DNS library"		Off
 +
 +MAKE_ARGS+=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
 +
  .include <bsd.port.pre.mk>
 
  WITHOUT_MILTER_CFLAGS=	yes
 @@ -48,14 +56,20 @@ CONFIGURE_ARGS+=	--with-openssl=${OPENSS
  CONFIGURE_ARGS+=	--enable-debug
  .endif
 
 +.if !defined(NOPORTDOCS)
 +PORTDOCS=	*
 +.else
 +CONFIGURE_ARGS+=--docdir=${WRKDIR}/doc
 +.endif
 +
  .if (defined(WITH_POPAUTH) \
  	|| defined(WITH_QUERY_CACHE) \
  	|| defined(WITH_BODYLENGTH_DB) \
 +	|| defined(WITH_LDAP_CACHING) \
  	|| defined(WITH_STATS)) \
  	&& !defined(WITH_BDB_BASE)
 -#BROKEN=		LIBDB_INCDIR nor LIBDB_LIBDIRS cannot be set individually
  CONFIGURE_ARGS+=	--with-db
 -USE_BDB=	41+
 +USE_BDB=		41+
  .endif
  .if defined(WITH_UNBOUND) && !defined(WITHOUT_UNBOUND)
  BROKEN=		configure fails since arlib cannot be disabled
 @@ -64,12 +78,13 @@ IGNORE=		libar cannot be used simultaneo
  .endif
  CONFIGURE_ARGS+=	--with-unbound \
  			--disable-arlib
 -LIB_DEPENDS+=	unbound:${PORTSDIR}/dns/unbound
 +LIB_DEPENDS+=		unbound:${PORTSDIR}/dns/unbound
  PLIST_SUB+=		ARLIB="@comment "
  .else
 -.if !defined(WITHOUT_ARLIB)
 +.if defined(WITH_ARLIB)
  PLIST_SUB+=		ARLIB=""
  CONFIGURE_ARGS+=	--enable-arlib
 +MAN3=			ar.3
  .else
  CONFIGURE_ARGS+=	--disable-arlib
  PLIST_SUB+=		ARLIB="@comment "
 @@ -79,13 +94,25 @@ PLIST_SUB+=		ARLIB="@comment "
  CONFIGURE_ARGS+=	--enable-popauth
  .endif
  .if defined(WITH_QUERY_CACHE) && !defined(WITHOUT_QUERY_CACHE)
 -CONFIGURE_ARGS+=	--enable-querycache
 +CONFIGURE_ARGS+=	--enable-query_cache
 +.endif
 +.if defined(WITH_OPENDBX)
 +CONFIGURE_ARGS+=	--with-odbx
 +LIB_DEPENDS+=		opendbx:${PORTSDIR}/databases/opendbx
 +.endif
 +.if defined(WITH_OPENLDAP)
 +CONFIGURE_ARGS+=	--with-openldap
 +USE_OPENLDAP=		yes
 +.endif
 +.if defined(WITH_LUA)
 +CONFIGURE_ARGS+=	--with-lua
 +MAN3+=			opendkim-lua.3
 +MAN8+=			miltertest.8
 +PLIST_SUB+=		LUA=""
 +USE_LUA=		5.1
 +.else
 +PLIST_SUB+=		LUA="@comment "
  .endif
 -
 -post-extract:
 -.for f in ${PORTDOCS0}
 -	@${CP} ${WRKSRC}/${f} ${WRKSRC}/docs/
 -.endfor
 
  post-install:
  .if !defined(WITH_DEBUG)
 @@ -93,13 +120,6 @@ post-install:
  .endif
  	@${MKDIR} ${PREFIX}/etc/mail
  	${INSTALL_DATA} ${WRKSRC}/opendkim/opendkim.conf.sample ${PREFIX}/etc/mail/
 -.if !defined(NOPORTDOCS)
 -.for f in ${PORTDOCS}
 -	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 -.endfor
 -.else
 -	@${RM} -rf ${DOCSDIR}
 -.endif
  	@${CAT} ${PKGMESSAGE}
 
  .include <bsd.port.post.mk>
 diff -Npru ports.orig/mail/opendkim/Makefile.features ports/mail/opendkim/Makefile.features
 --- ports.orig/mail/opendkim/Makefile.features	2010-07-12 09:21:04.000000000 +0900
 +++ ports/mail/opendkim/Makefile.features	2010-07-12 09:10:49.000000000 +0900
 @@ -7,6 +7,10 @@
  # $FreeBSD: ports/mail/opendkim/Makefile.features,v 1.1 2009/09/21 12:25:21 pav Exp $
  #
 
 +.if defined(WITH_ALLSYMBOLS) && !defined(WITHOUT_ALLSYMBOLS)
 +CONFIGURE_ARGS+=	--enable-allsymbols
 +.endif
 +
  .if defined(WITH_BODYLENGTH_DB) && !defined(WITHOUT_BODYLENGTH_DB)
  CONFIGURE_ARGS+=	--enable-bodylengthdb
  .endif
 @@ -15,8 +19,8 @@ CONFIGURE_ARGS+=	--enable-bodylengthdb
  CONFIGURE_ARGS+=	--enable-captureerrors
  .endif
 
 -.if defined(WITH_COMMAIZE) && !defined(WITHOUT_COMMAIZE)
 -CONFIGURE_ARGS+=	--enable-commaize
 +.if defined(WITH_CODECOVERAGE) && !defined(WITHOUT_CODECOVERAGE)
 +CONFIGURE_ARGS+=	--enable-codecoverage
  .endif
 
  .if defined(WITH_DIFFHEADERS) && !defined(WITHOUT_DIFFHEADERS)
 @@ -32,6 +36,15 @@ CONFIGURE_ARGS+=	--enable-dkimreputation
  CONFIGURE_ARGS+=	--enable-dnsupgrade
  .endif
 
 +.if defined(WITH_IDENTITY_HEADER) && !defined(WITHOUT_IDENTITY_HEADER)
 +CONFIGURE_ARGS+=	--enable-identity_header
 +.endif
 +
 +.if defined(WITH_LDAP_CACHING) && !defined(WITHOUT_LDAP_CACHING)
 +WITH_OPENLDAP=		yes
 +CONFIGURE_ARGS+=	--enable-ldap_caching
 +.endif
 +
  .if defined(WITH_MULTIPLE_SIGNATURES) && !defined(WITHOUT_MULTIPLE_SIGNATURES)
  CONFIGURE_ARGS+=	--enable-multiplesigs
  .endif
 @@ -41,6 +54,10 @@ BROKEN=		The feature ``_FFR_PARSE_TIME''
  CONFIGURE_ARGS+=	--enable-parsetime
  .endif
 
 +.if defined(WITH_REDIRECT) && !defined(WITHOUT_REDIRECT)
 +CONFIGURE_ARGS+=	-enable-redirect
 +.endif
 +
  .if defined(WITH_REPLACE_RULES) && !defined(WITHOUT_REPLACE_RULES)
  CONFIGURE_ARGS+=	-enable-replacerules
  .endif
 @@ -49,6 +66,10 @@ CONFIGURE_ARGS+=	-enable-replacerules
  CONFIGURE_ARGS+=	--enable-reportintervals
  .endif
 
 +.if defined(WITH_RESIGN) && !defined(WITHOUT_RESIGN)
 +CONFIGURE_ARGS+=	--enable-resign
 +.endif
 +
  .if defined(WITH_SELECT_CANONICALIZATION) && !defined(WITHOUT_SELECT_CANONICALIZATION)
  CONFIGURE_ARGS+=	--enable-selectcanon
  .endif
 @@ -57,8 +78,8 @@ CONFIGURE_ARGS+=	--enable-selectcanon
  CONFIGURE_ARGS+=	--enable-selectorheader
  .endif
 
 -.if defined(WITH_SENDER_HEADERS) && !defined(WITHOUT_SENDER_HEADERS)
 -CONFIGURE_ARGS+=	--enable-senderheaders
 +.if defined(WITH_SENDER_MACRO) && !defined(WITHOUT_SENDER_MACRO)
 +CONFIGURE_ARGS+=	--enable-sender_macro
  .endif
 
  .if defined(WITH_STATS) && !defined(WITHOUT_STATS)
 diff -Npru ports.orig/mail/opendkim/distinfo ports/mail/opendkim/distinfo
 --- ports.orig/mail/opendkim/distinfo	2010-07-12 09:21:04.000000000 +0900
 +++ ports/mail/opendkim/distinfo	2010-07-11 03:12:36.000000000 +0900
 @@ -1,3 +1,3 @@
 -MD5 (opendkim-1.1.2.tar.gz) = f869f90aad3561a01b377e9ca61dedc3
 -SHA256 (opendkim-1.1.2.tar.gz) = 5f11526c9a490b6649794b0e5910cb6e6c9b3fe815cf8b731dbed8ddb077d078
 -SIZE (opendkim-1.1.2.tar.gz) = 856455
 +MD5 (opendkim-2.1.2.tar.gz) = 7860684aaa3e17c9272081891a856092
 +SHA256 (opendkim-2.1.2.tar.gz) = 5f9e8c6447cfba022378e2cf54cfc82516319a745f01e457a6903c61a2295f93
 +SIZE (opendkim-2.1.2.tar.gz) = 1010010
 diff -Npru ports.orig/mail/opendkim/files/milter-opendkim.in ports/mail/opendkim/files/milter-opendkim.in
 --- ports.orig/mail/opendkim/files/milter-opendkim.in	2010-07-12 09:21:05.000000000 +0900
 +++ ports/mail/opendkim/files/milter-opendkim.in	2010-07-12 09:01:14.000000000 +0900
 @@ -22,6 +22,9 @@
  #
  # milteropendkim_${profile}_* :   Variables per profile.
  #                             Sockets must be different from each other.
 +#                             PidFile option in opendkim.conf(5) should be
 +#                             /var/run/milteropendkim/${profile}.pid
 +#                             to start/stop using this script
  #
  #  all parameters below now can be set in opendkim.conf(5).
  # milteropendkim_socket (str):    Path to the milter socket.
 @@ -99,7 +102,7 @@ if [ -n "$2" ]; then
  	if [ "x${milteropendkim_alg}" != "x" ];then
  	    milteropendkim_alg="-S ${milteropendkim_alg}"
  	fi
 -	command_args="-l ${_socket_prefix} ${milteropendkim_socket} ${_uid_prefix} ${milteropendkim_uid} -P ${pidfile} ${milteropendkim_cfgfile} ${milteropendkim_domain} ${milteropendkim_key} ${milteropendkim_selector} ${milteropendkim_alg}"
 +	command_args="-l ${_socket_prefix} ${milteropendkim_socket} ${_uid_prefix} ${milteropendkim_uid} ${milteropendkim_cfgfile} ${milteropendkim_domain} ${milteropendkim_key} ${milteropendkim_selector} ${milteropendkim_alg}"
      else
  	echo "$0: extra argument ignored"
      fi
 @@ -144,7 +147,7 @@ else
  	if [ "x${milteropendkim_alg}" != "x" ];then
  	    milteropendkim_alg="-S ${milteropendkim_alg}"
  	fi
 -	command_args="-l ${_socket_prefix} ${milteropendkim_socket} ${_uid_prefix} ${milteropendkim_uid} -P ${pidfile} ${milteropendkim_cfgfile} ${milteropendkim_domain} ${milteropendkim_key} ${milteropendkim_selector} ${milteropendkim_alg}"
 +	command_args="-l ${_socket_prefix} ${milteropendkim_socket} ${_uid_prefix} ${milteropendkim_uid} ${milteropendkim_cfgfile} ${milteropendkim_domain} ${milteropendkim_key} ${milteropendkim_selector} ${milteropendkim_alg}"
      fi
  fi
 
 diff -Npru ports.orig/mail/opendkim/files/patch-FEATURES ports/mail/opendkim/files/patch-FEATURES
 --- ports.orig/mail/opendkim/files/patch-FEATURES	2010-07-12 09:21:05.000000000 +0900
 +++ ports/mail/opendkim/files/patch-FEATURES	1970-01-01 09:00:00.000000000 +0900
 @@ -1,12 +0,0 @@
 ---- ./FEATURES.orig	2009-08-04 06:31:48.000000000 +0900
 -+++ ./FEATURES	2009-08-27 20:35:42.000000000 +0900
 -@@ -74,6 +74,9 @@
 - 		to use when signing based on the contents of an arbitrary
 - 		header.  (opendkim)
 -
 -+senderheaders	Optional control over which headers are used by the filter
 -+		to make the sign vs. verify decision.  (opendkim)
 -+
 - stats		Optional generation of statistics about pass/fail sorted
 - 		by domain and canonicalization.  Requires Sleepycat DB.
 - 		(opendkim, libopendkim)
 diff -Npru ports.orig/mail/opendkim/files/patch-opendkim__Makefile.in ports/mail/opendkim/files/patch-opendkim__Makefile.in
 --- ports.orig/mail/opendkim/files/patch-opendkim__Makefile.in	2010-07-12 09:21:05.000000000 +0900
 +++ ports/mail/opendkim/files/patch-opendkim__Makefile.in	1970-01-01 09:00:00.000000000 +0900
 @@ -1,11 +0,0 @@
 ---- ./opendkim/Makefile.in.orig	2009-08-15 01:44:49.000000000 +0900
 -+++ ./opendkim/Makefile.in	2009-08-27 20:36:49.000000000 +0900
 -@@ -327,7 +327,7 @@
 - AM_LDFLAGS = -pthread
 - sbin_SCRIPTS = opendkim-genkey.sh
 - exampledir = $(datarootdir)/doc/@PACKAGE@
 --example_DATA = opendkim.conf.sample
 -+example_DATA =
 - @BUILD_FILTER_TRUE@opendkim_SOURCES = opendkim.c opendkim.h opendkim-ar.c opendkim-ar.h opendkim-arf.c opendkim-arf.h opendkim-config.h opendkim-crypto.c opendkim-crypto.h opendkim-db.c opendkim-db.h config.c config.h stats.c stats.h test.c test.h util.c util.h
 - @BUILD_FILTER_TRUE@opendkim_CFLAGS = $(am__append_2) $(am__append_6) \
 - @BUILD_FILTER_TRUE@	$(am__append_7) $(am__append_8) \
 diff -Npru ports.orig/mail/opendkim/files/patch-opendkim__opendkim-db.c ports/mail/opendkim/files/patch-opendkim__opendkim-db.c
 --- ports.orig/mail/opendkim/files/patch-opendkim__opendkim-db.c	1970-01-01 09:00:00.000000000 +0900
 +++ ports/mail/opendkim/files/patch-opendkim__opendkim-db.c	2010-07-12 07:14:30.000000000 +0900
 @@ -0,0 +1,167 @@
 +--- ./opendkim/opendkim-db.c.orig	2010-07-07 04:54:31.000000000 +0900
 ++++ ./opendkim/opendkim-db.c	2010-07-12 07:14:26.000000000 +0900
 +@@ -1254,7 +1254,7 @@
 + 		if (status != 0)
 + 		{
 + 			if (err != NULL)
 +-				*err = db_strerror(status);
 ++				*err = DB_STRERROR(status);
 + 			free(new);
 + 			return 3;
 + 		}
 +@@ -1504,7 +1504,7 @@
 + 		_Bool found;
 + 		_Bool usetls = FALSE;
 + 		int c;
 +-		int err;
 ++		int lderr;
 + 		int v = LDAP_VERSION3;
 + 		size_t rem;
 + 		size_t plen;
 +@@ -1576,11 +1576,11 @@
 + 		**  first one.
 + 		*/
 +
 +-		err = ldap_url_parse(uris[0], &ldap->ldap_descr);
 +-		if (err != 0)
 ++		lderr = ldap_url_parse(uris[0], &ldap->ldap_descr);
 ++		if (lderr != 0)
 + 		{
 + 			if (err != NULL)
 +-				*err = ldap_err2string(err);
 ++				*err = ldap_err2string(lderr);
 + 			free(ldap);
 + 			free(p);
 + 			free(new);
 +@@ -1626,11 +1626,11 @@
 + 		}
 +
 + 		/* create LDAP handle */
 +-		err = ldap_initialize(&ld, ldap->ldap_urilist);
 +-		if (err != LDAP_SUCCESS)
 ++		lderr = ldap_initialize(&ld, ldap->ldap_urilist);
 ++		if (lderr != LDAP_SUCCESS)
 + 		{
 + 			if (err != NULL)
 +-				*err = ldap_err2string(err);
 ++				*err = ldap_err2string(lderr);
 + 			free(ldap);
 + 			free(p);
 + 			free(new);
 +@@ -1638,11 +1638,11 @@
 + 		}
 +
 + 		/* set LDAP version */
 +-		err = ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &v);
 +-		if (err != LDAP_OPT_SUCCESS)
 ++		lderr = ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &v);
 ++		if (lderr != LDAP_OPT_SUCCESS)
 + 		{
 + 			if (err != NULL)
 +-				*err = ldap_err2string(err);
 ++				*err = ldap_err2string(lderr);
 + 			ldap_unbind_ext(ld, NULL, NULL);
 + 			free(ldap);
 + 			free(p);
 +@@ -1656,11 +1656,11 @@
 + 		    strcasecmp(ldap->ldap_descr->lud_scheme, "ldapi") != 0 &&
 + 		    strcasecmp(ldap->ldap_descr->lud_scheme, "ldaps") != 0)
 + 		{
 +-			err = ldap_start_tls_s(ld, NULL, NULL);
 +-			if (err != LDAP_SUCCESS)
 ++			lderr = ldap_start_tls_s(ld, NULL, NULL);
 ++			if (lderr != LDAP_SUCCESS)
 + 			{
 + 				if (err != NULL)
 +-					*err = ldap_err2string(err);
 ++					*err = ldap_err2string(lderr);
 + 				ldap_unbind_ext(ld, NULL, NULL);
 + 				free(ldap);
 + 				free(p);
 +@@ -1689,12 +1689,12 @@
 + 				passwd.bv_len = 0;
 + 			}
 +
 +-			err = ldap_sasl_bind_s(ld, u, q, &passwd,
 +-			                       NULL, NULL, NULL);
 +-			if (err != LDAP_SUCCESS)
 ++			lderr = ldap_sasl_bind_s(ld, u, q, &passwd,
 ++			                         NULL, NULL, NULL);
 ++			if (lderr != LDAP_SUCCESS)
 + 			{
 + 				if (err != NULL)
 +-					*err = ldap_err2string(err);
 ++					*err = ldap_err2string(lderr);
 + 				ldap_unbind_ext(ld, NULL, NULL);
 + 				free(ldap);
 + 				free(p);
 +@@ -1705,18 +1705,18 @@
 + 		else
 + 		{
 + # ifdef USE_SASL
 +-			err = ldap_sasl_interactive_bind_s(ld,
 +-			                                   u,	/* bind user */
 +-			                                   q,	/* SASL mech */
 +-			                                   NULL, /* controls */
 +-			                                   NULL, /* controls */
 +-			                                   LDAP_SASL_QUIET, /* flags */
 +-			                                   dkimf_db_saslinteract, /* callback */
 +-			                                   NULL);
 +-			if (err != LDAP_SUCCESS)
 ++			lderr = ldap_sasl_interactive_bind_s(ld,
 ++			                                     u,	/* bind user */
 ++			                                     q,	/* SASL mech */
 ++			                                     NULL, /* controls */
 ++			                                     NULL, /* controls */
 ++			                                     LDAP_SASL_QUIET, /* flags */
 ++			                                     dkimf_db_saslinteract, /* callback */
 ++			                                     NULL);
 ++			if (lderr != LDAP_SUCCESS)
 + 			{
 + 				if (err != NULL)
 +-					*err = ldap_err2string(err);
 ++					*err = ldap_err2string(lderr);
 + 				ldap_unbind_ext(ld, NULL, NULL);
 + 				free(ldap);
 + 				free(p);
 +@@ -1740,30 +1740,30 @@
 + # ifdef _FFR_LDAP_CACHING
 + #  ifdef USE_DB
 + 		/* establish LDAP cache DB */
 +-		err = 0;
 ++		lderr = 0;
 +
 + #   if DB_VERSION_CHECK(3,0,0)
 +-		err = db_create(&newdb, NULL, 0);
 +-		if (err == 0)
 ++		lderr = db_create(&newdb, NULL, 0);
 ++		if (lderr == 0)
 + 		{
 + #    if DB_VERSION_CHECK(4,1,25)
 +- 			err = newdb->open(newdb, NULL, NULL, NULL,
 +-			                     DB_HASH, 0, 0);
 ++ 			lderr = newdb->open(newdb, NULL, NULL, NULL,
 ++			                    DB_HASH, 0, 0);
 + #    else /* DB_VERSION_CHECK(4,1,25) */
 +-			err = newdb->open(newdb, NULL, NULL, DB_HASH, 0, 0);
 ++			lderr = newdb->open(newdb, NULL, NULL, DB_HASH, 0, 0);
 + #    endif /* DB_VERSION_CHECK(4,1,25) */
 + 		}
 + #   elif DB_VERSION_CHECK(2,0,0)
 +-		err = db_open(NULL, DB_HASH, 0, DKIMF_DB_MODE,
 +-		                 NULL, NULL, &newdb);
 ++		lderr = db_open(NULL, DB_HASH, 0, DKIMF_DB_MODE,
 ++		                NULL, NULL, &newdb);
 + #   else /* DB_VERSION_CHECK(2,0,0) */
 + 		newdb = dbopen(NULL, (O_CREAT|O_RDWR),
 + 		               DKIMF_DB_MODE, DB_HASH, NULL);
 + 		if (newdb == NULL)
 +-			err = errno;
 ++			lderr = errno;
 + #   endif /* DB_VERSION_CHECK */
 +
 +-		if (err == 0)
 ++		if (lderr == 0)
 + 		{
 + 			DKIMF_DB cachedb;
 +
 diff -Npru ports.orig/mail/opendkim/files/patch-opendkim__opendkim.conf.sample ports/mail/opendkim/files/patch-opendkim__opendkim.conf.sample
 --- ports.orig/mail/opendkim/files/patch-opendkim__opendkim.conf.sample	1970-01-01 09:00:00.000000000 +0900
 +++ ports/mail/opendkim/files/patch-opendkim__opendkim.conf.sample	2010-07-12 08:46:15.000000000 +0900
 @@ -0,0 +1,10 @@
 +--- ./opendkim/opendkim.conf.sample.orig	2010-05-24 14:19:35.000000000 +0900
 ++++ ./opendkim/opendkim.conf.sample	2010-07-12 08:44:51.000000000 +0900
 +@@ -373,6 +373,7 @@
 + ##  normal operations.
 +
 + # PidFile		filename
 ++PidFile			/var/run/milteropendkim/pid
 +
 + ##  POPDBFile dataset
 + ##  	default (none)
 diff -Npru ports.orig/mail/opendkim/files/pkg-message.in ports/mail/opendkim/files/pkg-message.in
 --- ports.orig/mail/opendkim/files/pkg-message.in	2010-07-12 09:21:05.000000000 +0900
 +++ ports/mail/opendkim/files/pkg-message.in	2010-07-12 08:59:14.000000000 +0900
 @@ -15,6 +15,8 @@ smtpd_milters = _YOUR_SOCKET_SPEC_
 
  And to run the milter from startup, add milteropendkim_enable="YES" in
  your /etc/rc.conf.
 +If you run the milter more than one instance, PidFile name must be set
 +precisely.
  Extra options can be found in startup script.
 
  Note: milter sockets must be accessible from postfix/smtpd;
 diff -Npru ports.orig/mail/opendkim/pkg-descr ports/mail/opendkim/pkg-descr
 --- ports.orig/mail/opendkim/pkg-descr	2010-07-12 09:21:04.000000000 +0900
 +++ ports/mail/opendkim/pkg-descr	2010-07-11 03:12:36.000000000 +0900
 @@ -1,10 +1,12 @@
 -OpenDKIM is an open source implementation of the DKIM sender authentication
 -system proposed by the E-mail Signing Technology Group (ESTG), now a proposed
 -standard of the IETF (RFC4871).
 +OpenDKIM is an open source implementation of the DKIM (Domain Keys Identified
 +Mail) sender authentication system proposed by the E-mail Signing Technology
 +Group (ESTG), now standardized by the IETF (RFC4871). It also includes
 +implementations of the Author Domain Signing Practises (ADSP, RFC5617) and
 +Vouch By Reference (VBR, RFC5518) proposed standards.
 
  The OpenDKIM package consists of a library that implements the DKIM service
  and a milter-based filter application that can plug in to any milter-aware
  MTA to provide that service to sufficiently recent sendmail MTAs and other
  MTAs that support the milter protocol.
 
 -WWW:	http://opendkim.org/
 +WWW: http://opendkim.org/
 diff -Npru ports.orig/mail/opendkim/pkg-plist ports/mail/opendkim/pkg-plist
 --- ports.orig/mail/opendkim/pkg-plist	2010-07-12 09:21:05.000000000 +0900
 +++ ports/mail/opendkim/pkg-plist	2010-07-12 08:03:06.000000000 +0900
 @@ -10,119 +10,16 @@ include/opendkim/dkim.h
  lib/libopendkim.a
  lib/libopendkim.la
  lib/libopendkim.so
 -lib/libopendkim.so.0
 +lib/libopendkim.so.2
 +%%ARLIB%%libdata/pkgconfig/ar.pc
 +libdata/pkgconfig/opendkim.pc
 +%%LUA%%sbin/miltertest
  sbin/opendkim
  sbin/opendkim-genkey.sh
 +sbin/opendkim-genzone
  %%STATS%%sbin/opendkim-stats
  sbin/opendkim-testadsp
  sbin/opendkim-testkey
 -%%PORTDOCS%%%%DOCSDIR%%/FEATURES
 -%%PORTDOCS%%%%DOCSDIR%%/INSTALL
 -%%PORTDOCS%%%%DOCSDIR%%/KNOWNBUGS
 -%%PORTDOCS%%%%DOCSDIR%%/LICENSE
 -%%PORTDOCS%%%%DOCSDIR%%/LICENSE.Sendmail
 -%%PORTDOCS%%%%DOCSDIR%%/README
 -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES.Sendmail
 -%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-dkim-deployment-09.txt
 -%%PORTDOCS%%%%DOCSDIR%%/draft-kucherawy-dkim-reporting-06.txt
 -%%PORTDOCS%%%%DOCSDIR%%/draft-shafranovich-feedback-report-08.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc4686.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc4871.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc5016.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc5451.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc5518.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc5585.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc5617.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc5672.txt
 -%%DATADIR%%/dkim.html
 -%%DATADIR%%/dkim_alg_t.html
 -%%DATADIR%%/dkim_body.html
 -%%DATADIR%%/dkim_canon_t.html
 -%%DATADIR%%/dkim_cbstat.html
 -%%DATADIR%%/dkim_chunk.html
 -%%DATADIR%%/dkim_close.html
 -%%DATADIR%%/dkim_diffheaders.html
 -%%DATADIR%%/dkim_dnssec.html
 -%%DATADIR%%/dkim_eoh.html
 -%%DATADIR%%/dkim_eom.html
 -%%DATADIR%%/dkim_flush_cache.html
 -%%DATADIR%%/dkim_free.html
 -%%DATADIR%%/dkim_get_user_context.html
 -%%DATADIR%%/dkim_getcachestats.html
 -%%DATADIR%%/dkim_getdomain.html
 -%%DATADIR%%/dkim_geterror.html
 -%%DATADIR%%/dkim_getmode.html
 -%%DATADIR%%/dkim_get_msgdate.html
 -%%DATADIR%%/dkim_getpartial.html
 -%%DATADIR%%/dkim_getpolicystr.html
 -%%DATADIR%%/dkim_getpresult.html
 -%%DATADIR%%/dkim_getpresultstr.html
 -%%DATADIR%%/dkim_get_reputation.html
 -%%DATADIR%%/dkim_getresultstr.html
 -%%DATADIR%%/dkim_getsighdr.html
 -%%DATADIR%%/dkim_getsiglist.html
 -%%DATADIR%%/dkim_getsignature.html
 -%%DATADIR%%/dkim_header.html
 -%%DATADIR%%/dkim_init.html
 -%%DATADIR%%/dkim_key_syntax.html
 -%%DATADIR%%/dkim_lib.html
 -%%DATADIR%%/dkim_minbody.html
 -%%DATADIR%%/dkim_ohdrs.html
 -%%DATADIR%%/dkim_options.html
 -%%DATADIR%%/dkim_param_t.html
 -%%DATADIR%%/dkim_policy.html
 -%%DATADIR%%/dkim_policy_getdnssec.html
 -%%DATADIR%%/dkim_policy_getreportinfo.html
 -%%DATADIR%%/dkim_policy_syntax.html
 -%%DATADIR%%/dkim_policy_t.html
 -%%DATADIR%%/dkim_presult.html
 -%%DATADIR%%/dkim_pstate.html
 -%%DATADIR%%/dkim_query_t.html
 -%%DATADIR%%/dkim_set_dns_callback.html
 -%%DATADIR%%/dkim_set_final.html
 -%%DATADIR%%/dkim_set_key_lookup.html
 -%%DATADIR%%/dkim_set_margin.html
 -%%DATADIR%%/dkim_set_policy_lookup.html
 -%%DATADIR%%/dkim_setpartial.html
 -%%DATADIR%%/dkim_set_prescreen.html
 -%%DATADIR%%/dkim_set_signature_handle.html
 -%%DATADIR%%/dkim_set_signature_handle_free.html
 -%%DATADIR%%/dkim_set_signature_tagvalues.html
 -%%DATADIR%%/dkim_set_signer.html
 -%%DATADIR%%/dkim_set_trust_anchor.html
 -%%DATADIR%%/dkim_set_user_context.html
 -%%DATADIR%%/dkim_sig_getbh.html
 -%%DATADIR%%/dkim_sig_getcanonlen.html
 -%%DATADIR%%/dkim_sig_getcanons.html
 -%%DATADIR%%/dkim_sig_getcontext.html
 -%%DATADIR%%/dkim_sig_getdnssec.html
 -%%DATADIR%%/dkim_sig_getdomain.html
 -%%DATADIR%%/dkim_sig_geterror.html
 -%%DATADIR%%/dkim_sig_geterrorstr.html
 -%%DATADIR%%/dkim_sig_getflags.html
 -%%DATADIR%%/dkim_sig_getidentity.html
 -%%DATADIR%%/dkim_sig_getkeysize.html
 -%%DATADIR%%/dkim_sig_getreportinfo.html
 -%%DATADIR%%/dkim_sig_getselector.html
 -%%DATADIR%%/dkim_sig_getsignalg.html
 -%%DATADIR%%/dkim_sig_getsigntime.html
 -%%DATADIR%%/dkim_sig_hdrsigned.html
 -%%DATADIR%%/dkim_sig_ignore.html
 -%%DATADIR%%/dkim_sig_process.html
 -%%DATADIR%%/dkim_sig_syntax.html
 -%%DATADIR%%/dkim_sigerror.html
 -%%DATADIR%%/dkim_siginfo.html
 -%%DATADIR%%/dkim_sigkey_t.html
 -%%DATADIR%%/dkim_sign.html
 -%%DATADIR%%/dkim_libfeature.html
 -%%DATADIR%%/dkim_ssl_version.html
 -%%DATADIR%%/dkim_stat.html
 -%%DATADIR%%/dkim_verify.html
 -%%DATADIR%%/index.html
 -%%DATADIR%%/overview.html
 -%%DATADIR%%/rfc2822_mailbox_split.html
 -@dirrm %%DATADIR%%
  @dirrm include/opendkim
 -@dirrm include/ar
 +%%ARLIB%%@dirrm include/ar
  @dirrmtry etc/mail
 
 --Multipart_Tue_Jul_13_07:31:11_2010-1--
 
 --pgp-sign-Multipart_Tue_Jul_13_07:31:11_2010-1
 Content-Type: application/pgp-signature
 Content-Transfer-Encoding: 7bit
 Content-Description: OpenPGP Digital Signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (FreeBSD)
 
 iQEcBAABAgAGBQJMO5e1AAoJEML/cja+Xi6+N1UIAIdOxJywvjNn3ANGbvPvpJrC
 mHJR2L9ws6rH4YgIFVnHQdHmvATvHTeDd1YRgDmbt5OUs98Ucjl9o6P2xF94CGDJ
 Fq+8e18q4gGRbqETvyDgD10lYD0fNtOoejyGiU27FvyHkUJmQM3XDSc8hJinCiaN
 9rzAM16W1FZBFrlT8/6p5Eol1FPOOjZf3jWbMP3guwPO8lKtl4IrCX5aTJgLBcqt
 TBvqXFNqQuuth/IvKIwpc9Uqw70PZM1d3BsF6JvEOpIBc7QwOvRCN2VV8YmaDvF9
 iiB1Uo/mptuhvbWRzZZh3Xitmef+WRZrcJfVOiTNqBsA4gnGYgjHAr5uOGmfpx0=
 =9COb
 -----END PGP SIGNATURE-----
 
 --pgp-sign-Multipart_Tue_Jul_13_07:31:11_2010-1--

From: Hirohisa Yamaguchi <umq@ueo.co.jp>
To: sahil@FreeBSD.org, bug-followup@FreeBSD.org
Cc: msk@blackops.org
Subject: Re: ports/148397: Please update ports/mail/opendkim to latest version
Date: Fri, 16 Jul 2010 21:03:06 +0900

 --pgp-sign-Multipart_Fri_Jul_16_21:03:03_2010-1
 Content-Type: multipart/mixed;
  boundary="Multipart_Fri_Jul_16_21:03:03_2010-1"
 
 --Multipart_Fri_Jul_16_21:03:03_2010-1
 Content-Type: text/plain; charset=US-ASCII
 
 Hi,
 
 The new version 2.1.3 has been released.
 Attaching the new patch
 
 files/patch-FEATURES and files/patch-opendkim__Makefile.in are dropped.
 
 Regards.
 --
 
 	Hirohisa Yamaguchi
 	  umq@ueo.co.jp
 
 --Multipart_Fri_Jul_16_21:03:03_2010-1
 Content-Type: application/octet-stream; type=patch
 Content-Disposition: attachment; filename="opendkim-148397-2.1.3.patch"
 Content-Transfer-Encoding: 7bit
 
 cvs diff: Diffing .
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/mail/opendkim/Makefile,v
 retrieving revision 1.3
 diff -p -u -r1.3 Makefile
 --- Makefile	22 Dec 2009 11:36:22 -0000	1.3
 +++ Makefile	16 Jul 2010 11:53:27 -0000
 @@ -1,34 +1,45 @@
  # New ports collection makefile for:	opendkim
 -# Date created:		2009-08-26
 -# Whom:			Hirohisa Yamaguchi <umq@ueo.co.jp>
 +# Date created:				2009-08-26
 +# Whom:					Hirohisa Yamaguchi <umq@ueo.co.jp>
  #
  # $FreeBSD: ports/mail/opendkim/Makefile,v 1.3 2009/12/22 11:36:22 miwi Exp $
  #
 
  PORTNAME=	opendkim
 -PORTVERSION=	1.1.2
 -PORTREVISION=	1
 +PORTVERSION=	2.1.3
  CATEGORIES=	mail security
  MASTER_SITES=	SF/opendkim
 
  MAINTAINER=	umq@ueo.co.jp
 -COMMENT=	DKIM milter implimentation
 +COMMENT=	DKIM library and milter implimentation
 
  GNU_CONFIGURE=	yes
  USE_OPENSSL=	yes
  USE_RC_SUBR=	milter-opendkim
  USE_LDCONFIG=	yes
 
 -MAN_COMPRESSED=	no
 -MAN3=		ar.3
 +LICENSE=	BSD BSD
 +LICENSE_COMB=	multi
 +LICENSE_FILE=	${WRKSRC}/LICENSE ${WRKSRC}/LICENSE.Sendmail
  MAN5=		opendkim.conf.5
 -MAN8=		opendkim-genkey.8 opendkim-testadsp.8 \
 -		opendkim-testkey.8 opendkim.8
 -PORTDOCS0=	FEATURES INSTALL KNOWNBUGS LICENSE LICENSE.Sendmail \
 -		README RELEASE_NOTES RELEASE_NOTES.Sendmail
 -PORTDOCS=	docs/*
 +MAN8=		opendkim-genkey.8 opendkim-genzone.8 \
 +		opendkim-testadsp.8 opendkim-testkey.8 \
 +		opendkim.8
 +
  SUB_FILES=	pkg-message
 
 +OPTIONS= \
 +	ARLIB		"Asynchronous thread-safe DNS library"	On \
 +	LUA		"Describe filter policy with lua"	Off \
 +	OPENDBX		"Store filter policies via OpenDBX"	Off \
 +	OPENLDAP	"Store filter policies in LDAP"		Off \
 +	OPENSSL_PORT	"Use OpenSSL in ports"			Off \
 +	POPAUTH		"Use POP authentication DB"		Off \
 +	QUERY_CACHE	"Cache DNS query results locally"	Off \
 +	UNBOUND		"Use unbound DNS library"		Off
 +
 +MAKE_ARGS+=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
 +
  .include <bsd.port.pre.mk>
 
  WITHOUT_MILTER_CFLAGS=	yes
 @@ -48,14 +59,22 @@ CONFIGURE_ARGS+=	--with-openssl=${OPENSS
  CONFIGURE_ARGS+=	--enable-debug
  .endif
 
 +.if !defined(NOPORTDOCS)
 +PORTDOCS=	*
 +.else
 +CONFIGURE_ARGS+=--docdir=${WRKDIR}/doc
 +.endif
 +
  .if (defined(WITH_POPAUTH) \
  	|| defined(WITH_QUERY_CACHE) \
  	|| defined(WITH_BODYLENGTH_DB) \
 +	|| defined(WITH_LDAP_CACHING) \
  	|| defined(WITH_STATS)) \
  	&& !defined(WITH_BDB_BASE)
 -#BROKEN=		LIBDB_INCDIR nor LIBDB_LIBDIRS cannot be set individually
 -CONFIGURE_ARGS+=	--with-db
 -USE_BDB=	41+
 +CONFIGURE_ARGS+=	--with-db-incdir=${BDB_INCLUDE_DIR} \
 +			--with-db-libdir=${BDB_LIB_DIR} \
 +			--with-db-lib=${BDB_LIB_NAME}
 +USE_BDB=		41+
  .endif
  .if defined(WITH_UNBOUND) && !defined(WITHOUT_UNBOUND)
  BROKEN=		configure fails since arlib cannot be disabled
 @@ -64,12 +83,13 @@ IGNORE=		libar cannot be used simultaneo
  .endif
  CONFIGURE_ARGS+=	--with-unbound \
  			--disable-arlib
 -LIB_DEPENDS+=	unbound:${PORTSDIR}/dns/unbound
 +LIB_DEPENDS+=		unbound:${PORTSDIR}/dns/unbound
  PLIST_SUB+=		ARLIB="@comment "
  .else
 -.if !defined(WITHOUT_ARLIB)
 +.if defined(WITH_ARLIB)
  PLIST_SUB+=		ARLIB=""
  CONFIGURE_ARGS+=	--enable-arlib
 +MAN3=			ar.3
  .else
  CONFIGURE_ARGS+=	--disable-arlib
  PLIST_SUB+=		ARLIB="@comment "
 @@ -79,13 +99,25 @@ PLIST_SUB+=		ARLIB="@comment "
  CONFIGURE_ARGS+=	--enable-popauth
  .endif
  .if defined(WITH_QUERY_CACHE) && !defined(WITHOUT_QUERY_CACHE)
 -CONFIGURE_ARGS+=	--enable-querycache
 +CONFIGURE_ARGS+=	--enable-query_cache
 +.endif
 +.if defined(WITH_OPENDBX)
 +CONFIGURE_ARGS+=	--with-odbx
 +LIB_DEPENDS+=		opendbx:${PORTSDIR}/databases/opendbx
 +.endif
 +.if defined(WITH_OPENLDAP)
 +CONFIGURE_ARGS+=	--with-openldap
 +USE_OPENLDAP=		yes
 +.endif
 +.if defined(WITH_LUA)
 +CONFIGURE_ARGS+=	--with-lua
 +MAN3+=			opendkim-lua.3
 +MAN8+=			miltertest.8
 +PLIST_SUB+=		LUA=""
 +USE_LUA=		5.1
 +.else
 +PLIST_SUB+=		LUA="@comment "
  .endif
 -
 -post-extract:
 -.for f in ${PORTDOCS0}
 -	@${CP} ${WRKSRC}/${f} ${WRKSRC}/docs/
 -.endfor
 
  post-install:
  .if !defined(WITH_DEBUG)
 @@ -93,13 +125,6 @@ post-install:
  .endif
  	@${MKDIR} ${PREFIX}/etc/mail
  	${INSTALL_DATA} ${WRKSRC}/opendkim/opendkim.conf.sample ${PREFIX}/etc/mail/
 -.if !defined(NOPORTDOCS)
 -.for f in ${PORTDOCS}
 -	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 -.endfor
 -.else
 -	@${RM} -rf ${DOCSDIR}
 -.endif
  	@${CAT} ${PKGMESSAGE}
 
  .include <bsd.port.post.mk>
 Index: Makefile.features
 ===================================================================
 RCS file: /home/ncvs/ports/mail/opendkim/Makefile.features,v
 retrieving revision 1.1
 diff -p -u -r1.1 Makefile.features
 --- Makefile.features	21 Sep 2009 12:25:21 -0000	1.1
 +++ Makefile.features	16 Jul 2010 11:53:27 -0000
 @@ -7,16 +7,20 @@
  # $FreeBSD: ports/mail/opendkim/Makefile.features,v 1.1 2009/09/21 12:25:21 pav Exp $
  #
 
 +.if defined(WITH_ALLSYMBOLS) && !defined(WITHOUT_ALLSYMBOLS)
 +CONFIGURE_ARGS+=	--enable-allsymbols
 +.endif
 +
  .if defined(WITH_BODYLENGTH_DB) && !defined(WITHOUT_BODYLENGTH_DB)
 -CONFIGURE_ARGS+=	--enable-bodylengthdb
 +CONFIGURE_ARGS+=	--enable-bodylength_db
  .endif
 
  .if defined(WITH_CAPTURE_UNKNOWN_ERRORS) && !defined(WITHOUT_CAPTURE_UNKNOWN_ERRORS)
 -CONFIGURE_ARGS+=	--enable-captureerrors
 +CONFIGURE_ARGS+=	--enable-capture_unknown_errors
  .endif
 
 -.if defined(WITH_COMMAIZE) && !defined(WITHOUT_COMMAIZE)
 -CONFIGURE_ARGS+=	--enable-commaize
 +.if defined(WITH_CODECOVERAGE) && !defined(WITHOUT_CODECOVERAGE)
 +CONFIGURE_ARGS+=	--enable-codecoverage
  .endif
 
  .if defined(WITH_DIFFHEADERS) && !defined(WITHOUT_DIFFHEADERS)
 @@ -25,15 +29,20 @@ LIB_DEPENDS+=		tre:${PORTSDIR}/textproc/
  .endif
 
  .if defined(WITH_DKIM_REPUTATION) && !defined(WITHOUT_DKIM_REPUTATION)
 -CONFIGURE_ARGS+=	--enable-dkimreputation
 +CONFIGURE_ARGS+=	--enable-dkim_reputation
  .endif
 
  .if defined(WITH_DNS_UPGRADE) && !defined(WITHOUT_DNS_UPGRADE)
  CONFIGURE_ARGS+=	--enable-dnsupgrade
  .endif
 
 -.if defined(WITH_MULTIPLE_SIGNATURES) && !defined(WITHOUT_MULTIPLE_SIGNATURES)
 -CONFIGURE_ARGS+=	--enable-multiplesigs
 +.if defined(WITH_IDENTITY_HEADER) && !defined(WITHOUT_IDENTITY_HEADER)
 +CONFIGURE_ARGS+=	--enable-identity_header
 +.endif
 +
 +.if defined(WITH_LDAP_CACHING) && !defined(WITHOUT_LDAP_CACHING)
 +WITH_OPENLDAP=		yes
 +CONFIGURE_ARGS+=	--enable-ldap_caching
  .endif
 
  .if defined(WITH_PARSE_TIME) && !defined(WITHOUT_PARSE_TIME)
 @@ -41,24 +50,32 @@ BROKEN=		The feature ``_FFR_PARSE_TIME''
  CONFIGURE_ARGS+=	--enable-parsetime
  .endif
 
 +.if defined(WITH_REDIRECT) && !defined(WITHOUT_REDIRECT)
 +CONFIGURE_ARGS+=	--enable-redirect
 +.endif
 +
  .if defined(WITH_REPLACE_RULES) && !defined(WITHOUT_REPLACE_RULES)
 -CONFIGURE_ARGS+=	-enable-replacerules
 +CONFIGURE_ARGS+=	--enable-replace_rules
  .endif
 
  .if defined(WITH_REPORT_INTERVALS) && !defined(WITHOUT_REPORT_INTERVALS)
 -CONFIGURE_ARGS+=	--enable-reportintervals
 +CONFIGURE_ARGS+=	--enable-report_intervals
 +.endif
 +
 +.if defined(WITH_RESIGN) && !defined(WITHOUT_RESIGN)
 +CONFIGURE_ARGS+=	--enable-resign
  .endif
 
  .if defined(WITH_SELECT_CANONICALIZATION) && !defined(WITHOUT_SELECT_CANONICALIZATION)
 -CONFIGURE_ARGS+=	--enable-selectcanon
 +CONFIGURE_ARGS+=	--enable-select_canonicalization
  .endif
 
  .if defined(WITH_SELECTOR_HEADER) && !defined(WITHOUT_SELECTOR_HEADER)
 -CONFIGURE_ARGS+=	--enable-selectorheader
 +CONFIGURE_ARGS+=	--enable-selector_header
  .endif
 
 -.if defined(WITH_SENDER_HEADERS) && !defined(WITHOUT_SENDER_HEADERS)
 -CONFIGURE_ARGS+=	--enable-senderheaders
 +.if defined(WITH_SENDER_MACRO) && !defined(WITHOUT_SENDER_MACRO)
 +CONFIGURE_ARGS+=	--enable-sender_macro
  .endif
 
  .if defined(WITH_STATS) && !defined(WITHOUT_STATS)
 Index: distinfo
 ===================================================================
 RCS file: /home/ncvs/ports/mail/opendkim/distinfo,v
 retrieving revision 1.2
 diff -p -u -r1.2 distinfo
 --- distinfo	21 Nov 2009 14:42:46 -0000	1.2
 +++ distinfo	16 Jul 2010 11:53:27 -0000
 @@ -1,3 +1,3 @@
 -MD5 (opendkim-1.1.2.tar.gz) = f869f90aad3561a01b377e9ca61dedc3
 -SHA256 (opendkim-1.1.2.tar.gz) = 5f11526c9a490b6649794b0e5910cb6e6c9b3fe815cf8b731dbed8ddb077d078
 -SIZE (opendkim-1.1.2.tar.gz) = 856455
 +MD5 (opendkim-2.1.3.tar.gz) = 6ea7ea0adfd9f76ca028592d82ef5358
 +SHA256 (opendkim-2.1.3.tar.gz) = c889f18ec98ff9454bc211eaad4c746365a763500127ca022e03c087a7028eba
 +SIZE (opendkim-2.1.3.tar.gz) = 1011019
 Index: pkg-descr
 ===================================================================
 RCS file: /home/ncvs/ports/mail/opendkim/pkg-descr,v
 retrieving revision 1.1
 diff -p -u -r1.1 pkg-descr
 --- pkg-descr	21 Sep 2009 12:25:21 -0000	1.1
 +++ pkg-descr	16 Jul 2010 11:53:27 -0000
 @@ -1,10 +1,12 @@
 -OpenDKIM is an open source implementation of the DKIM sender authentication
 -system proposed by the E-mail Signing Technology Group (ESTG), now a proposed
 -standard of the IETF (RFC4871).
 +OpenDKIM is an open source implementation of the DKIM (Domain Keys Identified
 +Mail) sender authentication system proposed by the E-mail Signing Technology
 +Group (ESTG), now standardized by the IETF (RFC4871). It also includes
 +implementations of the Author Domain Signing Practices (ADSP, RFC5617) and
 +Vouch By Reference (VBR, RFC5518) proposed standards.
 
  The OpenDKIM package consists of a library that implements the DKIM service
  and a milter-based filter application that can plug in to any milter-aware
  MTA to provide that service to sufficiently recent sendmail MTAs and other
  MTAs that support the milter protocol.
 
 -WWW:	http://opendkim.org/
 +WWW: http://opendkim.org/
 Index: pkg-plist
 ===================================================================
 RCS file: /home/ncvs/ports/mail/opendkim/pkg-plist,v
 retrieving revision 1.2
 diff -p -u -r1.2 pkg-plist
 --- pkg-plist	21 Nov 2009 14:42:46 -0000	1.2
 +++ pkg-plist	16 Jul 2010 11:53:27 -0000
 @@ -10,119 +10,16 @@ include/opendkim/dkim.h
  lib/libopendkim.a
  lib/libopendkim.la
  lib/libopendkim.so
 -lib/libopendkim.so.0
 +lib/libopendkim.so.2
 +%%ARLIB%%libdata/pkgconfig/ar.pc
 +libdata/pkgconfig/opendkim.pc
 +%%LUA%%sbin/miltertest
  sbin/opendkim
  sbin/opendkim-genkey.sh
 +sbin/opendkim-genzone
  %%STATS%%sbin/opendkim-stats
  sbin/opendkim-testadsp
  sbin/opendkim-testkey
 -%%PORTDOCS%%%%DOCSDIR%%/FEATURES
 -%%PORTDOCS%%%%DOCSDIR%%/INSTALL
 -%%PORTDOCS%%%%DOCSDIR%%/KNOWNBUGS
 -%%PORTDOCS%%%%DOCSDIR%%/LICENSE
 -%%PORTDOCS%%%%DOCSDIR%%/LICENSE.Sendmail
 -%%PORTDOCS%%%%DOCSDIR%%/README
 -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES.Sendmail
 -%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-dkim-deployment-09.txt
 -%%PORTDOCS%%%%DOCSDIR%%/draft-kucherawy-dkim-reporting-06.txt
 -%%PORTDOCS%%%%DOCSDIR%%/draft-shafranovich-feedback-report-08.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc4686.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc4871.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc5016.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc5451.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc5518.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc5585.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc5617.txt
 -%%PORTDOCS%%%%DOCSDIR%%/rfc5672.txt
 -%%DATADIR%%/dkim.html
 -%%DATADIR%%/dkim_alg_t.html
 -%%DATADIR%%/dkim_body.html
 -%%DATADIR%%/dkim_canon_t.html
 -%%DATADIR%%/dkim_cbstat.html
 -%%DATADIR%%/dkim_chunk.html
 -%%DATADIR%%/dkim_close.html
 -%%DATADIR%%/dkim_diffheaders.html
 -%%DATADIR%%/dkim_dnssec.html
 -%%DATADIR%%/dkim_eoh.html
 -%%DATADIR%%/dkim_eom.html
 -%%DATADIR%%/dkim_flush_cache.html
 -%%DATADIR%%/dkim_free.html
 -%%DATADIR%%/dkim_get_user_context.html
 -%%DATADIR%%/dkim_getcachestats.html
 -%%DATADIR%%/dkim_getdomain.html
 -%%DATADIR%%/dkim_geterror.html
 -%%DATADIR%%/dkim_getmode.html
 -%%DATADIR%%/dkim_get_msgdate.html
 -%%DATADIR%%/dkim_getpartial.html
 -%%DATADIR%%/dkim_getpolicystr.html
 -%%DATADIR%%/dkim_getpresult.html
 -%%DATADIR%%/dkim_getpresultstr.html
 -%%DATADIR%%/dkim_get_reputation.html
 -%%DATADIR%%/dkim_getresultstr.html
 -%%DATADIR%%/dkim_getsighdr.html
 -%%DATADIR%%/dkim_getsiglist.html
 -%%DATADIR%%/dkim_getsignature.html
 -%%DATADIR%%/dkim_header.html
 -%%DATADIR%%/dkim_init.html
 -%%DATADIR%%/dkim_key_syntax.html
 -%%DATADIR%%/dkim_lib.html
 -%%DATADIR%%/dkim_minbody.html
 -%%DATADIR%%/dkim_ohdrs.html
 -%%DATADIR%%/dkim_options.html
 -%%DATADIR%%/dkim_param_t.html
 -%%DATADIR%%/dkim_policy.html
 -%%DATADIR%%/dkim_policy_getdnssec.html
 -%%DATADIR%%/dkim_policy_getreportinfo.html
 -%%DATADIR%%/dkim_policy_syntax.html
 -%%DATADIR%%/dkim_policy_t.html
 -%%DATADIR%%/dkim_presult.html
 -%%DATADIR%%/dkim_pstate.html
 -%%DATADIR%%/dkim_query_t.html
 -%%DATADIR%%/dkim_set_dns_callback.html
 -%%DATADIR%%/dkim_set_final.html
 -%%DATADIR%%/dkim_set_key_lookup.html
 -%%DATADIR%%/dkim_set_margin.html
 -%%DATADIR%%/dkim_set_policy_lookup.html
 -%%DATADIR%%/dkim_setpartial.html
 -%%DATADIR%%/dkim_set_prescreen.html
 -%%DATADIR%%/dkim_set_signature_handle.html
 -%%DATADIR%%/dkim_set_signature_handle_free.html
 -%%DATADIR%%/dkim_set_signature_tagvalues.html
 -%%DATADIR%%/dkim_set_signer.html
 -%%DATADIR%%/dkim_set_trust_anchor.html
 -%%DATADIR%%/dkim_set_user_context.html
 -%%DATADIR%%/dkim_sig_getbh.html
 -%%DATADIR%%/dkim_sig_getcanonlen.html
 -%%DATADIR%%/dkim_sig_getcanons.html
 -%%DATADIR%%/dkim_sig_getcontext.html
 -%%DATADIR%%/dkim_sig_getdnssec.html
 -%%DATADIR%%/dkim_sig_getdomain.html
 -%%DATADIR%%/dkim_sig_geterror.html
 -%%DATADIR%%/dkim_sig_geterrorstr.html
 -%%DATADIR%%/dkim_sig_getflags.html
 -%%DATADIR%%/dkim_sig_getidentity.html
 -%%DATADIR%%/dkim_sig_getkeysize.html
 -%%DATADIR%%/dkim_sig_getreportinfo.html
 -%%DATADIR%%/dkim_sig_getselector.html
 -%%DATADIR%%/dkim_sig_getsignalg.html
 -%%DATADIR%%/dkim_sig_getsigntime.html
 -%%DATADIR%%/dkim_sig_hdrsigned.html
 -%%DATADIR%%/dkim_sig_ignore.html
 -%%DATADIR%%/dkim_sig_process.html
 -%%DATADIR%%/dkim_sig_syntax.html
 -%%DATADIR%%/dkim_sigerror.html
 -%%DATADIR%%/dkim_siginfo.html
 -%%DATADIR%%/dkim_sigkey_t.html
 -%%DATADIR%%/dkim_sign.html
 -%%DATADIR%%/dkim_libfeature.html
 -%%DATADIR%%/dkim_ssl_version.html
 -%%DATADIR%%/dkim_stat.html
 -%%DATADIR%%/dkim_verify.html
 -%%DATADIR%%/index.html
 -%%DATADIR%%/overview.html
 -%%DATADIR%%/rfc2822_mailbox_split.html
 -@dirrm %%DATADIR%%
  @dirrm include/opendkim
 -@dirrm include/ar
 +%%ARLIB%%@dirrm include/ar
  @dirrmtry etc/mail
 cvs diff: Diffing files
 Index: files/milter-opendkim.in
 ===================================================================
 RCS file: /home/ncvs/ports/mail/opendkim/files/milter-opendkim.in,v
 retrieving revision 1.2
 diff -p -u -r1.2 milter-opendkim.in
 --- files/milter-opendkim.in	27 Mar 2010 00:13:18 -0000	1.2
 +++ files/milter-opendkim.in	16 Jul 2010 11:53:27 -0000
 @@ -36,11 +36,13 @@
  name="milteropendkim"
  rcvar=`set_rcvar`
 
 +extra_commands="reload"
  start_precmd="dkim_prepcmd"
  stop_postcmd="dkim_postcmd"
  command="%%PREFIX%%/sbin/opendkim"
  _piddir="/var/run/milteropendkim"
  pidfile="${_piddir}/pid"
 +sig_reload="USR1"
 
  load_rc_config $name
 
 cvs diff: cannot find files/patch-FEATURES
 cvs diff: cannot find files/patch-opendkim__Makefile.in
 
 --Multipart_Fri_Jul_16_21:03:03_2010-1--
 
 --pgp-sign-Multipart_Fri_Jul_16_21:03:03_2010-1
 Content-Type: application/pgp-signature
 Content-Transfer-Encoding: 7bit
 Content-Description: OpenPGP Digital Signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (FreeBSD)
 
 iQEcBAABAgAGBQJMQEp5AAoJEML/cja+Xi6+cPkH/ii34/cXzkMZkVzTBea/e6IY
 EbAUrJsS9LXfccCH8Es4uzgmydp+orfRzpUPoKTjkkj2GTv7vvNPByESyYgJW5mq
 wsjwazMmSb17SUdTXusJ59tzSxDEiwAumTRdTlOtZtDwcgrGxJW48VhclR/mXAJs
 leC3i4RjsW4oYAXoI0v+QrtAwTzdoCow0vW6b+M66Qj1q7Y4wRDNT85JuXGm77hJ
 RpuS3n3t6/6reDilIx1HFn9+fUp2CGgdn3lqFwWBja2g1xAm3X0qO6pcEb3CT0e3
 5daZHNJfjRbFpoYKZe2EkPG5NQDyNSVsE3lfKF8nsd5klLbw+qs5qdkiHyYmMiI=
 =1tng
 -----END PGP SIGNATURE-----
 
 --pgp-sign-Multipart_Fri_Jul_16_21:03:03_2010-1--
State-Changed-From-To: feedback->open 
State-Changed-By: sahil 
State-Changed-When: Tue Jul 20 03:07:03 UTC 2010 
State-Changed-Why:  
Maintainer has provided new patch. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148397 
State-Changed-From-To: open->closed 
State-Changed-By: sahil 
State-Changed-When: Thu Jul 22 02:30:44 UTC 2010 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148397 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/148397: commit references a PR
Date: Thu, 22 Jul 2010 02:30:28 +0000 (UTC)

 sahil       2010-07-22 02:30:19 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/opendkim        Makefile Makefile.features distinfo 
                          pkg-descr pkg-plist 
     mail/opendkim/files  milter-opendkim.in 
   Removed files:
     mail/opendkim/files  patch-FEATURES 
                          patch-opendkim__Makefile.in 
   Log:
   - Update to 2.1.3
   - Define OPTIONS
   - Respect NOPORTDOCS
   - Remove unnecessary patches
   - Fix alignment in Makefile header
   
   PR:             ports/148397
   Submitted by:   Hirohisa Yamaguchi <umq@ueo.co.jp> (maintainer)
   
   Revision  Changes    Path
   1.4       +52 -30    ports/mail/opendkim/Makefile
   1.2       +31 -14    ports/mail/opendkim/Makefile.features
   1.3       +3 -3      ports/mail/opendkim/distinfo
   1.3       +3 -1      ports/mail/opendkim/files/milter-opendkim.in
   1.2       +0 -12     ports/mail/opendkim/files/patch-FEATURES (dead)
   1.2       +0 -11     ports/mail/opendkim/files/patch-opendkim__Makefile.in (dead)
   1.2       +6 -4      ports/mail/opendkim/pkg-descr
   1.3       +7 -110    ports/mail/opendkim/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
