Import of pkgsrc-2016Q3

chat/jabberd2/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.99 2015/06/12 10:48:27 wiz Exp $
+# $NetBSD: Makefile,v 1.110 2016/07/09 06:37:53 wiz Exp $
 
-DISTNAME=	jabberd-2.3.3
-PKGREVISION=	1
+DISTNAME=	jabberd-2.4.0
+PKGREVISION=	2
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_GITHUB:=jabberd2/jabberd2/releases/download/${DISTNAME}/}
 EXTRACT_SUFX=	.tar.xz
@@ -65,8 +65,9 @@ DOCDIR=			${PREFIX}/share/doc/jabberd
 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 README.config NEWS
+			db-setup.sqlite db-update.mysql	db-update.pgsql \
+			db-update.sqlite
+DOCFILES=		README README.config README.md README.protocol NEWS
 
 INSTALLATION_DIRS=	bin ${EGDIR} ${DOCDIR}
 
@@ -125,12 +126,12 @@ post-install:
 .endfor
 
 .include "../../converters/libiconv/buildlink3.mk"
-.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/curses.buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

chat/jabberd2/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2014/03/11 14:04:59 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.19 2016/02/09 00:21:59 schnoebe Exp $
 bin/bdbdump.pl
 bin/c2s
 bin/jabberd
@@ -40,6 +40,7 @@ lib/jabberd/mod_status.la
 lib/jabberd/mod_template-roster.la
 lib/jabberd/mod_vacation.la
 lib/jabberd/mod_validate.la
+lib/jabberd/mod_verify.la
 lib/jabberd/storage_fs.la
 ${PLIST.db}lib/jabberd/storage_db.la
 ${PLIST.ldap}lib/jabberd/storage_ldapvcard.la
@@ -53,14 +54,16 @@ man/man8/s2s.8
 man/man8/sm.8
 share/doc/jabberd/NEWS
 share/doc/jabberd/README
-share/doc/jabberd/README.protocol
 share/doc/jabberd/README.config
+share/doc/jabberd/README.md
+share/doc/jabberd/README.protocol
 share/examples/jabberd/c2s.xml
 share/examples/jabberd/db-jd14-2-jd2.sql
 share/examples/jabberd/db-setup.mysql
 share/examples/jabberd/db-setup.pgsql
 share/examples/jabberd/db-setup.sqlite
 share/examples/jabberd/db-update.mysql
+share/examples/jabberd/db-update.pgsql
 share/examples/jabberd/db-update.sqlite
 share/examples/jabberd/jabberd.cfg
 share/examples/jabberd/roster.xml

chat/jabberd2/distinfo

@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.34 2015/04/19 12:48:20 gdt Exp $
+$NetBSD: distinfo,v 1.39 2016/05/25 16:24:54 schnoebe Exp $
 
-SHA1 (jabberd-2.3.3.tar.xz) = 4f682cb0c28cc5f048741f1257c5607c158bb4bf
-RMD160 (jabberd-2.3.3.tar.xz) = f1840a24690e264cb790aceae07a4af9905c5b5e
-Size (jabberd-2.3.3.tar.xz) = 1457340 bytes
-SHA1 (patch-Makefile.in) = 8be9b6820e46c0e62808c8eecee6c7bd72e94ee2
-SHA1 (patch-configure) = 1a58cc7b015a73009d8140402dfb739fc48e7fa0
+SHA1 (jabberd-2.4.0.tar.xz) = 6c51b4fe77d917d46f63864d3852877c1ed722a9
+RMD160 (jabberd-2.4.0.tar.xz) = c4d07cc205199df808977104d9309ad01fcc0dff
+SHA512 (jabberd-2.4.0.tar.xz) = eb621d2d76806361f54db49d1d3b2be0e0b5559f8ec64bc8ce8cd10f1455e8f4b98395cf790f969cb8ef63f2fa83f5974c5b70aaa82bbe670e1aa15a3d5a0a0b
+Size (jabberd-2.4.0.tar.xz) = 1507452 bytes
+SHA1 (patch-Makefile.in) = 31d8dc4a5446e96079e1016afb45dc7a602b98c9

chat/jabberd2/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.26 2014/02/24 19:30:53 schnoebe Exp $
+# $NetBSD: options.mk,v 1.29 2016/05/29 17:24:48 schnoebe Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.jabberd2
 PKG_OPTIONS_REQUIRED_GROUPS=	auth storage mio
@@ -11,14 +11,17 @@ PKG_OPTIONS_GROUP.storage+=	storage-sqlite storage-db
 # mio implementations
 PKG_OPTIONS_GROUP.mio=		mio-kqueue mio-select mio-poll mio-epoll
 # debugging
+PKG_SUPPORTED_OPTIONS+=		websocket
 PKG_SUPPORTED_OPTIONS+=		debug
 
 PKG_SUGGESTED_OPTIONS=		auth-sqlite storage-sqlite
 PKG_SUGGESTED_OPTIONS+=		mio-select mio-poll
+PKG_SUGGESTED_OPTIONS+=		websocket
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=	db ldap mysql pam pgsql sqlite
+# PLIST_VARS+=	ws
 
 .if !empty(PKG_OPTIONS:Mauth-db) || !empty(PKG_OPTIONS:Mstorage-db)
 BDB_ACCEPTED=		db4 db5
@@ -77,6 +80,7 @@ CONFIGURE_ARGS+=	--enable-developer
 # CONFIGURE_ARGS+=	--enable-nad-debug
 # CONFIGURE_ARGS+=	--enable-pool-debug
 # CONFIGURE_ARGS+=	--enable-mio-debug
+.   include "../../devel/cppunit/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mmio-kqueue)
@@ -94,3 +98,11 @@ CONFIGURE_ARGS+=	--enable-mio=poll
 .if !empty(PKG_OPTIONS:Mmio-select)
 CONFIGURE_ARGS+=	--enable-mio=select
 .endif
+
+.if !empty(PKG_OPTIONS:Mwebsocket)
+PLIST.ws=		yes
+CONFIGURE_ARGS+=	--enable-websocket
+.include  "../../www/http-parser/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-websocket
+.endif

chat/jabberd2/patches/patch-Makefile.in

@@ -1,13 +1,13 @@
-$NetBSD: patch-Makefile.in,v 1.4 2013/12/12 23:01:02 schnoebe Exp $
+$NetBSD: patch-Makefile.in,v 1.5 2015/12/13 23:46:11 schnoebe Exp $
 
 Skip etc.
 
---- Makefile.in.orig	2013-11-28 11:16:25.000000000 +0000
+--- Makefile.in.orig	2015-10-30 08:53:18.000000000 +0000
 +++ Makefile.in
-@@ -333,7 +333,7 @@ top_build_prefix = @top_build_prefix@
+@@ -343,7 +343,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 docs win32
+ EXTRA_DIST = Doxyfile.in README.md 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)

chat/jabberd2/patches/patch-configure

@@ -1,15 +0,0 @@
-$NetBSD: patch-configure,v 1.5 2012/08/26 18:25:47 adam Exp $
-
-Allow -Os in CFLAGS.
-
---- configure.orig	2011-05-31 22:11:47.000000000 +0000
-+++ configure
-@@ -11762,7 +11762,7 @@ fi
- # check for optimisation level
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS optimization level" >&5
- $as_echo_n "checking CFLAGS optimization level... " >&6; }
--if echo $CFLAGS | grep '.*-O[3s].*' >/dev/null 2>&1; then
-+if echo $CFLAGS | grep '.*-O[3].*' >/dev/null 2>&1; then
-     as_fn_error $? "maximum allowed optimization level is -O2" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: fine" >&5