Import of pkgsrc-2015Q2

2015-08-30 02:56:09 -07:00
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions
--- a/mail/GNUMail/Makefile
+++ b/mail/GNUMail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2014/10/07 16:47:29 adam Exp $
+# $NetBSD: Makefile,v 1.41 2015/04/06 08:17:31 adam Exp $

 DISTNAME=	GNUMail-1.2.0
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	mail gnustep
 MASTER_SITES=	http://debian.uni-essen.de/misc/GNUstep/Apps/GNUMail/

--- a/mail/Makefile
+++ b/mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.463 2015/02/04 15:23:31 taca Exp $
+# $NetBSD: Makefile,v 1.464 2015/04/21 08:56:38 jperkin Exp $
 #

 COMMENT=	Electronic mail utilities
@@ -347,6 +347,7 @@ SUBDIR+=	wmbiff
 SUBDIR+=	wmmail
 SUBDIR+=	xbiff
 SUBDIR+=	xbuffy
+SUBDIR+=	xfce4-mailwatch-plugin
 SUBDIR+=	xfmail
 SUBDIR+=	xmailbox
 SUBDIR+=	xmailwatcher
--- a/mail/Pantomime/Makefile
+++ b/mail/Pantomime/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2014/10/07 16:47:12 adam Exp $
+# $NetBSD: Makefile,v 1.33 2015/04/06 08:17:15 adam Exp $

 DISTNAME=	Pantomime-1.2.0
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	mail gnustep
 MASTER_SITES=	http://debian.uni-essen.de/misc/GNUstep/Apps/GNUMail/

--- a/mail/Pantomime/buildlink3.mk
+++ b/mail/Pantomime/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2014/10/07 16:47:12 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2015/04/06 08:17:15 adam Exp $

 BUILDLINK_TREE+=	Pantomime

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	Pantomime
 PANTOMIME_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.Pantomime+=	Pantomime>1.1.9
-BUILDLINK_ABI_DEPENDS.Pantomime+=	Pantomime>=1.2.0nb5
+BUILDLINK_ABI_DEPENDS.Pantomime+=	Pantomime>=1.2.0nb6
 BUILDLINK_PKGSRCDIR.Pantomime?=	../../mail/Pantomime

 .include "../../devel/gnustep-make/gnustep.mk"
--- a/mail/YoSucker/Makefile
+++ b/mail/YoSucker/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2014/05/29 23:36:44 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2015/06/12 10:50:17 wiz Exp $
 #

 DISTNAME=		YoSucker-pr37
 PKGNAME=		${DISTNAME:S/pr//}
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=yosucker/}

--- a/mail/akonadi/Makefile
+++ b/mail/akonadi/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2014/11/13 09:44:02 markd Exp $
+# $NetBSD: Makefile,v 1.69 2015/04/25 14:23:26 tnn Exp $

 DISTNAME=	akonadi-1.13.0
+PKGREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://kde.mirror.anlx.net/stable/akonadi/src/
 EXTRACT_SUFX=	.tar.bz2
--- a/mail/akonadi/buildlink3.mk
+++ b/mail/akonadi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2014/02/12 23:18:06 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2015/04/25 14:23:26 tnn Exp $

 BUILDLINK_TREE+=	akonadi

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	akonadi
 AKONADI_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.akonadi+=	akonadi>=0.82.0
-BUILDLINK_ABI_DEPENDS.akonadi+=	akonadi>=1.10.2nb4
+BUILDLINK_ABI_DEPENDS.akonadi+=	akonadi>=1.13.0nb3
 BUILDLINK_PKGSRCDIR.akonadi?=	../../mail/akonadi

 .include "../../x11/qt4-libs/buildlink3.mk"
--- a/mail/amavis-perl/Makefile
+++ b/mail/amavis-perl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2014/05/29 23:36:44 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2015/06/12 10:50:17 wiz Exp $

 DISTNAME=	amavisd-${VERSION}
 PKGNAME=	amavis-perl-${VERSION}
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	mail security
 MASTER_SITES=	http://www.amavis.org/dist/perl/ \
 		${MASTER_SITE_SOURCEFORGE:=amavis/}
--- a/mail/amavisd-new/Makefile
+++ b/mail/amavisd-new/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2014/06/14 10:13:05 wiedi Exp $
+# $NetBSD: Makefile,v 1.15 2015/06/12 10:50:17 wiz Exp $

 DISTNAME=	amavisd-new-${VERSION}${PATCHLEVEL}
 PKGNAME=	amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	mail security
 MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
 		http://mirrors.catpipe.net/amavisd-new/ \
--- a/mail/anomy-sanitizer/Makefile
+++ b/mail/anomy-sanitizer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2014/10/09 14:06:38 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2015/06/12 10:50:17 wiz Exp $
 #

 DISTNAME=	anomy-sanitizer-1.76
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	mail
 MASTER_SITES=	http://mailtools.anomy.net/dist/

--- a/mail/avenger/Makefile
+++ b/mail/avenger/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2014/11/22 03:01:33 mef Exp $
+# $NetBSD: Makefile,v 1.19 2015/06/12 10:50:17 wiz Exp $

 DISTNAME=	avenger-0.8.4
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailavenger.org/dist/

--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.114 2014/10/07 16:47:29 adam Exp $
+# $NetBSD: Makefile,v 1.117 2015/06/12 10:50:17 wiz Exp $

 DISTNAME=	balsa-2.4.14
-PKGREVISION=	11
+PKGREVISION=	14
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://pawsa.fedorapeople.org/balsa/
 EXTRACT_SUFX=	.tar.bz2
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2014/11/22 01:36:43 mef Exp $
+# $NetBSD: Makefile,v 1.58 2015/06/12 10:50:17 wiz Exp $

 DISTNAME=	bogofilter-1.2.4
+PKGREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bogofilter/}
 EXTRACT_SUFX=	.tar.bz2
--- a/mail/claws-mail-archive/Makefile
+++ b/mail/claws-mail-archive/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2015/01/21 09:12:41 obache Exp $
+# $NetBSD: Makefile,v 1.35 2015/04/25 14:23:26 tnn Exp $
 #

 PLUGIN_NAME=    archive
-PKGREVISION=	2
+PKGREVISION= 1
 .include "../../mail/claws-mail/plugins.mk"

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/mail/claws-mail-attachwarner/Makefile
+++ b/mail/claws-mail-attachwarner/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2014/04/09 07:27:10 obache Exp $
+# $NetBSD: Makefile,v 1.40 2015/04/25 14:23:26 tnn Exp $
 #

 PLUGIN_NAME=    attachwarner
-PKGREVISION=	1
+PKGREVISION= 1
 .include "../../mail/claws-mail/plugins.mk"

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/mail/claws-mail-attremover/Makefile
+++ b/mail/claws-mail-attremover/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2014/04/09 07:27:10 obache Exp $
+# $NetBSD: Makefile,v 1.39 2015/04/25 14:23:27 tnn Exp $
 #

 PLUGIN_NAME=    att_remover
-PKGREVISION=	1
+PKGREVISION= 1
 .include "../../mail/claws-mail/plugins.mk"

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/mail/claws-mail-bogofilter/Makefile
+++ b/mail/claws-mail-bogofilter/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2014/04/09 07:27:10 obache Exp $
+# $NetBSD: Makefile,v 1.34 2015/04/25 14:23:27 tnn Exp $
 #

 PLUGIN_NAME=	bogofilter
-PKGREVISION=	1
+PKGREVISION= 1
 .include "../../mail/claws-mail/plugins.mk"

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/mail/claws-mail-cachesaver/Makefile
+++ b/mail/claws-mail-cachesaver/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.39 2014/05/05 00:48:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.41 2015/04/25 14:23:27 tnn Exp $
 #

 DISTNAME=	cachesaver-0.10.9
 PKGNAME=	claws-mail-cachesaver-0.10.9
-PKGREVISION=	25
+PKGREVISION=	27
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/

--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2014/04/09 07:27:10 obache Exp $
+# $NetBSD: Makefile,v 1.40 2015/04/25 14:23:27 tnn Exp $
 #

 PLUGIN_NAME=    fetchinfo
-PKGREVISION=	1
+PKGREVISION= 1
 .include "../../mail/claws-mail/plugins.mk"

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/mail/claws-mail-mailmbox/Makefile
+++ b/mail/claws-mail-mailmbox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2014/04/09 07:27:10 obache Exp $
+# $NetBSD: Makefile,v 1.39 2015/04/25 14:23:27 tnn Exp $
 #

 PLUGIN_NAME=    mailmbox
-PKGREVISION=	1
+PKGREVISION= 1
 .include "../../mail/claws-mail/plugins.mk"

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/mail/claws-mail-newmail/Makefile
+++ b/mail/claws-mail-newmail/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2014/04/09 07:27:10 obache Exp $
+# $NetBSD: Makefile,v 1.41 2015/04/25 14:23:27 tnn Exp $
 #

 PLUGIN_NAME=    newmail
-PKGREVISION=	1
+PKGREVISION= 1
 .include "../../mail/claws-mail/plugins.mk"

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2014/04/09 07:27:10 obache Exp $
+# $NetBSD: Makefile,v 1.42 2015/04/25 14:23:27 tnn Exp $
 #

 PLUGIN_NAME=    notification
-PKGREVISION=	1
+PKGREVISION= 1
 .include "../../mail/claws-mail/plugins.mk"

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/mail/claws-mail-pgpcore/Makefile
+++ b/mail/claws-mail-pgpcore/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2014/05/05 00:48:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.42 2015/04/25 14:23:27 tnn Exp $
 #

 PLUGIN_NAME=	pgpcore
-PKGREVISION=	2
+PKGREVISION= 1
 .include "../../mail/claws-mail/plugins.mk"

 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -10,8 +10,6 @@ COMMENT=	Handles core PGP functions

 PLIST_SRC+=	PLIST

-PLIST_SRC+=	PLIST
-
 CONFIGURE_ARGS+=	--enable-pgpcore-plugin
 CONFIGURE_ARGS+=	--enable-pgpmime-plugin
 CONFIGURE_ARGS+=	--enable-pgpinline-plugin
--- a/mail/claws-mail-pgpcore/PLIST
+++ b/mail/claws-mail-pgpcore/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2014/01/15 17:22:31 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2015/04/03 12:34:44 nros Exp $
+include/claws-mail/plugins/pgpcore/autocompletion.h
 include/claws-mail/plugins/pgpcore/passphrase.h
 include/claws-mail/plugins/pgpcore/pgp_utils.h
 include/claws-mail/plugins/pgpcore/pgp_viewer.h
 include/claws-mail/plugins/pgpcore/prefs_gpg.h
 include/claws-mail/plugins/pgpcore/select-keys.h
 include/claws-mail/plugins/pgpcore/sgpgme.h
-lib/claws-mail/plugins/pgpcore.la
--- a/mail/claws-mail-pgpcore/buildlink3.mk
+++ b/mail/claws-mail-pgpcore/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2014/05/05 00:48:05 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2015/04/25 14:23:27 tnn Exp $

 BUILDLINK_TREE+=	claws-mail-pgpcore

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	claws-mail-pgpcore
 CLAWS_MAIL_PGPCORE_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.claws-mail-pgpcore+=	claws-mail-pgpcore>=3.7.0
-BUILDLINK_ABI_DEPENDS.claws-mail-pgpcore+=	claws-mail-pgpcore>=3.9.3nb2
+BUILDLINK_ABI_DEPENDS.claws-mail-pgpcore+=	claws-mail-pgpcore>=3.11.1nb1
 BUILDLINK_PKGSRCDIR.claws-mail-pgpcore?=	../../mail/claws-mail-pgpcore

 .include "../../x11/gtk2/buildlink3.mk"
--- a/mail/claws-mail-pgpinline/Makefile
+++ b/mail/claws-mail-pgpinline/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2014/05/05 00:48:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.42 2015/04/25 14:23:27 tnn Exp $
 #

 PLUGIN_NAME=	pgpinline
-PKGREVISION=	2
+PKGREVISION= 1
 .include "../../mail/claws-mail/plugins.mk"

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/mail/claws-mail-pgpmime/Makefile
+++ b/mail/claws-mail-pgpmime/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2014/05/05 00:48:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.41 2015/04/25 14:23:27 tnn Exp $
 #

 PLUGIN_NAME=	pgpmime
-PKGREVISION=	2
+PKGREVISION= 1
 .include "../../mail/claws-mail/plugins.mk"

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2014/04/09 07:27:10 obache Exp $
+# $NetBSD: Makefile,v 1.47 2015/04/25 14:23:27 tnn Exp $
 #

 PLUGIN_NAME=    rssyl
-PKGREVISION=	1
+PKGREVISION= 1
 .include "../../mail/claws-mail/plugins.mk"

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/mail/claws-mail-smime/Makefile
+++ b/mail/claws-mail-smime/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2014/05/05 00:48:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.43 2015/04/25 14:23:27 tnn Exp $
 #

 PLUGIN_NAME=	smime
-PKGREVISION=	2
+PKGREVISION= 1
 .include "../../mail/claws-mail/plugins.mk"

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/mail/claws-mail-spamassassin/Makefile
+++ b/mail/claws-mail-spamassassin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2014/04/09 07:27:10 obache Exp $
+# $NetBSD: Makefile,v 1.33 2015/04/25 14:23:27 tnn Exp $
 #

 PLUGIN_NAME=	spamassassin
-PKGREVISION=	1
+PKGREVISION= 1
 .include "../../mail/claws-mail/plugins.mk"

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/mail/claws-mail-spamreport/Makefile
+++ b/mail/claws-mail-spamreport/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2014/04/09 07:27:10 obache Exp $
+# $NetBSD: Makefile,v 1.44 2015/04/25 14:23:28 tnn Exp $
 #

 PLUGIN_NAME=    spam_report
-PKGREVISION=	1
+PKGREVISION= 1
 .include "../../mail/claws-mail/plugins.mk"

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/mail/claws-mail-synce/Makefile
+++ b/mail/claws-mail-synce/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.39 2014/05/05 00:48:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.41 2015/04/25 14:23:28 tnn Exp $
 #

 DISTNAME=	synce_plugin-0.7.5
 PKGNAME=	claws-mail-synce_plugin-0.7.5
-PKGREVISION=	27
+PKGREVISION=	29
 CATEGORIES=	mail
 MASTER_SITES=	http://claws-mail.org/downloads/plugins/

--- a/mail/claws-mail-tnef/Makefile
+++ b/mail/claws-mail-tnef/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2014/05/05 00:48:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.41 2015/04/25 14:23:28 tnn Exp $
 #

 PLUGIN_NAME=    tnef_parse
-PKGREVISION=	2
+PKGREVISION= 1
 .include "../../mail/claws-mail/plugins.mk"

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2014/05/29 23:36:44 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2015/06/12 10:50:17 wiz Exp $
 #

 PLUGIN_NAME=    vcalendar
-PKGREVISION=	2
+PKGREVISION= 2
 .include "../../mail/claws-mail/plugins.mk"

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.68 2014/06/09 14:18:07 ryoon Exp $
+# $NetBSD: Makefile,v 1.71 2015/06/12 10:50:17 wiz Exp $

 INSTALLATION_DIRS+=	${EGDIR}
 INSTALLATION_DIRS+=	share/claws-mail

+PKGREVISION= 2
 .include "Makefile.common"

 PKGNAME=	claws-mail-${CLAWS_VERSION}
-PKGREVISION=	5

 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	X based e-mail and netnews client
@@ -60,10 +60,14 @@ CONFIGURE_ARGS+=	--enable-ipv6
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif

+INSTALLATION_DIRS+=	share/applications
+
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/mime.types ${DESTDIR}${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/claws-mail*.png \
 		${DESTDIR}${PREFIX}/share/claws-mail
+	${INSTALL_DATA} ${WRKSRC}/claws-mail.desktop \
+		${DESTDIR}${PREFIX}/share/applications
 .if exists(files/shred.${OPSYS})
 	${INSTALL_SCRIPT} files/shred.${OPSYS} \
 		${DESTDIR}${PREFIX}/bin/claws-mail-shred
--- a/mail/claws-mail/Makefile.common
+++ b/mail/claws-mail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2013/07/24 15:26:11 drochner Exp $
+# $NetBSD: Makefile.common,v 1.14 2015/06/07 14:05:58 youri Exp $

 # used by mail/claws-mail/plugins.mk

@@ -6,8 +6,8 @@

 DISTNAME=	claws-mail-${CLAWS_VERSION}
 CATEGORIES=	mail news x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sylpheed-claws/}
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=claws-mail/}
+EXTRACT_SUFX=	.tar.xz

 HOMEPAGE=	http://claws-mail.org/
 LICENSE=	gnu-gpl-v3
@@ -54,7 +54,7 @@ CONFIGURE_ARGS+=	--disable-perl-plugin

 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mail/libetpan/buildlink3.mk"
-#.include "../../net/libsoup24/buildlink3.mk"
+#.include "../../net/libsoup/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../textproc/enchant/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
--- a/mail/claws-mail/Makefile.vers
+++ b/mail/claws-mail/Makefile.vers
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.vers,v 1.17 2014/01/15 17:19:30 drochner Exp $
+# $NetBSD: Makefile.vers,v 1.18 2015/04/03 12:34:44 nros Exp $
 #
-CLAWS_VERSION=	3.9.3
+CLAWS_VERSION=	3.11.1
--- a/mail/claws-mail/PLIST
+++ b/mail/claws-mail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2014/01/15 17:19:30 drochner Exp $
+@comment $NetBSD: PLIST,v 1.21 2015/04/03 12:34:44 nros Exp $
 bin/claws-mail
 bin/sylpheed-claws
 include/claws-mail/account.h
@@ -25,6 +25,7 @@ include/claws-mail/addrselect.h
 include/claws-mail/advsearch.h
 include/claws-mail/alertpanel.h
 include/claws-mail/autofaces.h
+include/claws-mail/avatars.h
 include/claws-mail/browseldap.h
 include/claws-mail/claws-features.h
 include/claws-mail/codeconv.h
@@ -70,6 +71,7 @@ include/claws-mail/edittags.h
 include/claws-mail/editvcard.h
 include/claws-mail/enriched.h
 include/claws-mail/etpan/etpan-errors.h
+include/claws-mail/etpan/etpan-ssl.h
 include/claws-mail/etpan/etpan-thread-manager-types.h
 include/claws-mail/etpan/etpan-thread-manager.h
 include/claws-mail/etpan/imap-thread.h
@@ -232,6 +234,7 @@ share/locale/ca/LC_MESSAGES/claws-mail.mo
 share/locale/cs/LC_MESSAGES/claws-mail.mo
 share/locale/de/LC_MESSAGES/claws-mail.mo
 share/locale/en_GB/LC_MESSAGES/claws-mail.mo
+share/locale/eo/LC_MESSAGES/claws-mail.mo
 share/locale/es/LC_MESSAGES/claws-mail.mo
 share/locale/fi/LC_MESSAGES/claws-mail.mo
 share/locale/fr/LC_MESSAGES/claws-mail.mo
@@ -241,6 +244,7 @@ share/locale/id_ID/LC_MESSAGES/claws-mail.mo
 share/locale/it/LC_MESSAGES/claws-mail.mo
 share/locale/ja/LC_MESSAGES/claws-mail.mo
 share/locale/lt/LC_MESSAGES/claws-mail.mo
+share/locale/nb/LC_MESSAGES/claws-mail.mo
 share/locale/nl/LC_MESSAGES/claws-mail.mo
 share/locale/pl/LC_MESSAGES/claws-mail.mo
 share/locale/pt_BR/LC_MESSAGES/claws-mail.mo
--- a/mail/claws-mail/buildlink3.mk
+++ b/mail/claws-mail/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2012/09/15 10:05:22 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2015/04/03 12:34:44 nros Exp $

 BUILDLINK_TREE+=	claws-mail

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	claws-mail
 CLAWS_MAIL_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.claws-mail+= claws-mail>=3.7.0
-BUILDLINK_ABI_DEPENDS.claws-mail+=	claws-mail>=3.8.1nb3
+BUILDLINK_ABI_DEPENDS.claws-mail+=	claws-mail>=3.11.1
 BUILDLINK_PKGSRCDIR.claws-mail?=	../../mail/claws-mail

 .include "../../textproc/enchant/buildlink3.mk"
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.25 2014/01/15 17:19:30 drochner Exp $
+$NetBSD: distinfo,v 1.26 2015/04/03 12:34:44 nros Exp $

-SHA1 (claws-mail-3.9.3.tar.bz2) = 82026ac7dfc0123544def8ef338a4d0746671284
-RMD160 (claws-mail-3.9.3.tar.bz2) = e9258dd2323010596782e2090a40f3fe674344e2
-Size (claws-mail-3.9.3.tar.bz2) = 9463943 bytes
+SHA1 (claws-mail-3.11.1.tar.xz) = b0c07906043f7a3ec726c7a96d6dcfc3c148b9cc
+RMD160 (claws-mail-3.11.1.tar.xz) = 6cdcae95d8c367da3d170dba55b9707b181fa723
+Size (claws-mail-3.11.1.tar.xz) = 6908772 bytes
 SHA1 (patch-ab) = d1c89842cedad037c9ac3836da630244fe8ff9c9
 SHA1 (patch-ae) = f1991ef4e31bd6a7cbddf6655f489f72fb40308b
 SHA1 (patch-af) = 2655fac7e0e7bfb2d50291537eab9481dbc83691
-SHA1 (patch-ag) = c5c3d16343437aedb9c899bec151338aea9fbbfb
 SHA1 (patch-ah) = cdfd816669c0c1ae6dba0d97a6d1fe5a8c2e4626
-SHA1 (patch-ai) = 22b9ad0763ee3053f8b3082a639991b6574e6f65
+SHA1 (patch-ai) = e2da8ef08afc0543cbbd00b71720d0002f8b9faf
 SHA1 (patch-bb) = 2d432d7c1c3869b76965adea77f05127796a27f5
 SHA1 (patch-ca) = 6243d9a22cf7e9b355e53ce301069f84278c6274
 SHA1 (patch-cb) = 41c8d3f48a22885854c5bef71558e38b60084e22
--- a/mail/claws-mail/patches/patch-ag
+++ b/mail/claws-mail/patches/patch-ag
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.7 2012/07/02 19:07:50 drochner Exp $
-
--- src/common/ssl.c.orig	2012-03-31 15:29:18.000000000 +0000
-+++ src/common/ssl.c
-@@ -29,6 +29,7 @@
- #include <glib/gi18n.h>
- #include <errno.h>
- #include <pthread.h>
-+#include <gnutls/gnutls.h>
- 
- #if GNUTLS_VERSION_NUMBER <= 0x020b00
- #include <gcrypt.h>
--- a/mail/claws-mail/patches/patch-ai
+++ b/mail/claws-mail/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.1 2013/07/24 15:26:11 drochner Exp $
+$NetBSD: patch-ai,v 1.2 2015/04/03 12:34:44 nros Exp $

--- src/Makefile.in.orig	2013-05-06 16:32:55.000000000 +0000
+--- src/Makefile.in.orig	2014-10-27 18:59:09.000000000 +0000
 +++ src/Makefile.in
-@@ -530,7 +530,7 @@ top_srcdir = @top_srcdir@
+@@ -614,7 +614,7 @@ top_srcdir = @top_srcdir@
 @CLAWS_LIBETPAN_TRUE@etpan_dir = etpan
 @CLAWS_LIBETPAN_FALSE@etpan_library = 
 @CLAWS_LIBETPAN_TRUE@etpan_library = etpan/libclawsetpan.la
 -SUBDIRS = common gtk $(etpan_dir) . plugins 
-+SUBDIRS = common gtk $(etpan_dir) .
+SUBDIRS = common gtk $(etpan_dir) . 
 @PLATFORM_WIN32_TRUE@LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
- @PLATFORM_WIN32_TRUE@     `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
+ @PLATFORM_WIN32_TRUE@     `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \
 @PLATFORM_WIN32_TRUE@     sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
--- a/mail/clawsker/Makefile
+++ b/mail/clawsker/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2014/05/29 23:36:44 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2015/06/12 10:50:17 wiz Exp $

 DISTNAME=	clawsker-0.7.8
-PKGREVISION=	3
+PKGREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/tools/

--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2014/05/29 23:36:44 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2015/06/12 10:50:17 wiz Exp $

 DISTNAME=	cone-0.90
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
--- a/mail/courier-analog/Makefile
+++ b/mail/courier-analog/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2014/05/29 23:36:44 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2015/06/12 10:50:17 wiz Exp $

 DISTNAME=	courier-analog-0.16
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2014/05/29 23:36:44 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2015/06/12 10:50:18 wiz Exp $

 DISTNAME=	courier-imap-4.10.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
--- a/mail/courier-maildir/Makefile
+++ b/mail/courier-maildir/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2014/05/29 23:36:44 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2015/06/12 10:50:18 wiz Exp $

 DISTNAME=	courier-${COURIER_VERSION}
 PKGNAME=	${DISTNAME:S/-/-maildir-/}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
--- a/mail/courier-mta/Makefile
+++ b/mail/courier-mta/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2014/05/29 23:36:45 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2015/06/12 10:50:18 wiz Exp $

 DISTNAME=	courier-${COURIER_VERSION}
 PKGNAME=	${DISTNAME:S/-/-mta-/}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.103 2014/09/23 14:40:28 jperkin Exp $
+# $NetBSD: Makefile,v 1.104 2015/06/12 10:50:18 wiz Exp $

 DISTNAME=	cyrus-imapd-2.2.13p1
-PKGREVISION=	12
+PKGREVISION=	13
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2015/03/15 19:42:33 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.37 2015/06/12 10:50:18 wiz Exp $

 DISTNAME=	cyrus-imapd-2.3.18
-PKGREVISION=	13
+PKGREVISION=	15
 CATEGORIES=	mail
 MASTER_SITES=	http://cyrusimap.org/releases/ \
 		ftp://ftp.cyrusimap.org/cyrus-imapd/ \
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2015/03/15 20:13:24 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.41 2015/06/12 10:50:18 wiz Exp $

 DISTNAME=	cyrus-imapd-2.4.17
-PKGREVISION=	10
+PKGREVISION=	12
 CATEGORIES=	mail
 MASTER_SITES=	http://cyrusimap.org/releases/ \
 		ftp://ftp.cyrusimap.org/cyrus-imapd/ \
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2014/10/07 16:47:29 adam Exp $
+# $NetBSD: Makefile,v 1.46 2015/04/06 08:17:31 adam Exp $

 DISTNAME=	dbmail-2.2.17
-PKGREVISION=	19
+PKGREVISION=	20
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/2.2/

--- a/mail/dcc/INSTALL
+++ b/mail/dcc/INSTALL
@@ -1,61 +0,0 @@
-# $NetBSD: INSTALL,v 1.1.1.1 2010/10/27 12:26:37 gdt Exp $
-#
-#	mostly taken from homedir/Makefile.in
-#
-#
-case ${STAGE} in
-POST-INSTALL)
-	DD=/bin/dd
-	TR=/usr/bin/tr
-	CKSUM=/usr/bin/cksum
-	CDCC=${PREFIX}/bin/cdcc
-
-	URND=/dev/urandom
-
-	DCC_USER=@DCC_USER@
-	DCC_GROUP=@DCC_GROUP@
-	DCC_HOME=@DCC_HOME@
-	DCC_EGDIR=@DCC_EGDIR@
-
-	DCC_MODE_PRIV=0600
-
-	IDS=ids
-	MAP=map
-	MAPTXT=${MAP}.txt
-
-	SECRET1=$(${DD} if=${URND} count=1 2>&1 | ${CKSUM} | ${TR} '	 ' xy)
-	SECRET2=$(${DD} if=${URND} count=1 2>&1 | ${CKSUM} | ${TR} '	 ' xy)
-	#
-	#	assemble sed-commands
-	#
-	SED_CMD1="-e /^[:blank:]*[^#]/{s/secret1/${SECRET1}/;}"
-	SED_CMD2="-e /^[:blank:]*[^#]/{s/secret2/${SECRET2}/;}"
-
-	if [ ! -f ${DCC_HOME}/${IDS} ]; then
-		#
-		#	replace secrets in ids
-		#
-		${SED} ${SED_CMD1} ${SED_CMD2} ${DCC_EGDIR}/${IDS} \
-			>${DCC_HOME}/${IDS}
-		${CHMOD} ${DCC_MODE_PRIV} ${DCC_HOME}/${IDS}
-		${CHOWN} ${DCC_USER}:${DCC_GROUP} ${DCC_HOME}/${IDS}
-	fi
-
-	if [ ! -f ${DCC_HOME}/${MAP} -a ! -f ${DCC_HOME}/${MAPTXT} ]; then
-		#
-		#	replace random secrets in MAPTXT and generate MAP
-		#
-		${SED} ${SED_CMD1} ${DCC_EGDIR}/${MAPTXT} |
-			${CDCC} -qh${DCC_HOME} "new map; load -"
-		${CHMOD} ${DCC_MODE_PRIV} ${DCC_HOME}/${MAP}
-		${CHOWN} ${DCC_USER}:${DCC_GROUP} ${DCC_HOME}/${MAP}
-		#
-		#	generate MAPTXT from MAP
-		#
-		${CDCC} -qh${DCC_HOME} "file ${MAP}; info" \
-			>${DCC_HOME}/${MAPTXT}
-		${CHMOD} ${DCC_MODE_PRIV} ${DCC_HOME}/${MAPTXT}
-		${CHOWN} ${DCC_USER}:${DCC_GROUP} ${DCC_HOME}/${MAPTXT}
-	fi
-	;;
-esac
--- a/mail/dcc/MESSAGE
+++ b/mail/dcc/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2010/10/27 12:26:37 gdt Exp $
+$NetBSD: MESSAGE,v 1.2 2015/06/05 13:43:20 gdt Exp $

 Use of Public DCC Servers
 -------------------------
@@ -42,15 +42,3 @@ checksums from the database:
   ${PREFIX}/libexec/cron-dccd

 ===========================================================================
-===========================================================================
-
-SpamAssassin DCC Module
-----------------------
-
-For a proper initialization of the SpamAssassin DCC module (DCC.pm),
-copy dcc-spamassassin.pre into the main SpamAssassin configuration
-directory and restart spamd:
-
-   ${PREFIX}/share/examples/dcc/dcc-spamassassin.pre
-
-===========================================================================
--- a/mail/dcc/Makefile
+++ b/mail/dcc/Makefile
@@ -1,15 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2013/08/27 16:40:11 shattered Exp $
-#
-#	Request by the author:
-#
-#	On Thu, Jan 29, 2009 at 06:27:03PM +0000,
-#	Vernon Schryver wrote:
-#	>
-#	> There should be no patches in whatever
-#	> you distribute. Updatedcc must work.
-#
-DISTNAME=		dcc-1.3.123
-PKGREVISION=		2
+# $NetBSD: Makefile,v 1.8 2015/06/12 10:50:18 wiz Exp $
+
+DISTNAME=		dcc-1.3.158
+PKGREVISION=		1
 CATEGORIES=		mail
 MASTER_SITES=		http://www.rhyolite.com/dcc/source/old/
 EXTRACT_SUFX=		.tar.Z
@@ -26,131 +18,83 @@ DCC_GROUP?=		dcc
 DCC_HOME?=		${VARBASE}/dcc
 DCC_RUN?=		${VARBASE}/run/dcc

-# expanded in INSTALL
-FILES_SUBST+=		DCC_USER=${DCC_USER} \
-			DCC_GROUP=${DCC_GROUP} \
-			DCC_HOME=${DCC_HOME} \
-			DCC_EGDIR=${DCC_EGDIR}
+# dcc already implements $DESTDIR as $installroot but also prepends
+# $installroot to $BINDIR, which bsd.prog.mk subsequently extends to
+# $DESTDIR/$BINDIR, effectively doubling the $DESTDIR prefix.  The
+# following bit of make dances around the issue and avoids adding
+# $DESTDIR when evaluated within a bsd.prog.mk target.
+DCC_DESTDIR=		$${"$${@:Mproginstall-*}"=="":?$${DESTDIR}:}

-# expanded in files/dcc{d,ifd,m}
-FILES_SUBST+=		DCC_RUN=${DCC_RUN}
+# expanded in files/dcc*.sh
+FILES_SUBST+=		DCC_HOME=${DCC_HOME}
+FILES_SUBST+=		DCC_EGDIR=${DCC_EGDIR}
+FILES_SUBST+=		DCC_RC=${PREFIX}/libexec/rcDCC
+FILES_SUBST+=		DCC_FIXMAP=${PREFIX}/libexec/fix-map

+# enabling/disabling daemons is done in rc.conf
 SUBST_CLASSES+=		dae
 SUBST_STAGE.dae=	post-patch
 SUBST_FILES.dae=	homedir/dcc_conf.in
-SUBST_SED.dae=		-e 's/^\(DCCD_ENABLE=\)off$$/\1on/'
-SUBST_SED.dae+=		-e 's/^\(DCCM_ENABLE=\)off$$/\1on/'
-SUBST_SED.dae+=		-e 's/^\(DCCIFD_ENABLE=\)off$$/\1on/'
+SUBST_SED.dae=		-e 's/^\(DCCD_ENABLE=\).*$$/\1on/'
+SUBST_SED.dae+=		-e 's/^\(GREY_ENABLE=\).*$$/\1on/'
+SUBST_SED.dae+=		-e 's/^\(DCCM_ENABLE=\).*$$/\1on/'
+SUBST_SED.dae+=		-e 's/^\(DCCIFD_ENABLE=\).*$$/\1on/'
 SUBST_MESSAGE.dae=	Enabling all daemons in dcc_conf

 HAS_CONFIGURE=		yes
+
+USE_TOOLS+=		perl:run
+USE_TOOLS+=		xargs:run
+
+CONFIGURE_ENV+=		PERL=${TOOLS_PATH.perl:Q}
+CONFIGURE_ENV+=		DCC_XARGS=${TOOLS_PATH.xargs:Q}
+
+CONFIGURE_ARGS+=	--homedir=${DCC_HOME}
+CONFIGURE_ARGS+=	--bindir=${PREFIX}/bin
+CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/libexec
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+=	--with-cgi-bin=${DCC_EGDIR}/cgi-bin
+CONFIGURE_ARGS+=	--with-rundir=${DCC_RUN}
+CONFIGURE_ARGS+=	--with-uid=${DCC_USER}
+CONFIGURE_ARGS+=	--with-make-cmd=${MAKE_PROGRAM:Q}
+CONFIGURE_ARGS+=	--with-installroot=\$$\(DCC_DESTDIR\)
+CONFIGURE_ARGS+=	--disable-sys-inst
+CONFIGURE_ARGS+=	--disable-dccm
+
+USE_BSD_MAKEFILE=	yes
 MAKE_JOBS_SAFE=		no

-CONFIGURE_ENV+=		PERL=${PERL5:Q} \
-			DCC_XARGS=${XARGS:Q}
-
-CONFIGURE_ARGS+=	--homedir=${DCC_HOME} \
-			--bindir=${PREFIX}/bin \
-			--libexecdir=${PREFIX}/libexec \
-			--mandir=${PREFIX}/${PKGMANDIR} \
-			--with-make-cmd=${MAKE_PROGRAM:Q} \
-			--with-rundir=${DCC_RUN} \
-			--with-uid=${DCC_USER}
-
-.include "options.mk"
+# PKGSRC_DCC_EGDIR is for homedir/Makefile
+MAKE_ENV+=		PKGSRC_DCC_EGDIR=${DCC_EGDIR}
+MAKE_ENV+=		DCC_DESTDIR=${DCC_DESTDIR:Q}
+MAKE_ENV+=		NO_SUID=yes

 BUILD_DEFS+=		VARBASE

-INSTALLATION_DIRS+=	bin libexec ${PKGMANDIR}/man8 \
-			share/examples/dcc/cgi-bin
+INSTALLATION_DIRS+=	bin
+INSTALLATION_DIRS+=	libexec
+INSTALLATION_DIRS+=	${PKGMANDIR}/man8

 PKG_GROUPS=		${DCC_GROUP}
 PKG_USERS=		${DCC_USER}:${DCC_GROUP}

-OWN_DIRS_PERMS+=	${DCC_HOME} ${DCC_USER} ${DCC_GROUP} 0755 \
-			${DCC_HOME}/log ${DCC_USER} ${DCC_GROUP} 0710
+OWN_DIRS_PERMS+=	${DCC_HOME} ${DCC_USER} ${DCC_GROUP} 0755
+OWN_DIRS_PERMS+=	${DCC_HOME}/log ${DCC_USER} ${DCC_GROUP} 0710

 DCC_EGDIR=		${PREFIX}/share/examples/dcc
-DCC_PERMS_CONFIG=	${ROOT_USER} ${ROOT_GROUP} 0644
-CONF_FILES_PERMS+=	${DCC_EGDIR}/dcc_conf ${DCC_HOME}/dcc_conf ${DCC_PERMS_CONFIG} \
-			${DCC_EGDIR}/flod ${DCC_HOME}/flod ${DCC_PERMS_CONFIG} \
-			${DCC_EGDIR}/grey_flod ${DCC_HOME}/grey_flod ${DCC_PERMS_CONFIG} \
-			${DCC_EGDIR}/grey_whitelist ${DCC_HOME}/grey_whitelist ${DCC_PERMS_CONFIG} \
-			${DCC_EGDIR}/whiteclnt ${DCC_HOME}/whiteclnt ${DCC_PERMS_CONFIG} \
-			${DCC_EGDIR}/whitecommon ${DCC_HOME}/whitecommon ${DCC_PERMS_CONFIG} \
-			${DCC_EGDIR}/whitelist ${DCC_HOME}/whitelist ${DCC_PERMS_CONFIG}
+DCC_PERMS_CONFIG=	${DCC_USER} ${DCC_GROUP} 0600
+CONF_FILES_PERMS+=	${DCC_EGDIR}/dcc_conf ${DCC_HOME}/dcc_conf ${DCC_PERMS_CONFIG}
+CONF_FILES_PERMS+=	${DCC_EGDIR}/flod ${DCC_HOME}/flod ${DCC_PERMS_CONFIG}
+CONF_FILES_PERMS+=	${DCC_EGDIR}/grey_flod ${DCC_HOME}/grey_flod ${DCC_PERMS_CONFIG}
+CONF_FILES_PERMS+=	${DCC_EGDIR}/grey_whitelist ${DCC_HOME}/grey_whitelist ${DCC_PERMS_CONFIG}
+CONF_FILES_PERMS+=	${DCC_EGDIR}/whiteclnt ${DCC_HOME}/whiteclnt ${DCC_PERMS_CONFIG}
+CONF_FILES_PERMS+=	${DCC_EGDIR}/whitecommon ${DCC_HOME}/whitecommon ${DCC_PERMS_CONFIG}
+CONF_FILES_PERMS+=	${DCC_EGDIR}/whitelist ${DCC_HOME}/whitelist ${DCC_PERMS_CONFIG}
 RCD_SCRIPTS+=		dccd dccifd

-DCC_PERMS_SETUID=	${DCC_USER} ${ROOT_GROUP} 4555
-SPECIAL_PERMS+=		bin/cdcc ${DCC_PERMS_SETUID} \
-			bin/dccproc ${DCC_PERMS_SETUID} \
-			libexec/dccsight ${DCC_PERMS_SETUID}
-
-post-build:
-	${SED} -e "s!@DCC_HOME@!${DCC_HOME}!g" ${FILESDIR}/dcc-spamassassin.pre \
-		>${WRKDIR}/dcc-spamassassin.pre
-
-# options.mk/dccm adds a dependency on do-install.
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cdcc/cdcc ${DESTDIR}${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/ck2ip/ck2ip ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_PROGRAM} ${WRKSRC}/dbclean/dbclean ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_PROGRAM} ${WRKSRC}/dblist/dblist ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_PROGRAM} ${WRKSRC}/dccd/dccd ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_PROGRAM} ${WRKSRC}/dccifd/dccifd ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_PROGRAM} ${WRKSRC}/dccproc/dccproc ${DESTDIR}${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/dccsight/dccsight ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_PROGRAM} ${WRKSRC}/dns-helper/dns-helper ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_PROGRAM} ${WRKSRC}/misc/wlist ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_SCRIPT} ${WRKSRC}/cgi-bin/chgpasswd ${DESTDIR}${DCC_EGDIR}/cgi-bin/
-	${INSTALL_SCRIPT} ${WRKSRC}/cgi-bin/common ${DESTDIR}${DCC_EGDIR}/cgi-bin/
-	${INSTALL_SCRIPT} ${WRKSRC}/cgi-bin/edit-whiteclnt ${DESTDIR}${DCC_EGDIR}/cgi-bin/
-	${INSTALL_SCRIPT} ${WRKSRC}/cgi-bin/http2https ${DESTDIR}${DCC_EGDIR}/cgi-bin/
-	${INSTALL_SCRIPT} ${WRKSRC}/cgi-bin/list-log ${DESTDIR}${DCC_EGDIR}/cgi-bin/
-	${INSTALL_SCRIPT} ${WRKSRC}/cgi-bin/list-msg ${DESTDIR}${DCC_EGDIR}/cgi-bin/
-	${INSTALL_SCRIPT} ${WRKSRC}/cgi-bin/webuser-notify ${DESTDIR}${DCC_EGDIR}/cgi-bin/
-	${INSTALL_SCRIPT} ${WRKSRC}/misc/cron-dccd ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_SCRIPT} ${WRKSRC}/misc/dcc-nagios ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_SCRIPT} ${WRKSRC}/misc/dcc-stats-collect ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_SCRIPT} ${WRKSRC}/misc/dcc-stats-graph ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_SCRIPT} ${WRKSRC}/misc/dcc-stats-init ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_SCRIPT} ${WRKSRC}/misc/fetch-testmsg-whitelist ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_SCRIPT} ${WRKSRC}/misc/fetchblack ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_SCRIPT} ${WRKSRC}/misc/fetchids ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_SCRIPT} ${WRKSRC}/misc/hackmc ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_SCRIPT} ${WRKSRC}/misc/list-clients ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_SCRIPT} ${WRKSRC}/misc/logger ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_SCRIPT} ${WRKSRC}/misc/newwebuser ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_SCRIPT} ${WRKSRC}/misc/rcDCC ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_SCRIPT} ${WRKSRC}/misc/start-dccd ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_SCRIPT} ${WRKSRC}/misc/start-dccifd ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_SCRIPT} ${WRKSRC}/misc/start-dccm ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_SCRIPT} ${WRKSRC}/misc/start-grey ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_SCRIPT} ${WRKSRC}/misc/stats-get ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_SCRIPT} ${WRKSRC}/misc/stop-dccd ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_SCRIPT} ${WRKSRC}/misc/uninstalldcc ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_SCRIPT} ${WRKSRC}/misc/updatedcc ${DESTDIR}${PREFIX}/libexec/
-	${INSTALL_MAN} ${WRKSRC}/cdcc.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
-	${INSTALL_MAN} ${WRKSRC}/dbclean.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
-	${INSTALL_MAN} ${WRKSRC}/dblist.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
-	${INSTALL_MAN} ${WRKSRC}/dcc.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
-	${INSTALL_MAN} ${WRKSRC}/dccd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
-	${INSTALL_MAN} ${WRKSRC}/dccifd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
-	${INSTALL_MAN} ${WRKSRC}/dccm.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
-	${INSTALL_MAN} ${WRKSRC}/dccproc.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
-	${INSTALL_MAN} ${WRKSRC}/dccsight.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
-	${INSTALL_DATA} ${WRKSRC}/cgi-bin/README ${DESTDIR}${DCC_EGDIR}/cgi-bin/
-	${INSTALL_DATA} ${WRKSRC}/cgi-bin/footer ${DESTDIR}${DCC_EGDIR}/cgi-bin/
-	${INSTALL_DATA} ${WRKSRC}/cgi-bin/header ${DESTDIR}${DCC_EGDIR}/cgi-bin/
-	${INSTALL_DATA} ${WRKSRC}/homedir/dcc_conf ${DESTDIR}${DCC_EGDIR}/
-	${INSTALL_DATA} ${WRKSRC}/homedir/flod ${DESTDIR}${DCC_EGDIR}/
-	${INSTALL_DATA} ${WRKSRC}/homedir/grey_flod ${DESTDIR}${DCC_EGDIR}/
-	${INSTALL_DATA} ${WRKSRC}/homedir/grey_whitelist ${DESTDIR}${DCC_EGDIR}/
-	${INSTALL_DATA} ${WRKSRC}/homedir/ids ${DESTDIR}${DCC_EGDIR}/
-	${INSTALL_DATA} ${WRKSRC}/homedir/map.txt ${DESTDIR}${DCC_EGDIR}/
-	${INSTALL_DATA} ${WRKSRC}/homedir/whiteclnt ${DESTDIR}${DCC_EGDIR}/
-	${INSTALL_DATA} ${WRKSRC}/homedir/whitecommon ${DESTDIR}${DCC_EGDIR}/
-	${INSTALL_DATA} ${WRKSRC}/homedir/whitelist ${DESTDIR}${DCC_EGDIR}/
-	${INSTALL_DATA} ${WRKDIR}/dcc-spamassassin.pre ${DESTDIR}${DCC_EGDIR}/
+DCC_PERMS_SETUID=	${DCC_USER} ${REAL_ROOT_GROUP} 4555
+SPECIAL_PERMS+=		bin/cdcc ${DCC_PERMS_SETUID}
+SPECIAL_PERMS+=		bin/dccproc ${DCC_PERMS_SETUID}
+SPECIAL_PERMS+=		libexec/dccsight ${DCC_PERMS_SETUID}

 .include "../../mk/bsd.pkg.mk"
--- a/mail/dcc/PLIST
+++ b/mail/dcc/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2014/03/11 14:05:03 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/06/05 13:43:20 gdt Exp $
 bin/cdcc
+bin/dccif-test
 bin/dccproc
+libexec/check_ip_range
 libexec/ck2ip
 libexec/cron-dccd
 libexec/dbclean
@@ -9,14 +11,16 @@ libexec/dcc-nagios
 libexec/dcc-stats-collect
 libexec/dcc-stats-graph
 libexec/dcc-stats-init
+libexec/dcc-stats-update
 libexec/dccd
 libexec/dccifd
-${PLIST.dccm}libexec/dccm
 libexec/dccsight
 libexec/dns-helper
+libexec/dump-clients
 libexec/fetch-testmsg-whitelist
 libexec/fetchblack
 libexec/fetchids
+libexec/fix-map
 libexec/hackmc
 libexec/list-clients
 libexec/logger
@@ -43,19 +47,22 @@ man/man8/dccsight.8
 share/examples/dcc/cgi-bin/README
 share/examples/dcc/cgi-bin/chgpasswd
 share/examples/dcc/cgi-bin/common
+share/examples/dcc/cgi-bin/common.pm
 share/examples/dcc/cgi-bin/edit-whiteclnt
 share/examples/dcc/cgi-bin/footer
+share/examples/dcc/cgi-bin/footer-dist
 share/examples/dcc/cgi-bin/header
+share/examples/dcc/cgi-bin/header-dist
 share/examples/dcc/cgi-bin/http2https
 share/examples/dcc/cgi-bin/list-log
 share/examples/dcc/cgi-bin/list-msg
 share/examples/dcc/cgi-bin/webuser-notify
-share/examples/dcc/dcc-spamassassin.pre
 share/examples/dcc/dcc_conf
 share/examples/dcc/flod
 share/examples/dcc/grey_flod
 share/examples/dcc/grey_whitelist
 share/examples/dcc/ids
+share/examples/dcc/map
 share/examples/dcc/map.txt
 share/examples/dcc/whiteclnt
 share/examples/dcc/whitecommon
--- a/mail/dcc/distinfo
+++ b/mail/dcc/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.3 2013/08/27 16:40:11 shattered Exp $
+$NetBSD: distinfo,v 1.4 2015/06/05 13:43:20 gdt Exp $

-SHA1 (dcc-1.3.123.tar.Z) = 3127cdde1ce374fbc5ef08fa5103cffcf93b99ee
-RMD160 (dcc-1.3.123.tar.Z) = c7b0cedba3feffc4ad7c94249a56303c7f09bf2b
-Size (dcc-1.3.123.tar.Z) = 1663943 bytes
+SHA1 (dcc-1.3.158.tar.Z) = 016442e1cf87f50588787cd5632b345bb15e6335
+RMD160 (dcc-1.3.158.tar.Z) = 00676a5fbb52cd3971a764f1b4244296e90c2dba
+Size (dcc-1.3.158.tar.Z) = 1714175 bytes
+SHA1 (patch-Makefile.inc.in) = 9cd0fb433697d1864dde3314bed08f5a78bf3e7e
+SHA1 (patch-Makefile.inc2.in) = 16e3fdd5933048ea31f90a6e1b2dad2949deb2a3
+SHA1 (patch-configure) = 25b5aafe9dd652c5db633c91d8aee2d20f534599
+SHA1 (patch-homedir_Makefile.in) = f1097124734b848140cd7ea7827b67c7e3855680
--- a/mail/dcc/files/dcc-spamassassin.pre
+++ b/mail/dcc/files/dcc-spamassassin.pre
@@ -1,28 +0,0 @@
-#
-#	spamassassin configuration example
-#
-#
-# Copy this file into the main SpamAssassin configuration directory
-# and restart spamd in order to initialize DCC.pm properly. Use
-# dcc_dccifd_path instead of dcc_home if your dccifd-socket is not
-# in @DCC_HOME@ or has a different name (`dccifd' is default).
-#
-# Also make sure that dccifd is running or SpamAssassin won't be
-# able to find the socket and will fall back to dccproc. There is
-# nothing wrong with that -- dccifd is just considered to be more
-# efficient than dccproc.
-
-
-# load DCC.pm
-#
-loadplugin Mail::SpamAssassin::Plugin::DCC
-
-
-# DCC home directory
-#
-dcc_home @DCC_HOME@
-
-
-# path to dccifd socket
-#
-#dcc_dccifd_path @DCC_HOME@/dccifd
--- a/mail/dcc/files/dccd.sh
+++ b/mail/dcc/files/dccd.sh
@@ -1,42 +1,32 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dccd.sh,v 1.1.1.1 2010/10/27 12:26:37 gdt Exp $
+# $NetBSD: dccd.sh,v 1.2 2015/06/05 13:43:20 gdt Exp $
 #
 #
 # PROVIDE: dccd
 # REQUIRE: DAEMON
-# BEFORE:  mail spamd
+# BEFORE:  mail spamd dccifd
+# KEYWORD: shutdown

 $_rc_subr_loaded . /etc/rc.subr

-name="dccd"
-rcvar="${name}"
-start_precmd="dcc_precmd"
-command="@PREFIX@/libexec/start-${name}"
-procname="@PREFIX@/libexec/${name}"
-pidfile="@DCC_RUN@/${name}.pid"
-#
-#
-#	start-dcc{d,ifd,m} understands certain flags while
-#	it passes everything behind -a to dcc{d,ifd,m}
-#
-#
-dcc_precmd()
+name=dccd
+rcvar=$name
+start_precmd=dcc_precmd
+start_cmd="@DCC_RC@ \${rc_flags:+-x} -m $name start"
+stop_cmd="@DCC_RC@ \${rc_flags:+-x} -m $name stop"
+
+dcc_precmd ()
 {
-	if [ -n "${rc_flags}" ]; then
-		rc_flags="-a '${rc_flags}'"
-	fi
-
-	eval dcc_start_flags=\$${name}_start_flags
-	if [ -n "${dcc_start_flags}" ]; then
-		rc_flags="${dcc_start_flags} ${rc_flags}"
-	fi
-
-	if [ -n "${command_args}" ]; then
-		rc_flags="${command_args} ${rc_flags}"
-		unset command_args
+	if [ ! -s @DCC_HOME@/ids ]; then
+		@DCC_FIXMAP@ \
+			-i @DCC_HOME@/ids \
+			-I @DCC_EGDIR@/ids \
+			-m @DCC_HOME@/map \
+			-t @DCC_HOME@/map.txt \
+			-T @DCC_EGDIR@/map.txt
 	fi
 }

-load_rc_config "${name}"
+load_rc_config $name
 run_rc_command "${1}"
--- a/mail/dcc/files/dccifd.sh
+++ b/mail/dcc/files/dccifd.sh
@@ -1,42 +1,32 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dccifd.sh,v 1.1.1.1 2010/10/27 12:26:37 gdt Exp $
+# $NetBSD: dccifd.sh,v 1.2 2015/06/05 13:43:20 gdt Exp $
 #
 #
 # PROVIDE: dccifd
 # REQUIRE: DAEMON
 # BEFORE:  mail spamd
+# KEYWORD: shutdown

 $_rc_subr_loaded . /etc/rc.subr

-name="dccifd"
-rcvar="${name}"
-start_precmd="dcc_precmd"
-command="@PREFIX@/libexec/start-${name}"
-procname="@PREFIX@/libexec/${name}"
-pidfile="@DCC_RUN@/${name}.pid"
-#
-#
-#	start-dcc{d,ifd,m} understands certain flags while
-#	it passes everything behind -a to dcc{d,ifd,m}
-#
-#
-dcc_precmd()
+name=dccifd
+rcvar=$name
+start_precmd=dcc_precmd
+start_cmd="@DCC_RC@ \${rc_flags:+-x} -m $name start"
+stop_cmd="@DCC_RC@ \${rc_flags:+-x} -m $name stop"
+
+dcc_precmd ()
 {
-	if [ -n "${rc_flags}" ]; then
-		rc_flags="-a '${rc_flags}'"
-	fi
-
-	eval dcc_start_flags=\$${name}_start_flags
-	if [ -n "${dcc_start_flags}" ]; then
-		rc_flags="${dcc_start_flags} ${rc_flags}"
-	fi
-
-	if [ -n "${command_args}" ]; then
-		rc_flags="${command_args} ${rc_flags}"
-		unset command_args
+	if [ ! -s @DCC_HOME@/ids ]; then
+		@DCC_FIXMAP@ \
+			-i @DCC_HOME@/ids \
+			-I @DCC_EGDIR@/ids \
+			-m @DCC_HOME@/map \
+			-t @DCC_HOME@/map.txt \
+			-T @DCC_EGDIR@/map.txt
 	fi
 }

-load_rc_config "${name}"
+load_rc_config $name
 run_rc_command "${1}"
--- a/mail/dcc/files/dccm.sh
+++ b/mail/dcc/files/dccm.sh
@@ -1,42 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: dccm.sh,v 1.1.1.1 2010/10/27 12:26:37 gdt Exp $
-#
-#
-# PROVIDE: dccm
-# REQUIRE: DAEMON
-# BEFORE:  mail spamd
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name="dccm"
-rcvar="${name}"
-start_precmd="dcc_precmd"
-command="@PREFIX@/libexec/start-${name}"
-procname="@PREFIX@/libexec/${name}"
-pidfile="@DCC_RUN@/${name}.pid"
-#
-#
-#	start-dcc{d,ifd,m} understands certain flags while
-#	it passes everything behind -a to dcc{d,ifd,m}
-#
-#
-dcc_precmd()
-{
-	if [ -n "${rc_flags}" ]; then
-		rc_flags="-a '${rc_flags}'"
-	fi
-
-	eval dcc_start_flags=\$${name}_start_flags
-	if [ -n "${dcc_start_flags}" ]; then
-		rc_flags="${dcc_start_flags} ${rc_flags}"
-	fi
-
-	if [ -n "${command_args}" ]; then
-		rc_flags="${command_args} ${rc_flags}"
-		unset command_args
-	fi
-}
-
-load_rc_config "${name}"
-run_rc_command "${1}"
--- a/mail/dcc/options.mk
+++ b/mail/dcc/options.mk
@@ -1,24 +0,0 @@
-# $NetBSD: options.mk,v 1.1.1.1 2010/10/27 12:26:37 gdt Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.dcc
-PKG_SUPPORTED_OPTIONS=	dccm
-PKG_SUGGESTED_OPTIONS=
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+=		dccm
-#
-#
-#	Enable dccm, the DCC milter interface.
-#
-#
-.if empty(PKG_OPTIONS:Mdccm)
-CONFIGURE_ARGS+=	--disable-dccm
-.else
-RCD_SCRIPTS+=		dccm
-PLIST.dccm=		yes
-do-install: dccm-install
-dccm-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/dccm/dccm ${DESTDIR}${PREFIX}/libexec/
-.include "../../mail/libmilter/buildlink3.mk"
-.endif
--- a/mail/dcc/patches/patch-Makefile.inc.in
+++ b/mail/dcc/patches/patch-Makefile.inc.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-Makefile.inc.in,v 1.1 2015/06/05 13:43:20 gdt Exp $
+
+NO_SYS_INSTALL shouldn't prevent man pages from being installed.
+
+--- Makefile.inc.in.orig	2014-08-06 14:43:42.000000000 +0000
+++ Makefile.inc.in
+@@ -124,7 +124,6 @@ MANOWN	    =$(DCC_OWN)
+ MANMODE	    =444
+ 
+ @MAKE_DOT@ifdef NO_SYS_INSTALL
+-NOMAN	=no
+ SET_BINOWN=
+ SET_MANOWN=
+ SET_DCCOWN=
--- a/mail/dcc/patches/patch-Makefile.inc2.in
+++ b/mail/dcc/patches/patch-Makefile.inc2.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-Makefile.inc2.in,v 1.1 2015/06/05 13:43:20 gdt Exp $
+
+Prepending `depend' and `all' during the install stage will cause at
+least two ambiguous errors.  Remove the whole dependency because it
+doesn't seem to have much use anyway.
+
+--- Makefile.inc2.in.orig	2014-08-06 14:43:42.000000000 +0000
+++ Makefile.inc2.in
+@@ -47,7 +47,6 @@ INSTALL	=@DCCINSTALL@
+ BININSTALL=$(INSTALL) -c $(SET_BINOWN) -m $(BINMODE)
+ 
+ # create the DCC home directory before trying to install files
+-beforeinstall:$(BINDIR) $(MANDIR)8 depend all
+ $(BINDIR):
+ 	$(INSTALL) -d $(SET_BINOWN) -m 755 $(BINDIR)
+ 
--- a/mail/dcc/patches/patch-configure
+++ b/mail/dcc/patches/patch-configure
@@ -0,0 +1,23 @@
+$NetBSD: patch-configure,v 1.1 2015/06/05 13:43:20 gdt Exp $
+
+NetBSD uses mandoc since netbsd-6.
+
+--- configure.orig	2014-08-06 14:43:42.000000000 +0000
+++ configure
+@@ -1970,12 +1970,10 @@ case "$TARGET_SYS" in
+ 	USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
+ 	;;
+     NetBSD)
+-	# use text output to avoid running groff on every `man` command
+-	mancat=cat
+-	MANX='$(MAN0)'
+-	# force NetBSD to install the man pages
+-	USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes\
+-install:maninstall'
+	# default to /usr/local/man/man8 and use nroff files
+	mancat=man
+	MANX='$(MAN8)'
+	USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
+ 	;;
+     BSD/OS)
+ 	# default to /usr/local/man/cat8 and use cleartext files, possibly
--- a/mail/dcc/patches/patch-homedir_Makefile.in
+++ b/mail/dcc/patches/patch-homedir_Makefile.in
@@ -0,0 +1,38 @@
+$NetBSD: patch-homedir_Makefile.in,v 1.1 2015/06/05 13:43:20 gdt Exp $
+
+Install configuration files into PKGSRC_DCC_EGDIR.
+
+The path in HD is only used during installation and should therefore not
+end up in any of the installed files.
+
+Also, skip make-dcc_conf (there is nothing to merge) and fix-map (moved
+into rc-files as start_precmd check).
+
+--- homedir/Makefile.in.orig	2014-08-06 14:43:42.000000000 +0000
+++ homedir/Makefile.in
+@@ -39,7 +39,7 @@
+ DEPTH	=..
+ 
+ HINST	=$(INSTALL) -c $(SET_DCCOWN)
+-HD	=@installroot@@prefix@
+HD	=@installroot@$(PKGSRC_DCC_EGDIR)
+ MAP	=$(HD)/map@configsuffix@
+ MAPTXT	=$(HD)/map.txt@configsuffix@
+ IDS	=$(HD)/ids@configsuffix@
+@@ -60,14 +60,12 @@ DCC_BINDIR=@installroot@@libexecdir@
+ all:
+ 	@:
+ 
+-install:$(HD) $(HD)/log
+install:$(HD)
+ 	for NM in $(SSCRIPTS); do $(BININSTALL) $$NM $(DCC_BINDIR)/$$NM;done
+-	sh make-dcc_conf -F '@configsuffix@' -h $(HD)
+-	for NM in $(SIMPLE); do\
+	for NM in $(SIMPLE) $(GENFILES); do\
+ 	    if test -n '@configsuffix@' -o ! -f $(HD)/$$NM; then\
+ 		$(HINST) -m 644 $$NM $(HD)/$${NM}@configsuffix@; fi; done
+ 	if test -s $(PFILE); then $(HINST) -m 600 $(PFILE) $(HD)/$(PFILE); fi
+-	sh fix-map -n '@configsuffix@' -c $(CDCC) -h $(HD) -i $(IDS) -m $(MAP) -t $(MAPTXT)
+ 	for NM in $(SIMPLE) $(GENFILES); do\
+ 	    if test -n '@configsuffix@' -a ! -s $(HD)/$$NM; then\
+ 		cp -p $(HD)/$${NM}@configsuffix@ $(HD)/$${NM}; fi; done
--- a/mail/deforaos-mailer/Makefile
+++ b/mail/deforaos-mailer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2014/05/05 00:48:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.18 2015/04/25 14:23:28 tnn Exp $

 DISTNAME=	Mailer-0.1.6
 PKGNAME=	deforaos-mailer-0.1.6
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	http://www.defora.org/os/download/download/4029/

--- a/mail/demime/Makefile
+++ b/mail/demime/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2014/05/29 23:36:45 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2015/06/12 10:50:18 wiz Exp $

 DISTNAME=	demime-1.1d
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	mail textproc
 MASTER_SITES=	${MASTER_SITE_FREEBSD}
 DISTFILES=	${DISTNAME:S/-/./} \
--- a/mail/distribute/Makefile
+++ b/mail/distribute/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2014/05/29 23:36:45 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2015/06/12 10:50:18 wiz Exp $

 DISTNAME=	distribute-2.1-pl19
 PKGNAME=	distribute-2.1.26
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.foretune.co.jp/pub/network/mail/distribute/
 # AWOL
--- a/mail/dnsbl-milter/Makefile
+++ b/mail/dnsbl-milter/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2014/11/22 03:07:12 mef Exp $
+# $NetBSD: Makefile,v 1.4 2015/04/10 01:48:37 mef Exp $
 #

-VERSION=	6.44
+VERSION=	6.45
 PKGNAME=	dnsbl-milter-${VERSION}
 DISTNAME=	dnsbl-${VERSION}
 CATEGORIES=	mail
--- a/mail/dnsbl-milter/distinfo
+++ b/mail/dnsbl-milter/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2014/11/22 03:07:12 mef Exp $
+$NetBSD: distinfo,v 1.3 2015/04/10 01:48:37 mef Exp $

-SHA1 (dnsbl-6.44.tar.gz) = 4aee4bf10da893d4257e353096d4a5e3acaedf91
-RMD160 (dnsbl-6.44.tar.gz) = 97e609ab3f496156e5c425773957863256dcfb3a
-Size (dnsbl-6.44.tar.gz) = 611334 bytes
+SHA1 (dnsbl-6.45.tar.gz) = 15d79ce492f195439a29f14492941d5fec5264c9
+RMD160 (dnsbl-6.45.tar.gz) = b5b9e553373e0912f59b46f7cb43685a6d9f7e0f
+Size (dnsbl-6.45.tar.gz) = 617954 bytes
 SHA1 (patch-src_context.cpp) = 9cfd237be9ac059acd741e4430f43c4152001fd8
 SHA1 (patch-src_dnsbl.cpp) = c5b7cfdd4656472f170c32c452e71741e9715323
 SHA1 (patch-src_tokenizer.cpp) = 3f628ffabcddd7c9a90118c8165b90f468d4a1b7
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.176 2015/01/28 17:44:28 tron Exp $
+# $NetBSD: Makefile,v 1.177 2015/04/06 08:17:31 adam Exp $

 DOVECOT_VERSION=	1.2
 DOVECOT_SUBVERSION=	.17
 SIEVE_VERSION=		0.1.19
 MANAGESIEVE_VERSION=	0.11.13
 DISTNAME=		dovecot-${DOVECOT_VERSION}${DOVECOT_SUBVERSION}
-PKGREVISION=		15
+PKGREVISION=		16
 CATEGORIES=		mail
 MASTER_SITES=		http://www.dovecot.org/releases/${DOVECOT_VERSION}/
 DOVECOT_SIEVE_SITES=	http://pigeonhole.dovecot.org/releases/${DOVECOT_VERSION}/
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.120 2015/01/26 23:26:48 wiz Exp $
+$NetBSD: distinfo,v 1.121 2015/04/08 05:35:39 wiz Exp $

 SHA1 (dovecot-1.2-managesieve-0.11.13.tar.gz) = cd5d2149250072aa8079f9db967cfeffc1b57c53
 RMD160 (dovecot-1.2-managesieve-0.11.13.tar.gz) = 9deed0637f1b5942a1b4996a343fed1b23301023
@@ -13,7 +13,7 @@ SHA1 (dovecot-1.2.17.tar.gz) = 457b16791a15e739c6bc8b02bc9c78f9ad794e39
 RMD160 (dovecot-1.2.17.tar.gz) = 59f619dba2aadef3cccd6ceb045a2e75a11700a2
 Size (dovecot-1.2.17.tar.gz) = 2983431 bytes
 SHA1 (patch-aa) = 447e46268a93201b3ef22491ff0968752978d020
-SHA1 (patch-ab) = e5b5d72f0553da42d14ee05a9ed0faff8a6c7075
+SHA1 (patch-ab) = f2126b875b13505f6123ff300b4d47de5e7d9d13
 SHA1 (patch-ac) = 5912392abb79df8e78de6f710c2a83264ee58fe7
 SHA1 (patch-ag) = 7e733d41c0607df64c2c3195b78683689f2143d6
 SHA1 (patch-ah) = a7d02fa3ab1d1a760e05510ebd3cfb07a6652863
--- a/mail/dovecot/patches/patch-ab
+++ b/mail/dovecot/patches/patch-ab
@@ -1,4 +1,13 @@
-$NetBSD: patch-ab,v 1.31 2015/01/26 23:26:48 wiz Exp $
+$NetBSD: patch-ab,v 1.32 2015/04/08 05:35:39 wiz Exp $
+
+Please note that this patch cannot be regenerated automatically. What would be
+the first hunk has manually been split into two and the context reduced for the
+second half because the managesieve patch changes the line
+        # Protocols we want to be serving: imap imaps pop3 pop3s
+into
+        # Protocols we want to be serving: imap imaps pop3 pop3s managesieve
+and the patch needs to apply to both versions. So this line must be kept out of
+the context.

 --- dovecot-example.conf.orig	2009-06-01 05:21:42.000000000 +0200
 +++ dovecot-example.conf
--- a/mail/dovecot2-pigeonhole/Makefile
+++ b/mail/dovecot2-pigeonhole/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2015/03/20 01:25:31 taca Exp $
+# $NetBSD: Makefile,v 1.24 2015/05/17 00:13:51 taca Exp $

-DISTNAME=	dovecot-2.2-pigeonhole-0.4.7
+DISTNAME=	dovecot-2.2-pigeonhole-0.4.8
 PKGNAME=	${DISTNAME:S/-2.2-/-/}
 CATEGORIES=	mail
 MASTER_SITES=	http://pigeonhole.dovecot.org/releases/2.2/
--- a/mail/dovecot2-pigeonhole/PLIST
+++ b/mail/dovecot2-pigeonhole/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2015/03/20 01:25:31 taca Exp $
+@comment $NetBSD: PLIST,v 1.9 2015/05/17 00:13:51 taca Exp $
 bin/sieve-dump
 bin/sieve-filter
 bin/sieve-test
@@ -71,7 +71,15 @@ man/man1/sieve-test.1
 man/man1/sievec.1
 man/man1/sieved.1
 man/man7/pigeonhole.7
-share/doc/dovecot/sieve/script-location-dict.txt
+share/doc/dovecot/sieve/extensions/duplicate.txt
+share/doc/dovecot/sieve/extensions/editheader.txt
+share/doc/dovecot/sieve/extensions/include.txt
+share/doc/dovecot/sieve/extensions/spamtest-virustest.txt
+share/doc/dovecot/sieve/extensions/vacation.txt
+share/doc/dovecot/sieve/locations/dict.txt
+share/doc/dovecot/sieve/locations/file.txt
+share/doc/dovecot/sieve/locations/ldap.txt
+share/doc/dovecot/sieve/plugins/sieve_extprograms.txt
 share/examples/dovecot/conf.d/20-managesieve.conf
 share/examples/dovecot/conf.d/90-sieve-extprograms.conf
 share/examples/dovecot/conf.d/90-sieve.conf
--- a/mail/dovecot2-pigeonhole/distinfo
+++ b/mail/dovecot2-pigeonhole/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.15 2015/03/20 01:25:31 taca Exp $
+$NetBSD: distinfo,v 1.16 2015/05/17 00:13:51 taca Exp $

-SHA1 (dovecot-2.2-pigeonhole-0.4.7.tar.gz) = 9f646a5f4b7d46f2280dfb0e2386f7076e1455bb
-RMD160 (dovecot-2.2-pigeonhole-0.4.7.tar.gz) = 6351c85a2b3d97ebad44c9c213716cdba88e7151
-Size (dovecot-2.2-pigeonhole-0.4.7.tar.gz) = 1271959 bytes
+SHA1 (dovecot-2.2-pigeonhole-0.4.8.tar.gz) = 23da3c1d24f97d87d19be4ad5a9136a9b54771e7
+RMD160 (dovecot-2.2-pigeonhole-0.4.8.tar.gz) = 8d7ce3b798979a709fd7b484fa32d1390105909d
+Size (dovecot-2.2-pigeonhole-0.4.8.tar.gz) = 1567528 bytes
 SHA1 (patch-aa) = 264399e166b5fece22bacd47b043c59f8f0f0a29
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.72 2015/03/14 10:52:09 adam Exp $
+# $NetBSD: Makefile,v 1.76 2015/05/17 00:12:45 taca Exp $
 #
 # when updating to a new release, update ABI depends in
 # the buildlink3.mk file as well, since the plugins' version
 # must match (see PR 49563).

-DISTNAME=	dovecot-2.2.16
+DISTNAME=	dovecot-2.2.18
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dovecot.org/releases/${PKGVERSION_NOREV:R}/

@@ -20,6 +20,11 @@ CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-ssldir=${SSLDIR}

+OPSYSVARS+=	CONFIGURE_ENV
+
+# Explicitly disable inotify on illumos, it is provided for Linux compat only.
+CONFIGURE_ENV.SunOS+=	ac_cv_func_inotify_init=no
+
 .include "../../mk/bsd.prefs.mk"

 RCD_SCRIPTS=		dovecot
--- a/mail/dovecot2/PLIST
+++ b/mail/dovecot2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2015/03/14 10:52:09 adam Exp $
+@comment $NetBSD: PLIST,v 1.40 2015/05/17 00:12:45 taca Exp $
 bin/doveadm
 bin/doveconf
 bin/dsync
@@ -107,6 +107,7 @@ include/dovecot/fts-api.h
 include/dovecot/fts-expunge-log.h
 include/dovecot/fts-indexer.h
 include/dovecot/fts-parser.h
+include/dovecot/fts-user.h
 include/dovecot/guid.h
 include/dovecot/hash-decl.h
 include/dovecot/hash-format.h
@@ -147,6 +148,7 @@ include/dovecot/imap-envelope.h
 include/dovecot/imap-expunge.h
 include/dovecot/imap-fetch.h
 include/dovecot/imap-id.h
+include/dovecot/imap-keepalive.h
 include/dovecot/imap-list.h
 include/dovecot/imap-match.h
 include/dovecot/imap-metadata.h
@@ -217,6 +219,7 @@ include/dovecot/istream-chain.h
 include/dovecot/istream-concat.h
 include/dovecot/istream-crlf.h
 include/dovecot/istream-dot.h
+include/dovecot/istream-file-private.h
 include/dovecot/istream-fs-file.h
 include/dovecot/istream-hash.h
 include/dovecot/istream-header-filter.h
@@ -232,9 +235,11 @@ include/dovecot/istream-seekable.h
 include/dovecot/istream-sized.h
 include/dovecot/istream-tee.h
 include/dovecot/istream-timeout.h
+include/dovecot/istream-unix.h
 include/dovecot/istream-zlib.h
 include/dovecot/istream.h
 include/dovecot/json-parser.h
+include/dovecot/json-tree.h
 include/dovecot/lda-settings.h
 include/dovecot/lib-signals.h
 include/dovecot/lib.h
@@ -279,6 +284,8 @@ include/dovecot/mail-transaction-log.h
 include/dovecot/mail-types.h
 include/dovecot/mail-user-hash.h
 include/dovecot/mail-user.h
+include/dovecot/mailbox-attribute-private.h
+include/dovecot/mailbox-attribute.h
 include/dovecot/mailbox-guid-cache.h
 include/dovecot/mailbox-list-delete.h
 include/dovecot/mailbox-list-fs.h
@@ -386,6 +393,7 @@ include/dovecot/primes.h
 include/dovecot/printf-format-fix.h
 include/dovecot/priorityq.h
 include/dovecot/process-title.h
+include/dovecot/qp-decoder.h
 include/dovecot/quota-fs.h
 include/dovecot/quota-plugin.h
 include/dovecot/quota-private.h
@@ -470,6 +478,7 @@ lib/dovecot/lib20_fts_plugin.la
 lib/dovecot/lib20_listescape_plugin.la
 lib/dovecot/lib20_mail_log_plugin.la
 lib/dovecot/lib20_mailbox_alias_plugin.la
+lib/dovecot/lib20_quota_clone_plugin.la
 lib/dovecot/lib20_replication_plugin.la
 lib/dovecot/lib20_virtual_plugin.la
 lib/dovecot/lib20_zlib_plugin.la
@@ -484,6 +493,7 @@ lib/dovecot/libdovecot-login.la
 lib/dovecot/libdovecot-sql.la
 lib/dovecot/libdovecot-storage.la
 lib/dovecot/libdovecot.la
+lib/dovecot/libfs_compress.la
 ${PLIST.ssl}lib/dovecot/libssl_iostream_openssl.la
 lib/dovecot/stats/libstats_mail.la
 libexec/dovecot/aggregator
@@ -724,8 +734,13 @@ share/doc/dovecot/wiki/Pigeonhole.ManageSieve.Install.txt
 share/doc/dovecot/wiki/Pigeonhole.ManageSieve.Troubleshooting.txt
 share/doc/dovecot/wiki/Pigeonhole.ManageSieve.txt
 share/doc/dovecot/wiki/Pigeonhole.Sieve.Configuration.Dict.txt
+share/doc/dovecot/wiki/Pigeonhole.Sieve.Configuration.File.txt
+share/doc/dovecot/wiki/Pigeonhole.Sieve.Configuration.LDAP.txt
 share/doc/dovecot/wiki/Pigeonhole.Sieve.Configuration.txt
 share/doc/dovecot/wiki/Pigeonhole.Sieve.Examples.txt
+share/doc/dovecot/wiki/Pigeonhole.Sieve.Extensions.Duplicate.txt
+share/doc/dovecot/wiki/Pigeonhole.Sieve.Extensions.Editheader.txt
+share/doc/dovecot/wiki/Pigeonhole.Sieve.Extensions.Include.txt
 share/doc/dovecot/wiki/Pigeonhole.Sieve.Extensions.SpamtestVirustest.txt
 share/doc/dovecot/wiki/Pigeonhole.Sieve.Extensions.Vacation.txt
 share/doc/dovecot/wiki/Pigeonhole.Sieve.Extensions.txt
@@ -751,6 +766,7 @@ share/doc/dovecot/wiki/Plugins.MailFilter.txt
 share/doc/dovecot/wiki/Plugins.MailLog.txt
 share/doc/dovecot/wiki/Plugins.MailboxAlias.txt
 share/doc/dovecot/wiki/Plugins.Notify.txt
+share/doc/dovecot/wiki/Plugins.QuotaClone.txt
 share/doc/dovecot/wiki/Plugins.Snarf.txt
 share/doc/dovecot/wiki/Plugins.Stats.txt
 share/doc/dovecot/wiki/Plugins.Trash.txt
@@ -788,6 +804,7 @@ share/doc/dovecot/wiki/SystemUsers.txt
 share/doc/dovecot/wiki/TestInstallation.txt
 share/doc/dovecot/wiki/TestPop3Installation.txt
 share/doc/dovecot/wiki/TimeMovedBackwards.txt
+share/doc/dovecot/wiki/Timeouts.txt
 share/doc/dovecot/wiki/Upgrading.1.0.txt
 share/doc/dovecot/wiki/Upgrading.1.1.txt
 share/doc/dovecot/wiki/Upgrading.1.2.txt
@@ -808,6 +825,9 @@ share/doc/dovecot/wiki/WhyDoesItNotWork.txt
 share/doc/dovecot/wiki/maildrop.txt
 share/doc/dovecot/wiki/mutt.txt
 share/doc/dovecot/wiki/uw2dovecot.sh.txt
+share/dovecot/stopwords/stopwords_en.txt
+share/dovecot/stopwords/stopwords_fi.txt
+share/dovecot/stopwords/stopwords_fr.txt
 share/examples/dovecot/conf.d/10-auth.conf
 share/examples/dovecot/conf.d/10-director.conf
 share/examples/dovecot/conf.d/10-logging.conf
--- a/mail/dovecot2/buildlink3.mk
+++ b/mail/dovecot2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2015/03/14 10:52:09 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2015/05/17 00:12:45 taca Exp $

 BUILDLINK_TREE+=	dovecot

@@ -7,7 +7,7 @@ DOVECOT_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.dovecot+=		dovecot>=2.2.0
 # must match current package version for plugins to load
-BUILDLINK_ABI_DEPENDS.dovecot+=		dovecot>=2.2.16<2.2.17
+BUILDLINK_ABI_DEPENDS.dovecot+=		dovecot>=2.2.18<2.2.19
 BUILDLINK_PKGSRCDIR.dovecot?=		../../mail/dovecot2

 pkgbase:=	dovecot
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.53 2015/03/15 09:19:23 tron Exp $
+$NetBSD: distinfo,v 1.55 2015/05/17 00:12:45 taca Exp $

-SHA1 (dovecot-2.2.16.tar.gz) = 7b267ee939b790ee42809efebc96d6ae78a49432
-RMD160 (dovecot-2.2.16.tar.gz) = 79768b2077137d255a3cfbc492de6d979e594e31
-Size (dovecot-2.2.16.tar.gz) = 4830169 bytes
+SHA1 (dovecot-2.2.18.tar.gz) = 8309b5ef8d33d464eb7a6e1d3cba0b4e87c55eff
+RMD160 (dovecot-2.2.18.tar.gz) = 847ca54f76210d0f06b1471bee62d6fcdc7b02c7
+Size (dovecot-2.2.18.tar.gz) = 5100040 bytes
 SHA1 (patch-aa) = ea185011f0c1ee3aa1ff528e61f6f356fe385666
 SHA1 (patch-ab) = d637a64feec8e4eafacda149cf0193aa1b70a054
 SHA1 (patch-ae) = 51d8cb998cc2ded8bfc767710e465b752c50e656
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2014/10/07 16:47:29 adam Exp $
+# $NetBSD: Makefile,v 1.82 2015/06/12 10:50:18 wiz Exp $

 DISTNAME=	dspam-3.10.2
-PKGREVISION=	9
+PKGREVISION=	11
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dspam/}

--- a/mail/elmo/Makefile
+++ b/mail/elmo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2014/05/29 23:36:45 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2015/06/12 10:50:18 wiz Exp $
 #

 DISTNAME=		elmo-1.3.2
-PKGREVISION=		11
+PKGREVISION=		12
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=elmo/}

--- a/mail/etpan/Makefile
+++ b/mail/etpan/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2014/05/29 23:36:45 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2015/06/12 10:50:18 wiz Exp $

 DISTNAME=	etpan-ng-0.7.1
 PKGNAME=	${DISTNAME:S/-ng//}
-PKGREVISION=	18
+PKGREVISION=	20
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libetpan/}

--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.148 2014/10/07 16:47:12 adam Exp $
+# $NetBSD: Makefile,v 1.152 2015/06/08 23:29:43 joerg Exp $

 DISTNAME=	evolution-data-server-2.32.3
-PKGREVISION=	33
+PKGREVISION=	35
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evolution-data-server/2.32/}
 EXTRACT_SUFX=	.tar.bz2
@@ -73,9 +73,10 @@ BUILDLINK_TRANSFORM+=	rm:-ldl
 .include "../../devel/libgweather/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
 .include "../../lang/python/application.mk"
-.include "../../net/libsoup24/buildlink3.mk"
+.include "../../net/libsoup/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../net/libgdata/buildlink3.mk"
+.include "../../security/libgnome-keyring/buildlink3.mk"
 .include "../../textproc/gtk-doc/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libical+=	libical>=0.43
--- a/mail/evolution-data-server/buildlink3.mk
+++ b/mail/evolution-data-server/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.53 2014/10/07 16:47:12 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.56 2015/06/09 14:18:47 joerg Exp $

 BUILDLINK_TREE+=	evolution-data-server

@@ -6,17 +6,18 @@ BUILDLINK_TREE+=	evolution-data-server
 EVOLUTION_DATA_SERVER_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.evolution-data-server+=	evolution-data-server>=1.8.0
-BUILDLINK_ABI_DEPENDS.evolution-data-server+=	evolution-data-server>=2.32.3nb33
+BUILDLINK_ABI_DEPENDS.evolution-data-server+=	evolution-data-server>=2.32.3nb34
 BUILDLINK_PKGSRCDIR.evolution-data-server?=	../../mail/evolution-data-server

 BDB_ACCEPTED?=		db4 db5
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
-.include "../../net/libsoup24/buildlink3.mk"
+.include "../../net/libsoup/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../net/libgdata/buildlink3.mk"
 .include "../../time/libical/buildlink3.mk"
+.include "../../security/libgnome-keyring/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bdb.buildlink3.mk"
 .endif # EVOLUTION_DATA_SERVER_BUILDLINK3_MK
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.85 2014/10/07 16:47:29 adam Exp $
+# $NetBSD: Makefile,v 1.88 2015/06/07 14:05:58 youri Exp $
 #

 DISTNAME=	evolution-exchange-2.32.2
 EE_VER=		2.32
-PKGREVISION=	32
+PKGREVISION=	34
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evolution-exchange/2.32/}
 EXTRACT_SUFX=	.tar.bz2
@@ -27,7 +27,7 @@ GCONF_SCHEMAS=		apps_exchange_addressbook-${EE_VER}.schemas
 .include "../../mail/evolution-data-server/buildlink3.mk"
 BUILDLINK_API_DEPENDS.evolution+= evolution>=2.32.2
 .include "../../mail/evolution/buildlink3.mk"
-.include "../../net/libsoup24/buildlink3.mk"
+.include "../../net/libsoup/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/krb5.buildlink3.mk"
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.210 2014/10/07 16:47:12 adam Exp $
+# $NetBSD: Makefile,v 1.213 2015/06/07 14:05:58 youri Exp $

 DISTNAME=		evolution-2.32.3
-PKGREVISION=		33
+PKGREVISION=		35
 CATEGORIES=		mail time gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evolution/2.32/}
 EXTRACT_SUFX=		.tar.bz2
@@ -77,7 +77,7 @@ BUILDLINK_API_DEPENDS.gnome-icon-theme+=	gnome-icon-theme>=2.30.2.1
 BUILDLINK_API_DEPENDS.evolution-data-server+=	evolution-data-server>=2.24.3
 .include "../../mail/evolution-data-server/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
-.include "../../net/libsoup24/buildlink3.mk"
+.include "../../net/libsoup/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
--- a/mail/evolution/buildlink3.mk
+++ b/mail/evolution/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.64 2014/10/07 16:47:12 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.66 2015/04/25 14:23:28 tnn Exp $

 BUILDLINK_TREE+=	evolution

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	evolution
 EVOLUTION_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.evolution+=	evolution>=2.8.0
-BUILDLINK_ABI_DEPENDS.evolution+=	evolution>=2.32.3nb33
+BUILDLINK_ABI_DEPENDS.evolution+=	evolution>=2.32.3nb35
 BUILDLINK_PKGSRCDIR.evolution?=	../../mail/evolution

 .include "../../devel/nspr/buildlink3.mk"
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.138 2015/02/14 07:33:19 adam Exp $
+# $NetBSD: Makefile,v 1.140 2015/06/12 10:50:18 wiz Exp $

 DISTNAME=	exim-4.85
+PKGREVISION=	2
 CATEGORIES=	mail net
 MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/ \
 		http://dl.ambiweb.de/mirrors/ftp.exim.org/exim/exim4/
--- a/mail/exim3/Makefile
+++ b/mail/exim3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2014/05/29 23:36:45 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2015/06/12 10:50:19 wiz Exp $

 DISTNAME=	exim-3.36
-PKGREVISION=	14
+PKGREVISION=	15
 CATEGORIES=	mail net
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim3/ \
 		http://public.planetmirror.com.au/pub/exim/exim3/
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2015/03/12 17:04:52 tnn Exp $
+# $NetBSD: Makefile,v 1.62 2015/06/12 10:50:19 wiz Exp $

 DISTNAME=	faces-1.6.1
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cs.indiana.edu/pub/faces/faces/faces-1.6.1/
 EXTRACT_SUFX=	.tar.Z
--- a/mail/fetchyahoo/Makefile
+++ b/mail/fetchyahoo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2014/05/29 23:36:45 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2015/06/12 10:50:19 wiz Exp $
 #

 DISTNAME=		fetchyahoo-2.11.0
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		mail
 MASTER_SITES=		http://fetchyahoo.sourceforge.net/
 #MASTER_SITES=	        ${MASTER_SITE_SOURCEFORGE:=fetchyahoo/}
--- a/mail/fix-mime-charset/Makefile
+++ b/mail/fix-mime-charset/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2014/05/29 23:36:45 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2015/06/12 10:50:19 wiz Exp $
 #

 DISTNAME=		fix-mime-charset-0.5.3
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		mail converters
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=fix-mime-chr/}

--- a/mail/fml/Makefile
+++ b/mail/fml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2014/05/29 23:36:45 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2015/06/22 16:16:50 jperkin Exp $
 #

 DISTNAME=	fml-7.98.18-${FML_STAMP}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.fml.org/pub/fml8/

@@ -61,6 +61,11 @@ PRINT_PLIST_AWK+=	/${FML_STAMP}/ \
 CHECK_INTERPRETER_SKIP+= lib/fml/${FML_STAMP}/* \
 			libexec/fml/${FML_STAMP}/loader.in

+SUBST_CLASSES+=		fixpaths
+SUBST_STAGE.fixpaths=	post-build
+SUBST_FILES.fixpaths=	fml/etc/install.cf
+SUBST_SED.fixpaths=	-e 's,${WRAPPER_BINDIR}/cc,${CCPATH},g'
+
 pre-configure:
 	${ECHO} ${FML_STAMP} > ${WRKSRC}/.version

--- a/mail/fml4/Makefile
+++ b/mail/fml4/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2014/05/29 23:36:45 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2015/06/24 19:49:56 joerg Exp $
 #

 DISTNAME=	fml-4.0-stable-20040215
 PKGNAME=	fml4-4.0.3.20040215
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.fml.org/pub/fml/stable/

@@ -50,12 +50,18 @@ MESSAGE_SUBST+=		FML_DIR=${FML_DIR}

 INSTALLATION_DIRS+=	${FML_DIR}/examples

+do-configure:
+	${LN} -fs ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/sbin
+
 do-install:
 	cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ${PERL5} makefml install
 	${MV} ${DESTDIR}${PREFIX}/${FML_DIR}/.fml/system \
 		${DESTDIR}${PREFIX}/${FML_DIR}/examples
 	${FIND} ${DESTDIR}${PREFIX}/${FML_DIR} -xdev -type f \
 		\( -name '*.bak' -o -name '*.orig' \) -exec ${RM} -- {} \;
+	${INSTALL_SCRIPT} ${PKGSRCDIR}/mk/gnu-config/config.guess \
+	    ${DESTDIR}${PREFIX}/${FML_DIR}/sbin/config.guess
+

 .include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/mail/fml4/distinfo
+++ b/mail/fml4/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.3 2013/01/29 15:48:55 taca Exp $
+$NetBSD: distinfo,v 1.5 2015/06/25 07:36:56 joerg Exp $

 SHA1 (fml-4.0-stable-20040215.tar.gz) = b7f958deacc50a0173928b7c43df52b5869d9491
 RMD160 (fml-4.0-stable-20040215.tar.gz) = 40eb43d2631a5e6d6769b8cfdf35e4a980ff0391
 Size (fml-4.0-stable-20040215.tar.gz) = 2906052 bytes
 SHA1 (patch-aa) = 91c0544e2969b3e4537a485d1f7a92ab5bf72bae
 SHA1 (patch-ab) = d8f8ef2085d9ad30331924c89958aaeddb89b457
-SHA1 (patch-ac) = da279a9ac2b3c0f013da43b8993b84026362efd0
+SHA1 (patch-ac) = 75f5a3da8a17d29a81d7912e7ba0721277ded0fd
 SHA1 (patch-ad) = 17e5d1d97e5a085b8b5da67e00730ce92b959fbf
 SHA1 (patch-ae) = 467a8bacfb0a6d41ceb1d8f52fc4bfc0ae2fc565
 SHA1 (patch-af) = 9e7fa7c70b4f3353a5c33d0ded2eeae86d9a5c65
-SHA1 (patch-ag) = 5a7a8a3d32e1a290e29cefa67aec584c21206d0c
-SHA1 (patch-sbin_config.guess) = 66087f9512181bd76dcbca34a1d8532bdd6ae07c
+SHA1 (patch-ag) = 7b4c0be6de3b7fba18280779ede5c3b217598b32
 SHA1 (patch-src_libkernsubr.pl) = c9d4e57b12fddb3045f47b27926c67cfe32c0d44
--- a/mail/fml4/patches/patch-ac
+++ b/mail/fml4/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2010/12/23 16:55:02 taca Exp $
+$NetBSD: patch-ac,v 1.2 2015/06/24 19:49:56 joerg Exp $

 - use HOSTNAME as hostname when install.
 - Stop perl deprecated warnings.
@@ -454,6 +454,15 @@ $NetBSD: patch-ac,v 1.1.1.1 2010/12/23 16:55:02 taca Exp $
 	print STDERR $f, " " unless $SilentMode;
 	&Copy($template, $outfile);
 	chmod 0755, $outfile;
+@@ -6355,7 +6368,7 @@ sub main::Dumpvar 
+ 		$buf .= "\$$key = '$entry';\n";
+ 	    }
+ 
+-	    if (defined @entry) {
+	    if (@entry) {
+ 		$buf .= "\@$key = (\n";
+ 		foreach $num ($[ .. $#entry) {
+ 		    $buf .= "\t'$entry[$num]',\n";
@@ -6364,12 +6377,12 @@ sub main::Dumpvar 
 	    }
 
--- a/mail/fml4/patches/patch-ag
+++ b/mail/fml4/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1.1.1 2010/12/23 16:55:02 taca Exp $
+$NetBSD: patch-ag,v 1.2 2015/06/25 07:36:56 joerg Exp $

 Stop perl deprecated warnings.

@@ -17,6 +17,15 @@ Stop perl deprecated warnings.
 		print STDERR "GO \%\t$key\n";
 	    }
 	    elsif (defined &entry) {
+@@ -703,7 +703,7 @@ sub main'reverse
+ 	    next;
+ 	}
+ 
+-	if (defined @entry) {
+	if (@entry) {
+ 	    undef $num;
+ 	    $OUT'LOCAL .=  "\@$key = (";
+ 	    foreach (@entry) {
@@ -718,7 +718,7 @@ sub main'reverse
 	# Is there an associative array that isn't the one
 	# we're currently iterating through?
--- a/mail/fml4/patches/patch-sbin_config.guess
+++ b/mail/fml4/patches/patch-sbin_config.guess
@@ -1,16 +0,0 @@
-$NetBSD: patch-sbin_config.guess,v 1.2 2013/01/29 15:48:55 taca Exp $
-
-Add DragonFly support.
-
--- sbin/config.guess.orig	2012-05-21 07:04:19.000000000 +0000
-+++ sbin/config.guess
-@@ -759,6 +759,9 @@ EOF
- 	rm -f $dummy.c && rmdir $tmpdir
- 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
- 	exit 0 ;;
-+    *:DragonFly:*:*)
-+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
-+	exit 0 ;;    
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
- 	exit 0 ;;
--- a/Show More
+++ b/Show More