Fri Feb 20 21:06:52 2015 UTC ()
Update ejabberd to 15.02.
Enable odbc, mysql and pgsql support unconditionally (no dependency cost).

Changes in 15.02:
- Add Elixir support, allows to write plugins in Elixir (not enabled in
  this pkgsrc package)
- New command to reload configuration without restart
- Support old style erlang expressions in YAML configuration
- Improved captcha listener parsing when protocol not specified
- Fix upgrade of old unbinarized pubsub table from 2.1
- Minor updates in the documentation
- Other bugfixes


(fhajny)
diff -r1.48 -r1.49 pkgsrc/chat/ejabberd/Makefile
diff -r1.28 -r1.29 pkgsrc/chat/ejabberd/PLIST
diff -r1.29 -r1.30 pkgsrc/chat/ejabberd/distinfo
diff -r1.10 -r1.11 pkgsrc/chat/ejabberd/patches/patch-aa
cvs diff -r1.48 -r1.49 pkgsrc/chat/ejabberd/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/Makefile 2015/01/02 09:14:16 1.48
+++ pkgsrc/chat/ejabberd/Makefile 2015/02/20 21:06:52 1.49
@@ -1,51 +1,48 @@ @@ -1,51 +1,48 @@
1# $NetBSD: Makefile,v 1.48 2015/01/02 09:14:16 fhajny Exp $ 1# $NetBSD: Makefile,v 1.49 2015/02/20 21:06:52 fhajny Exp $
2 2
3DISTNAME= ejabberd-14.12 3DISTNAME= ejabberd-15.02
4CATEGORIES= chat 4CATEGORIES= chat
5MASTER_SITES= http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/ 5MASTER_SITES= http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
6EXTRACT_SUFX= .tgz 6EXTRACT_SUFX= .tgz
7 7
8DISTFILES= ${DEFAULT_DISTFILES} ${DISTNAME}-deps.tar.gz 8DISTFILES= ${DEFAULT_DISTFILES} ${DISTNAME}-deps.tar.gz
9SITES.${DISTNAME}-deps.tar.gz= ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/ 9SITES.${DISTNAME}-deps.tar.gz= ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.ejabberd.im/ 12HOMEPAGE= http://www.ejabberd.im/
13COMMENT= Free and Open Source distributed fault-tolerant Jabber server 13COMMENT= Free and Open Source distributed fault-tolerant Jabber server
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
15 15
16BUILD_DEPENDS+= git-base>=1.5:../../devel/git-base 16BUILD_DEPENDS+= git-base>=1.5:../../devel/git-base
17CONFLICTS+= jabberd-[0-9]* 17CONFLICTS+= jabberd-[0-9]*
18 18
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20USE_GCC_RUNTIME= yes 20USE_GCC_RUNTIME= yes
21USE_LANGUAGES= c c++ 21USE_LANGUAGES= c c++
22USE_TOOLS+= gmake patch 22USE_TOOLS+= gmake patch
23 23
24CONFIGURE_ARGS+= --disable-debug 24CONFIGURE_ARGS+= --disable-debug
25CONFIGURE_ARGS+= --enable-iconv 25CONFIGURE_ARGS+= --enable-iconv
26CONFIGURE_ARGS+= --enable-json 26CONFIGURE_ARGS+= --enable-json
27CONFIGURE_ARGS+= --enable-lager 27CONFIGURE_ARGS+= --enable-lager
 28CONFIGURE_ARGS+= --enable-mysql
28CONFIGURE_ARGS+= --enable-nif 29CONFIGURE_ARGS+= --enable-nif
29CONFIGURE_ARGS+= --enable-stun 30CONFIGURE_ARGS+= --enable-odbc
30CONFIGURE_ARGS+= --enable-user=${EJABBERD_USER} 31CONFIGURE_ARGS+= --enable-pgsql
31CONFIGURE_ARGS+= --enable-zlib 32CONFIGURE_ARGS+= --enable-zlib
32CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 
33 33
34.include "../../lang/erlang/buildlink3.mk" 34CONFIGURE_ARGS+= --enable-user=${EJABBERD_USER}
35.if !empty(PKG_BUILD_OPTIONS.erlang:Miodbc) || \ 35CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
36 !empty(PKG_BUILD_OPTIONS.erlang:Munixodbc) 
37CONFIGURE_ARGS+= --enable-odbc 
38.endif 
39 36
40RCD_SCRIPTS= ejabberd 37RCD_SCRIPTS= ejabberd
41 38
42BUILD_DEFS+= EJABBERD_USER EJABBERD_GROUP EJABBERD_LOGDIR 39BUILD_DEFS+= EJABBERD_USER EJABBERD_GROUP EJABBERD_LOGDIR
43BUILD_DEFS+= EJABBERD_PIDDIR EJABBERD_DB EJABBERD_TRANSDIR 40BUILD_DEFS+= EJABBERD_PIDDIR EJABBERD_DB EJABBERD_TRANSDIR
44BUILD_DEFS+= VARBASE 41BUILD_DEFS+= VARBASE
45PKG_SYSCONFSUBDIR= ejabberd 42PKG_SYSCONFSUBDIR= ejabberd
46 43
47.include "../../mk/bsd.prefs.mk" 44.include "../../mk/bsd.prefs.mk"
48 45
49EJABBERD_USER?= ejabberd 46EJABBERD_USER?= ejabberd
50EJABBERD_GROUP?= ejabberd 47EJABBERD_GROUP?= ejabberd
51EJABBERD_PIDDIR?= ${VARBASE}/run/ejabberd 48EJABBERD_PIDDIR?= ${VARBASE}/run/ejabberd
@@ -81,42 +78,38 @@ CONF_FILES_PERMS+= ${EGDIR}/ejabberdctl. @@ -81,42 +78,38 @@ CONF_FILES_PERMS+= ${EGDIR}/ejabberdctl.
81 ${ROOT_USER} ${EJABBERD_GROUP} 0640 78 ${ROOT_USER} ${EJABBERD_GROUP} 0640
82CONF_FILES_PERMS+= ${EGDIR}/inetrc ${PKG_SYSCONFDIR}/inetrc \ 79CONF_FILES_PERMS+= ${EGDIR}/inetrc ${PKG_SYSCONFDIR}/inetrc \
83 ${ROOT_USER} ${EJABBERD_GROUP} 0640 80 ${ROOT_USER} ${EJABBERD_GROUP} 0640
84SPECIAL_PERMS+= sbin/ejabberdctl ${ROOT_USER} ${EJABBERD_GROUP} 0750 81SPECIAL_PERMS+= sbin/ejabberdctl ${ROOT_USER} ${EJABBERD_GROUP} 0750
85 82
86REPLACE_SH= ejabberdctl.template tools/captcha.sh 83REPLACE_SH= ejabberdctl.template tools/captcha.sh
87 84
88SUBST_CLASSES+= paths 85SUBST_CLASSES+= paths
89SUBST_MESSAGE.paths= Localizing paths 86SUBST_MESSAGE.paths= Localizing paths
90SUBST_STAGE.paths= pre-configure 87SUBST_STAGE.paths= pre-configure
91SUBST_FILES.paths= Makefile.in 88SUBST_FILES.paths= Makefile.in
92SUBST_FILES.paths+= ejabberd.yml.example 89SUBST_FILES.paths+= ejabberd.yml.example
93SUBST_FILES.paths+= ejabberdctl.template 90SUBST_FILES.paths+= ejabberdctl.template
94SUBST_FILES.paths+= doc/guide.tex 
95SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' 91SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
96SUBST_SED.paths+= -e 's,@EJABBERD_DB@,${EJABBERD_DB},g' 92SUBST_SED.paths+= -e 's,@EJABBERD_DB@,${EJABBERD_DB},g'
97SUBST_SED.paths+= -e 's,@EJABBERD_LOGDIR@,${EJABBERD_LOGDIR},g' 93SUBST_SED.paths+= -e 's,@EJABBERD_LOGDIR@,${EJABBERD_LOGDIR},g'
98SUBST_SED.paths+= -e 's,@EJABBERD_PIDDIR@,${EJABBERD_PIDDIR},g' 94SUBST_SED.paths+= -e 's,@EJABBERD_PIDDIR@,${EJABBERD_PIDDIR},g'
99SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' 95SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
100SUBST_SED.paths+= -e 's,@DISTNAME@,${DISTNAME},g' 96SUBST_SED.paths+= -e 's,@DISTNAME@,${DISTNAME},g'
101 97
102# Helper target to refresh remote deps for tarring up 98# Helper target to refresh remote deps for tarring up
103fetch-deps: 99fetch-deps:
104 cd ${WRKSRC} && ${RM} -rf deps && ${BUILD_MAKE_CMD} deps 100 cd ${WRKSRC} && ${RM} -rf deps && ${BUILD_MAKE_CMD} deps
105 101
106post-extract: 102post-extract:
107 ${LN} -s ${WRKDIR}/deps ${WRKSRC}/ 103 ${LN} -s ${WRKDIR}/deps ${WRKSRC}/
108 104
109post-patch: 
110 ${RM} -f ${WRKSRC}/doc/guide.tex.orig 
111 
112post-install: 105post-install:
113 ${INSTALL_DATA} ${WRKSRC}/doc/dev.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} 106 ${INSTALL_DATA} ${WRKSRC}/doc/dev.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
114 ${INSTALL_DATA} ${WRKSRC}/doc/features.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} 107 ${INSTALL_DATA} ${WRKSRC}/doc/features.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
115 ${INSTALL_DATA} ${WRKSRC}/doc/guide.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} 108 ${INSTALL_DATA} ${WRKSRC}/doc/guide.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
116 109
117.include "../../converters/libiconv/buildlink3.mk" 110.include "../../converters/libiconv/buildlink3.mk"
118.include "../../devel/zlib/buildlink3.mk" 111.include "../../devel/zlib/buildlink3.mk"
119.include "../../security/openssl/buildlink3.mk" 112.include "../../security/openssl/buildlink3.mk"
120.include "../../textproc/expat/buildlink3.mk" 113.include "../../textproc/expat/buildlink3.mk"
121.include "../../textproc/libyaml/buildlink3.mk" 114.include "../../textproc/libyaml/buildlink3.mk"
122.include "../../mk/bsd.pkg.mk" 115.include "../../mk/bsd.pkg.mk"
cvs diff -r1.28 -r1.29 pkgsrc/chat/ejabberd/PLIST (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/PLIST 2015/01/02 09:14:16 1.28
+++ pkgsrc/chat/ejabberd/PLIST 2015/02/20 21:06:52 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.28 2015/01/02 09:14:16 fhajny Exp $ 1@comment $NetBSD: PLIST,v 1.29 2015/02/20 21:06:52 fhajny Exp $
2lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam 2lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
3lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam 3lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
4lib/erlang/lib/${PKGNAME}/ebin/acl.beam 4lib/erlang/lib/${PKGNAME}/ebin/acl.beam
5lib/erlang/lib/${PKGNAME}/ebin/adhoc.beam 5lib/erlang/lib/${PKGNAME}/ebin/adhoc.beam
6lib/erlang/lib/${PKGNAME}/ebin/bitmap.beam 6lib/erlang/lib/${PKGNAME}/ebin/bitmap.beam
7lib/erlang/lib/${PKGNAME}/ebin/cache_tab.beam 7lib/erlang/lib/${PKGNAME}/ebin/cache_tab.beam
8lib/erlang/lib/${PKGNAME}/ebin/cache_tab_app.beam 8lib/erlang/lib/${PKGNAME}/ebin/cache_tab_app.beam
9lib/erlang/lib/${PKGNAME}/ebin/cache_tab_sup.beam 9lib/erlang/lib/${PKGNAME}/ebin/cache_tab_sup.beam
10lib/erlang/lib/${PKGNAME}/ebin/cyrsasl.beam 10lib/erlang/lib/${PKGNAME}/ebin/cyrsasl.beam
11lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_anonymous.beam 11lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_anonymous.beam
12lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_digest.beam 12lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_digest.beam
13lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_plain.beam 13lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_plain.beam
14lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_scram.beam 14lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_scram.beam
@@ -195,43 +195,56 @@ lib/erlang/lib/${PKGNAME}/ebin/node_home @@ -195,43 +195,56 @@ lib/erlang/lib/${PKGNAME}/ebin/node_home
195lib/erlang/lib/${PKGNAME}/ebin/node_mb.beam 195lib/erlang/lib/${PKGNAME}/ebin/node_mb.beam
196lib/erlang/lib/${PKGNAME}/ebin/node_pep.beam 196lib/erlang/lib/${PKGNAME}/ebin/node_pep.beam
197lib/erlang/lib/${PKGNAME}/ebin/node_pep_odbc.beam 197lib/erlang/lib/${PKGNAME}/ebin/node_pep_odbc.beam
198lib/erlang/lib/${PKGNAME}/ebin/node_private.beam 198lib/erlang/lib/${PKGNAME}/ebin/node_private.beam
199lib/erlang/lib/${PKGNAME}/ebin/node_public.beam 199lib/erlang/lib/${PKGNAME}/ebin/node_public.beam
200lib/erlang/lib/${PKGNAME}/ebin/nodetree_dag.beam 200lib/erlang/lib/${PKGNAME}/ebin/nodetree_dag.beam
201lib/erlang/lib/${PKGNAME}/ebin/nodetree_tree.beam 201lib/erlang/lib/${PKGNAME}/ebin/nodetree_tree.beam
202lib/erlang/lib/${PKGNAME}/ebin/nodetree_tree_odbc.beam 202lib/erlang/lib/${PKGNAME}/ebin/nodetree_tree_odbc.beam
203lib/erlang/lib/${PKGNAME}/ebin/nodetree_virtual.beam 203lib/erlang/lib/${PKGNAME}/ebin/nodetree_virtual.beam
204lib/erlang/lib/${PKGNAME}/ebin/odbc_queries.beam 204lib/erlang/lib/${PKGNAME}/ebin/odbc_queries.beam
205lib/erlang/lib/${PKGNAME}/ebin/p1_cache_tab.app 205lib/erlang/lib/${PKGNAME}/ebin/p1_cache_tab.app
206lib/erlang/lib/${PKGNAME}/ebin/p1_fsm.beam 206lib/erlang/lib/${PKGNAME}/ebin/p1_fsm.beam
207lib/erlang/lib/${PKGNAME}/ebin/p1_iconv.app 207lib/erlang/lib/${PKGNAME}/ebin/p1_iconv.app
208lib/erlang/lib/${PKGNAME}/ebin/p1_prof.beam 208lib/erlang/lib/${PKGNAME}/ebin/p1_mysql.app
 209lib/erlang/lib/${PKGNAME}/ebin/p1_mysql.beam
 210lib/erlang/lib/${PKGNAME}/ebin/p1_mysql_app.beam
 211lib/erlang/lib/${PKGNAME}/ebin/p1_mysql_auth.beam
 212lib/erlang/lib/${PKGNAME}/ebin/p1_mysql_conn.beam
 213lib/erlang/lib/${PKGNAME}/ebin/p1_mysql_recv.beam
 214lib/erlang/lib/${PKGNAME}/ebin/p1_mysql_sup.beam
 215lib/erlang/lib/${PKGNAME}/ebin/p1_pgsql.app
209lib/erlang/lib/${PKGNAME}/ebin/p1_server.beam 216lib/erlang/lib/${PKGNAME}/ebin/p1_server.beam
210lib/erlang/lib/${PKGNAME}/ebin/p1_sha.beam 217lib/erlang/lib/${PKGNAME}/ebin/p1_sha.beam
211lib/erlang/lib/${PKGNAME}/ebin/p1_stringprep.app 218lib/erlang/lib/${PKGNAME}/ebin/p1_stringprep.app
212lib/erlang/lib/${PKGNAME}/ebin/p1_stun.app 219lib/erlang/lib/${PKGNAME}/ebin/p1_stun.app
213lib/erlang/lib/${PKGNAME}/ebin/p1_tls.app 220lib/erlang/lib/${PKGNAME}/ebin/p1_tls.app
214lib/erlang/lib/${PKGNAME}/ebin/p1_tls.beam 221lib/erlang/lib/${PKGNAME}/ebin/p1_tls.beam
215lib/erlang/lib/${PKGNAME}/ebin/p1_tls_app.beam 222lib/erlang/lib/${PKGNAME}/ebin/p1_tls_app.beam
216lib/erlang/lib/${PKGNAME}/ebin/p1_tls_sup.beam 223lib/erlang/lib/${PKGNAME}/ebin/p1_tls_sup.beam
217lib/erlang/lib/${PKGNAME}/ebin/p1_utils.app 224lib/erlang/lib/${PKGNAME}/ebin/p1_utils.app
218lib/erlang/lib/${PKGNAME}/ebin/p1_xml.app 225lib/erlang/lib/${PKGNAME}/ebin/p1_xml.app
219lib/erlang/lib/${PKGNAME}/ebin/p1_xmlrpc.beam 226lib/erlang/lib/${PKGNAME}/ebin/p1_xmlrpc.beam
220lib/erlang/lib/${PKGNAME}/ebin/p1_yaml.app 227lib/erlang/lib/${PKGNAME}/ebin/p1_yaml.app
221lib/erlang/lib/${PKGNAME}/ebin/p1_yaml.beam 228lib/erlang/lib/${PKGNAME}/ebin/p1_yaml.beam
222lib/erlang/lib/${PKGNAME}/ebin/p1_yaml_app.beam 229lib/erlang/lib/${PKGNAME}/ebin/p1_yaml_app.beam
223lib/erlang/lib/${PKGNAME}/ebin/p1_yaml_sup.beam 230lib/erlang/lib/${PKGNAME}/ebin/p1_yaml_sup.beam
224lib/erlang/lib/${PKGNAME}/ebin/p1_zlib.app 231lib/erlang/lib/${PKGNAME}/ebin/p1_zlib.app
 232lib/erlang/lib/${PKGNAME}/ebin/pgsql.beam
 233lib/erlang/lib/${PKGNAME}/ebin/pgsql_app.beam
 234lib/erlang/lib/${PKGNAME}/ebin/pgsql_proto.beam
 235lib/erlang/lib/${PKGNAME}/ebin/pgsql_sup.beam
 236lib/erlang/lib/${PKGNAME}/ebin/pgsql_tcp.beam
 237lib/erlang/lib/${PKGNAME}/ebin/pgsql_util.beam
225lib/erlang/lib/${PKGNAME}/ebin/pubsub_db_odbc.beam 238lib/erlang/lib/${PKGNAME}/ebin/pubsub_db_odbc.beam
226lib/erlang/lib/${PKGNAME}/ebin/pubsub_index.beam 239lib/erlang/lib/${PKGNAME}/ebin/pubsub_index.beam
227lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription.beam 240lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription.beam
228lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription_odbc.beam 241lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription_odbc.beam
229lib/erlang/lib/${PKGNAME}/ebin/randoms.beam 242lib/erlang/lib/${PKGNAME}/ebin/randoms.beam
230lib/erlang/lib/${PKGNAME}/ebin/scram.beam 243lib/erlang/lib/${PKGNAME}/ebin/scram.beam
231lib/erlang/lib/${PKGNAME}/ebin/shaper.beam 244lib/erlang/lib/${PKGNAME}/ebin/shaper.beam
232lib/erlang/lib/${PKGNAME}/ebin/str.beam 245lib/erlang/lib/${PKGNAME}/ebin/str.beam
233lib/erlang/lib/${PKGNAME}/ebin/stringprep.beam 246lib/erlang/lib/${PKGNAME}/ebin/stringprep.beam
234lib/erlang/lib/${PKGNAME}/ebin/stringprep_app.beam 247lib/erlang/lib/${PKGNAME}/ebin/stringprep_app.beam
235lib/erlang/lib/${PKGNAME}/ebin/stringprep_sup.beam 248lib/erlang/lib/${PKGNAME}/ebin/stringprep_sup.beam
236lib/erlang/lib/${PKGNAME}/ebin/stun.beam 249lib/erlang/lib/${PKGNAME}/ebin/stun.beam
237lib/erlang/lib/${PKGNAME}/ebin/stun_app.beam 250lib/erlang/lib/${PKGNAME}/ebin/stun_app.beam
@@ -242,48 +255,50 @@ lib/erlang/lib/${PKGNAME}/ebin/stun_sup. @@ -242,48 +255,50 @@ lib/erlang/lib/${PKGNAME}/ebin/stun_sup.
242lib/erlang/lib/${PKGNAME}/ebin/stun_test.beam 255lib/erlang/lib/${PKGNAME}/ebin/stun_test.beam
243lib/erlang/lib/${PKGNAME}/ebin/stun_tmp_sup.beam 256lib/erlang/lib/${PKGNAME}/ebin/stun_tmp_sup.beam
244lib/erlang/lib/${PKGNAME}/ebin/translate.beam 257lib/erlang/lib/${PKGNAME}/ebin/translate.beam
245lib/erlang/lib/${PKGNAME}/ebin/treap.beam 258lib/erlang/lib/${PKGNAME}/ebin/treap.beam
246lib/erlang/lib/${PKGNAME}/ebin/turn.beam 259lib/erlang/lib/${PKGNAME}/ebin/turn.beam
247lib/erlang/lib/${PKGNAME}/ebin/turn_sm.beam 260lib/erlang/lib/${PKGNAME}/ebin/turn_sm.beam
248lib/erlang/lib/${PKGNAME}/ebin/turn_tmp_sup.beam 261lib/erlang/lib/${PKGNAME}/ebin/turn_tmp_sup.beam
249lib/erlang/lib/${PKGNAME}/ebin/win32_dns.beam 262lib/erlang/lib/${PKGNAME}/ebin/win32_dns.beam
250lib/erlang/lib/${PKGNAME}/ebin/xml.beam 263lib/erlang/lib/${PKGNAME}/ebin/xml.beam
251lib/erlang/lib/${PKGNAME}/ebin/xml_app.beam 264lib/erlang/lib/${PKGNAME}/ebin/xml_app.beam
252lib/erlang/lib/${PKGNAME}/ebin/xml_gen.beam 265lib/erlang/lib/${PKGNAME}/ebin/xml_gen.beam
253lib/erlang/lib/${PKGNAME}/ebin/xml_stream.beam 266lib/erlang/lib/${PKGNAME}/ebin/xml_stream.beam
254lib/erlang/lib/${PKGNAME}/ebin/xml_sup.beam 267lib/erlang/lib/${PKGNAME}/ebin/xml_sup.beam
 268lib/erlang/lib/${PKGNAME}/ebin/xml_util.beam
255lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_codec.beam 269lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_codec.beam
256lib/erlang/lib/${PKGNAME}/include/ELDAPv3.hrl 270lib/erlang/lib/${PKGNAME}/include/ELDAPv3.hrl
257lib/erlang/lib/${PKGNAME}/include/XmppAddr.hrl 271lib/erlang/lib/${PKGNAME}/include/XmppAddr.hrl
258lib/erlang/lib/${PKGNAME}/include/adhoc.hrl 272lib/erlang/lib/${PKGNAME}/include/adhoc.hrl
259lib/erlang/lib/${PKGNAME}/include/ejabberd.hrl 273lib/erlang/lib/${PKGNAME}/include/ejabberd.hrl
260lib/erlang/lib/${PKGNAME}/include/ejabberd_commands.hrl 274lib/erlang/lib/${PKGNAME}/include/ejabberd_commands.hrl
261lib/erlang/lib/${PKGNAME}/include/ejabberd_config.hrl 275lib/erlang/lib/${PKGNAME}/include/ejabberd_config.hrl
262lib/erlang/lib/${PKGNAME}/include/ejabberd_ctl.hrl 276lib/erlang/lib/${PKGNAME}/include/ejabberd_ctl.hrl
263lib/erlang/lib/${PKGNAME}/include/ejabberd_http.hrl 277lib/erlang/lib/${PKGNAME}/include/ejabberd_http.hrl
264lib/erlang/lib/${PKGNAME}/include/ejabberd_web_admin.hrl 278lib/erlang/lib/${PKGNAME}/include/ejabberd_web_admin.hrl
265lib/erlang/lib/${PKGNAME}/include/eldap.hrl 279lib/erlang/lib/${PKGNAME}/include/eldap.hrl
266lib/erlang/lib/${PKGNAME}/include/esip.hrl 280lib/erlang/lib/${PKGNAME}/include/esip.hrl
267lib/erlang/lib/${PKGNAME}/include/esip_lib.hrl 281lib/erlang/lib/${PKGNAME}/include/esip_lib.hrl
268lib/erlang/lib/${PKGNAME}/include/http_bind.hrl 282lib/erlang/lib/${PKGNAME}/include/http_bind.hrl
269lib/erlang/lib/${PKGNAME}/include/jlib.hrl 283lib/erlang/lib/${PKGNAME}/include/jlib.hrl
270lib/erlang/lib/${PKGNAME}/include/lager.hrl 284lib/erlang/lib/${PKGNAME}/include/lager.hrl
271lib/erlang/lib/${PKGNAME}/include/logger.hrl 285lib/erlang/lib/${PKGNAME}/include/logger.hrl
272lib/erlang/lib/${PKGNAME}/include/mod_muc_room.hrl 286lib/erlang/lib/${PKGNAME}/include/mod_muc_room.hrl
273lib/erlang/lib/${PKGNAME}/include/mod_privacy.hrl 287lib/erlang/lib/${PKGNAME}/include/mod_privacy.hrl
274lib/erlang/lib/${PKGNAME}/include/mod_proxy65.hrl 288lib/erlang/lib/${PKGNAME}/include/mod_proxy65.hrl
275lib/erlang/lib/${PKGNAME}/include/mod_roster.hrl 289lib/erlang/lib/${PKGNAME}/include/mod_roster.hrl
276lib/erlang/lib/${PKGNAME}/include/ns.hrl 290lib/erlang/lib/${PKGNAME}/include/ns.hrl
 291lib/erlang/lib/${PKGNAME}/include/p1_mysql.hrl
277lib/erlang/lib/${PKGNAME}/include/pubsub.hrl 292lib/erlang/lib/${PKGNAME}/include/pubsub.hrl
278lib/erlang/lib/${PKGNAME}/include/stun.hrl 293lib/erlang/lib/${PKGNAME}/include/stun.hrl
279lib/erlang/lib/${PKGNAME}/include/xml.hrl 294lib/erlang/lib/${PKGNAME}/include/xml.hrl
280lib/erlang/lib/${PKGNAME}/include/xml_gen.hrl 295lib/erlang/lib/${PKGNAME}/include/xml_gen.hrl
281lib/erlang/lib/${PKGNAME}/priv/bin/captcha.sh 296lib/erlang/lib/${PKGNAME}/priv/bin/captcha.sh
282lib/erlang/lib/${PKGNAME}/priv/jiffy.so 297lib/erlang/lib/${PKGNAME}/priv/jiffy.so
283lib/erlang/lib/${PKGNAME}/priv/lib/esip_drv.so 298lib/erlang/lib/${PKGNAME}/priv/lib/esip_drv.so
284lib/erlang/lib/${PKGNAME}/priv/lib/expat_erl.so 299lib/erlang/lib/${PKGNAME}/priv/lib/expat_erl.so
285lib/erlang/lib/${PKGNAME}/priv/lib/ezlib_drv.so 300lib/erlang/lib/${PKGNAME}/priv/lib/ezlib_drv.so
286lib/erlang/lib/${PKGNAME}/priv/lib/iconv.so 301lib/erlang/lib/${PKGNAME}/priv/lib/iconv.so
287lib/erlang/lib/${PKGNAME}/priv/lib/jiffy.so 302lib/erlang/lib/${PKGNAME}/priv/lib/jiffy.so
288lib/erlang/lib/${PKGNAME}/priv/lib/p1_sha.so 303lib/erlang/lib/${PKGNAME}/priv/lib/p1_sha.so
289lib/erlang/lib/${PKGNAME}/priv/lib/p1_tls_drv.so 304lib/erlang/lib/${PKGNAME}/priv/lib/p1_tls_drv.so
cvs diff -r1.29 -r1.30 pkgsrc/chat/ejabberd/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/distinfo 2015/01/02 09:14:16 1.29
+++ pkgsrc/chat/ejabberd/distinfo 2015/02/20 21:06:52 1.30
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.29 2015/01/02 09:14:16 fhajny Exp $ 1$NetBSD: distinfo,v 1.30 2015/02/20 21:06:52 fhajny Exp $
2 2
3SHA1 (ejabberd-14.12-deps.tar.gz) = 995cd087df008f7493bac2bd66de6b276cfd37b8 3SHA1 (ejabberd-15.02-deps.tar.gz) = 4963bf6526ccfea876ea99051c57fbc3710c1836
4RMD160 (ejabberd-14.12-deps.tar.gz) = 77f04cb42fbed07680bef05d384093753cc435c0 4RMD160 (ejabberd-15.02-deps.tar.gz) = 037c2c60ca228ba07df8b24877403357c09cbf34
5Size (ejabberd-14.12-deps.tar.gz) = 8906098 bytes 5Size (ejabberd-15.02-deps.tar.gz) = 9099152 bytes
6SHA1 (ejabberd-14.12.tgz) = baf944fb15a31ea19a3bc6da685bbc0e7c0daeff 6SHA1 (ejabberd-15.02.tgz) = 2cb148fa5e7c4efb3a99fd8a603c12673f1257b9
7RMD160 (ejabberd-14.12.tgz) = 71ccb676695730bcb8b5ad0c683d8de4fd6ef569 7RMD160 (ejabberd-15.02.tgz) = 1224dea34bb01b4ae994a88e235c2ff9b102dd9d
8Size (ejabberd-14.12.tgz) = 3261685 bytes 8Size (ejabberd-15.02.tgz) = 3281316 bytes
9SHA1 (patch-aa) = f573f541ae6963acffa5a470a290874b3312b787 9SHA1 (patch-aa) = 32968bf94c0859cc2c65710b038c8ff7162e1422
10SHA1 (patch-ad) = cdd7a61333f3206ac3ae9168b1878a059da25988 10SHA1 (patch-ad) = cdd7a61333f3206ac3ae9168b1878a059da25988
11SHA1 (patch-ae) = 90787d77dda8317d89908ca9520710ea4e8d43f4 11SHA1 (patch-ae) = 90787d77dda8317d89908ca9520710ea4e8d43f4
12SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe 12SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
cvs diff -r1.10 -r1.11 pkgsrc/chat/ejabberd/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/patches/patch-aa 2013/10/11 13:32:25 1.10
+++ pkgsrc/chat/ejabberd/patches/patch-aa 2015/02/20 21:06:52 1.11
@@ -1,55 +1,57 @@ @@ -1,55 +1,57 @@
1$NetBSD: patch-aa,v 1.10 2013/10/11 13:32:25 fhajny Exp $ 1$NetBSD: patch-aa,v 1.11 2015/02/20 21:06:52 fhajny Exp $
2 2
3Fix locations; don't mess with ownership. 3Fix locations; don't mess with ownership.
4--- Makefile.in.orig 2013-09-27 09:19:22.000000000 +0000 4--- Makefile.in.orig 2015-02-11 23:14:57.000000000 +0000
5+++ Makefile.in 5+++ Makefile.in
6@@ -9,13 +9,13 @@ exec_prefix = @exec_prefix@ 6@@ -9,7 +9,7 @@ exec_prefix = @exec_prefix@
7 DESTDIR = 7 DESTDIR =
8  8
9 # /etc/ejabberd/ 9 # /etc/ejabberd/
10-ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd 10-ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
11+ETCDIR = $(DESTDIR)@prefix@/share/examples/ejabberd 11+ETCDIR = $(DESTDIR)@prefix@/share/examples/ejabberd
12  12
13 # /sbin/ 13 # /bin/
 14 BINDIR = $(DESTDIR)@bindir@
 15@@ -18,7 +18,7 @@ BINDIR = $(DESTDIR)@bindir@
14 SBINDIR = $(DESTDIR)@sbindir@ 16 SBINDIR = $(DESTDIR)@sbindir@
15  17
16 # /lib/ejabberd/ 18 # /lib/ejabberd/
17-EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd 19-EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
18+EJABBERDDIR = $(DESTDIR)@prefix@/lib/erlang/lib/@DISTNAME@ 20+EJABBERDDIR = $(DESTDIR)@prefix@/lib/erlang/lib/@DISTNAME@
19  21
20 # /share/doc/ejabberd 22 # /share/doc/ejabberd
21 PACKAGE_TARNAME = @PACKAGE_TARNAME@ 23 PACKAGE_TARNAME = @PACKAGE_TARNAME@
22@@ -41,16 +41,16 @@ SODIR = $(PRIVDIR)/lib 24@@ -44,16 +44,16 @@ SODIR = $(PRIVDIR)/lib
23 MSGSDIR = $(PRIVDIR)/msgs 25 MSGSDIR = $(PRIVDIR)/msgs
24  26
25 # /var/lib/ejabberd/ 27 # /var/lib/ejabberd/
26-SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd 28-SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
27+SPOOLDIR = $(DESTDIR)@EJABBERD_DB@ 29+SPOOLDIR = $(DESTDIR)@EJABBERD_DB@
28  30
29 # /var/lock/ejabberdctl 31 # /var/lock/ejabberdctl
30-CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl 32-CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl
31+CTLLOCKDIR = $(DESTDIR)@EJABBERD_PIDDIR@ 33+CTLLOCKDIR = $(DESTDIR)@EJABBERD_PIDDIR@
32  34
33 # /var/lib/ejabberd/.erlang.cookie 35 # /var/lib/ejabberd/.erlang.cookie
34 COOKIEFILE = $(SPOOLDIR)/.erlang.cookie 36 COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
35  37
36 # /var/log/ejabberd/ 38 # /var/log/ejabberd/
37-LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd 39-LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
38+LOGDIR = $(DESTDIR)@EJABBERD_LOGDIR@ 40+LOGDIR = $(DESTDIR)@EJABBERD_LOGDIR@
39  41
40 INSTALLUSER=@INSTALLUSER@ 42 INSTALLUSER=@INSTALLUSER@
41 # if no user was enabled, don't set privileges or ownership 43 # if no user was enabled, don't set privileges or ownership
42@@ -61,10 +61,10 @@ ifeq ($(INSTALLUSER),) 44@@ -64,10 +64,10 @@ ifeq ($(INSTALLUSER),)
43 CHOWN_OUTPUT=/dev/null 45 CHOWN_OUTPUT=/dev/null
44 INIT_USER=root 46 INIT_USER=root
45 else 47 else
46- O_USER=-o $(INSTALLUSER) 48- O_USER=-o $(INSTALLUSER)
47- G_USER=-g $(INSTALLUSER) 49- G_USER=-g $(INSTALLUSER)
48- CHOWN_COMMAND=chown 50- CHOWN_COMMAND=chown
49- CHOWN_OUTPUT=&1 51- CHOWN_OUTPUT=&1
50+ O_USER= 52+ O_USER=
51+ G_USER= 53+ G_USER=
52+ CHOWN_COMMAND=echo 54+ CHOWN_COMMAND=echo
53+ CHOWN_OUTPUT=/dev/null 55+ CHOWN_OUTPUT=/dev/null
54 INIT_USER=$(INSTALLUSER) 56 INIT_USER=$(INSTALLUSER)
55 endif 57 endif