Pull in improvements from wip (packaged by j+pkgsrc (at) salmi.ch):

* Install documentation for the library
* Install a static version of the dkim library
* Move to external options.mk
* Add support for ar(3) and debug

5 files changed, 201 insertions, 21 deletions

diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 0a2106ff071..0adc0bcc4bf 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2008/02/19 13:23:06 adrianp Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/09 14:02:08 adrianp Exp $
 
 DISTNAME=	dkim-milter-2.4.4
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dkim-milter/}
 
@@ -17,8 +18,6 @@ MAKE_ENV+=		M4=${M4:Q}
 RCD_SCRIPTS=		dkim-filter
 USE_BUILTIN.libmilter=	no
 USE_TOOLS+=		gm4
-PKG_OPTIONS_VAR=	PKG_OPTIONS.dkim-milter
-PKG_SUPPORTED_OPTIONS=	inet6
 EGDIR=			${PREFIX}/share/examples/dkim-milter
 FILES_SUBST+=		DKIM_USER=${DKIM_USER:Q} DKIM_GROUP=${DKIM_GROUP:Q}
 BUILD_DEFS+=		VARBASE DKIM_USER DKIM_GROUP
@@ -32,13 +31,13 @@ PKG_USERS_VARS+=	DKIM_USER
 OWN_DIRS_PERMS+=	${VARBASE}/run/dkim-filter \
 			${DKIM_USER} ${DKIM_GROUP} 0750
 
-.include "../../mk/bsd.options.mk"
+.include "options.mk"
 
 SUBST_CLASSES+=		libs
 SUBST_STAGE.libs=	pre-configure
 SUBST_FILES.libs=	${WRKSRC}/devtools/Site/site.config.m4
 SUBST_FILES.libs+=	dkim-filter/dkim-filter.conf.5 dkim-filter/dkim-stats.8
-SUBST_SED.libs=		-e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g'
+SUBST_SED.libs+=	-e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g'
 SUBST_SED.libs+=	-e 's|@LMBASE@|${BUILDLINK_PREFIX.libmilter}|g'
 SUBST_SED.libs+=	-e 's|@PTHREAD@|${BUILDLINK_PREFIX.pthread}|g'
 SUBST_SED.libs+=	-e 's|@PTHREAD_LDFLAGS@|${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}|g'
@@ -46,17 +45,13 @@ SUBST_SED.libs+=	-e 's|@PREFIX@|${PREFIX}|g'
 SUBST_SED.libs+=	-e 's|@PKGMANDIR@|${PKGMANDIR}|g'
 SUBST_SED.libs+=	-e 's|/etc/mail|${PKG_SYSCONFDIR}|g'
 SUBST_SED.libs+=	-e 's|.I /etc/dkim-filter.conf|.I ${PKG_SYSCONFDIR}/dkim-filter.conf|g'
-.if !empty(PKG_OPTIONS:Minet6)
-SUBST_SED.libs+=	-e 's|@INET6@||'
-.else
-SUBST_SED.libs+=	-e 's|@INET6@|dnl|'
-.endif
 SUBST_MESSAGE.libs=	Fixing Makefile references and man pages.
 
 CONF_FILES=		${EGDIR}/dkim-filter.conf.sample \
 			${PKG_SYSCONFDIR}/dkim-filter.conf
 
-INSTALLATION_DIRS=	share/doc/dkim-milter ${EGDIR}
+INSTALLATION_DIRS=	share/doc/dkim-milter ${EGDIR} \
+			share/doc/dkim-milter/libdkim
 
 post-extract:
 	${CP} ${WRKSRC}/site.config.m4.dist \
@@ -76,6 +71,29 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dkim-milter
 	${INSTALL_DATA} ${WRKSRC}/RELEASE_NOTES ${PREFIX}/share/doc/dkim-milter
 
+	cd ${WRKSRC} && for f in draft-*.txt; do \
+		${INSTALL_DATA} $${f} \
+			${PREFIX}/share/doc/dkim-milter; \
+	done
+
+	cd ${WRKSRC} && for f in rfc*.txt; do \
+		${INSTALL_DATA} $${f} \
+			${PREFIX}/share/doc/dkim-milter; \
+	done
+
+	cd ${WRKSRC}/libdkim/docs/ && for f in *.html; do \
+		${INSTALL_DATA} $${f} \
+			${PREFIX}/share/doc/dkim-milter/libdkim; \
+	done
+
+	${CHMOD} ${SHAREMODE} ${PREFIX}/include/dkim.h
+
+.	if !empty(PKG_OPTIONS:Mdkim-milter-arlib)
+	cd ${WRKSRC}/obj.`uname -s`.`uname -r`.`uname -m`/libar && \
+		${INSTALL_LIB} libar.a ${PREFIX}/lib && \
+		${INSTALL_MAN} ar.3 ${PREFIX}/${PKGMANDIR}/man3
+.	endif
+
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mail/libmilter/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/mail/dkim-milter/PLIST b/mail/dkim-milter/PLIST
index 343a8a40070..1253d1d47c3 100644
--- a/mail/dkim-milter/PLIST
+++ b/mail/dkim-milter/PLIST
@@ -1,4 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2008/02/19 13:23:06 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/03/09 14:02:08 adrianp Exp $
+${WITH_ARLIB}lib/libar.a
+${WITH_ARLIB}man/man3/ar.3
+lib/libdkim.a
+include/dkim.h
 bin/dkim-filter
 bin/dkim-genkey
 bin/dkim-testkey
@@ -15,6 +19,85 @@ share/doc/dkim-milter/KNOWNBUGS
 share/doc/dkim-milter/README
 share/doc/dkim-milter/RELEASE_NOTES
 share/examples/dkim-milter/dkim-filter.conf.sample
+share/doc/dkim-milter/draft-hoffman-dac-vbr-02.txt
+share/doc/dkim-milter/draft-ietf-dkim-deployment-00.txt
+share/doc/dkim-milter/draft-ietf-dkim-overview-07.txt
+share/doc/dkim-milter/draft-ietf-dkim-ssp-01.txt
+share/doc/dkim-milter/draft-kucherawy-sender-auth-header-10.txt
+share/doc/dkim-milter/libdkim/dkim.html
+share/doc/dkim-milter/libdkim/dkim_alg_t.html
+share/doc/dkim-milter/libdkim/dkim_body.html
+share/doc/dkim-milter/libdkim/dkim_canon_t.html
+share/doc/dkim-milter/libdkim/dkim_cbstat.html
+share/doc/dkim-milter/libdkim/dkim_close.html
+share/doc/dkim-milter/libdkim/dkim_eoh.html
+share/doc/dkim-milter/libdkim/dkim_eom.html
+share/doc/dkim-milter/libdkim/dkim_flush_cache.html
+share/doc/dkim-milter/libdkim/dkim_free.html
+share/doc/dkim-milter/libdkim/dkim_get_user_context.html
+share/doc/dkim-milter/libdkim/dkim_getcachestats.html
+share/doc/dkim-milter/libdkim/dkim_getdomain.html
+share/doc/dkim-milter/libdkim/dkim_geterror.html
+share/doc/dkim-milter/libdkim/dkim_gethandlingstr.html
+share/doc/dkim-milter/libdkim/dkim_getmode.html
+share/doc/dkim-milter/libdkim/dkim_getpolicystr.html
+share/doc/dkim-milter/libdkim/dkim_getpresult.html
+share/doc/dkim-milter/libdkim/dkim_getpresultstr.html
+share/doc/dkim-milter/libdkim/dkim_getresultstr.html
+share/doc/dkim-milter/libdkim/dkim_getsighdr.html
+share/doc/dkim-milter/libdkim/dkim_getsiglist.html
+share/doc/dkim-milter/libdkim/dkim_getsignature.html
+share/doc/dkim-milter/libdkim/dkim_handling_t.html
+share/doc/dkim-milter/libdkim/dkim_header.html
+share/doc/dkim-milter/libdkim/dkim_init.html
+share/doc/dkim-milter/libdkim/dkim_lib.html
+share/doc/dkim-milter/libdkim/dkim_minbody.html
+share/doc/dkim-milter/libdkim/dkim_ohdrs.html
+share/doc/dkim-milter/libdkim/dkim_options.html
+share/doc/dkim-milter/libdkim/dkim_param_t.html
+share/doc/dkim-milter/libdkim/dkim_policy.html
+share/doc/dkim-milter/libdkim/dkim_policy_t.html
+share/doc/dkim-milter/libdkim/dkim_presult.html
+share/doc/dkim-milter/libdkim/dkim_pstate.html
+share/doc/dkim-milter/libdkim/dkim_query_t.html
+share/doc/dkim-milter/libdkim/dkim_reportinfo.html
+share/doc/dkim-milter/libdkim/dkim_set_dns_callback.html
+share/doc/dkim-milter/libdkim/dkim_set_final.html
+share/doc/dkim-milter/libdkim/dkim_set_key_lookup.html
+share/doc/dkim-milter/libdkim/dkim_set_policy_lookup.html
+share/doc/dkim-milter/libdkim/dkim_set_prescreen.html
+share/doc/dkim-milter/libdkim/dkim_set_signature_handle.html
+share/doc/dkim-milter/libdkim/dkim_set_signature_handle_free.html
+share/doc/dkim-milter/libdkim/dkim_set_signature_tagvalues.html
+share/doc/dkim-milter/libdkim/dkim_set_signer.html
+share/doc/dkim-milter/libdkim/dkim_set_user_context.html
+share/doc/dkim-milter/libdkim/dkim_sig_getbh.html
+share/doc/dkim-milter/libdkim/dkim_sig_getcanonlen.html
+share/doc/dkim-milter/libdkim/dkim_sig_getcontext.html
+share/doc/dkim-milter/libdkim/dkim_sig_getdomain.html
+share/doc/dkim-milter/libdkim/dkim_sig_geterror.html
+share/doc/dkim-milter/libdkim/dkim_sig_geterrorstr.html
+share/doc/dkim-milter/libdkim/dkim_sig_getflags.html
+share/doc/dkim-milter/libdkim/dkim_sig_getkeysize.html
+share/doc/dkim-milter/libdkim/dkim_sig_getselector.html
+share/doc/dkim-milter/libdkim/dkim_sig_getsignalg.html
+share/doc/dkim-milter/libdkim/dkim_sig_getsigntime.html
+share/doc/dkim-milter/libdkim/dkim_sig_ignore.html
+share/doc/dkim-milter/libdkim/dkim_sig_process.html
+share/doc/dkim-milter/libdkim/dkim_sigerror.html
+share/doc/dkim-milter/libdkim/dkim_siginfo.html
+share/doc/dkim-milter/libdkim/dkim_sigkey_t.html
+share/doc/dkim-milter/libdkim/dkim_sign.html
+share/doc/dkim-milter/libdkim/dkim_ssl_version.html
+share/doc/dkim-milter/libdkim/dkim_stat.html
+share/doc/dkim-milter/libdkim/dkim_verify.html
+share/doc/dkim-milter/libdkim/index.html
+share/doc/dkim-milter/libdkim/overview.html
+share/doc/dkim-milter/libdkim/rfc2822_mailbox_split.html
+share/doc/dkim-milter/rfc4686.txt
+share/doc/dkim-milter/rfc4871.txt
+share/doc/dkim-milter/rfc5016.txt
 share/examples/rc.d/dkim-filter
+@dirrm share/doc/dkim-milter/libdkim
 @dirrm share/doc/dkim-milter
 @dirrm share/examples/dkim-milter
diff --git a/mail/dkim-milter/distinfo b/mail/dkim-milter/distinfo
index e53205aa2f3..7b48b43bbbb 100644
--- a/mail/dkim-milter/distinfo
+++ b/mail/dkim-milter/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2008/02/19 13:23:06 adrianp Exp $
+$NetBSD: distinfo,v 1.4 2008/03/09 14:02:08 adrianp Exp $
 
 SHA1 (dkim-milter-2.4.4.tar.gz) = 0e945bdca7b70d6b1478ce3e0171f8023de50df2
 RMD160 (dkim-milter-2.4.4.tar.gz) = 744d167f86ad09b0f3856567f812787d18f40349
 Size (dkim-milter-2.4.4.tar.gz) = 617230 bytes
-SHA1 (patch-aa) = edf63a6c5376cb8fefbcd40ab46f944462eb94ab
+SHA1 (patch-aa) = 0c4288ea10ac76547b69e3173cf2d671077a0af1
diff --git a/mail/dkim-milter/options.mk b/mail/dkim-milter/options.mk
new file mode 100644
index 00000000000..61eb4199b99
--- /dev/null
+++ b/mail/dkim-milter/options.mk
@@ -0,0 +1,37 @@
+# $NetBSD: options.mk,v 1.3 2008/03/09 14:02:08 adrianp Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.dkim-milter
+PKG_SUPPORTED_OPTIONS=	inet6 dkim-milter-arlib debug
+
+.include "../../mk/bsd.options.mk"
+
+###
+### IPv6 support.
+###
+.if !empty(PKG_OPTIONS:Minet6)
+SUBST_SED.libs+=	-e 's|@INET6@||g'
+.else
+SUBST_SED.libs+=	-e 's|@INET6@|dnl|g'
+.endif
+
+###
+### Debug support
+###
+.if !empty(PKG_OPTIONS:Mdebug)
+SUBST_SED.libs+=	-e 's|@DEBUG@||g'
+.else
+SUBST_SED.libs+=	-e 's|@DEBUG@|dnl|g'
+.endif
+
+###
+### Use asynchronous DNS resolver library shipping with dkim-milter.
+###
+.if !empty(PKG_OPTIONS:Mdkim-milter-arlib)
+PLIST_SUBST+=		WITH_ARLIB=''
+SUBST_SED.libs+=	-e 's|@RESOLVLIB@||g'
+SUBST_SED.libs+=	-e 's|@ARLIB@||g'
+.else
+PLIST_SUBST+=		WITH_ARLIB='@comment '
+SUBST_SED.libs+=	-e 's|@RESOLVLIB@|resolv bind|g'
+SUBST_SED.libs+=	-e 's|@ARLIB@|dnl|g'
+.endif
diff --git a/mail/dkim-milter/patches/patch-aa b/mail/dkim-milter/patches/patch-aa
index 1a16a4429ea..4bbdc51244b 100644
--- a/mail/dkim-milter/patches/patch-aa
+++ b/mail/dkim-milter/patches/patch-aa
@@ -1,8 +1,44 @@
-$NetBSD: patch-aa,v 1.2 2008/02/19 13:23:06 adrianp Exp $
+$NetBSD: patch-aa,v 1.3 2008/03/09 14:02:08 adrianp Exp $
 
---- devtools/Site/site.config.m4.orig	2008-02-16 12:17:49.000000000 +0000
-+++ devtools/Site/site.config.m4
-@@ -87,6 +87,14 @@ dnl have v0.9.8 or later for SHA256 supp
+--- devtools/Site/site.config.m4.orig	2008-03-09 11:23:02.000000000 +0000
++++ devtools/Site/site.config.m4	2008-03-09 12:49:32.000000000 +0000
+@@ -11,7 +11,7 @@
+ dnl If you are encountering coredumps and want to be able to analyze them
+ dnl using something like "gdb", enable this next line by deleting the "dnl"
+ dnl at the front of it.
+-dnl define(`confOPTIMIZE', `-g')
++@DEBUG@ define(`confOPTIMIZE', `-g')
+ 
+ dnl Shared library for libdkim
+ dnl
+@@ -26,7 +26,7 @@
+ dnl the package, enable this next line by deleting the "dnl" at the front
+ dnl of it.  This is done automatically if you've requested the shared
+ dnl library.
+-dnl define(`bld_LIBDKIM_INSTALL', `true')
++define(`bld_LIBDKIM_INSTALL', `true')
+ 
+ dnl Faster strtoul()/strtoull() implementations
+ dnl
+@@ -40,7 +40,7 @@
+ dnl
+ dnl If you want to use the asynchronous resolver library, enable this
+ dnl next line by deleting the "dnl" at the front of it.
+-dnl define(`bld_USE_ARLIB', `true')
++@ARLIB@ define(`bld_USE_ARLIB', `true')
+ dnl 
+ dnl libar normally uses res_init() or res_ninit() to load the contents
+ dnl of resolv.conf for its use.  If neither of these work on your system
+@@ -49,7 +49,7 @@
+ dnl also be required if you've got any IPv6 addresses in /etc/resolv.conf.
+ dnl In that case, enable this next line by deleting the "dnl" at the front
+ dnl of it.
+-dnl APPENDDEF(`conf_libar_ENVDEF', `-DAR_RES_MANUAL')
++@ARLIB@ APPENDDEF(`conf_libar_ENVDEF', `-DAR_RES_MANUAL')
+ 
+ dnl POPAUTH -- POP-before-SMTP authentication
+ dnl
+@@ -87,6 +87,14 @@
  dnl lines by deleting "dnl" from the front of them and edit paths as needed.
  dnl APPENDDEF(`confINCDIRS', `-I/usr/local/ssl/include ')
  dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/ssl/lib ')
@@ -17,7 +53,7 @@ $NetBSD: patch-aa,v 1.2 2008/02/19 13:23:06 adrianp Exp $
  
  dnl TRE -- Approximate regular expression matching
  dnl
-@@ -117,6 +125,7 @@ dnl APPENDDEF(`confENVDEF', `-D_FFR_SELE
+@@ -117,6 +125,7 @@
  dnl APPENDDEF(`confENVDEF', `-D_FFR_STATS ')
  dnl APPENDDEF(`confENVDEF', `-D_FFR_VBR ')
  dnl APPENDDEF(`confENVDEF', `-D_FFR_ZTAGS ')
@@ -25,7 +61,7 @@ $NetBSD: patch-aa,v 1.2 2008/02/19 13:23:06 adrianp Exp $
  
  dnl DomainKeys -- Yahoo DomainKeys verification support
  dnl 
-@@ -130,8 +139,8 @@ dnl
+@@ -130,8 +139,8 @@
  dnl This must be in the search rules for your compile.  If necessary,
  dnl adjust the paths below and enable the lines by deleting "dnl" from the
  dnl front of them.
@@ -36,13 +72,15 @@ $NetBSD: patch-aa,v 1.2 2008/02/19 13:23:06 adrianp Exp $
  
  dnl smfi_addheader() -- older versions of libmilter
  dnl
-@@ -140,3 +149,15 @@ dnl primitive, you can enable this to ha
+@@ -140,3 +149,21 @@
  dnl instead.  It will still work, but it breaks the DKIM specification.
  dnl To enable this, remove the "dnl" from the front of the line.
  dnl APPENDDEF(`conf_dkim_filter_ENVDEF', `-DNO_SMFI_INSHEADER ')
 +
 +dnl path fixes for pkgsrc
 +dnl
++define(`confINCLUDEDIR', `@PREFIX@/include')
++define(`confLIBDIR', `@PREFIX@/lib')
 +define(`confSBINDIR', `@PREFIX@/sbin')
 +define(`confUBINDIR', `@PREFIX@/bin')
 +define(`confMANROOT', `@PREFIX@/@PKGMANDIR@/man')
@@ -52,3 +90,7 @@ $NetBSD: patch-aa,v 1.2 2008/02/19 13:23:06 adrianp Exp $
 +define(`confMAN8EXT', `8')
 +define(`confINSTALL_RAWMAN', 'yes')
 +define(`confDONT_INSTALL_CATMAN', 'yes')
++
++dnl option fixes for pkgsrc
++dnl
++define(`confLIBSEARCH', `db @RESOLVLIB@')