4 files changed, 119 insertions, 104 deletions

diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index c19e5ecf1223..16a20d98801a 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	opendkim
-PORTVERSION=	1.0.0
+PORTVERSION=	1.1.2
 CATEGORIES=	mail security
 MASTER_SITES=	SF/opendkim
 
@@ -26,6 +26,7 @@ MAN8=		opendkim-genkey.8 opendkim-testadsp.8 \
 PORTDOCS0=	FEATURES INSTALL KNOWNBUGS LICENSE LICENSE.Sendmail \
 		README RELEASE_NOTES RELEASE_NOTES.Sendmail
 PORTDOCS=	docs/*
+SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
 
@@ -95,6 +96,8 @@ post-install:
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
+.else
+	@${RM} -rf ${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/mail/opendkim/distinfo b/mail/opendkim/distinfo
index 65da617a5052..9706ba5f5dde 100644
--- a/mail/opendkim/distinfo
+++ b/mail/opendkim/distinfo
@@ -1,3 +1,3 @@
-MD5 (opendkim-1.0.0.tar.gz) = ecc09da6a40ba55b922d284d43db5468
-SHA256 (opendkim-1.0.0.tar.gz) = 9420aa7b0bd0bcd0122675d412060dc807fcc0cec65028c038f150a43f260aa5
-SIZE (opendkim-1.0.0.tar.gz) = 885016
+MD5 (opendkim-1.1.2.tar.gz) = f869f90aad3561a01b377e9ca61dedc3
+SHA256 (opendkim-1.1.2.tar.gz) = 5f11526c9a490b6649794b0e5910cb6e6c9b3fe815cf8b731dbed8ddb077d078
+SIZE (opendkim-1.1.2.tar.gz) = 856455
diff --git a/mail/opendkim/pkg-message b/mail/opendkim/files/pkg-message.in
index 36f4cab66ac8..4359c82d876f 100644
--- a/mail/opendkim/pkg-message
+++ b/mail/opendkim/files/pkg-message.in
@@ -8,7 +8,7 @@ if you use sendmail, add the milter socket `socketspec' in
 INPUT_MAIL_FILTER(`dkim-filter', `S=_YOUR_SOCKET_SPEC_, F=T, T=R:2m')
 
 or if you use postfix write your milter socket `socketspec' in
-${PREFIX}/etc/mail/main.cf:
+%%PREFIX%%/etc/postfix/main.cf:
 
 smtpd_milters = _YOUR_SOCKET_SPEC_
 
diff --git a/mail/opendkim/pkg-plist b/mail/opendkim/pkg-plist
index 605ad53591a0..f547d10ea7d3 100644
--- a/mail/opendkim/pkg-plist
+++ b/mail/opendkim/pkg-plist
@@ -4,6 +4,9 @@ etc/mail/opendkim.conf.sample
 %%ARLIB%%include/ar/manual.h
 include/opendkim/dkim.h
 %%ARLIB%%lib/libar.a
+%%ARLIB%%lib/libar.la
+%%ARLIB%%lib/libar.so
+%%ARLIB%%lib/libar.so.0
 lib/libopendkim.a
 lib/libopendkim.la
 lib/libopendkim.so
@@ -13,104 +16,113 @@ sbin/opendkim-genkey.sh
 %%STATS%%sbin/opendkim-stats
 sbin/opendkim-testadsp
 sbin/opendkim-testkey
-%%PORTDOCS%%share/doc/opendkim/FEATURES
-%%PORTDOCS%%share/doc/opendkim/INSTALL
-%%PORTDOCS%%share/doc/opendkim/KNOWNBUGS
-%%PORTDOCS%%share/doc/opendkim/LICENSE
-%%PORTDOCS%%share/doc/opendkim/LICENSE.Sendmail
-%%PORTDOCS%%share/doc/opendkim/README
-%%PORTDOCS%%share/doc/opendkim/RELEASE_NOTES
-%%PORTDOCS%%share/doc/opendkim/RELEASE_NOTES.Sendmail
-%%PORTDOCS%%share/doc/opendkim/draft-ietf-dkim-deployment-07.txt
-%%PORTDOCS%%share/doc/opendkim/draft-ietf-dkim-rfc4871-errata-07.txt
-%%PORTDOCS%%share/doc/opendkim/draft-kucherawy-dkim-reporting-04.txt
-%%PORTDOCS%%share/doc/opendkim/draft-shafranovich-feedback-report-07.txt
-%%PORTDOCS%%share/doc/opendkim/rfc4686.txt
-%%PORTDOCS%%share/doc/opendkim/rfc4871.txt
-%%PORTDOCS%%share/doc/opendkim/rfc5016.txt
-%%PORTDOCS%%share/doc/opendkim/rfc5451.txt
-%%PORTDOCS%%share/doc/opendkim/rfc5518.txt
-%%PORTDOCS%%share/doc/opendkim/rfc5585.txt
-%%PORTDOCS%%share/doc/opendkim/rfc5617.txt
-share/opendkim/dkim.html
-share/opendkim/dkim_alg_t.html
-share/opendkim/dkim_body.html
-share/opendkim/dkim_canon_t.html
-share/opendkim/dkim_cbstat.html
-share/opendkim/dkim_chunk.html
-share/opendkim/dkim_close.html
-share/opendkim/dkim_dnssec.html
-share/opendkim/dkim_eoh.html
-share/opendkim/dkim_eom.html
-share/opendkim/dkim_flush_cache.html
-share/opendkim/dkim_free.html
-share/opendkim/dkim_get_user_context.html
-share/opendkim/dkim_getcachestats.html
-share/opendkim/dkim_getdomain.html
-share/opendkim/dkim_geterror.html
-share/opendkim/dkim_getmode.html
-share/opendkim/dkim_getpolicystr.html
-share/opendkim/dkim_getpresult.html
-share/opendkim/dkim_getpresultstr.html
-share/opendkim/dkim_getresultstr.html
-share/opendkim/dkim_getsighdr.html
-share/opendkim/dkim_getsiglist.html
-share/opendkim/dkim_getsignature.html
-share/opendkim/dkim_header.html
-share/opendkim/dkim_init.html
-share/opendkim/dkim_key_syntax.html
-share/opendkim/dkim_lib.html
-share/opendkim/dkim_minbody.html
-share/opendkim/dkim_ohdrs.html
-share/opendkim/dkim_options.html
-share/opendkim/dkim_param_t.html
-share/opendkim/dkim_policy.html
-share/opendkim/dkim_policy_getdnssec.html
-share/opendkim/dkim_policy_getreportinfo.html
-share/opendkim/dkim_policy_syntax.html
-share/opendkim/dkim_policy_t.html
-share/opendkim/dkim_presult.html
-share/opendkim/dkim_pstate.html
-share/opendkim/dkim_query_t.html
-share/opendkim/dkim_set_dns_callback.html
-share/opendkim/dkim_set_final.html
-share/opendkim/dkim_set_key_lookup.html
-share/opendkim/dkim_set_margin.html
-share/opendkim/dkim_set_policy_lookup.html
-share/opendkim/dkim_set_prescreen.html
-share/opendkim/dkim_set_signature_handle.html
-share/opendkim/dkim_set_signature_handle_free.html
-share/opendkim/dkim_set_signature_tagvalues.html
-share/opendkim/dkim_set_signer.html
-share/opendkim/dkim_set_user_context.html
-share/opendkim/dkim_sig_getbh.html
-share/opendkim/dkim_sig_getcanonlen.html
-share/opendkim/dkim_sig_getcontext.html
-share/opendkim/dkim_sig_getdnssec.html
-share/opendkim/dkim_sig_getdomain.html
-share/opendkim/dkim_sig_geterror.html
-share/opendkim/dkim_sig_geterrorstr.html
-share/opendkim/dkim_sig_getflags.html
-share/opendkim/dkim_sig_getkeysize.html
-share/opendkim/dkim_sig_getreportinfo.html
-share/opendkim/dkim_sig_getselector.html
-share/opendkim/dkim_sig_getsignalg.html
-share/opendkim/dkim_sig_getsigntime.html
-share/opendkim/dkim_sig_hdrsigned.html
-share/opendkim/dkim_sig_ignore.html
-share/opendkim/dkim_sig_process.html
-share/opendkim/dkim_sig_syntax.html
-share/opendkim/dkim_sigerror.html
-share/opendkim/dkim_siginfo.html
-share/opendkim/dkim_sigkey_t.html
-share/opendkim/dkim_sign.html
-share/opendkim/dkim_ssl_version.html
-share/opendkim/dkim_stat.html
-share/opendkim/dkim_verify.html
-share/opendkim/index.html
-share/opendkim/overview.html
-share/opendkim/rfc2822_mailbox_split.html
-@dirrm share/opendkim
+%%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
-@dirrm etc/mail
+@dirrmtry etc/mail