Stop pretending the helper scripts are not Bash scripts. Fix PLIST handling

for the non-default sqlite option. Help libiconv linking on some platforms.
Bump PKGREVISION.

5 files changed, 29 insertions, 5 deletions

diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile
index 80e2298b568..e12db89c86f 100644
--- a/chat/ejabberd/Makefile
+++ b/chat/ejabberd/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2015/04/29 10:03:58 fhajny Exp $
+# $NetBSD: Makefile,v 1.54 2015/05/04 14:40:38 fhajny Exp $
 
 DISTNAME=	ejabberd-15.04
+PKGREVISION=	1
 CATEGORIES=	chat
 MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
@@ -19,7 +20,7 @@ CONFLICTS+=		jabberd-[0-9]*
 GNU_CONFIGURE=		yes
 USE_GCC_RUNTIME=	yes
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake patch
+USE_TOOLS+=		bash:run gmake patch
 
 CONFIGURE_ARGS+=	--disable-debug
 CONFIGURE_ARGS+=	--enable-iconv
@@ -77,7 +78,7 @@ CONF_FILES_PERMS+=	${EGDIR}/inetrc ${PKG_SYSCONFDIR}/inetrc \
 			${ROOT_USER} ${EJABBERD_GROUP} 0640
 SPECIAL_PERMS+=		sbin/ejabberdctl ${ROOT_USER} ${EJABBERD_GROUP} 0750
 
-REPLACE_SH=		ejabberdctl.template tools/captcha.sh \
+REPLACE_BASH=		ejabberdctl.template tools/captcha.sh \
 			tools/joincluster tools/leavecluster
 
 SUBST_CLASSES+=		paths
diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST
index 47e2a117376..ff7528d41f7 100644
--- a/chat/ejabberd/PLIST
+++ b/chat/ejabberd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2015/04/29 10:03:58 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.32 2015/05/04 14:40:38 fhajny Exp $
 lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
 lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
 lib/erlang/lib/${PKGNAME}/ebin/acl.beam
@@ -300,6 +300,7 @@ lib/erlang/lib/${PKGNAME}/include/mod_roster.hrl
 lib/erlang/lib/${PKGNAME}/include/ns.hrl
 lib/erlang/lib/${PKGNAME}/include/p1_mysql.hrl
 lib/erlang/lib/${PKGNAME}/include/pubsub.hrl
+lib/erlang/lib/${PKGNAME}/include/sqlite3.hrl
 lib/erlang/lib/${PKGNAME}/include/stun.hrl
 lib/erlang/lib/${PKGNAME}/include/xml.hrl
 lib/erlang/lib/${PKGNAME}/include/xml_gen.hrl
@@ -343,6 +344,7 @@ lib/erlang/lib/${PKGNAME}/priv/msgs/uk.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/vi.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/wa.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/zh.msg
+lib/erlang/lib/${PKGNAME}/priv/sql/lite.sql
 sbin/ejabberdctl
 share/doc/ejabberd/COPYING
 share/doc/ejabberd/dev.html
diff --git a/chat/ejabberd/PLIST.sqlite b/chat/ejabberd/PLIST.sqlite
new file mode 100644
index 00000000000..1a5d0aa5132
--- /dev/null
+++ b/chat/ejabberd/PLIST.sqlite
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST.sqlite,v 1.1 2015/05/04 14:40:38 fhajny Exp $
+lib/erlang/lib/${PKGNAME}/ebin/sqlite3.app
+lib/erlang/lib/${PKGNAME}/ebin/sqlite3.beam
+lib/erlang/lib/${PKGNAME}/ebin/sqlite3_lib.beam
+lib/erlang/lib/${PKGNAME}/priv/lib/sqlite3_drv.so
+lib/erlang/lib/${PKGNAME}/priv/sqlite3_drv.so
diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo
index 2118215bd07..b998b9a4313 100644
--- a/chat/ejabberd/distinfo
+++ b/chat/ejabberd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2015/04/29 10:03:58 fhajny Exp $
+$NetBSD: distinfo,v 1.33 2015/05/04 14:40:38 fhajny Exp $
 
 SHA1 (ejabberd-15.04-deps.tar.gz) = c4a920fe2e60c0810af1588bd955066261f8dfc4
 RMD160 (ejabberd-15.04-deps.tar.gz) = 527e6f8c9965012281cac6da7feea0993a6d8378
@@ -10,3 +10,4 @@ SHA1 (patch-aa) = 5025927e6be5792fa8e59541938950d901b91ee5
 SHA1 (patch-ad) = cdd7a61333f3206ac3ae9168b1878a059da25988
 SHA1 (patch-ae) = 90787d77dda8317d89908ca9520710ea4e8d43f4
 SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
+SHA1 (patch-deps_p1__iconv_rebar.config) = cd1200342aea2d4731207b3b5c33653682a8988f
diff --git a/chat/ejabberd/patches/patch-deps_p1__iconv_rebar.config b/chat/ejabberd/patches/patch-deps_p1__iconv_rebar.config
new file mode 100644
index 00000000000..565fea95c4a
--- /dev/null
+++ b/chat/ejabberd/patches/patch-deps_p1__iconv_rebar.config
@@ -0,0 +1,14 @@
+$NetBSD: patch-deps_p1__iconv_rebar.config,v 1.3 2015/05/04 14:40:38 fhajny Exp $
+
+Make sure LDFLAGS are included as well.
+--- deps/p1_iconv/rebar.config.orig	2015-04-29 09:27:02.000000000 +0000
++++ deps/p1_iconv/rebar.config
+@@ -1,7 +1,7 @@
+ {erl_opts, [debug_info]}.
+ 
+ {port_env, [{"CFLAGS", "-g -O2 -Wall -O2 -Wall"},
+-	    {"LDFLAGS", "$ERL_LDFLAGS -liconv"}]}.
++	    {"LDFLAGS", "$LDFLAGS $ERL_LDFLAGS -liconv"}]}.
+ 
+ {port_specs, [{"priv/lib/iconv.so", ["c_src/iconv.c"]}]}.
+