diff options
| -rw-r--r-- | mail/opendkim/Makefile | 10 | ||||
| -rw-r--r-- | mail/opendkim/PLIST | 27 | ||||
| -rw-r--r-- | mail/opendkim/PLIST.filter | 3 | ||||
| -rw-r--r-- | mail/opendkim/PLIST.stats | 14 | ||||
| -rw-r--r-- | mail/opendkim/distinfo | 8 | ||||
| -rw-r--r-- | mail/opendkim/options.mk | 27 |
6 files changed, 59 insertions, 30 deletions
diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile index 4778b2be269..3a1530c91e6 100644 --- a/mail/opendkim/Makefile +++ b/mail/opendkim/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2012/11/12 19:23:35 pettai Exp $ +# $NetBSD: Makefile,v 1.10 2013/01/05 17:05:07 pettai Exp $ -DISTNAME= opendkim-2.6.7 +DISTNAME= opendkim-2.7.3 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opendkim/} @@ -10,10 +10,12 @@ COMMENT= Open source DKIM library, MTA filter implementation and tools LICENSE= sendmail-open-source-license USE_LIBTOOL= yes -USE_TOOLS+= pkg-config +USE_TOOLS+= pkg-config perl:run GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +REPLACE_PERL+= opendkim/opendkim-genkey.in + FILES_SUBST+= DKIM_USER=${DKIM_USER} DKIM_GROUP=${DKIM_GROUP} BUILD_DEFS+= VARBASE DKIM_USER DKIM_GROUP @@ -26,9 +28,7 @@ PKG_USERS_VARS+= DKIM_USER OWN_DIRS_PERMS+= ${VARBASE}/run/opendkim \ ${DKIM_USER} ${DKIM_GROUP} 0750 -PKGCONFIG_OVERRIDE+= libar/ar.pc.in PKGCONFIG_OVERRIDE+= libopendkim/opendkim.pc.in -PKGCONFIG_OVERRIDE+= libvbr/vbr.pc.in .include "options.mk" diff --git a/mail/opendkim/PLIST b/mail/opendkim/PLIST index e3dd85d557b..f5299195657 100644 --- a/mail/opendkim/PLIST +++ b/mail/opendkim/PLIST @@ -1,17 +1,20 @@ -@comment $NetBSD: PLIST,v 1.7 2012/11/12 19:23:35 pettai Exp $ -bin/opendkim-genkey -bin/opendkim-genzone -bin/opendkim-testadsp -bin/opendkim-testkey -bin/opendkim-testmsg +@comment $NetBSD: PLIST,v 1.8 2013/01/05 17:05:07 pettai Exp $ include/opendkim/dkim.h lib/libopendkim.la lib/pkgconfig/opendkim.pc +man/man5/opendkim.conf.5 man/man8/opendkim-genkey.8 man/man8/opendkim-genzone.8 man/man8/opendkim-testadsp.8 man/man8/opendkim-testkey.8 man/man8/opendkim-testmsg.8 +man/man8/opendkim.8 +sbin/opendkim +sbin/opendkim-genkey +sbin/opendkim-genzone +sbin/opendkim-testadsp +sbin/opendkim-testkey +sbin/opendkim-testmsg share/doc/opendkim/FEATURES share/doc/opendkim/KNOWNBUGS share/doc/opendkim/LICENSE @@ -26,6 +29,7 @@ share/doc/opendkim/authheaders-check-setup-hook.lua share/doc/opendkim/chroot share/doc/opendkim/convert_keylist.sh share/doc/opendkim/dkim.html +share/doc/opendkim/dkim_add_querymethod.html share/doc/opendkim/dkim_add_xtag.html share/doc/opendkim/dkim_alg_t.html share/doc/opendkim/dkim_body.html @@ -34,10 +38,20 @@ share/doc/opendkim/dkim_cbstat.html share/doc/opendkim/dkim_chunk.html share/doc/opendkim/dkim_close.html share/doc/opendkim/dkim_diffheaders.html +share/doc/opendkim/dkim_dns_close.html +share/doc/opendkim/dkim_dns_config.html +share/doc/opendkim/dkim_dns_init.html +share/doc/opendkim/dkim_dns_nslist.html +share/doc/opendkim/dkim_dns_set_close.html +share/doc/opendkim/dkim_dns_set_config.html +share/doc/opendkim/dkim_dns_set_init.html +share/doc/opendkim/dkim_dns_set_nslist.html share/doc/opendkim/dkim_dns_set_query_cancel.html share/doc/opendkim/dkim_dns_set_query_service.html share/doc/opendkim/dkim_dns_set_query_start.html share/doc/opendkim/dkim_dns_set_query_waitreply.html +share/doc/opendkim/dkim_dns_set_trustanchor.html +share/doc/opendkim/dkim_dns_trustanchor.html share/doc/opendkim/dkim_dnssec.html share/doc/opendkim/dkim_eoh.html share/doc/opendkim/dkim_eom.html @@ -146,3 +160,4 @@ share/doc/opendkim/opendkim.spec.in share/doc/opendkim/opendkim.xml share/doc/opendkim/overview.html share/doc/opendkim/stats.lua +share/examples/rc.d/opendkim diff --git a/mail/opendkim/PLIST.filter b/mail/opendkim/PLIST.filter index c81a4c03eb9..ab9d6f4a4ab 100644 --- a/mail/opendkim/PLIST.filter +++ b/mail/opendkim/PLIST.filter @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST.filter,v 1.1.1.1 2010/10/19 23:11:42 pettai Exp $ +@comment $NetBSD: PLIST.filter,v 1.2 2013/01/05 17:05:07 pettai Exp $ man/man5/opendkim.conf.5 man/man8/opendkim.8 sbin/opendkim +share/examples/opendkim/opendkim.conf.sample share/examples/rc.d/opendkim diff --git a/mail/opendkim/PLIST.stats b/mail/opendkim/PLIST.stats index 0f349d1290c..fbdac435ec0 100644 --- a/mail/opendkim/PLIST.stats +++ b/mail/opendkim/PLIST.stats @@ -1,5 +1,11 @@ -@comment $NetBSD: PLIST.stats,v 1.5 2012/06/16 20:20:15 pettai Exp $ -bin/opendkim-spam -bin/opendkim-stats -man/man1/opendkim-spam.1 +@comment $NetBSD: PLIST.stats,v 1.6 2013/01/05 17:05:07 pettai Exp $ +man/man8/opendkim-expire.8 +man/man8/opendkim-gengraphs.8 +man/man8/opendkim-genstats.8 man/man8/opendkim-stats.8 +sbin/opendkim-expire +sbin/opendkim-gengraphs +sbin/opendkim-genstats +sbin/opendkim-reportstats +sbin/opendkim-stats +share/doc/opendkim/mkdb.mysql diff --git a/mail/opendkim/distinfo b/mail/opendkim/distinfo index 5fdb0ceddd4..b9faeabfe41 100644 --- a/mail/opendkim/distinfo +++ b/mail/opendkim/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2012/11/19 18:39:34 pettai Exp $ +$NetBSD: distinfo,v 1.9 2013/01/05 17:05:07 pettai Exp $ -SHA1 (opendkim-2.6.7.tar.gz) = db689bbb9c2df7c0140a470504f050e6ffe2c24b -RMD160 (opendkim-2.6.7.tar.gz) = 54fc6693d610f5e746360904415c003396ab5012 -Size (opendkim-2.6.7.tar.gz) = 1129124 bytes +SHA1 (opendkim-2.7.3.tar.gz) = abaab329ccea5f27166d99030a6e3cac3db63d76 +RMD160 (opendkim-2.7.3.tar.gz) = 83270cc71246b21806e6c3ca83f3e2dcdae6c845 +Size (opendkim-2.7.3.tar.gz) = 1157432 bytes SHA1 (patch-configure) = 8e635d41c213f899b31b392b1cdb96c8d5113ca4 diff --git a/mail/opendkim/options.mk b/mail/opendkim/options.mk index 9f0efec290b..5762819b820 100644 --- a/mail/opendkim/options.mk +++ b/mail/opendkim/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.3 2011/04/29 11:48:24 adam Exp $ +# $NetBSD: options.mk,v 1.4 2013/01/05 17:05:07 pettai Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.opendkim -PKG_SUPPORTED_OPTIONS= filter debug dkim-stats vbr -PKG_SUGGESTED_OPTIONS= filter +PKG_SUPPORTED_OPTIONS= opendkim-filter debug dkim-stats vbr +PKG_SUGGESTED_OPTIONS= opendkim-filter .include "../../mk/bsd.options.mk" @@ -18,30 +18,34 @@ CONFIGURE_ARGS+= --disable-debug ### ### Install filter (milter) plugin ### -.if !empty(PKG_OPTIONS:Mfilter) +.if !empty(PKG_OPTIONS:Mopendkim-filter) EGDIR= ${PREFIX}/share/examples/opendkim RCD_SCRIPTS= opendkim CONFIGURE_ARGS+= --enable-filter CONFIGURE_ARGS+= --with-milter=${PREFIX} -SUBST_CLASSES+= conf -SUBST_STAGE.conf= pre-configure -SUBST_FILES.conf= opendkim/Makefile.in -SUBST_SED.conf+= -e 's|@EGDIR@|${EGDIR}|g' -#CONF_FILES= ${EGDIR}/opendkim.conf.sample \ -# ${PKG_SYSCONFDIR}/opendkim.conf +CONF_FILES= ${EGDIR}/opendkim.conf.sample \ + ${PKG_SYSCONFDIR}/opendkim.conf + +INSTALLATION_DIRS= ${EGDIR} + +post-install: + ${INSTALL_DATA} ${WRKSRC}/opendkim/opendkim.conf.sample \ + ${DESTDIR}${EGDIR}/opendkim.conf.sample PLIST_SRC+= ${PKGDIR}/PLIST.filter .else CONFIGURE_ARGS+= --disable-filter .endif + ### ### Build with VBR support ### .if !empty(PKG_OPTIONS:Mvbr) CONFIGURE_ARGS+= --enable-vbr +PKGCONFIG_OVERRIDE+= libvbr/vbr.pc.in PLIST_SRC+= ${PKGDIR}/PLIST.vbr .else CONFIGURE_ARGS+= --disable-vbr @@ -54,6 +58,9 @@ CONFIGURE_ARGS+= --disable-vbr #.include "../../mk/db1.builtin.mk" CONFIGURE_ARGS+= --enable-stats PLIST_SRC+= ${PKGDIR}/PLIST.stats +REPLACE_PERL+= stats/opendkim-expire.in +REPLACE_PERL+= stats/opendkim-gengraphs.in +REPLACE_PERL+= stats/opendkim-genstats.in .else CONFIGURE_ARGS+= --disable-stats .endif |