Import of pkgsrc-2014Q1

2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
--- a/chat/Makefile
+++ b/chat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.168 2012/12/29 20:15:54 dholland Exp $
+# $NetBSD: Makefile,v 1.171 2014/01/10 09:50:55 wiz Exp $
 #

 COMMENT=	Communication programs
@@ -56,6 +56,7 @@ SUBDIR+=	irssi-xmpp
 SUBDIR+=	jabberd
 SUBDIR+=	jabberd2
 SUBDIR+=	kadu
+SUBDIR+=	kgb-bot
 SUBDIR+=	kmess
 SUBDIR+=	konversation
 SUBDIR+=	konversation-kde3
@@ -70,6 +71,7 @@ SUBDIR+=	licq-core
 SUBDIR+=	licq-gui-console
 SUBDIR+=	licq-gui-qt
 SUBDIR+=	loudmouth
+SUBDIR+=	mcabber
 SUBDIR+=	meanwhile
 SUBDIR+=	msn-pecan
 SUBDIR+=	msnre
@@ -85,6 +87,7 @@ SUBDIR+=	p5-Net-ICQ2000
 SUBDIR+=	p5-Net-Jabber
 SUBDIR+=	p5-POE-Component-IRC
 SUBDIR+=	p5-POE-Filter-IRCD
+SUBDIR+=	phone
 SUBDIR+=	pidgin
 SUBDIR+=	pidgin-facebookchat
 SUBDIR+=	pidgin-icb
--- a/chat/amsn/Makefile
+++ b/chat/amsn/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2013/06/06 12:54:08 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2014/01/11 14:42:01 adam Exp $
 #

 DISTNAME=		amsn-0.98.3
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=		chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=amsn/}
 DISTFILES=		${DISTNAME}-src.tar.bz2
--- a/chat/anope/Makefile
+++ b/chat/anope/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2013/05/31 12:39:39 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2013/07/12 10:44:52 jperkin Exp $

 DISTNAME=	anope-1.7.21
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=anope/}

--- a/chat/anope/PLIST
+++ b/chat/anope/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:28:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/03/11 14:04:58 jperkin Exp $
 lib/anope/anoperc
 lib/anope/languages/cat
 lib/anope/languages/de
@@ -188,4 +188,3 @@ share/doc/anope/WIN32.txt
 share/examples/anope/example.chk
 share/examples/anope/example.conf
 share/examples/anope/tables.sql
-share/examples/rc.d/anope
--- a/chat/atheme/Makefile
+++ b/chat/atheme/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2013/02/06 23:21:43 jperkin Exp $
+# $NetBSD: Makefile,v 1.10 2014/02/12 23:17:35 tron Exp $
 #

 DISTNAME=	atheme-services-3.0.4
 PKGNAME=	${DISTNAME:S/-services//}
-PKGREVISION=	2
+PKGREVISION=	4
 CATEGORIES=	chat
 MASTER_SITES=	http://distfiles.atheme.org/
 EXTRACT_SUFX=	.tbz2
--- a/chat/atheme/PLIST
+++ b/chat/atheme/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:37:42 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/03/11 14:04:58 jperkin Exp $
 bin/atheme-services
 lib/atheme/modules/backend/flatfile.so
 lib/atheme/modules/chanserv/akick.so
@@ -327,4 +327,3 @@ share/examples/atheme/atheme.conf.example
 share/examples/atheme/atheme.conf.userserv-example
 share/examples/atheme/atheme.cron.example
 share/examples/atheme/atheme.motd.example
-share/examples/rc.d/atheme
--- a/chat/bitchx/Makefile
+++ b/chat/bitchx/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2013/02/06 23:21:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.54 2014/02/12 23:17:35 tron Exp $

 DISTNAME=	ircii-pana-1.1-final
 PKGNAME=	bitchx-1.1
-PKGREVISION=	5
+PKGREVISION=	7
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bitchx/}

@@ -35,7 +35,7 @@ INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX}
 INSTALL_MAKE_FLAGS+=	mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}

 .include "../../archivers/bzip2/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"

+.include "../../mk/terminfo.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/chat/bitchx/distinfo
+++ b/chat/bitchx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2012/02/16 13:50:52 hans Exp $
+$NetBSD: distinfo,v 1.19 2013/12/06 15:35:53 seanb Exp $

 SHA1 (ircii-pana-1.1-final.tar.gz) = b25635b62c7ff905b6492a4aaa88c43b5aa164f8
 RMD160 (ircii-pana-1.1-final.tar.gz) = 4105de2587964146e2391a26a8a16e3d0059a93f
@@ -16,3 +16,4 @@ SHA1 (patch-ao) = b91a58efaac234c815542375f4f87eb3bd4055e8
 SHA1 (patch-ap) = 7cc6162de323bf07e52cbad7d4b4b54ac01d105e
 SHA1 (patch-aq) = 97387bc2f7059f1a864f47ecd611ce62e13cb969
 SHA1 (patch-ar) = 09286c5e21c6b8f6d35ab53146297c2e4f44ad55
+SHA1 (patch-include_irc__std.h) = 49d8164f76bbb1f0f6601763b50fbe4aa760fc3e
--- a/chat/bitchx/patches/patch-include_irc__std.h
+++ b/chat/bitchx/patches/patch-include_irc__std.h
@@ -0,0 +1,18 @@
+$NetBSD: patch-include_irc__std.h,v 1.1 2013/12/06 15:35:53 seanb Exp $
+
+Later gcc have a string optimization pass at -O2 which
+will swap combinations strcat to stpcpy if it sees a
+stpcpy prototype.  This leads to undefined references 
+if it's not actually present.
+
+--- include/irc_std.h.orig	2003-04-11 01:09:07.000000000 +0000
+++ include/irc_std.h
+@@ -190,7 +190,7 @@ extern  char    *sys_errlist[];
+ extern	int	gettimeofday(struct timeval *tv, struct timezone *tz);
+ #endif
+ 
+-#ifndef STPCPY_DECLARED
+#if defined(HAVE_STPCPY) && !defined(STPCPY_DECLARED)
+ char *  stpcpy (char *to, const char *from);
+ #endif
+ 
--- a/chat/bitlbee/Makefile
+++ b/chat/bitlbee/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2013/01/20 10:56:25 tonio Exp $
+# $NetBSD: Makefile,v 1.65 2014/01/01 11:52:10 wiz Exp $
 #

 DISTNAME=		bitlbee-3.2
+PKGREVISION=		2
 CATEGORIES=		chat
 MASTER_SITES=		http://get.bitlbee.org/src/

--- a/chat/bitlbee/PLIST
+++ b/chat/bitlbee/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/07/16 19:19:18 tonio Exp $
+@comment $NetBSD: PLIST,v 1.8 2014/03/11 14:04:58 jperkin Exp $
 man/man5/bitlbee.conf.5
 man/man8/bitlbee.8
 sbin/bitlbee
@@ -11,4 +11,3 @@ share/doc/bitlbee/README
 share/doc/bitlbee/user-guide.html
 share/doc/bitlbee/user-guide.txt
 share/examples/bitlbee/bitlbee.conf
-share/examples/rc.d/bitlbee
--- a/chat/bnc/Makefile
+++ b/chat/bnc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2013/02/06 23:21:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.22 2014/02/12 23:17:35 tron Exp $

 DISTNAME=	bnc2.9.4
 PKGNAME=	${DISTNAME:S/bnc/&-/}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	chat
 MASTER_SITES=	http://www.ircadmin.net/bnc/

--- a/chat/centerim/Makefile
+++ b/chat/centerim/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2013/05/31 12:39:39 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2014/02/12 23:17:35 tron Exp $
 #

 DISTNAME=	centerim-4.22.9
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	chat
 MASTER_SITES=	http://www.centerim.org/download/releases/ \
 		http://transacid.de/centerim/releases/
--- a/chat/climm/Makefile
+++ b/chat/climm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2013/02/06 23:21:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.14 2014/02/12 23:17:35 tron Exp $

 DISTNAME=	climm-0.7.1
-PKGREVISION=	2
+PKGREVISION=	4
 CATEGORIES=	chat
 MASTER_SITES=	http://www.climm.org/source/
 EXTRACT_SUFX=	.tgz
--- a/chat/dircproxy/Makefile
+++ b/chat/dircproxy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2013/05/31 12:39:40 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2014/02/12 23:17:35 tron Exp $

 DISTNAME=	dircproxy-1.2.0-beta2
 PKGNAME=	${DISTNAME:S/-beta/beta/}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	chat
 MASTER_SITES=	http://dircproxy.googlecode.com/files/
 EXTRACT_SUFX=	.tar.bz
--- a/chat/dircproxy/PLIST
+++ b/chat/dircproxy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:37:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2014/03/11 14:04:58 jperkin Exp $
 bin/dircproxy
 bin/dircproxy-crypt
 man/man1/dircproxy-crypt.1
@@ -7,4 +7,3 @@ share/dircproxy/cronchk.sh
 share/dircproxy/log.pl
 share/dircproxy/privmsg-log.pl
 share/examples/dircproxy/dircproxyrc.sample
-share/examples/rc.d/dircproxy
--- a/chat/eggdrop/Makefile
+++ b/chat/eggdrop/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2012/10/03 00:02:35 asau Exp $
+# $NetBSD: Makefile,v 1.36 2014/01/11 14:42:01 adam Exp $

 DISTNAME=	eggdrop1.6.21
 PKGNAME=	eggdrop-1.6.21
 #KGREVISION=	1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	chat
 MASTER_SITES=	ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/
 EXTRACT_SUFX=	.tar.bz2
--- a/chat/eggdrop/distinfo
+++ b/chat/eggdrop/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2012/11/16 00:35:28 joerg Exp $
+$NetBSD: distinfo,v 1.16 2014/02/21 20:18:13 joerg Exp $

 SHA1 (eggdrop1.6.21.tar.bz2) = 98ce7220c8aff19d2f8406fcc52aa1807aa0de01
 RMD160 (eggdrop1.6.21.tar.bz2) = 1006dfd6a6e735500c2b484eb3061f1d2dfd20f8
 Size (eggdrop1.6.21.tar.bz2) = 999211 bytes
-SHA1 (patch-aa) = 0dfc560d2ef0d92c65c5afa9396da00f80257ee6
+SHA1 (patch-aa) = 555c7e7529643eb0e0fec0388e8767047ec8b984
 SHA1 (patch-ab) = c43cbe9586c6a05114a3ff21eb5fe5b806e8bb05
 SHA1 (patch-ac) = c71d67618a5b53a3de2f3041ed8fa098a89e4471
 SHA1 (patch-ad) = 9904f090a2a942a7442b1950489db0ae68a6e294
--- a/chat/eggdrop/patches/patch-aa
+++ b/chat/eggdrop/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2012/03/31 21:52:57 shattered Exp $
+$NetBSD: patch-aa,v 1.7 2014/02/21 20:18:13 joerg Exp $

 --- configure.orig	2011-10-26 02:00:10.000000000 +0000
 +++ configure
@@ -30,3 +30,12 @@ $NetBSD: patch-aa,v 1.6 2012/03/31 21:52:57 shattered Exp $
     ;;
     Darwin)
       # Mac OS X
+@@ -6872,7 +6878,7 @@ tclrecommendver="8.5.X"
+ tclrecommendsite="ftp://tcl.activestate.com/pub/tcl/tcl8_5/"
+ 
+ # Tcl library filename prefixes, suffixes, and search paths.
+-tcllibnames="tcl8.5 tcl85 tcl8.4 tcl84 tcl8.3 tcl83 tcl8.2 tcl82 \
+tcllibnames="tcl86 tcl8.5 tcl85 tcl8.4 tcl84 tcl8.3 tcl83 tcl8.2 tcl82 \
+              tcl8.1 tcl81 tcl8.0 tcl80 tcl tcl7.6 tcl76 tcl7.5 tcl75 \
+              tcl7.4 tcl74 tcl7.3 tcl73 tcl7.2 tcl72 tcl7.1 tcl71 \
+              tcl7.0 tcl70"
--- a/chat/ejabberd/MESSAGE
+++ b/chat/ejabberd/MESSAGE
@@ -1,9 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2008/11/12 13:13:59 martti Exp $
+$NetBSD: MESSAGE,v 1.4 2014/03/10 11:33:59 fhajny Exp $

 You will need to customize the following files to configure ejabberd for
 local use:

-    ${PKG_SYSCONFDIR}/ejabberd.cfg
+    ${PKG_SYSCONFDIR}/ejabberd.yml

 ===========================================================================
--- a/chat/ejabberd/Makefile
+++ b/chat/ejabberd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2013/05/31 20:01:30 fhajny Exp $
+# $NetBSD: Makefile,v 1.40 2014/03/13 11:08:49 jperkin Exp $

-DISTNAME=	ejabberd-2.1.12
+DISTNAME=	ejabberd-13.12
 CATEGORIES=	chat
 MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
@@ -10,43 +10,34 @@ HOMEPAGE=	http://www.ejabberd.im/
 COMMENT=	Free and Open Source distributed fault-tolerant Jabber server
 LICENSE=	gnu-gpl-v2

-CONFLICTS+=	jabberd-[0-9]*
+BUILD_DEPENDS+=		git-base>=1.5:../../devel/git-base
+CONFLICTS+=		jabberd-[0-9]*

-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake
+GNU_CONFIGURE=		yes
+USE_GCC_RUNTIME=	yes
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake patch

-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-# much prefer to be explicit about the configure settings rather than
-# depending on the defaults to continue to be sane or same between versions
-CONFIGURE_ARGS+=	--enable-odbc
-CONFIGURE_ARGS+=	--enable-mod_irc
-CONFIGURE_ARGS+=	--enable-mod_muc
-CONFIGURE_ARGS+=	--enable-eldap
-CONFIGURE_ARGS+=	--enable-web
-CONFIGURE_ARGS+=	--enable-tls
-CONFIGURE_ARGS+=	--enable-ejabberd_zlib
-CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
-CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
-CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_PREFIX.expat}
-CONFIGURE_ARGS+=	--with-libiconv=${BUILDLINK_PREFIX.iconv}
-CONFIGURE_ARGS+=	--with-erlang=${BUILDLINK_PREFIX.erlang}
+CONFIGURE_ARGS+=	--disable-debug
+CONFIGURE_ARGS+=	--enable-iconv
+CONFIGURE_ARGS+=	--enable-json
+CONFIGURE_ARGS+=	--enable-lager
+CONFIGURE_ARGS+=	--enable-nif
+CONFIGURE_ARGS+=	--enable-stun
+CONFIGURE_ARGS+=	--enable-user=${EJABBERD_USER}
+CONFIGURE_ARGS+=	--enable-zlib
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}

-CONFIGURE_DIRS+=	src
-BUILD_DIRS+=		src
-
-MAKE_ENV=		PKGVERSION=${PKGVERSION}
-PLIST_SUBST+=		DISTNAME=${DISTNAME} PKGBASE=${PKGBASE}
-
-FILES_SUBST+=		DISTNAME=${DISTNAME} PKGBASE=${PKGBASE}
-FILES_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
-FILES_SUBST+=		EGDIR=${EGDIR}
+.include "../../lang/erlang/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.erlang:Miodbc) || \
+    !empty(PKG_BUILD_OPTIONS.erlang:Munixodbc)
+CONFIGURE_ARGS+=	--enable-odbc
+.endif

 RCD_SCRIPTS=		ejabberd

 BUILD_DEFS+=		EJABBERD_USER EJABBERD_GROUP EJABBERD_LOGDIR
 BUILD_DEFS+=		EJABBERD_PIDDIR EJABBERD_DB EJABBERD_TRANSDIR
-BUILD_DEFS+=		EJABBERD_EXDIR
 BUILD_DEFS+=		VARBASE
 PKG_SYSCONFSUBDIR=	ejabberd

@@ -57,35 +48,39 @@ EJABBERD_GROUP?=	ejabberd
 EJABBERD_PIDDIR?=	${VARBASE}/run/ejabberd
 EJABBERD_LOGDIR?=	${VARBASE}/log/ejabberd
 EJABBERD_DB?=		${VARBASE}/spool/ejabberd
-EJABBERD_EXDIR=		share/examples/ejabberd

-OWN_DIRS+=		${EJABBERD_PIDDIR}
-OWN_DIRS+=		${EJABBERD_LOGDIR}
-OWN_DIRS+=		${EJABBERD_DB}
 OWN_DIRS_PERMS+=	${EJABBERD_PIDDIR} ${EJABBERD_USER} ${EJABBERD_GROUP} 0770
 OWN_DIRS_PERMS+=	${EJABBERD_LOGDIR} ${EJABBERD_USER} ${EJABBERD_GROUP} 0770
 OWN_DIRS_PERMS+=	${EJABBERD_DB} ${EJABBERD_USER} ${EJABBERD_GROUP} 0770

-FILES_SUBST+=		JABBERD_USER=${EJABBERD_USER}
-FILES_SUBST+=		JABBERD_LOGDIR=${EJABBERD_LOGDIR}
+FILES_SUBST+=		DISTNAME=${DISTNAME}
+FILES_SUBST+=		EJABBERD_USER=${EJABBERD_USER}
+FILES_SUBST+=		EJABBERD_GROUP=${EJABBERD_GROUP}
+FILES_SUBST+=		EJABBERD_DB=${EJABBERD_DB}

+PLIST_SUBST+=		DISTNAME=${DISTNAME}
 PLIST_SUBST+=		EJABBERD_EXDIR=${EJABBERD_EXDIR}

 PKG_GROUPS+=		${EJABBERD_GROUP}
 PKG_USERS+=		${EJABBERD_USER}:${EJABBERD_GROUP}
 PKG_GECOS.${EJABBERD_USER}=	ejabberd user
 PKG_HOME.${EJABBERD_USER}=	${EJABBERD_DB}
+PKG_SHELL.${EJABBERD_USER}=	${SH}

-EGDIR=			${PREFIX}/${EJABBERD_EXDIR}
+EGDIR=			share/examples/ejabberd

-INSTALLATION_DIRS+=	${PREFIX}/share/doc/${PKGBASE}
+INSTALLATION_DIRS+=	share/doc/${PKGBASE}
 INSTALLATION_DIRS+=	${EGDIR}

-CONF_FILES=		${EGDIR}/ejabberd.cfg ${PKG_SYSCONFDIR}/ejabberd.cfg
-CONF_FILES+=		${EGDIR}/ejabberdctl.cfg ${PKG_SYSCONFDIR}/ejabberdctl.cfg
-CONF_FILES+=		${EGDIR}/inetrc ${PKG_SYSCONFDIR}/inetrc
+CONF_FILES_PERMS=	${EGDIR}/ejabberd.yml ${PKG_SYSCONFDIR}/ejabberd.yml \
+			${ROOT_USER} ${EJABBERD_GROUP} 0640
+CONF_FILES_PERMS+=	${EGDIR}/ejabberdctl.cfg ${PKG_SYSCONFDIR}/ejabberdctl.cfg \
+			${ROOT_USER} ${EJABBERD_GROUP} 0640
+CONF_FILES_PERMS+=	${EGDIR}/inetrc ${PKG_SYSCONFDIR}/inetrc \
+			${ROOT_USER} ${EJABBERD_GROUP} 0640
+SPECIAL_PERMS+=		sbin/ejabberdctl ${ROOT_USER} ${EJABBERD_GROUP} 0750

-REPLACE_SH=		src/ejabberdctl.template tools/captcha.sh
+REPLACE_SH=		ejabberdctl.template tools/captcha.sh

 post-patch:
 	${RM} -f ${WRKSRC}/doc/guide.tex.orig
@@ -98,23 +93,25 @@ post-install:
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Localizing paths
 SUBST_STAGE.paths=	pre-configure
-SUBST_FILES.paths=	src/Makefile.in
-SUBST_FILES.paths+=	src/ejabberd.cfg.example
-SUBST_FILES.paths+=	src/ejabberdctl.template
+SUBST_FILES.paths=	Makefile.in
+SUBST_FILES.paths+=	ejabberd.yml.example
+SUBST_FILES.paths+=	ejabberdctl.template
 SUBST_FILES.paths+=	doc/guide.tex
 SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+=	-e 's,@JABBERD_LOGDIR@,${EJABBERD_LOGDIR},g'
-SUBST_SED.paths+=	-e 's,@EJABBERD_DBDIR@,${EJABBERD_DB},g'
+SUBST_SED.paths+=	-e 's,@EJABBERD_DB@,${EJABBERD_DB},g'
 SUBST_SED.paths+=	-e 's,@EJABBERD_LOGDIR@,${EJABBERD_LOGDIR},g'
 SUBST_SED.paths+=	-e 's,@EJABBERD_PIDDIR@,${EJABBERD_PIDDIR},g'
-SUBST_SED.paths+=	-e 's,@EJABBERD_DB@,${EJABBERD_DB},g'
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@DISTNAME@,${DISTNAME},g'
-SUBST_SED.paths+=	-e 's,@EJABBERD_VARDIR@,${VARBASE},g'
+
+post-configure:
+	cd ${WRKSRC} && ${BUILD_MAKE_CMD} deps
+	${PATCH} -p0 ${WRKSRC}/deps/p1_iconv/rebar.config \
+	  < ${FILESDIR}/deps_p1__iconv_rebar.config.patch

 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../lang/erlang/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../textproc/libyaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/chat/ejabberd/PLIST
+++ b/chat/ejabberd/PLIST
@@ -1,84 +1,126 @@
-@comment $NetBSD: PLIST,v 1.19 2013/05/31 20:01:30 fhajny Exp $
-lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
-lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
+@comment $NetBSD: PLIST,v 1.24 2014/03/11 14:04:58 jperkin Exp $
 lib/erlang/lib/${PKGNAME}/ebin/acl.beam
 lib/erlang/lib/${PKGNAME}/ebin/adhoc.beam
-lib/erlang/lib/${PKGNAME}/ebin/cache_tab.beam
+lib/erlang/lib/${PKGNAME}/ebin/beam_util.beam
+lib/erlang/lib/${PKGNAME}/ebin/cache_tab_app.beam
 lib/erlang/lib/${PKGNAME}/ebin/cache_tab_sup.beam
-lib/erlang/lib/${PKGNAME}/ebin/cyrsasl.beam
+lib/erlang/lib/${PKGNAME}/ebin/cache_tab_treap.beam
+lib/erlang/lib/${PKGNAME}/ebin/cache_tab.beam
 lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_anonymous.beam
 lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_digest.beam
 lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_plain.beam
 lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_scram.beam
-lib/erlang/lib/${PKGNAME}/ebin/dynamic_compile.beam
-lib/erlang/lib/${PKGNAME}/ebin/ejabberd.app
-lib/erlang/lib/${PKGNAME}/ebin/ejabberd.beam
+lib/erlang/lib/${PKGNAME}/ebin/cyrsasl.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_admin.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_app.beam
-lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_anonymous.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_external.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_internal.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_ldap.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_odbc.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_pam.beam
-lib/erlang/lib/${PKGNAME}/ebin/ejabberd_c2s.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_c2s_config.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_c2s.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_captcha.beam
-lib/erlang/lib/${PKGNAME}/ebin/ejabberd_check.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_commands.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_config.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_ctl.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_frontend_socket.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_hooks.beam
-lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http_bind.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http_poll.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_listener.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_local.beam
-lib/erlang/lib/${PKGNAME}/ebin/ejabberd_logger_h.beam
-lib/erlang/lib/${PKGNAME}/ebin/ejabberd_loglevel.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_logger.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_node_groups.beam
-lib/erlang/lib/${PKGNAME}/ebin/ejabberd_odbc.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_odbc_sup.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_odbc.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_piefxis.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_rdbms.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_receiver.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_regexp.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router.beam
-lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s_in.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s_out.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_service.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sm.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_socket.beam
-lib/erlang/lib/${PKGNAME}/ebin/ejabberd_stun.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sup.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_system_monitor.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_tmp_sup.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_update.beam
-lib/erlang/lib/${PKGNAME}/ebin/ejabberd_web.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_web_admin.beam
-lib/erlang/lib/${PKGNAME}/ebin/ejabberd_zlib.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_web.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_xmlrpc.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd.app
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejd2odbc.beam
-lib/erlang/lib/${PKGNAME}/ebin/eldap.beam
-lib/erlang/lib/${PKGNAME}/ebin/eldap_filter.beam
 lib/erlang/lib/${PKGNAME}/ebin/eldap_filter_yecc.beam
+lib/erlang/lib/${PKGNAME}/ebin/eldap_filter.beam
 lib/erlang/lib/${PKGNAME}/ebin/eldap_pool.beam
 lib/erlang/lib/${PKGNAME}/ebin/eldap_utils.beam
+lib/erlang/lib/${PKGNAME}/ebin/eldap.beam
+lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
+lib/erlang/lib/${PKGNAME}/ebin/error_logger_lager_h.beam
+lib/erlang/lib/${PKGNAME}/ebin/example_serv.beam
 lib/erlang/lib/${PKGNAME}/ebin/extauth.beam
+lib/erlang/lib/${PKGNAME}/ebin/ezlib_app.beam
+lib/erlang/lib/${PKGNAME}/ebin/ezlib_sup.beam
+lib/erlang/lib/${PKGNAME}/ebin/ezlib.beam
 lib/erlang/lib/${PKGNAME}/ebin/gen_iq_handler.beam
 lib/erlang/lib/${PKGNAME}/ebin/gen_mod.beam
 lib/erlang/lib/${PKGNAME}/ebin/gen_pubsub_node.beam
 lib/erlang/lib/${PKGNAME}/ebin/gen_pubsub_nodetree.beam
+lib/erlang/lib/${PKGNAME}/ebin/glc_code.beam
+lib/erlang/lib/${PKGNAME}/ebin/glc_lib.beam
+lib/erlang/lib/${PKGNAME}/ebin/glc_ops.beam
+lib/erlang/lib/${PKGNAME}/ebin/glc.beam
+lib/erlang/lib/${PKGNAME}/ebin/goldrush.app
+lib/erlang/lib/${PKGNAME}/ebin/gr_app.beam
+lib/erlang/lib/${PKGNAME}/ebin/gr_context.beam
+lib/erlang/lib/${PKGNAME}/ebin/gr_counter_sup.beam
+lib/erlang/lib/${PKGNAME}/ebin/gr_counter.beam
+lib/erlang/lib/${PKGNAME}/ebin/gr_manager_sup.beam
+lib/erlang/lib/${PKGNAME}/ebin/gr_manager.beam
+lib/erlang/lib/${PKGNAME}/ebin/gr_param_sup.beam
+lib/erlang/lib/${PKGNAME}/ebin/gr_param.beam
+lib/erlang/lib/${PKGNAME}/ebin/gr_sup.beam
+lib/erlang/lib/${PKGNAME}/ebin/gre.beam
+lib/erlang/lib/${PKGNAME}/ebin/iconv_app.beam
+lib/erlang/lib/${PKGNAME}/ebin/iconv_sup.beam
 lib/erlang/lib/${PKGNAME}/ebin/iconv.beam
 lib/erlang/lib/${PKGNAME}/ebin/idna.beam
 lib/erlang/lib/${PKGNAME}/ebin/jd2ejd.beam
+lib/erlang/lib/${PKGNAME}/ebin/jiffy_utf8.beam
+lib/erlang/lib/${PKGNAME}/ebin/jiffy.app
+lib/erlang/lib/${PKGNAME}/ebin/jiffy.beam
 lib/erlang/lib/${PKGNAME}/ebin/jlib.beam
+lib/erlang/lib/${PKGNAME}/ebin/lager_app.beam
+lib/erlang/lib/${PKGNAME}/ebin/lager_backend_throttle.beam
+lib/erlang/lib/${PKGNAME}/ebin/lager_config.beam
+lib/erlang/lib/${PKGNAME}/ebin/lager_console_backend.beam
+lib/erlang/lib/${PKGNAME}/ebin/lager_crash_log.beam
+lib/erlang/lib/${PKGNAME}/ebin/lager_default_formatter.beam
+lib/erlang/lib/${PKGNAME}/ebin/lager_file_backend.beam
+lib/erlang/lib/${PKGNAME}/ebin/lager_format.beam
+lib/erlang/lib/${PKGNAME}/ebin/lager_handler_watcher_sup.beam
+lib/erlang/lib/${PKGNAME}/ebin/lager_handler_watcher.beam
+lib/erlang/lib/${PKGNAME}/ebin/lager_msg.beam
+lib/erlang/lib/${PKGNAME}/ebin/lager_stdlib.beam
+lib/erlang/lib/${PKGNAME}/ebin/lager_sup.beam
+lib/erlang/lib/${PKGNAME}/ebin/lager_transform.beam
+lib/erlang/lib/${PKGNAME}/ebin/lager_trunc_io.beam
+lib/erlang/lib/${PKGNAME}/ebin/lager_util.beam
+lib/erlang/lib/${PKGNAME}/ebin/lager.app
+lib/erlang/lib/${PKGNAME}/ebin/lager.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_adhoc.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_announce.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_blocking.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_caps.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_configure.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_configure2.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_disco.beam
@@ -86,99 +128,138 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_echo.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_http_bind.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_http_fileserver.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_ip_blacklist.beam
-lib/erlang/lib/${PKGNAME}/ebin/mod_irc.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_irc_connection.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_irc.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_last.beam
-lib/erlang/lib/${PKGNAME}/ebin/mod_muc.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_muc_log.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_muc_room.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_muc.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_offline.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_ping.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_pres_counter.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_privacy.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_private.beam
-lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_lib.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_service.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_sm.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_stream.beam
-lib/erlang/lib/${PKGNAME}/ebin/mod_pubsub.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_pubsub_odbc.beam
-lib/erlang/lib/${PKGNAME}/ebin/mod_register.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_pubsub.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_register_web.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_register.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_roster.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_service_log.beam
-lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster_ldap.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_sic.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_stats.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_time.beam
-lib/erlang/lib/${PKGNAME}/ebin/mod_vcard.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_ldap.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_xupdate.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_vcard.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_version.beam
 lib/erlang/lib/${PKGNAME}/ebin/node_buddy.beam
 lib/erlang/lib/${PKGNAME}/ebin/node_club.beam
 lib/erlang/lib/${PKGNAME}/ebin/node_dag.beam
 lib/erlang/lib/${PKGNAME}/ebin/node_dispatch.beam
-lib/erlang/lib/${PKGNAME}/ebin/node_flat.beam
 lib/erlang/lib/${PKGNAME}/ebin/node_flat_odbc.beam
-lib/erlang/lib/${PKGNAME}/ebin/node_hometree.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_flat.beam
 lib/erlang/lib/${PKGNAME}/ebin/node_hometree_odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_hometree.beam
 lib/erlang/lib/${PKGNAME}/ebin/node_mb.beam
-lib/erlang/lib/${PKGNAME}/ebin/node_pep.beam
 lib/erlang/lib/${PKGNAME}/ebin/node_pep_odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_pep.beam
 lib/erlang/lib/${PKGNAME}/ebin/node_private.beam
 lib/erlang/lib/${PKGNAME}/ebin/node_public.beam
 lib/erlang/lib/${PKGNAME}/ebin/nodetree_dag.beam
-lib/erlang/lib/${PKGNAME}/ebin/nodetree_tree.beam
 lib/erlang/lib/${PKGNAME}/ebin/nodetree_tree_odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/nodetree_tree.beam
 lib/erlang/lib/${PKGNAME}/ebin/nodetree_virtual.beam
 lib/erlang/lib/${PKGNAME}/ebin/odbc_queries.beam
+lib/erlang/lib/${PKGNAME}/ebin/p1_cache_tab.app
 lib/erlang/lib/${PKGNAME}/ebin/p1_fsm.beam
+lib/erlang/lib/${PKGNAME}/ebin/p1_iconv.app
 lib/erlang/lib/${PKGNAME}/ebin/p1_mnesia.beam
-lib/erlang/lib/${PKGNAME}/ebin/pg2_backport.beam
+lib/erlang/lib/${PKGNAME}/ebin/p1_sha.beam
+lib/erlang/lib/${PKGNAME}/ebin/p1_stringprep.app
+lib/erlang/lib/${PKGNAME}/ebin/p1_stun.app
+lib/erlang/lib/${PKGNAME}/ebin/p1_tls_app.beam
+lib/erlang/lib/${PKGNAME}/ebin/p1_tls_sup.beam
+lib/erlang/lib/${PKGNAME}/ebin/p1_tls.app
+lib/erlang/lib/${PKGNAME}/ebin/p1_tls.beam
+lib/erlang/lib/${PKGNAME}/ebin/p1_xml.app
+lib/erlang/lib/${PKGNAME}/ebin/p1_yaml_app.beam
+lib/erlang/lib/${PKGNAME}/ebin/p1_yaml_sup.beam
+lib/erlang/lib/${PKGNAME}/ebin/p1_yaml.app
+lib/erlang/lib/${PKGNAME}/ebin/p1_yaml.beam
+lib/erlang/lib/${PKGNAME}/ebin/p1_zlib.app
 lib/erlang/lib/${PKGNAME}/ebin/pubsub_db_odbc.beam
 lib/erlang/lib/${PKGNAME}/ebin/pubsub_index.beam
-lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription.beam
 lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription_odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription.beam
 lib/erlang/lib/${PKGNAME}/ebin/randoms.beam
 lib/erlang/lib/${PKGNAME}/ebin/scram.beam
-lib/erlang/lib/${PKGNAME}/ebin/sha.beam
 lib/erlang/lib/${PKGNAME}/ebin/shaper.beam
-lib/erlang/lib/${PKGNAME}/ebin/stringprep.beam
+lib/erlang/lib/${PKGNAME}/ebin/str.beam
+lib/erlang/lib/${PKGNAME}/ebin/stringprep_app.beam
 lib/erlang/lib/${PKGNAME}/ebin/stringprep_sup.beam
+lib/erlang/lib/${PKGNAME}/ebin/stringprep.beam
+lib/erlang/lib/${PKGNAME}/ebin/stun_app.beam
 lib/erlang/lib/${PKGNAME}/ebin/stun_codec.beam
-lib/erlang/lib/${PKGNAME}/ebin/tls.beam
+lib/erlang/lib/${PKGNAME}/ebin/stun_sup.beam
+lib/erlang/lib/${PKGNAME}/ebin/stun.beam
+lib/erlang/lib/${PKGNAME}/ebin/tcp_serv.beam
 lib/erlang/lib/${PKGNAME}/ebin/translate.beam
 lib/erlang/lib/${PKGNAME}/ebin/treap.beam
+lib/erlang/lib/${PKGNAME}/ebin/url_util.beam
 lib/erlang/lib/${PKGNAME}/ebin/win32_dns.beam
-lib/erlang/lib/${PKGNAME}/ebin/xml.beam
+lib/erlang/lib/${PKGNAME}/ebin/xml_app.beam
+lib/erlang/lib/${PKGNAME}/ebin/xml_gen.beam
 lib/erlang/lib/${PKGNAME}/ebin/xml_stream.beam
-lib/erlang/lib/${PKGNAME}/include/XmppAddr.hrl
+lib/erlang/lib/${PKGNAME}/ebin/xml_sup.beam
+lib/erlang/lib/${PKGNAME}/ebin/xml.beam
+lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_decode.beam
+lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_encode.beam
+lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_http.beam
+lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_util.beam
+lib/erlang/lib/${PKGNAME}/ebin/xmlrpc.app
+lib/erlang/lib/${PKGNAME}/ebin/xmlrpc.beam
+lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
 lib/erlang/lib/${PKGNAME}/include/adhoc.hrl
-lib/erlang/lib/${PKGNAME}/include/ejabberd.hrl
 lib/erlang/lib/${PKGNAME}/include/ejabberd_commands.hrl
 lib/erlang/lib/${PKGNAME}/include/ejabberd_config.hrl
 lib/erlang/lib/${PKGNAME}/include/ejabberd_ctl.hrl
-lib/erlang/lib/${PKGNAME}/include/eldap/ELDAPv3.hrl
-lib/erlang/lib/${PKGNAME}/include/eldap/eldap.hrl
+lib/erlang/lib/${PKGNAME}/include/ejabberd_http.hrl
+lib/erlang/lib/${PKGNAME}/include/ejabberd_web_admin.hrl
+lib/erlang/lib/${PKGNAME}/include/ejabberd.hrl
+lib/erlang/lib/${PKGNAME}/include/eldap.hrl
+lib/erlang/lib/${PKGNAME}/include/ELDAPv3.hrl
+lib/erlang/lib/${PKGNAME}/include/http_bind.hrl
 lib/erlang/lib/${PKGNAME}/include/jlib.hrl
-lib/erlang/lib/${PKGNAME}/include/mod_muc/mod_muc_room.hrl
+lib/erlang/lib/${PKGNAME}/include/lager.hrl
+lib/erlang/lib/${PKGNAME}/include/logger.hrl
+lib/erlang/lib/${PKGNAME}/include/mod_muc_room.hrl
 lib/erlang/lib/${PKGNAME}/include/mod_privacy.hrl
-lib/erlang/lib/${PKGNAME}/include/mod_proxy65/mod_proxy65.hrl
-lib/erlang/lib/${PKGNAME}/include/mod_pubsub/pubsub.hrl
+lib/erlang/lib/${PKGNAME}/include/mod_proxy65.hrl
 lib/erlang/lib/${PKGNAME}/include/mod_roster.hrl
-lib/erlang/lib/${PKGNAME}/include/web/ejabberd_http.hrl
-lib/erlang/lib/${PKGNAME}/include/web/ejabberd_web_admin.hrl
-lib/erlang/lib/${PKGNAME}/include/web/http_bind.hrl
+lib/erlang/lib/${PKGNAME}/include/ns.hrl
+lib/erlang/lib/${PKGNAME}/include/pubsub.hrl
+lib/erlang/lib/${PKGNAME}/include/stun.hrl
+lib/erlang/lib/${PKGNAME}/include/xml_gen.hrl
+lib/erlang/lib/${PKGNAME}/include/xml.hrl
+lib/erlang/lib/${PKGNAME}/include/xmlrpc.hrl
+lib/erlang/lib/${PKGNAME}/include/XmppAddr.hrl
 lib/erlang/lib/${PKGNAME}/priv/bin/captcha.sh
-lib/erlang/lib/${PKGNAME}/priv/lib/ejabberd_zlib_drv.so
 lib/erlang/lib/${PKGNAME}/priv/lib/expat_erl.so
-lib/erlang/lib/${PKGNAME}/priv/lib/iconv_erl.so
-lib/erlang/lib/${PKGNAME}/priv/lib/sha_drv.so
-lib/erlang/lib/${PKGNAME}/priv/lib/stringprep_drv.so
-lib/erlang/lib/${PKGNAME}/priv/lib/tls_drv.so
+lib/erlang/lib/${PKGNAME}/priv/lib/ezlib_drv.so
+lib/erlang/lib/${PKGNAME}/priv/lib/iconv.so
+lib/erlang/lib/${PKGNAME}/priv/lib/jiffy.so
+lib/erlang/lib/${PKGNAME}/priv/lib/p1_sha.so
+lib/erlang/lib/${PKGNAME}/priv/lib/p1_tls_drv.so
+lib/erlang/lib/${PKGNAME}/priv/lib/p1_yaml.so
+lib/erlang/lib/${PKGNAME}/priv/lib/stringprep.so
+lib/erlang/lib/${PKGNAME}/priv/lib/xml.so
 lib/erlang/lib/${PKGNAME}/priv/msgs/ca.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/cs.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/de.msg
@@ -235,7 +316,7 @@ share/doc/ejabberd/release_notes_2.1.0.txt
 share/doc/ejabberd/release_notes_2.1.1.txt
 share/doc/ejabberd/release_notes_2.1.10.txt
 share/doc/ejabberd/release_notes_2.1.11.txt
-share/doc/ejabberd/release_notes_${PKGVERSION}.txt
+share/doc/ejabberd/release_notes_2.1.12.txt
 share/doc/ejabberd/release_notes_2.1.2.txt
 share/doc/ejabberd/release_notes_2.1.3.txt
 share/doc/ejabberd/release_notes_2.1.4.txt
@@ -247,7 +328,6 @@ share/doc/ejabberd/release_notes_2.1.9.txt
 share/doc/ejabberd/webadmmain.png
 share/doc/ejabberd/webadmmainru.png
 share/doc/ejabberd/yozhikheader.png
-share/examples/ejabberd/ejabberd.cfg
+share/examples/ejabberd/ejabberd.yml
 share/examples/ejabberd/ejabberdctl.cfg
 share/examples/ejabberd/inetrc
-share/examples/rc.d/ejabberd
--- a/chat/ejabberd/distinfo
+++ b/chat/ejabberd/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.20 2013/05/31 20:01:30 fhajny Exp $
+$NetBSD: distinfo,v 1.23 2014/03/10 11:32:38 fhajny Exp $

-SHA1 (ejabberd-2.1.12.tgz) = 5610a944afb8ac07e68ca87d14ef398a0d42d633
-RMD160 (ejabberd-2.1.12.tgz) = 90b1e209c9b1e8070447d0b017337d9819aed986
-Size (ejabberd-2.1.12.tgz) = 1999224 bytes
-SHA1 (patch-aa) = 81bffd072f179713989cde0c1efc3cce8cf10944
-SHA1 (patch-ad) = ea92f93624b5d6d8fa3760d426a967a499721fe7
-SHA1 (patch-ae) = e518cb5eb67ae8feef7617ad52799af3b8e81179
+SHA1 (ejabberd-13.12.tgz) = 3aedb5012fab49181961ff24bad3af581f4b30ee
+RMD160 (ejabberd-13.12.tgz) = 68a45c133b5a529255d60ddd2c064a6d7c2bdc2d
+Size (ejabberd-13.12.tgz) = 2178478 bytes
+SHA1 (patch-aa) = f573f541ae6963acffa5a470a290874b3312b787
+SHA1 (patch-ad) = cdd7a61333f3206ac3ae9168b1878a059da25988
+SHA1 (patch-ae) = cfd7a7337410a70d38e4ef10a74db91ca512874c
+SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
--- a/chat/ejabberd/files/deps_p1__iconv_rebar.config.patch
+++ b/chat/ejabberd/files/deps_p1__iconv_rebar.config.patch
@@ -0,0 +1,11 @@
+--- rebar.config.orig	2013-10-11 06:52:27.975407457 +0000
+++ rebar.config	2013-10-11 06:59:26.293793956 +0000
+@@ -1,6 +1,7 @@
+ {erl_opts, [debug_info]}.
+ 
+-{port_env, [{"CFLAGS", "-g -O2 -Wall"}]}.
+{port_env, [{"CFLAGS", "$CFLAGS -g -O2 -Wall"},
+            {"LDFLAGS", "$LDFLAGS -liconv"}]}.
+ 
+ {port_specs, [{"priv/lib/iconv.so", ["c_src/iconv.c"]}]}.
+ 
--- a/chat/ejabberd/files/ejabberd.sh
+++ b/chat/ejabberd/files/ejabberd.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: ejabberd.sh,v 1.2 2011/10/07 22:37:03 shattered Exp $
+# $NetBSD: ejabberd.sh,v 1.3 2013/10/11 13:32:25 fhajny Exp $
 # $FreeBSD: ejabberd.sh.in,v 1.1 2005/08/28 15:51:48 vsevolod Exp $
 #
 # PROVIDE: ejabberd
@@ -17,7 +17,7 @@ name="ejabberd"
 rcvar=${name}

 command=ejabberdctl
-ejabberd_user="@JABBERD_USER@"
+ejabberd_user="@EJABBERD_USER@"
 reload_cmd="ejabberd_reload"
 restart_cmd="ejabberd_reload"
 start_cmd="ejabberd_start"
--- a/chat/ejabberd/files/smf/manifest.xml
+++ b/chat/ejabberd/files/smf/manifest.xml
@@ -0,0 +1,39 @@
+<?xml version='1.0'?>
+<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
+<service_bundle type='manifest' name='@SMF_NAME@'>
+  <service name='@SMF_PREFIX@/@SMF_NAME@' type='service' version='1'>
+    <create_default_instance enabled='false' />
+    <single_instance />
+    <dependency name='fs-local' grouping='require_all' restart_on='none' type='service'>
+      <service_fmri value='svc:/system/filesystem/local' />
+    </dependency>
+    <dependency name='network-service' grouping='require_all' restart_on='none' type='service'>
+      <service_fmri value='svc:/network/service' />
+    </dependency>
+    <dependency name='system-log' grouping='optional_all' restart_on='none' type='service'>
+      <service_fmri value='svc:/system/system-log' />
+    </dependency>
+    <dependency name='config-files' grouping='require_any' restart_on='refresh' type='path'>
+      <service_fmri value='file://localhost@PKG_SYSCONFDIR@/ejabberd.cfg' />
+      <service_fmri value='file://localhost@PKG_SYSCONFDIR@/ejabberctl.cfg' />
+      <service_fmri value='file://localhost@PKG_SYSCONFDIR@/inetrc' />
+    </dependency>
+    <dependency name='@SMF_NAME@-epmd' grouping='require_all' restart_on='none' type='service'>
+      <service_fmri value='svc:/@SMF_PREFIX@/epmd' />
+    </dependency>
+    <method_context working_directory='@EJABBERD_DB@'>
+      <method_credential user='@EJABBERD_USER@' group='@EJABBERD_GROUP@' />
+    </method_context>
+    <exec_method name='start' type='method' exec='@PREFIX@/sbin/ejabberdctl start' timeout_seconds='120' />
+    <exec_method name='stop' type='method' exec='@PREFIX@/sbin/ejabberdctl stop' timeout_seconds='60' />
+    <property_group name='startd' type='framework'>
+      <propval name='ignore_error' type='astring' value='core,signal' />
+    </property_group>
+    <stability value='Unstable' />
+    <template>
+      <common_name>
+        <loctext xml:lang='C'>ejabberd - the Erlang Jabber/XMPP daemon</loctext>
+      </common_name>
+    </template>
+  </service>
+</service_bundle>
--- a/chat/ejabberd/patches/patch-aa
+++ b/chat/ejabberd/patches/patch-aa
@@ -1,17 +1,9 @@
-$NetBSD: patch-aa,v 1.9 2011/06/06 13:45:38 fhajny Exp $
+$NetBSD: patch-aa,v 1.10 2013/10/11 13:32:25 fhajny Exp $

--- src/Makefile.in.orig	2011-06-06 13:25:51.841507950 +0000
-+++ src/Makefile.in
-@@ -71,7 +71,7 @@ endif
- 
- INSTALL_EPAM=
- ifeq (@pam@, pam)
-  INSTALL_EPAM=install -m 750 $(O_USER) epam $(PBINDIR)
-+  INSTALL_EPAM=$(BSD_INSTALL_DATA) -m 750 $(O_USER) epam $(PBINDIR)
- endif
- 
- prefix = @prefix@
-@@ -89,13 +89,13 @@ BEAMS = $(SOURCES:.erl=.beam)
+Fix locations; don't mess with ownership.
+--- Makefile.in.orig	2013-09-27 09:19:22.000000000 +0000
+++ Makefile.in
+@@ -9,13 +9,13 @@ exec_prefix = @exec_prefix@
 DESTDIR =
 
 # /etc/ejabberd/
@@ -27,7 +19,7 @@ $NetBSD: patch-aa,v 1.9 2011/06/06 13:45:38 fhajny Exp $
 
 # /share/doc/ejabberd
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
-@@ -121,16 +121,16 @@ SODIR = $(PRIVDIR)/lib
+@@ -41,16 +41,16 @@ SODIR = $(PRIVDIR)/lib
 MSGSDIR = $(PRIVDIR)/msgs
 
 # /var/lib/ejabberd/
@@ -43,135 +35,22 @@ $NetBSD: patch-aa,v 1.9 2011/06/06 13:45:38 fhajny Exp $
 
 # /var/log/ejabberd/
 -LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
-+LOGDIR = $(DESTDIR)@JABBERD_LOGDIR@
+LOGDIR = $(DESTDIR)@EJABBERD_LOGDIR@
 
- # Assume Linux-style dynamic library flags
- DYNAMIC_LIB_CFLAGS = -fpic -shared
-@@ -183,10 +183,10 @@ translations:
- install: all
- 	#
- 	# Configuration files
-	install -d -m 750 $(G_USER) $(ETCDIR)
-+	$(BSD_INSTALL_DATA_DIR) -m 750 $(G_USER) $(ETCDIR)
- 	[ -f $(ETCDIR)/ejabberd.cfg ] \
-		&& install -b -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg-new \
-		|| install -b -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg
-+		&& $(BSD_INSTALL_DATA) -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg-new \
-+		|| $(BSD_INSTALL_DATA) -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg
- 	sed -e "s*@rootdir@*@prefix@*" \
- 		-e "s*@installuser@*@INSTALLUSER@*" \
- 		-e "s*@LIBDIR@*@libdir@*" \
-@@ -196,13 +196,13 @@ install: all
- 		-e "s*@erl@*@ERL@*" ejabberdctl.template \
- 		> ejabberdctl.example
- 	[ -f $(ETCDIR)/ejabberdctl.cfg ] \
-		&& install -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
-		|| install -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
-	install -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
-+		&& $(BSD_INSTALL_DATA) -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
-+		|| $(BSD_INSTALL_DATA) -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
-+	$(BSD_INSTALL_DATA) -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
- 	#
- 	# Administration script
-	[ -d $(SBINDIR) ] || install -d -m 755 $(SBINDIR)
-	install -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
-+	[ -d $(SBINDIR) ] || $(BSD_INSTALL_DATA_DIR) -m 755 $(SBINDIR)
-+	$(BSD_INSTALL_SCRIPT) -m 555 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
- 	#
- 	# Init script
- 	sed -e "s*@ctlscriptpath@*$(SBINDIR)*" \
-@@ -211,64 +211,58 @@ install: all
- 	chmod 755 ejabberd.init
- 	#
- 	# Binary Erlang files
-	install -d $(BEAMDIR)
-	install -m 644 *.app $(BEAMDIR)
-	install -m 644 *.beam $(BEAMDIR)
-+	$(BSD_INSTALL_DATA_DIR) $(BEAMDIR)
-+	$(BSD_INSTALL_DATA) -m 644 *.app $(BEAMDIR)
-+	$(BSD_INSTALL_DATA) -m 644 *.beam $(BEAMDIR)
- 	rm -f $(BEAMDIR)/configure.beam
- 	#
- 	# ejabberd header files
-	install -d $(INCLUDEDIR)
-	install -m 644 *.hrl $(INCLUDEDIR)
-	install -d $(INCLUDEDIR)/eldap/
-	install -m 644 eldap/*.hrl $(INCLUDEDIR)/eldap/
-	install -d $(INCLUDEDIR)/mod_muc/
-	install -m 644 mod_muc/*.hrl $(INCLUDEDIR)/mod_muc/
-	install -d $(INCLUDEDIR)/mod_proxy65/
-	install -m 644 mod_proxy65/*.hrl $(INCLUDEDIR)/mod_proxy65/
-	install -d $(INCLUDEDIR)/mod_pubsub/
-	install -m 644 mod_pubsub/*.hrl $(INCLUDEDIR)/mod_pubsub/
-	install -d $(INCLUDEDIR)/web/
-	install -m 644 web/*.hrl $(INCLUDEDIR)/web/
-+	$(BSD_INSTALL_DATA_DIR) $(INCLUDEDIR)
-+	$(BSD_INSTALL_DATA) -m 644 *.hrl $(INCLUDEDIR)
-+	$(BSD_INSTALL_DATA_DIR) $(INCLUDEDIR)/eldap/
-+	$(BSD_INSTALL_DATA) -m 644 eldap/*.hrl $(INCLUDEDIR)/eldap/
-+	$(BSD_INSTALL_DATA_DIR) $(INCLUDEDIR)/mod_muc/
-+	$(BSD_INSTALL_DATA) -m 644 mod_muc/*.hrl $(INCLUDEDIR)/mod_muc/
-+	$(BSD_INSTALL_DATA_DIR) $(INCLUDEDIR)/mod_proxy65/
-+	$(BSD_INSTALL_DATA) -m 644 mod_proxy65/*.hrl $(INCLUDEDIR)/mod_proxy65/
-+	$(BSD_INSTALL_DATA_DIR) $(INCLUDEDIR)/mod_pubsub/
-+	$(BSD_INSTALL_DATA) -m 644 mod_pubsub/*.hrl $(INCLUDEDIR)/mod_pubsub/
-+	$(BSD_INSTALL_DATA_DIR) $(INCLUDEDIR)/web/
-+	$(BSD_INSTALL_DATA) -m 644 web/*.hrl $(INCLUDEDIR)/web/
- 	#
- 	# Binary C programs
-	install -d $(PBINDIR)
-	install -m 750 $(O_USER) ../tools/captcha.sh $(PBINDIR)
-+	$(BSD_INSTALL_SCRIPT_DIR) $(PBINDIR)
-+	$(BSD_INSTALL_SCRIPT) -m 750 $(O_USER) ../tools/captcha.sh $(PBINDIR)
- 	$(INSTALL_EPAM)
- 	#
- 	# Binary system libraries
-	install -d $(SODIR)
-	install -m 644 *.so $(SODIR)
-+	$(BSD_INSTALL_LIB_DIR) $(SODIR)
-+	$(BSD_INSTALL_LIB) -m 644 *.so $(SODIR)
- 	#
- 	# Translated strings
-	install -d $(MSGSDIR)
-	install -m 644 msgs/*.msg $(MSGSDIR)
-	#
-	# Spool directory
-	install -d -m 750 $(O_USER) $(SPOOLDIR)
-	$(CHOWN_COMMAND) -R @INSTALLUSER@ $(SPOOLDIR) >$(CHOWN_OUTPUT)
-	chmod -R 750 $(SPOOLDIR)
-	[ ! -f $(COOKIEFILE) ] || { $(CHOWN_COMMAND) @INSTALLUSER@ $(COOKIEFILE) >$(CHOWN_OUTPUT) ; chmod 400 $(COOKIEFILE) ; }
-+	$(BSD_INSTALL_DATA_DIR) $(MSGSDIR)
-+	$(BSD_INSTALL_DATA) -m 644 msgs/*.msg $(MSGSDIR)
- 	#
- 	# ejabberdctl lock directory
-	install -d -m 750 $(O_USER) $(CTLLOCKDIR)
-+	$(BSD_INSTALL_DATA_DIR) -m 750 $(O_USER) $(CTLLOCKDIR)
- 	$(CHOWN_COMMAND) -R @INSTALLUSER@ $(CTLLOCKDIR) >$(CHOWN_OUTPUT)
- 	chmod -R 750 $(CTLLOCKDIR)
- 	#
- 	# Log directory
-	install -d -m 750 $(O_USER) $(LOGDIR)
-+	$(BSD_INSTALL_DATA_DIR) -m 750 $(O_USER) $(LOGDIR)
- 	$(CHOWN_COMMAND) -R @INSTALLUSER@ $(LOGDIR) >$(CHOWN_OUTPUT)
- 	chmod -R 750 $(LOGDIR)
- 	#
- 	# Documentation
-	install -d $(DOCDIR)
-	install -m 644 ../doc/dev.html $(DOCDIR)
-	install -m 644 ../doc/guide.html $(DOCDIR)
-	install -m 644 ../doc/*.png $(DOCDIR)
-	install -m 644 ../doc/*.txt $(DOCDIR)
-+	$(BSD_INSTALL_DATA_DIR) $(DOCDIR)
-+	$(BSD_INSTALL_DATA) -m 644 ../doc/dev.html $(DOCDIR)
-+	$(BSD_INSTALL_DATA) -m 644 ../doc/guide.html $(DOCDIR)
-+	$(BSD_INSTALL_DATA) -m 644 ../doc/*.png $(DOCDIR)
-+	$(BSD_INSTALL_DATA) -m 644 ../doc/*.txt $(DOCDIR)
- 	[ -f ../doc/guide.pdf ] \
-		&& install -m 644 ../doc/guide.pdf $(DOCDIR) \
-+		&& $(BSD_INSTALL_DATA) -m 644 ../doc/guide.pdf $(DOCDIR) \
- 		|| echo "No ../doc/guide.pdf was built"
-	install -m 644 ../COPYING $(DOCDIR)
-+	$(BSD_INSTALL_DATA) -m 644 ../COPYING $(DOCDIR)
- 
- uninstall: uninstall-binary
+ INSTALLUSER=@INSTALLUSER@
+ # if no user was enabled, don't set privileges or ownership
+@@ -61,10 +61,10 @@ ifeq ($(INSTALLUSER),)
+   CHOWN_OUTPUT=/dev/null
+   INIT_USER=root
+ else
+-  O_USER=-o $(INSTALLUSER)
+-  G_USER=-g $(INSTALLUSER)
+-  CHOWN_COMMAND=chown
+-  CHOWN_OUTPUT=&1
+  O_USER=
+  G_USER=
+  CHOWN_COMMAND=echo
+  CHOWN_OUTPUT=/dev/null
+   INIT_USER=$(INSTALLUSER)
+ endif
 
--- a/chat/ejabberd/patches/patch-ad
+++ b/chat/ejabberd/patches/patch-ad
@@ -1,53 +1,14 @@
-$NetBSD: patch-ad,v 1.6 2011/06/06 13:45:38 fhajny Exp $
+$NetBSD: patch-ad,v 1.7 2013/10/11 13:32:25 fhajny Exp $

--- src/ejabberd.cfg.example.orig	2011-06-01 09:03:36.000000000 +0000
-+++ src/ejabberd.cfg.example
-@@ -109,7 +109,6 @@
-  [
+Proper path to captcha script.
+--- ejabberd.yml.example.orig	2013-09-27 09:19:22.000000000 +0000
+++ ejabberd.yml.example
+@@ -490,7 +490,7 @@ language: "en"
+ ##
+ ## Full path to a script that generates the image.
+ ##
+-## captcha_cmd: "/lib/ejabberd/priv/bin/captcha.sh"
+## captcha_cmd: "@PREFIX@/lib/erlang/lib/@DISTNAME@/priv/bin/captcha.sh"
 
-   {5222, ejabberd_c2s, [
-
- 			%%
- 			%% If TLS is compiled in and you installed a SSL
- 			%% certificate, specify the full path to the
-@@ -125,12 +124,12 @@
-   %%
-   %% To enable the old SSL connection method on port 5223:
-   %%
-  %%{5223, ejabberd_c2s, [
-  %%			{access, c2s},
-  %%			{shaper, c2s_shaper},
-  %%			{certfile, "/path/to/ssl.pem"}, tls,
-  %%			{max_stanza_size, 65536}
-  %%		       ]},
-+  {5223, ejabberd_c2s, [
-+			{access, c2s},
-+			{shaper, c2s_shaper},
-+			{certfile, "/path/to/ssl.pem"}, tls,
-+			{max_stanza_size, 65536}
-+		       ]},
- 
-   {5269, ejabberd_s2s_in, [
- 			   {shaper, s2s_shaper},
-@@ -140,10 +139,10 @@
-   %%
-   %% ejabberd_service: Interact with external components (transports, ...)
-   %%
-  %%{8888, ejabberd_service, [
-+  %%{{8888, "127.0.0.1"},
-+  %% ejabberd_service, [
-   %%			    {access, all},
-   %%			    {shaper_rule, fast},
-  %%			    {ip, {127, 0, 0, 1}},
-   %%			    {hosts, ["icq.example.org", "sms.example.org"],
-   %%			     [{password, "secret"}]
-   %%			    }
-@@ -472,7 +471,7 @@
- %%
- %% Full path to a script that generates the image.
- %%
-%%{captcha_cmd, "/lib/ejabberd/priv/bin/captcha.sh"}.
-+%%{captcha_cmd, "@PREFIX@/lib/erlang/lib/@DISTNAME@/priv/bin/captcha.sh"}.
- 
- %%
- %% Host for the URL and port where ejabberd listens for CAPTCHA requests.
+ ##
+ ## Host for the URL and port where ejabberd listens for CAPTCHA requests.
--- a/chat/ejabberd/patches/patch-ae
+++ b/chat/ejabberd/patches/patch-ae
@@ -1,35 +1,45 @@
-$NetBSD: patch-ae,v 1.6 2010/09/03 10:31:43 fhajny Exp $
+$NetBSD: patch-ae,v 1.7 2013/10/11 13:32:25 fhajny Exp $

--- src/ejabberdctl.template.orig	2010-08-02 16:33:20.000000000 +0000
-+++ src/ejabberdctl.template
-@@ -43,10 +43,10 @@ if [ "$EJABBERDCTL_CONFIG_PATH" = "" ] ;
+Default locations.
+--- ejabberdctl.template.orig	2013-09-27 09:19:22.000000000 +0000
+++ ejabberdctl.template
+@@ -23,7 +23,7 @@ if [ "$INSTALLUSER" != "" ] ; then
+     EXEC_CMD="false"
+     for GID in `id -G`; do
+         if [ $GID -eq 0 ] ; then
+-            EXEC_CMD="su $INSTALLUSER -p -c"
+            EXEC_CMD="su $INSTALLUSER -m -c"
+         fi
+     done
+     if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
+@@ -68,10 +68,10 @@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th
+     EJABBERD_CONFIG_PATH=$ETCDIR/ejabberd.yml
 fi
- [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
 if [ "$LOGS_DIR" = "" ] ; then
-    LOGS_DIR=@LOCALSTATEDIR@/log/ejabberd
+-    LOGS_DIR={{localstatedir}}/log/ejabberd
 +    LOGS_DIR=@EJABBERD_LOGDIR@
 fi
 if [ "$SPOOLDIR" = "" ] ; then
-    SPOOLDIR=@LOCALSTATEDIR@/lib/ejabberd
+-    SPOOLDIR={{localstatedir}}/lib/ejabberd
 +    SPOOLDIR=@EJABBERD_DB@
 fi
 if [ "$EJABBERD_DOC_PATH" = "" ] ; then
-     EJABBERD_DOC_PATH=@DOCDIR@
-@@ -86,7 +86,7 @@ ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_
- 
- # define additional environment variables
- if [ "$EJABBERDDIR" = "" ]; then
-    EJABBERDDIR=@LIBDIR@/ejabberd
-+    EJABBERDDIR=@LIBDIR@/erlang/lib/@DISTNAME@
+     EJABBERD_DOC_PATH={{docdir}}
+@@ -82,7 +82,7 @@ if [ "$ERLANG_NODE_ARG" != "" ] ; then
 fi
- if [ "$EJABBERD_EBIN_PATH" = "" ]; then
-     EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin
-@@ -237,7 +237,7 @@ ctl ()
+ if [ "{{release}}" != "true" ] ; then
+     if [ "$EJABBERDDIR" = "" ] ; then
+-        EJABBERDDIR={{libdir}}/ejabberd
+        EJABBERDDIR={{libdir}}/erlang/lib/@DISTNAME@
+     fi
+     if [ "$EJABBERD_EBIN_PATH" = "" ] ; then
+         EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin
+@@ -261,7 +261,7 @@ ctl()
     # using flock if available. Expects a linux-style
     # flock that can lock a file descriptor.
     MAXCONNID=100
-    CONNLOCKDIR=@LOCALSTATEDIR@/lock/ejabberdctl
+-    CONNLOCKDIR={{localstatedir}}/lock/ejabberdctl
 +    CONNLOCKDIR=@EJABBERD_PIDDIR@
     FLOCK='/usr/bin/flock'
     if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then
- 	JOT='/usr/bin/jot'
+         JOT='/usr/bin/jot'
--- a/chat/ejabberd/patches/patch-configure
+++ b/chat/ejabberd/patches/patch-configure
@@ -0,0 +1,23 @@
+$NetBSD: patch-configure,v 1.1 2013/10/11 13:32:25 fhajny Exp $
+
+Portability.
+--- configure.orig	2013-10-10 10:59:33.747311941 +0000
+++ configure
+@@ -2548,7 +2548,7 @@ EOF
+ 	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+ $as_echo "failed" >&6; }
+ 	   X="`cat conftest.out`"
+-	   if test "" == "warn"; then
+	   if test "" = "warn"; then
+ 	      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $X" >&5
+ $as_echo "$as_me: WARNING: $X" >&2;}
+ 	   else
+@@ -2630,7 +2630,7 @@ EOF
+ 	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+ $as_echo "failed" >&6; }
+ 	   X="`cat conftest.out`"
+-	   if test "warn" == "warn"; then
+	   if test "warn" = "warn"; then
+ 	      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $X" >&5
+ $as_echo "$as_me: WARNING: $X" >&2;}
+ 	   else
--- a/chat/ekg/Makefile
+++ b/chat/ekg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2013/02/06 23:20:53 jperkin Exp $
+# $NetBSD: Makefile,v 1.52 2014/02/12 23:17:35 tron Exp $

 DISTNAME=	ekg-1.7
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	chat
 MASTER_SITES=	http://ekg.chmurka.net/ \
 		http://ekg.chmurka.net/archive/
@@ -10,7 +10,6 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://ekg.chmurka.net/
 COMMENT=	Experimental Gadu-Gadu Client (Polish instant messaging system)

-USE_GNU_READLINE=	yes
 USE_LIBTOOL=		yes
 USE_NCURSES=		yes
 USE_TOOLS+=		gmake pkg-config
--- a/chat/ekg/buildlink3.mk
+++ b/chat/ekg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2013/02/06 23:20:53 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2014/02/12 23:17:35 tron Exp $

 BUILDLINK_TREE+=	ekg

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ekg
 EKG_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.ekg+=	ekg>=1.6
-BUILDLINK_ABI_DEPENDS.ekg+=	ekg>=1.7nb7
+BUILDLINK_ABI_DEPENDS.ekg+=	ekg>=1.7nb8
 BUILDLINK_PKGSRCDIR.ekg?=	../../chat/ekg

 .include "../../devel/zlib/buildlink3.mk"
--- a/chat/empathy/Makefile
+++ b/chat/empathy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2013/06/06 12:53:57 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2014/02/12 23:17:35 tron Exp $

 DISTNAME=	empathy-2.34.0
-PKGREVISION=	29
+PKGREVISION=	37
 CATEGORIES=	chat gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/empathy/2.34/}

--- a/chat/empathy/buildlink3.mk
+++ b/chat/empathy/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2013/06/06 12:53:57 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.33 2014/01/01 11:52:08 wiz Exp $

 BUILDLINK_TREE+=	empathy

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	empathy
 EMPATHY_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.empathy+=	empathy>=2.24.1nb1
-BUILDLINK_ABI_DEPENDS.empathy+=	empathy>=2.34.0nb29
+BUILDLINK_ABI_DEPENDS.empathy+=	empathy>=2.34.0nb36
 BUILDLINK_PKGSRCDIR.empathy?=	../../chat/empathy

 .include "../../devel/glib2/buildlink3.mk"
--- a/chat/empathy/distinfo
+++ b/chat/empathy/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.11 2013/05/04 22:38:14 prlw1 Exp $
+$NetBSD: distinfo,v 1.12 2013/08/12 10:00:03 obache Exp $

 SHA1 (empathy-2.34.0.tar.gz) = 533be910844e92e24be7232d2d122e9dc8b2267f
 RMD160 (empathy-2.34.0.tar.gz) = dfff9212f8c7f5d1c745a4b6bd3f6dbaf4ef02ab
 Size (empathy-2.34.0.tar.gz) = 5085101 bytes
-SHA1 (patch-aa) = ee11360640dcf6a4dd54339ddf63d1aca9d8a7ae
-SHA1 (patch-ab) = faab0ef087905b61eb676f5ae91df3f6ac4b06df
-SHA1 (patch-ac) = 0f99ad2c0498ad849ec3a3f6dcfe760d7e158a6c
-SHA1 (patch-ad) = 0df9f0f04447930e311913ab0e7fc13d5470cdf3
+SHA1 (patch-ad) = 2f0df78b7ee7ae3f58610894a6899397a4601ba7
 SHA1 (patch-libempathy_empathy-auth-factory.c) = 4f2e4fe7ad4e15bd075c39791248143a5c0f005f
 SHA1 (patch-src_Makefile.am) = b80be45492abf1a4bf79f4c408f07beb4ee4ed29
 SHA1 (patch-src_Makefile.in) = bf630e12c9517d0bb7b4e0e32ee47d4197ab0d92
--- a/chat/empathy/patches/patch-aa
+++ b/chat/empathy/patches/patch-aa
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2011/04/05 18:27:08 drochner Exp $
-
--- src/empathy-chat-window.c.orig	2011-03-24 15:15:16.000000000 +0000
-+++ src/empathy-chat-window.c
-@@ -1325,7 +1325,7 @@ chat_window_show_or_update_notification 
- 		   to an existing notification with the same title.
- 		   In this way the previous message will not be lost: the new
- 		   message will appear below it, in the same notification */
-		notification = notify_notification_new (header, escaped, NULL);
-+		notification = notify_notification_new (header, escaped, NULL, NULL);
- 
- 		if (priv->notification == NULL) {
- 			priv->notification = notification;
--- a/chat/empathy/patches/patch-ab
+++ b/chat/empathy/patches/patch-ab
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2011/04/05 18:27:08 drochner Exp $
-
--- src/empathy-call-observer.c.orig	2011-03-24 15:15:16.000000000 +0000
-+++ src/empathy-call-observer.c
-@@ -135,7 +135,7 @@ get_contact_cb (TpConnection *connection
-       _("%s just tried to call you, but you were in another call."),
-       tp_contact_get_alias (contact));
- 
-  notification = notify_notification_new (summary, body, NULL);
-+  notification = notify_notification_new (summary, body, NULL, NULL);
- 
-   emp_contact = empathy_contact_dup_from_tp_contact (contact);
-   pixbuf = empathy_notify_manager_get_pixbuf_for_notification (
--- a/chat/empathy/patches/patch-ac
+++ b/chat/empathy/patches/patch-ac
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2011/04/05 18:27:08 drochner Exp $
-
--- src/empathy-status-icon.c.orig	2011-03-24 15:15:16.000000000 +0000
-+++ src/empathy-status-icon.c
-@@ -241,7 +241,7 @@ status_icon_update_notification (Empathy
- 			   In this way the previous message will not be lost: the new
- 			   message will appear below it, in the same notification */
- 			notification = notify_notification_new
-				(priv->event->header, message_esc, NULL);
-+				(priv->event->header, message_esc, NULL, NULL);
- 
- 			if (priv->notification == NULL) {
- 				priv->notification = notification;
--- a/chat/empathy/patches/patch-ad
+++ b/chat/empathy/patches/patch-ad
@@ -1,16 +1,7 @@
-$NetBSD: patch-ad,v 1.1 2011/04/05 18:27:08 drochner Exp $
+$NetBSD: patch-ad,v 1.2 2013/08/12 10:00:03 obache Exp $

 --- configure.orig	2011-03-24 15:18:52.000000000 +0000
 +++ configure
-@@ -2659,7 +2659,7 @@ GSTREAMER_REQUIRED=0.10.32
- GTK_REQUIRED=2.22.0
- KEYRING_REQUIRED=2.26.0
- LIBCANBERRA_GTK_REQUIRED=0.4
-LIBNOTIFY_REQUIRED=0.7.0
-+LIBNOTIFY_REQUIRED=0.4.0
- TELEPATHY_FARSIGHT_REQUIRED=0.0.14
- TELEPATHY_GLIB_REQUIRED=0.14.1
- TELEPATHY_LOGGER=0.2.0
@@ -13553,8 +13553,8 @@ install-data-am: install-gsettings-schem
 .SECONDARY: $(gsettings_SCHEMAS)
 
--- a/chat/epic4/Makefile
+++ b/chat/epic4/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2013/02/06 23:21:46 jperkin Exp $
+# $NetBSD: Makefile,v 1.38 2014/02/12 23:17:35 tron Exp $
 #

-DISTNAME=	epic4-2.2
-PKGREVISION=	4
+DISTNAME=	epic4-2.10.2
+PKGREVISION=	1
 CATEGORIES=	chat
 MASTER_SITES=	ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/ \
 		ftp://ftp.freenet.de/pub/ftp.prbh.org/pub/epic/EPIC4-PRODUCTION/ \
--- a/chat/epic4/distinfo
+++ b/chat/epic4/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.11 2012/01/09 23:08:56 sbd Exp $
+$NetBSD: distinfo,v 1.12 2013/08/21 10:43:29 shattered Exp $

-SHA1 (epic4-2.2.tar.bz2) = 88d4140e693b571ceb8148f98d504a5fefa74076
-RMD160 (epic4-2.2.tar.bz2) = 8f1f1b446bd3260e665093864f1becc0b625be32
-Size (epic4-2.2.tar.bz2) = 623254 bytes
-SHA1 (patch-aa) = c00699223db490c044d07754d73078c4f768e3a3
+SHA1 (epic4-2.10.2.tar.bz2) = 5b6538d9c1465bc861295f54fe375f326921dcb7
+RMD160 (epic4-2.10.2.tar.bz2) = 38af0d56fdb315c4ce47bf531a4e00d79f13eb5f
+Size (epic4-2.10.2.tar.bz2) = 633946 bytes
 SHA1 (patch-source_Makefile.in) = ea4b6520c228b22b43dc391725f3a0d616aeb729
--- a/chat/epic4/patches/patch-aa
+++ b/chat/epic4/patches/patch-aa
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2007/03/17 14:19:59 rillig Exp $
-
-gcc4 complains:
-term.c:98: error: conflicting types for 'tparm'
-term.c:98: note: a parameter list with an ellipsis can't match an empty parameter name list declaration
-./../include/compat.h:10: error: previous declaration of 'tparm' was here
-
--- source/term.c.orig	2003-12-03 23:17:40.000000000 +0100
-+++ source/term.c	2007-03-17 15:16:22.000000000 +0100
-@@ -94,8 +94,7 @@ extern	int		tgetflag();
- #define Tgetflag(x) 	tgetflag(x.tname)
- #endif
- 
-extern	char	*getenv();
-extern	char	*tparm();
-+#include <stdlib.h>
- 
- /*
-  * The old code assumed termcap. termcap is almost always present, but on
--- a/chat/finch/Makefile
+++ b/chat/finch/Makefile
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile,v 1.54 2013/05/31 12:39:40 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2014/02/03 16:38:53 wiz Exp $

 PKGNAME=	finch-${PIDGIN_VERSION}
-PKGREVISION=	1

 COMMENT=	Multi-protocol Instant Messaging client console frontend

+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 2.10.8
+# finch/libgnt/gntwm.c needs
+# -       PyObject *pp = PySys_GetObject("path"), *dirobj = PyString_FromString(dir);
+# +       PyObject *pp = PySys_GetObject("path"), *dirobj = PyBytes_FromString(dir);
+
 .include		"../../chat/libpurple/Makefile.common"

 USE_TOOLS+=	intltool msgfmt perl
--- a/chat/fisg/Makefile
+++ b/chat/fisg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2012/10/03 00:02:36 asau Exp $
+# $NetBSD: Makefile,v 1.10 2013/07/21 11:34:51 shattered Exp $

-DISTNAME=		fisg-0.2.0
-PKGREVISION=		1
+DISTNAME=		fisg-0.3.12
 CATEGORIES=		chat textproc
 MASTER_SITES=		http://www.tnsp.org/files/

--- a/chat/fisg/PLIST
+++ b/chat/fisg/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:37:44 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/07/21 11:34:51 shattered Exp $
 bin/fisg
 share/examples/fisg/example.cfg
 share/examples/fisg/users.cfg
 share/fisg/blue-h.png
 share/fisg/blue-v.png
+share/fisg/c64.css
+share/fisg/grayblue.css
 share/fisg/green-h.png
 share/fisg/green-v.png
 share/fisg/happy1.gif
@@ -12,9 +14,9 @@ share/fisg/happy3.gif
 share/fisg/happy4.gif
 share/fisg/happy5.gif
 share/fisg/happy6.gif
+share/fisg/pisg.css
 share/fisg/red-h.png
 share/fisg/red-v.png
-share/fisg/style-c64.css
-share/fisg/style-pisg.css
+share/fisg/simple.css
 share/fisg/yellow-h.png
 share/fisg/yellow-v.png
--- a/chat/fisg/distinfo
+++ b/chat/fisg/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2009/02/16 22:14:43 snj Exp $
+$NetBSD: distinfo,v 1.4 2013/07/21 11:34:51 shattered Exp $

-SHA1 (fisg-0.2.0.tar.gz) = e145f05a7d1485ef9ac2c3cf77d3ed8ec92aaf59
-RMD160 (fisg-0.2.0.tar.gz) = 75eba29d8bc87bd6c6b02ac9d8ad2b43db9c9908
-Size (fisg-0.2.0.tar.gz) = 76700 bytes
-SHA1 (patch-aa) = 0730fa6ee5256f8dcc234311fef9955c0442f05d
+SHA1 (fisg-0.3.12.tar.gz) = 7d70d4cad3103c8040e6703e452473584b3bb3a5
+RMD160 (fisg-0.3.12.tar.gz) = d79052ecfa184afb23ae26a28fed8cde0434a07d
+Size (fisg-0.3.12.tar.gz) = 157216 bytes
+SHA1 (patch-aa) = d3bd6f902c5d303e2f355e2ff0c8c148b3449e42
--- a/chat/fisg/patches/patch-aa
+++ b/chat/fisg/patches/patch-aa
@@ -1,26 +1,31 @@
-$NetBSD: patch-aa,v 1.2 2009/02/16 22:14:43 snj Exp $
--- Makefile.orig	2003-02-18 02:59:18.000000000 -0800
-+++ Makefile	2003-09-28 18:41:07.000000000 -0700
-@@ -1,11 +1,19 @@
+$NetBSD: patch-aa,v 1.3 2013/07/21 11:34:51 shattered Exp $
+
+--- Makefile.orig	2004-09-28 04:51:55.000000000 +0000
+++ Makefile
+@@ -1,18 +1,13 @@
 #
 # Makefile for UNIX
 #
-RM=rm
+-# Installation prefix
+-PREFIX=/usr/local
+-
+-# C-compiler, flags and linker flags
 -CC=gcc
-CFLAGS= -g -O2 -Wall
-+#RM=rm
-+#CC=gcc
-+#CFLAGS= -g -O2 -Wall
- 
- FISGEXE=fisg
- TARGETS=$(FISGEXE) strmatch
+-CFLAGS=-g -W -Wall
+-LDFLAGS=
+-
+-# Miscellaneous
+-RM=rm
+-INSTALL=install -c -m 755
+-BINPATH=
+-EXEEXT=
 
 include Makefile.gen
 +
 +install: $(FISGEXE)
-+	$(BSD_INSTALL_PROGRAM) $(FISGEXE) $(DESTDIR)$(PREFIX)/bin
+	$(BSD_INSTALL_PROGRAM) $(FISGBIN) $(DESTDIR)$(PREFIX)/bin
 +	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/share/examples/fisg
 +	$(BSD_INSTALL_DATA) ../example.cfg $(DESTDIR)$(PREFIX)/share/examples/fisg
 +	$(BSD_INSTALL_DATA) ../users.cfg $(DESTDIR)$(PREFIX)/share/examples/fisg
 +	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/share/fisg
-+	$(BSD_INSTALL_DATA) ../data/* $(DESTDIR)$(PREFIX)/share/fisg
+	$(BSD_INSTALL_DATA) ../data/*.* $(DESTDIR)$(PREFIX)/share/fisg
--- a/chat/gajim/Makefile
+++ b/chat/gajim/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2013/06/06 12:54:08 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.24 2014/01/25 10:29:57 wiz Exp $

 DISTNAME=	gajim-0.15
-PKGREVISION=	9
+PKGREVISION=	11
 CATEGORIES=	chat python
 MASTER_SITES=	http://www.gajim.org/downloads/0.15/
 EXTRACT_SUFX=	.tar.bz2
@@ -16,6 +15,8 @@ DEPENDS=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 DEPENDS=	${PYPKGPREFIX}-dbus>=0.81:../../sysutils/py-dbus
 DEPENDS=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3

+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2
+
 .include "options.mk"

 USE_TOOLS+=	gmake intltool pkg-config msgfmt
--- a/chat/gajim/options.mk
+++ b/chat/gajim/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2012/04/17 20:57:09 gls Exp $
+# $NetBSD: options.mk,v 1.4 2014/01/25 10:29:57 wiz Exp $

 PKG_OPTIONS_VAR=	PKG_OPTIONS.gajim
 PKG_SUPPORTED_OPTIONS=	avahi gnome gnome-keyring ssl
@@ -20,6 +20,7 @@ DEPENDS+=	avahi-[0-9]*:../../net/avahi
 # gnome
 .if !empty(PKG_OPTIONS:Mgnome)
 DEPENDS+=	${PYPKGPREFIX}-gnome2-[0-9]*:../../x11/py-gnome2
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-ORBit via py-gnome2
 .endif

 # gnome-keyring
--- a/chat/gale/Makefile
+++ b/chat/gale/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2013/02/06 23:21:18 jperkin Exp $
+# $NetBSD: Makefile,v 1.47 2014/02/12 23:17:35 tron Exp $

 DISTNAME=	gale-0.99fruit
 PKGNAME=	gale-0.99f
-PKGREVISION=	7
+PKGREVISION=	10
 CATEGORIES=	chat
 MASTER_SITES=	http://download.ofb.net/gale/
 EXTRACT_SUFX=	.tar.bz2
@@ -13,7 +13,6 @@ COMMENT=	Secure instant messaging system

 MAKE_JOBS_SAFE=	no

-USE_GNU_READLINE=	yes	# needs rl_named_function()
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
@@ -49,6 +48,7 @@ post-install:

 .include "../../devel/boehm-gc/buildlink3.mk"
 .include "../../devel/glib/buildlink3.mk"
+# needs rl_named_function()
 .include "../../devel/readline/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../net/adns/buildlink3.mk"
--- a/chat/gale/buildlink3.mk
+++ b/chat/gale/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2013/02/06 23:21:18 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2014/02/12 23:17:35 tron Exp $

 BUILDLINK_TREE+=	gale

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gale
 GALE_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.gale+=	gale>=0.99f
-BUILDLINK_ABI_DEPENDS.gale+=	gale>=0.99fnb7
+BUILDLINK_ABI_DEPENDS.gale+=	gale>=0.99fnb10
 BUILDLINK_PKGSRCDIR.gale?=	../../chat/gale

 .include "../../devel/boehm-gc/buildlink3.mk"
--- a/chat/gg2/Makefile
+++ b/chat/gg2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2013/06/06 12:54:08 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2014/02/12 23:17:36 tron Exp $

 DISTNAME=	gg2-2.3.0
-PKGREVISION=	25
+PKGREVISION=	28
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ggadu/}
 EXTRACT_SUFX=	.tar.bz2
--- a/chat/gloox/Makefile
+++ b/chat/gloox/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2013/02/06 23:21:46 jperkin Exp $
+# $NetBSD: Makefile,v 1.9 2014/02/12 23:17:36 tron Exp $

 DISTNAME=		gloox-1.0
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		chat
 MASTER_SITES=		http://camaya.net/download/
 EXTRACT_SUFX=		.tar.bz2
--- a/chat/gnomeicu/Makefile
+++ b/chat/gnomeicu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.94 2013/06/06 12:54:08 wiz Exp $
+# $NetBSD: Makefile,v 1.100 2014/02/12 23:17:36 tron Exp $

 DISTNAME=	gnomeicu-0.99.12
-PKGREVISION=	39
+PKGREVISION=	45
 CATEGORIES=	chat gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnomeicu/}
 EXTRACT_SUFX=	.tar.bz2
--- a/chat/gossip/Makefile
+++ b/chat/gossip/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.89 2013/06/06 12:54:08 wiz Exp $
+# $NetBSD: Makefile,v 1.94 2014/02/12 23:17:36 tron Exp $
 #

 DISTNAME=	gossip-0.10.2
-PKGREVISION=	34
+PKGREVISION=	39
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gossip/0.10/}
 EXTRACT_SUFX=	.tar.bz2
--- a/chat/gtmess/Makefile
+++ b/chat/gtmess/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2013/02/06 23:21:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.16 2014/02/12 23:17:36 tron Exp $
 #

 DISTNAME=		gtmess-0.91
-PKGREVISION=		5
+PKGREVISION=		7
 CATEGORIES=		chat
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gtmess/}

@@ -21,7 +21,7 @@ CFLAGS.SunOS+=		-D_POSIX_PTHREAD_SEMANTICS
 INCOMPAT_CURSES=	NetBSD-1.*-*

 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/chat/i2cb/Makefile
+++ b/chat/i2cb/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2012/10/03 00:02:37 asau Exp $
+# $NetBSD: Makefile,v 1.27 2014/01/11 14:42:02 adam Exp $
 #

 DISTNAME=	i2cb-6.0_ALPHA
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_LOCAL}

@@ -11,7 +11,6 @@ HOMEPAGE=	http://www.draga.com/~jwise/i2cb/
 COMMENT=	Next generation Internet Citicen's Band chat client

 WRKSRC=		${WRKDIR}/icb
-USE_GNU_READLINE=	yes

 CFLAGS.SunOS+=	-DBSD_COMP
 LIBS.SunOS+=	-lsocket
--- a/chat/i2cb/distinfo
+++ b/chat/i2cb/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2012/12/24 03:11:25 dholland Exp $
+$NetBSD: distinfo,v 1.14 2013/08/31 14:45:43 joerg Exp $

 SHA1 (i2cb-6.0_ALPHA.tar.gz) = 6d2ddd234403fe33426ece3fd4de4104cf1a6257
 RMD160 (i2cb-6.0_ALPHA.tar.gz) = 2c0683c20939fe5709fa08b6e335cbee2574ecd8
@@ -25,7 +25,7 @@ SHA1 (patch-as) = 04caba156b07ef94552227b434ed51b83123b078
 SHA1 (patch-at) = 2eeaa4dc6e8fd4e31f91b5b8a7004681465925f5
 SHA1 (patch-au) = 591bae1fcfe43ba86ec29c5ca53322bad5b572e7
 SHA1 (patch-av) = 3ebe9872953147e9694f36e76584482167d2f34a
-SHA1 (patch-aw) = 8db36d0c1323323477d652601bc0968452004b7f
+SHA1 (patch-aw) = 27e6c09d15f7f0ece6337c6c14d66de2424a4068
 SHA1 (patch-ax) = 610a34662113e800fa7455422b170312ef92fe4d
 SHA1 (patch-ay) = 442fdc77dfe58676c17212d4343ffba42ce44b8b
 SHA1 (patch-az) = 7e0cd06b7085bbbf451bedf406564f30c82a5aaf
--- a/chat/i2cb/patches/patch-aw
+++ b/chat/i2cb/patches/patch-aw
@@ -1,8 +1,8 @@
-$NetBSD: patch-aw,v 1.2 2012/02/16 14:05:07 hans Exp $
+$NetBSD: patch-aw,v 1.3 2013/08/31 14:45:43 joerg Exp $

--- src/unix.c.orig	2005-12-13 17:46:52.000000000 +0000
+--- src/unix.c.orig	2000-03-15 22:13:29.000000000 +0000
 +++ src/unix.c
-@@ -6,11 +6,13 @@
+@@ -6,11 +6,14 @@
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -14,10 +14,11 @@ $NetBSD: patch-aw,v 1.2 2012/02/16 14:05:07 hans Exp $
 -#include <sys/dir.h>
 +#include <dirent.h>
 +#include <limits.h>
+#include <termios.h>
 #include <time.h>
 #include <unistd.h>
 #include "icb.h"
-@@ -235,7 +237,11 @@ tildexpand (char *s)
+@@ -235,7 +238,11 @@ tildexpand (char *s)
 	struct passwd *pw;
 	char login[17];
 	char *p = login;
--- a/chat/i2cbd/PLIST
+++ b/chat/i2cbd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:37:45 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/03/11 14:04:58 jperkin Exp $
 man/man8/icbd.8
 man/man8/icbdb.8
 sbin/icbd
@@ -7,4 +7,3 @@ share/examples/i2cbd/icbd.deny
 share/examples/i2cbd/icbd_help
 share/examples/i2cbd/motd
 share/examples/i2cbd/news.1
-share/examples/rc.d/icbd
--- a/chat/inspircd/Makefile
+++ b/chat/inspircd/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.33 2013/05/31 12:39:40 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2014/02/12 23:17:36 tron Exp $
 #

 DISTNAME=	InspIRCd-1.1.23
 PKGNAME=	${DISTNAME:S/InspIRCd/inspircd/}
-PKGREVISION=	10
+PKGREVISION=	13
 CATEGORIES=	chat
 MASTER_SITES=	http://www.inspircd.org/downloads/
 EXTRACT_SUFX=	.tar.bz2
--- a/chat/inspircd/PLIST
+++ b/chat/inspircd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:37:45 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2014/03/11 14:04:58 jperkin Exp $
 bin/inspircd
 lib/inspircd/cmd_admin.so
 lib/inspircd/cmd_away.so
@@ -72,7 +72,6 @@ share/examples/inspircd/sql/m_sqllog.sqlite3.sql
 share/examples/inspircd/sql/m_sqloper.mysql.sql
 share/examples/inspircd/sql/m_sqloper.postgresql.sql
 share/examples/inspircd/sql/m_sqloper.sqlite3.sql
-share/examples/rc.d/inspircd
 share/inspircd/.gdbargs
 share/inspircd/inspircd
 share/inspircd/modules/m_alias.so
--- a/chat/inspircd12/Makefile
+++ b/chat/inspircd12/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2013/05/31 12:39:40 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2014/02/12 23:17:36 tron Exp $
 #

 DISTNAME=	InspIRCd-1.2.0
 PKGNAME=	${DISTNAME:S/InspIRCd/inspircd/}
-PKGREVISION=	11
+PKGREVISION=	14
 CATEGORIES=	chat
 MASTER_SITES=	http://www.inspircd.org/downloads/
 EXTRACT_SUFX=	.tar.bz2
--- a/chat/inspircd12/PLIST
+++ b/chat/inspircd12/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/08/29 22:42:46 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.7 2014/03/11 14:04:58 jperkin Exp $
 bin/inspircd
 lib/inspircd/cmd_admin.so
 lib/inspircd/cmd_away.so
@@ -74,7 +74,6 @@ share/examples/inspircd/sql/m_sqloper.mssql.sql
 share/examples/inspircd/sql/m_sqloper.mysql.sql
 share/examples/inspircd/sql/m_sqloper.postgresql.sql
 share/examples/inspircd/sql/m_sqloper.sqlite3.sql
-share/examples/rc.d/inspircd
 share/inspircd/.gdbargs
 share/inspircd/inspircd
 share/inspircd/modules/m_alias.so
--- a/chat/ircII/Makefile
+++ b/chat/ircII/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.61 2012/10/03 00:02:38 asau Exp $
+# $NetBSD: Makefile,v 1.63 2014/03/12 07:22:34 mrg Exp $

 DISTNAME=		ircii-${VERS}
 PKGNAME=		ircII-${VERS}
-PKGREVISION=		3
+PKGREVISION=		1
 CATEGORIES=		chat
-MASTER_SITES=		ftp://ircii.warped.com/pub/ircII/ \
-			http://ircii.warped.com/pub/ircII/
+MASTER_SITES=		http://ircii.warped.com/
 EXTRACT_SUFX=		.tar.bz2

 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -17,7 +16,7 @@ CONFLICTS=		blackened-[0-9]*

 PKG_INSTALLATION_TYPES=	overwrite pkgviews

-VERS=			20111115
+VERS=			20131230
 PLIST_SUBST+=	VERS=${VERS:Q}

 .include "../../mk/bsd.prefs.mk"
--- a/chat/ircII/PLIST
+++ b/chat/ircII/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2011/11/16 08:28:29 tron Exp $
+@comment $NetBSD: PLIST,v 1.25 2014/01/02 07:57:49 mrg Exp $
 bin/irc
 bin/irc-${VERS}
 bin/ircbug
@@ -158,8 +158,8 @@ share/irc/help/load/edit${GZSUFFIX}
 share/irc/help/load/english${GZSUFFIX}
 share/irc/help/load/events${GZSUFFIX}
 share/irc/help/load/extensions${GZSUFFIX}
-share/irc/help/load/finger.who${GZSUFFIX}
 share/irc/help/load/finger${GZSUFFIX}
+share/irc/help/load/finger.who${GZSUFFIX}
 share/irc/help/load/flood${GZSUFFIX}
 share/irc/help/load/fnet${GZSUFFIX}
 share/irc/help/load/functions${GZSUFFIX}
@@ -350,6 +350,7 @@ share/irc/help/set/dccport${GZSUFFIX}
 share/irc/help/set/debug${GZSUFFIX}
 share/irc/help/set/decrypt_program${GZSUFFIX}
 share/irc/help/set/display${GZSUFFIX}
+share/irc/help/set/display_encoding${GZSUFFIX}
 share/irc/help/set/eight_bit_characters${GZSUFFIX}
 share/irc/help/set/encrypt_program${GZSUFFIX}
 share/irc/help/set/exec_protection${GZSUFFIX}
@@ -372,10 +373,12 @@ share/irc/help/set/hold_mode${GZSUFFIX}
 share/irc/help/set/hold_mode_max${GZSUFFIX}
 share/irc/help/set/indent${GZSUFFIX}
 share/irc/help/set/input_aliases${GZSUFFIX}
+share/irc/help/set/input_encoding${GZSUFFIX}
 share/irc/help/set/input_prompt${GZSUFFIX}
 share/irc/help/set/input_protection${GZSUFFIX}
 share/irc/help/set/insert_mode${GZSUFFIX}
 share/irc/help/set/inverse_video${GZSUFFIX}
+share/irc/help/set/irc_encoding${GZSUFFIX}
 share/irc/help/set/irchost${GZSUFFIX}
 share/irc/help/set/lastlog${GZSUFFIX}
 share/irc/help/set/lastlog_level${GZSUFFIX}
@@ -436,7 +439,6 @@ share/irc/help/set/status_window${GZSUFFIX}
 share/irc/help/set/suppress_server_motd${GZSUFFIX}
 share/irc/help/set/tab${GZSUFFIX}
 share/irc/help/set/tab_max${GZSUFFIX}
-share/irc/help/set/translation${GZSUFFIX}
 share/irc/help/set/underline_video${GZSUFFIX}
 share/irc/help/set/user_information${GZSUFFIX}
 share/irc/help/set/user_wallops${GZSUFFIX}
@@ -596,36 +598,3 @@ share/irc/script/voice
 share/irc/script/wallopstat
 share/irc/script/whowas
 share/irc/script/window
-share/irc/translation/ASCII
-share/irc/translation/CP437
-share/irc/translation/CP850
-share/irc/translation/DANISH
-share/irc/translation/DEC_MCS
-share/irc/translation/DG_MCS
-share/irc/translation/DUTCH
-share/irc/translation/FINNISH
-share/irc/translation/FRENCH
-share/irc/translation/FRENCH_CANADIAN
-share/irc/translation/GERMAN
-share/irc/translation/HP_MCS
-share/irc/translation/IRV
-share/irc/translation/ITALIAN
-share/irc/translation/JIS
-share/irc/translation/MACINTOSH
-share/irc/translation/NEXT
-share/irc/translation/NORWEGIAN_1
-share/irc/translation/NORWEGIAN_2
-share/irc/translation/POLISH
-share/irc/translation/POLISH_NOPL
-share/irc/translation/PORTUGUESE
-share/irc/translation/PORTUGUESE_COM
-share/irc/translation/RUSSIAN
-share/irc/translation/RUSSIAN_ALT
-share/irc/translation/RUSSIAN_WIN
-share/irc/translation/SPANISH
-share/irc/translation/SWEDISH
-share/irc/translation/SWEDISH_NAMES
-share/irc/translation/SWEDISH_NAMES_COM
-share/irc/translation/SWISS
-share/irc/translation/UNITED_KINGDOM
-share/irc/translation/UNITED_KINGDOM_COM
--- a/chat/ircII/distinfo
+++ b/chat/ircII/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.35 2011/11/15 09:41:40 mrg Exp $
+$NetBSD: distinfo,v 1.37 2014/03/12 07:22:34 mrg Exp $

-SHA1 (ircii-20111115.tar.bz2) = 723f89ca6c0ef0085da858076865e6493fbe9788
-RMD160 (ircii-20111115.tar.bz2) = b2cdcafcfde914ead88049d55c0d5ba0680db746
-Size (ircii-20111115.tar.bz2) = 555731 bytes
-SHA1 (patch-ac) = 51a4eb7987e99871ca5fd519b33196eb6cc772de
+SHA1 (ircii-20131230.tar.bz2) = b59f8fcd344c09b8820f6efbcc74ba9af7e587ce
+RMD160 (ircii-20131230.tar.bz2) = ae2696afc9b6efec3e866ae217d5f5bd258d4493
+Size (ircii-20131230.tar.bz2) = 552149 bytes
+SHA1 (patch-ac) = 9f6f3b27670b63ff00b55c5431ec1da5219369ff
+SHA1 (patch-source_input.c) = 4ddd92d6209624db964f08f0d7b0375781344138
--- a/chat/ircII/patches/patch-ac
+++ b/chat/ircII/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.7 2011/11/15 09:41:41 mrg Exp $
+$NetBSD: patch-ac,v 1.8 2014/01/02 07:57:49 mrg Exp $

--- Makefile.in.orig	2011-07-09 23:18:01.000000000 -0700
-+++ Makefile.in	2011-11-15 01:22:04.000000000 -0800
-@@ -132,8 +132,8 @@
+--- Makefile.in.orig	2013-12-30 08:42:37.000000000 -0800
+++ Makefile.in	2014-01-01 23:21:21.000000000 -0800
+@@ -127,8 +127,8 @@
 CP = cp
 MV = mv
 SED = sed
@@ -13,7 +13,7 @@ $NetBSD: patch-ac,v 1.7 2011/11/15 09:41:41 mrg Exp $
 
 VERSION = @VERSION@
 
-@@ -154,11 +154,9 @@
+@@ -149,11 +149,9 @@
 
 installirc: irc installdirs
 	$(INSTALL) irc $(INSTALL_IRC)-$(VERSION)
@@ -27,12 +27,12 @@ $NetBSD: patch-ac,v 1.7 2011/11/15 09:41:41 mrg Exp $
 
 installscript: installdirs
 	(								\
-@@ -209,7 +207,7 @@
+@@ -193,7 +191,7 @@
 #	$(INSTALL_DATA) $(topdir)/doc/query-pr.1 $(mandir)
 
 installdirs:
 -	umask 022; $(topdir)/mkinstalldirs $(IRCLIB) $(bindir) $(mandir) \
 +	$(topdir)/mkinstalldirs $(IRCLIB) $(bindir) $(mandir) \
- 		$(TRANS_PATH) $(INSTALL_SCRIPT) $(HELP_DIR) $(libexecdir)
+ 		$(INSTALL_SCRIPT) $(HELP_DIR) $(libexecdir)
 
 clena clean:
--- a/chat/ircII/patches/patch-source_input.c
+++ b/chat/ircII/patches/patch-source_input.c
@@ -0,0 +1,23 @@
+$NetBSD: patch-source_input.c,v 1.1 2014/03/12 07:22:34 mrg Exp $
+
+fix a problem with the input line when it goes beyond the screen size
+
+Index: source/input.c
+===================================================================
+RCS file: /home/cvs/ircii/source/input.c,v
+retrieving revision 1.55
+retrieving revision 1.56
+diff -p -r1.55 -r1.56
+*** source/input.c	30 Dec 2013 16:42:38 -0000	1.55
+--- source/input.c	30 Jan 2014 10:13:06 -0000	1.56
+*************** update_input(update)
+*** 488,493 ****
+--- 484,491 ----
+  			}
+  		}
+  		VisBuf[optr] = '\0';
+ 		if (old_cursor_pos > inputdata->cursor_x)
+ 			old_cursor_pos = 0;
+  		term_move_cursor(old_cursor_pos, inputdata->cursor_y);
+  		written = output_line(VisBuf + old_cursor_pos, 0);
+  		if (term_clear_to_eol() && written < current_screen->co)
--- a/chat/ircd-hybrid/Makefile
+++ b/chat/ircd-hybrid/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2013/03/23 19:29:50 spz Exp $
+# $NetBSD: Makefile,v 1.49 2014/02/12 23:17:36 tron Exp $

 DISTNAME=	ircd-hybrid-7.2.3
-PKGREVISION=	6
+PKGREVISION=	8
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ircd-hybrid/}
 EXTRACT_SUFX=	.tgz
--- a/chat/ircd-hybrid/PLIST
+++ b/chat/ircd-hybrid/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 17:37:46 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2014/03/11 14:04:59 jperkin Exp $
 bin/encspeed
 bin/ircd
 bin/ircd-hybrid-mkpasswd
@@ -121,7 +121,6 @@ share/examples/ircd-hybrid/example.conf
 share/examples/ircd-hybrid/example.conf.quick
 share/examples/ircd-hybrid/example.efnet.conf
 share/examples/ircd-hybrid/simple.conf
-share/examples/rc.d/ircd-hybrid
 share/ircd-hybrid/help/opers/accept
 share/ircd-hybrid/help/opers/admin
 share/ircd-hybrid/help/opers/away
--- a/chat/ircservices/PLIST
+++ b/chat/ircservices/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:28:44 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2014/03/11 14:04:59 jperkin Exp $
 lib/services/convert-db
 lib/services/helpfiles/help
 lib/services/languages/de
@@ -35,4 +35,3 @@ share/doc/html/ircservices/copyright.html
 share/doc/html/ircservices/faq.html
 share/doc/html/ircservices/index.html
 share/doc/html/ircservices/upgrade.html
-share/examples/rc.d/ircservices
--- a/chat/ircu/Makefile
+++ b/chat/ircu/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2012/10/03 00:02:38 asau Exp $
+# $NetBSD: Makefile,v 1.36 2013/07/12 10:44:53 jperkin Exp $
 #

 DISTNAME=	ircu2.10.12.12
 PKGNAME=	${DISTNAME:S/ircu2/ircu-2/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=undernet-ircu/}

--- a/chat/ircu/PLIST
+++ b/chat/ircu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:37:46 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2014/03/11 14:04:59 jperkin Exp $
 man/man8/ircd.8
 sbin/ircd
 bin/umkpasswd
@@ -22,4 +22,3 @@ share/doc/ircd/readme.log
 share/doc/ircd/readme.who
 share/doc/ircd/readme.www
 share/examples/ircd/example.conf
-share/examples/rc.d/ircd
--- a/chat/irssi-xmpp/Makefile
+++ b/chat/irssi-xmpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/03 00:02:38 asau Exp $
+# $NetBSD: Makefile,v 1.4 2014/03/24 17:44:47 jperkin Exp $
 #

 DISTNAME=	irssi-xmpp-0.52
@@ -29,6 +29,15 @@ SUBST_MESSAGE.makefile=	Fixing doc-install Makefile target.
 SUBST_FILES.makefile=	Makefile
 SUBST_SED.makefile+=	-e '/docs/s/install/install -m 644/'

+SUBST_CLASSES+=		configmk
+SUBST_STAGE.configmk=	pre-build
+SUBST_MESSAGE.configmk=	Fixing CFLAGS and LDFLAGS to be user-settable.
+SUBST_FILES.configmk=	config.mk
+SUBST_SED.configmk+=	-e 's/^CFLAGS =/CFLAGS +=/'
+SUBST_SED.configmk+=	-e 's/^LDFLAGS =/LDFLAGS +=/'
+
+CFLAGS.SunOS+=	-D__BEGIN_DECLS= -D__END_DECLS=
+
 post-extract:
 	${MV} ${WRKDIR}/${DISTNAME} ${WRKDIR}/${IRSSI_DISTNAME}
 	${CP} ${IRSSI_CONFIG_H} ${WRKSRC}/src/config.h
--- a/chat/irssi/Makefile
+++ b/chat/irssi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2013/05/31 12:39:40 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2014/02/12 23:17:36 tron Exp $

 DISTNAME=		${IRSSI_DISTNAME}
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		chat
 MASTER_SITES=		http://www.irssi.org/files/
 EXTRACT_SUFX=		${IRSSI_EXTRACT_SUFX}
--- a/chat/jabberd/Makefile
+++ b/chat/jabberd/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.36 2013/02/06 23:21:00 jperkin Exp $
+# $NetBSD: Makefile,v 1.38 2014/02/12 23:17:36 tron Exp $
 #

 DISTNAME=		jabber-1.4.2
 PKGNAME=		jabberd-1.4.2
-PKGREVISION=		10
+PKGREVISION=		12
 CATEGORIES=		chat
 MASTER_SITES=		http://download.jabberd.org/jabberd14/

--- a/chat/jabberd/PLIST
+++ b/chat/jabberd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:37:46 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2014/03/11 14:04:59 jperkin Exp $
 include/jabberd/jabberd.h
 include/jabberd/lib/lib.h
 include/jabberd/lib/xmlparse.h
@@ -10,4 +10,3 @@ lib/jabberd/xdb_file.so
 sbin/jabberd
 share/examples/jabberd/jabber.xml
 share/examples/jabberd/platform-settings
-share/examples/rc.d/jabberd
--- a/chat/jabberd/buildlink3.mk
+++ b/chat/jabberd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2013/02/06 23:21:00 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2014/02/12 23:17:36 tron Exp $

 BUILDLINK_TREE+=	jabberd

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	jabberd
 JABBERD_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.jabberd+=	jabberd>=1.4.2
-BUILDLINK_ABI_DEPENDS.jabberd+=	jabberd>=1.4.2nb10
+BUILDLINK_ABI_DEPENDS.jabberd+=	jabberd>=1.4.2nb12
 BUILDLINK_PKGSRCDIR.jabberd?=	../../chat/jabberd

 .include "../../security/openssl/buildlink3.mk"
--- a/chat/jabberd2/MESSAGE
+++ b/chat/jabberd2/MESSAGE
@@ -1,6 +1,6 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2009/08/21 02:28:12 schnoebe Exp $
+$NetBSD: MESSAGE,v 1.2 2013/12/12 23:01:02 schnoebe Exp $

-	Review ${PREFIX}/share/doc/jabberd/UPGRADE if you're upgrading
+	Review ${PREFIX}/share/doc/jabberd/NEWS if you're upgrading
 	from an earlier release of Jabberd 2.x.
 ===========================================================================
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.83 2013/05/31 12:39:40 wiz Exp $
+# $NetBSD: Makefile,v 1.91 2014/02/24 19:30:53 schnoebe Exp $

-DISTNAME=	jabberd-2.2.17
-PKGREVISION=	9
+DISTNAME=	jabberd-2.3.2
 CATEGORIES=	chat
-MASTER_SITES=	http://cloud.github.com/downloads/jabberd2/jabberd2/
+MASTER_SITES=	https://github.com/jabberd2/jabberd2/releases/download/${DISTNAME}/
 EXTRACT_SUFX=	.tar.xz

+FETCH_USING=	curl
+
 MAINTAINER=	adam@NetBSD.org
-HOMEPAGE=	http://jabberd2.xiaoka.com/
+HOMEPAGE=	http://jabberd2.org/
 COMMENT=	XMPP (Jabber) instant messaging server
 LICENSE=	gnu-gpl-v2

@@ -64,7 +65,7 @@ FILES=			jabberd.cfg c2s.xml router.xml router-users.xml \
 			router-filter.xml s2s.xml sm.xml
 DBFILES=		db-jd14-2-jd2.sql db-setup.mysql db-setup.pgsql \
 			db-update.mysql	db-setup.sqlite db-update.sqlite
-DOCFILES=		README.protocol README UPGRADE ChangeLog
+DOCFILES=		README.protocol README README.config NEWS

 INSTALLATION_DIRS=	bin ${EGDIR} ${DOCDIR}

@@ -126,6 +127,7 @@ post-install:
 .include "../../devel/cppunit/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../net/udns/buildlink3.mk"
+.include "../../security/gsasl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
--- a/chat/jabberd2/PLIST
+++ b/chat/jabberd2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2012/08/26 18:25:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2014/03/11 14:04:59 jperkin Exp $
 bin/bdbdump.pl
 bin/c2s
 bin/jabberd
@@ -51,10 +51,10 @@ man/man8/jabberd.8
 man/man8/router.8
 man/man8/s2s.8
 man/man8/sm.8
-share/doc/jabberd/ChangeLog
+share/doc/jabberd/NEWS
 share/doc/jabberd/README
 share/doc/jabberd/README.protocol
-share/doc/jabberd/UPGRADE
+share/doc/jabberd/README.config
 share/examples/jabberd/c2s.xml
 share/examples/jabberd/db-jd14-2-jd2.sql
 share/examples/jabberd/db-setup.mysql
@@ -69,8 +69,3 @@ share/examples/jabberd/router-users.xml
 share/examples/jabberd/router.xml
 share/examples/jabberd/s2s.xml
 share/examples/jabberd/sm.xml
-share/examples/rc.d/c2s
-share/examples/rc.d/jabberd
-share/examples/rc.d/router
-share/examples/rc.d/s2s
-share/examples/rc.d/sm
--- a/chat/jabberd2/distinfo
+++ b/chat/jabberd2/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.31 2012/08/27 05:14:55 dholland Exp $
+$NetBSD: distinfo,v 1.33 2014/02/24 19:30:53 schnoebe Exp $

-SHA1 (jabberd-2.2.17.tar.xz) = 2b94707e0a06d07ba0329760d308460edf0f1cd8
-RMD160 (jabberd-2.2.17.tar.xz) = 4e0d30fdd24ce707ce3c5e3654f51c01de7ee0a2
-Size (jabberd-2.2.17.tar.xz) = 1382124 bytes
-SHA1 (patch-Makefile.in) = 9cdc341d764b28d331b51fb5a559afbc0b3e952b
+SHA1 (jabberd-2.3.2.tar.xz) = c2f5a79b2c8fb1c0f16dd015490e3a453fac3332
+RMD160 (jabberd-2.3.2.tar.xz) = 6b97de4d4e2ff782fed060a01b57ba322c77fe70
+Size (jabberd-2.3.2.tar.xz) = 1473436 bytes
+SHA1 (patch-Makefile.in) = 8be9b6820e46c0e62808c8eecee6c7bd72e94ee2
 SHA1 (patch-configure) = 1a58cc7b015a73009d8140402dfb739fc48e7fa0
-SHA1 (patch-s2s_out.c) = c72be21c425b56345eb8a79284b4e4aaf18c0d65
-SHA1 (patch-sm_mod_roster.c) = f43d80c2abfd31d99016b4738a717d3c6db183ce
--- a/chat/jabberd2/options.mk
+++ b/chat/jabberd2/options.mk
@@ -1,37 +1,25 @@
-# $NetBSD: options.mk,v 1.25 2010/07/06 00:01:35 schnoebe Exp $
+# $NetBSD: options.mk,v 1.26 2014/02/24 19:30:53 schnoebe Exp $

 PKG_OPTIONS_VAR=		PKG_OPTIONS.jabberd2
-PKG_OPTIONS_REQUIRED_GROUPS=	auth storage sasl mio
+PKG_OPTIONS_REQUIRED_GROUPS=	auth storage mio
 # Authentication backend
 PKG_OPTIONS_GROUP.auth=		auth-mysql auth-pgsql auth-sqlite
 PKG_OPTIONS_GROUP.auth+=	auth-db auth-ldap auth-pam
 # Storage backend
 PKG_OPTIONS_GROUP.storage=	storage-mysql storage-pgsql
 PKG_OPTIONS_GROUP.storage+=	storage-sqlite storage-db
-# SASL implementation
-PKG_OPTIONS_GROUP.sasl=		sasl-cyrus sasl-gnu
 # mio implementations
 PKG_OPTIONS_GROUP.mio=		mio-kqueue mio-select mio-poll mio-epoll
 # debugging
 PKG_SUPPORTED_OPTIONS+=		debug

-PKG_SUGGESTED_OPTIONS=		auth-sqlite storage-sqlite sasl-gnu
+PKG_SUGGESTED_OPTIONS=		auth-sqlite storage-sqlite
 PKG_SUGGESTED_OPTIONS+=		mio-select mio-poll

 .include "../../mk/bsd.options.mk"

 PLIST_VARS+=	db ldap mysql pam pgsql sqlite

-.if !empty(PKG_OPTIONS:Msasl-cyrus)
-CONFIGURE_ARGS+=	--with-sasl=cyrus
-.  include "../../security/cyrus-sasl/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Msasl-gnu)
-CONFIGURE_ARGS+=	--with-sasl=gsasl
-.  include "../../security/gsasl/buildlink3.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mauth-db) || !empty(PKG_OPTIONS:Mstorage-db)
 BDB_ACCEPTED=		db4 db5
 CONFIGURE_ARGS+=	--enable-db
--- a/chat/jabberd2/patches/patch-Makefile.in
+++ b/chat/jabberd2/patches/patch-Makefile.in
@@ -1,13 +1,13 @@
-$NetBSD: patch-Makefile.in,v 1.3 2012/08/26 18:25:47 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.4 2013/12/12 23:01:02 schnoebe Exp $

 Skip etc.

--- Makefile.in.orig	2012-05-12 05:19:32.000000000 +0000
+--- Makefile.in.orig	2013-11-28 11:16:25.000000000 +0000
 +++ Makefile.in
-@@ -245,7 +245,7 @@ top_build_prefix = @top_build_prefix@
+@@ -333,7 +333,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
- EXTRA_DIST = Doxyfile.in README.win32 README.protocol README.config contrib UPGRADE docs win32
+ EXTRA_DIST = Doxyfile.in README.win32 README.protocol README.config contrib docs win32
 -SUBDIRS = etc man $(am__append_1) tools mio sx util c2s router s2s \
 +SUBDIRS = man $(am__append_1) tools mio sx util c2s router s2s \
 	storage sm $(am__append_2)
--- a/chat/jabberd2/patches/patch-s2s_out.c
+++ b/chat/jabberd2/patches/patch-s2s_out.c
@@ -1,15 +0,0 @@
-$NetBSD: patch-s2s_out.c,v 1.4 2012/08/26 18:25:47 adam Exp $
-
-Non-void function must return a value.
-
--- s2s/out.c.orig	2012-05-12 05:21:36.000000000 +0000
-+++ s2s/out.c
-@@ -627,7 +627,7 @@ int out_packet(s2s_t s2s, pkt_t pkt) {
-             nad_free(pkt->nad);
-         free(pkt);
- 
-        return;
-+        return -1;
-     }
- 
-     /* new route key */
--- a/chat/jabberd2/patches/patch-sm_mod_roster.c
+++ b/chat/jabberd2/patches/patch-sm_mod_roster.c
@@ -1,15 +0,0 @@
-$NetBSD: patch-sm_mod_roster.c,v 1.1 2012/05/12 05:44:46 adam Exp $
-
-Void function must not return any values.
-
--- sm/mod_roster.c.orig	2012-05-12 05:25:14.000000000 +0000
-+++ sm/mod_roster.c
-@@ -460,7 +460,7 @@ static void _roster_set_item(pkt_t pkt, 
-     log_debug(ZONE, "added %s to roster (to %d from %d ask %d name %s ngroups %d)", jid_full(item->jid), item->to, item->from, item->ask, item->name, item->ngroups);
- 
-     if (sm_storage_rate_limit(sess->user->sm, jid_user(sess->user->jid)))
-        return -stanza_err_RESOURCE_CONSTRAINT;
-+        return;
- 
-     /* save changes */
-     _roster_save_item(sess->user, item);
--- a/chat/kadu/Makefile
+++ b/chat/kadu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2013/06/06 12:54:08 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2014/02/12 23:17:36 tron Exp $

 DISTNAME=	kadu-0.5.0
-PKGREVISION=	14
+PKGREVISION=	16
 CATEGORIES=	chat
 MASTER_SITES=	http://www.kadu.net/download/stable/
 EXTRACT_SUFX=	.tar.bz2
--- a/chat/kgb-bot/DESCR
+++ b/chat/kgb-bot/DESCR
@@ -0,0 +1,4 @@
+KGB is a system that provides notifications on IRC for commits made to Git,
+Subversion and CVS repositories. It uses two components: a server, which
+runs the IRC bot, and a client, which is hooked into the repositories and
+sends the notifications to the server.
--- a/chat/kgb-bot/Makefile
+++ b/chat/kgb-bot/Makefile
@@ -0,0 +1,55 @@
+# $NetBSD: Makefile,v 1.3 2013/11/05 11:15:43 tonnerre Exp $
+#
+
+DISTNAME=	App-KGB-1.31
+PKGNAME=	${DISTNAME:S/App-KGB/kgb-bot/}
+PKGREVISION=	2
+
+CATEGORIES=	chat perl5 scm
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=App/}
+
+MAINTAINER=	tonnerre@NetBSD.org
+HOMEPAGE=	https://alioth.debian.org/projects/kgb/
+COMMENT=	Notify about VCS commits on IRC
+
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+USE_TOOLS+=	perl:run
+
+DEPENDS+=		p5-Class-Accessor-[0-9]*:../../devel/p5-Class-Accessor
+DEPENDS+=		p5-File-Touch-[0-9]*:../../devel/p5-File-Touch
+DEPENDS+=		p5-IPC-Run-[0-9]*:../../devel/p5-IPC-Run
+DEPENDS+=		p5-JSON-RPC-[0-9]*:../../www/p5-JSON-RPC
+DEPENDS+=		p5-JSON-XS-[0-9]*:../../converters/p5-JSON-XS
+DEPENDS+=		p5-POE-[0-9]*:../../devel/p5-POE
+DEPENDS+=		p5-POE-Component-IRC-[0-9]*:../../chat/p5-POE-Component-IRC
+DEPENDS+=		p5-POE-Component-Server-SOAP-[0-9]*:../../www/p5-POE-Component-Server-SOAP
+DEPENDS+=		p5-Proc-PID-File-[0-9]*:../../devel/p5-Proc-PID-File
+DEPENDS+=		p5-Schedule-RateLimiter-[0-9]*:../../devel/p5-Schedule-RateLimiter
+DEPENDS+=		p5-SOAP-Lite-[0-9]*:../../net/p5-SOAP-Lite
+DEPENDS+=		p5-subversion-[0-9]*:../../devel/p5-subversion
+DEPENDS+=		p5-WWW-Shorten-[0-9]*:../../www/p5-WWW-Shorten
+DEPENDS+=		p5-YAML-[0-9]*:../../textproc/p5-YAML
+
+RCD_SCRIPTS=		kgb_bot
+RCD_SCRIPT_SRC.kgb_bot=	files/kgb_bot.sh
+
+REPLACE_INTERPRETER+=	perl
+REPLACE.perl.old=	/usr/bin/perl
+REPLACE.perl.new=	${TOOLS_PATH.perl}
+REPLACE_FILES.perl=	script/kgb-add-project script/kgb-bot
+REPLACE_FILES.perl+=	script/kgb-split-config script/kgb-client
+REPLACE_FILES.perl+=	eg/simple-soap-client eg/simple-soap-server
+
+SUBST_CLASSES+=		configs
+SUBST_STAGE.configs=	pre-configure
+SUBST_FILES.configs=	script/kgb-add-project script/kgb-bot
+SUBST_FILES.configs+=	script/kgb-split-config
+SUBST_SED.configs=	-e "s,/etc/,${PKG_SYSCONFDIR}/,g"
+
+MAKE_ENV+=		PERL=${TOOLS_PATH.perl}
+
+PERL5_PACKLIST=		auto/App/KGB/.packlist
+PERL5_MODULE_TYPE=	Module::Build
+
+.include "../../lang/perl5/module.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/chat/kgb-bot/PLIST
+++ b/chat/kgb-bot/PLIST
@@ -0,0 +1 @@
+@comment $NetBSD: PLIST,v 1.2 2014/03/11 14:04:59 jperkin Exp $
--- a/chat/kgb-bot/distinfo
+++ b/chat/kgb-bot/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1.1.1 2013/10/20 14:16:16 tonnerre Exp $
+
+SHA1 (App-KGB-1.31.tar.gz) = 9cfffc64a6698faa2330f807de67e4e318310811
+RMD160 (App-KGB-1.31.tar.gz) = 981c5109c941a8da120df005ce41009af6b0df8b
+Size (App-KGB-1.31.tar.gz) = 97753 bytes
+SHA1 (patch-Build.PL) = 5e49e8c654448da10c4116da8a799e4c12d56380
--- a/chat/kgb-bot/files/kgb_bot.sh
+++ b/chat/kgb-bot/files/kgb_bot.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+#
+# $NetBSD: kgb_bot.sh,v 1.1 2013/11/05 02:13:42 tonnerre Exp $
+#
+# PROVIDE: kgb_bot
+# REQUIRE: DAEMON
+
+. /etc/rc.subr
+
+name="kgb_bot"
+rcvar=$name
+command="@PREFIX@/sbin/kgb-bot"
+required_files="@PKG_SYSCONFDIR@/kgb-bot/kgb.conf"
+
+load_rc_config $name
+run_rc_command "$1"
--- a/chat/kgb-bot/patches/patch-Build.PL
+++ b/chat/kgb-bot/patches/patch-Build.PL
@@ -0,0 +1,41 @@
+$NetBSD: patch-Build.PL,v 1.1.1.1 2013/10/20 14:16:16 tonnerre Exp $
+
+Install into the appropriate directories.
+
+--- Build.PL.orig	2013-08-17 07:41:14.000000000 +0000
+++ Build.PL
+@@ -60,8 +60,13 @@ my $builder = My::Builder->new(
+     },
+     bindoc_dirs  => [qw(script sbin)],
+     install_path => {
+-        sbin => '/usr/sbin',
+-        etc  => 'etc'
+        bin =>  $ENV{PREFIX} . '/bin',
+        sbin => $ENV{PREFIX} . '/sbin',
+        man5 => $ENV{PREFIX} . '/' . $ENV{PKGMANDIR} . '/man5/',
+        man7 => $ENV{PREFIX} . '/' . $ENV{PKGMANDIR} . '/man7/'
+    },
+    bin_files => {
+        'script/kgb-client'       => 'bin/kgb-client'
+     },
+     sbin_files => {
+         'script/kgb-bot'          => 'sbin/kgb-bot',
+@@ -69,13 +74,16 @@ my $builder = My::Builder->new(
+         'script/kgb-split-config' => 'sbin/kgb-split-config',
+     },
+     etc_files => { 'etc/kgb.conf' => 'etc/kgb-bot/kgb.conf' },
+-    man_files => { 'man5/*' => 'man5/' },
+-    script_files => [ 'script/kgb-client' ],
+    man_files => {
+	'man5/*' => 'man5/',
+	'man7/*' => 'man7/'
+    },
+     no_index => {
+         directory => [ 'privinc' ],
+     },
+ );
+ 
+$builder->add_build_element('bin');
+ $builder->add_build_element('sbin');
+ $builder->add_build_element('etc');
+ $builder->add_build_element('man');
--- a/chat/kmess/Makefile
+++ b/chat/kmess/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.62 2013/06/06 12:54:08 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2014/02/12 23:17:36 tron Exp $
 #

 DISTNAME=	kmess-1.4.3
-PKGREVISION=	30
+PKGREVISION=	33
 CATEGORIES=	chat kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kmess/}

--- a/chat/konversation-kde3/Makefile
+++ b/chat/konversation-kde3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2013/06/06 12:54:08 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2014/02/12 23:17:36 tron Exp $
 #

 DISTNAME=	konversation-1.1
-PKGREVISION=	27
+PKGREVISION=	30
 CATEGORIES=	chat kde
 MASTER_SITES=	http://download.berlios.de/konversation/
 EXTRACT_SUFX=	.tar.bz2
--- a/chat/konversation/Makefile
+++ b/chat/konversation/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.62 2013/06/06 12:54:08 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2014/03/12 19:49:02 wiedi Exp $
 #

-DISTNAME=	konversation-1.4
-PKGREVISION=	20
+DISTNAME=	konversation-1.5
 CATEGORIES=	chat kde
-MASTER_SITES=	${MASTER_SITE_KDE:=konversation/1.4/src/}
+MASTER_SITES=	${MASTER_SITE_KDE:=konversation/1.5/src/}
 EXTRACT_SUFX=	.tar.xz

 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -31,6 +30,8 @@ USE_TOOLS+=		bash:run
 DEPENDS+=		psmisc>=20.1:../../sysutils/psmisc
 .endif

+LDFLAGS.SunOS+=	-lsocket -lnsl
+
 .include "../../meta-pkgs/kde4/kde4.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/application.mk"
--- a/chat/konversation/PLIST
+++ b/chat/konversation/PLIST
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.11 2012/03/20 10:36:40 markd Exp $
+@comment $NetBSD: PLIST,v 1.12 2014/03/12 19:49:02 wiedi Exp $
 bin/konversation
 share/applications/kde4/konversation.desktop
+share/doc/kde/HTML/ca/konversation/common
+share/doc/kde/HTML/ca/konversation/index.cache.bz2
+share/doc/kde/HTML/ca/konversation/index.docbook
 share/doc/kde/HTML/de/konversation/common
 share/doc/kde/HTML/de/konversation/index.cache.bz2
 share/doc/kde/HTML/de/konversation/index.docbook
@@ -48,9 +51,18 @@ share/doc/kde/HTML/en/konversation/quickconnect_screen.png
 share/doc/kde/HTML/en/konversation/serverlist_co.png
 share/doc/kde/HTML/en/konversation/urlcatcher_screen_co.png
 share/doc/kde/HTML/en/konversation/webbrowser_screen_co.png
+share/doc/kde/HTML/es/konversation/common
+share/doc/kde/HTML/es/konversation/index.cache.bz2
+share/doc/kde/HTML/es/konversation/index.docbook
 share/doc/kde/HTML/et/konversation/common
 share/doc/kde/HTML/et/konversation/index.cache.bz2
 share/doc/kde/HTML/et/konversation/index.docbook
+share/doc/kde/HTML/fr/konversation/common
+share/doc/kde/HTML/fr/konversation/index.cache.bz2
+share/doc/kde/HTML/fr/konversation/index.docbook
+share/doc/kde/HTML/it/konversation/common
+share/doc/kde/HTML/it/konversation/index.cache.bz2
+share/doc/kde/HTML/it/konversation/index.docbook
 share/doc/kde/HTML/nl/konversation/common
 share/doc/kde/HTML/nl/konversation/index.cache.bz2
 share/doc/kde/HTML/nl/konversation/index.docbook
@@ -104,7 +116,6 @@ share/kde/apps/konversation/scripts/cmd
 share/kde/apps/konversation/scripts/fortune
 share/kde/apps/konversation/scripts/fortunes.dat
 share/kde/apps/konversation/scripts/gauge
-share/kde/apps/konversation/scripts/kdeversion
 share/kde/apps/konversation/scripts/mail
 share/kde/apps/konversation/scripts/media
 share/kde/apps/konversation/scripts/sayclip
@@ -184,9 +195,12 @@ share/locale/et/LC_MESSAGES/konversation.mo
 share/locale/fi/LC_MESSAGES/konversation.mo
 share/locale/fr/LC_MESSAGES/konversation.mo
 share/locale/gl/LC_MESSAGES/konversation.mo
+share/locale/he/LC_MESSAGES/konversation.mo
 share/locale/hu/LC_MESSAGES/konversation.mo
 share/locale/it/LC_MESSAGES/konversation.mo
-share/locale/ja/LC_MESSAGES/konversation.mo
+share/locale/kk/LC_MESSAGES/konversation.mo
+share/locale/km/LC_MESSAGES/konversation.mo
+share/locale/lt/LC_MESSAGES/konversation.mo
 share/locale/nb/LC_MESSAGES/konversation.mo
 share/locale/nds/LC_MESSAGES/konversation.mo
 share/locale/nl/LC_MESSAGES/konversation.mo
@@ -195,6 +209,8 @@ share/locale/pt/LC_MESSAGES/konversation.mo
 share/locale/pt_BR/LC_MESSAGES/konversation.mo
 share/locale/ru/LC_MESSAGES/konversation.mo
 share/locale/si/LC_MESSAGES/konversation.mo
+share/locale/sk/LC_MESSAGES/konversation.mo
+share/locale/sl/LC_MESSAGES/konversation.mo
 share/locale/sr/LC_MESSAGES/konversation.mo
 share/locale/sr@ijekavian/LC_MESSAGES/konversation.mo
 share/locale/sr@ijekavianlatin/LC_MESSAGES/konversation.mo
--- a/chat/konversation/distinfo
+++ b/chat/konversation/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.13 2012/03/20 10:36:40 markd Exp $
+$NetBSD: distinfo,v 1.14 2014/03/12 19:49:02 wiedi Exp $

-SHA1 (konversation-1.4.tar.xz) = 90741721f68a02d4345b9006a8ae53bc49ef3777
-RMD160 (konversation-1.4.tar.xz) = 63ea9d70521ed8f4e2f9de11696e9289703b65c6
-Size (konversation-1.4.tar.xz) = 2902368 bytes
+SHA1 (konversation-1.5.tar.xz) = 3955a43758750b63d84299a9d9a5933b73e5492b
+RMD160 (konversation-1.5.tar.xz) = 4dd9b418586da1cb7d702398e21041b46c96704b
+Size (konversation-1.5.tar.xz) = 3169284 bytes
+SHA1 (patch-src_dcc_dcccommon.cpp) = 59578bd54bd3f45eb03ddb43a8d3d3492d7a0ca6
--- a/chat/konversation/patches/patch-src_dcc_dcccommon.cpp
+++ b/chat/konversation/patches/patch-src_dcc_dcccommon.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_dcc_dcccommon.cpp,v 1.1 2014/03/12 19:49:03 wiedi Exp $
+
+Needed for SIOCGIFADDR on SunOS
+--- src/dcc/dcccommon.cpp.orig	2014-01-15 01:53:02.000000000 +0000
+++ src/dcc/dcccommon.cpp
+@@ -27,6 +27,9 @@
+ #       include <stropts.h>
+ #   endif
+ #endif
+#if defined(__sun)
+#include <sys/sockio.h> 
+#endif
+ #include <arpa/inet.h>
+ 
+ #include <QHostAddress>
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`@comment $NetBSD: PLIST,v 1.2 2014/03/11 14:04:59 jperkin Exp $`