[pkgsrc/trunk]: pkgsrc/chat/jabberd2 Rev.2 changes:

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0db319b220d6
branches:  trunk
changeset: 574353:0db319b220d6
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Apr 15 07:01:22 2010 +0000

description:
Rev.2 changes:
* Unlimit file descr. to 1024 for c2s, as in c2s configuration file.
* Allow -Os (instead of -O1) as a work-around 64-bit compiler bug.
* Router patch.

diffstat:

 chat/jabberd2/Makefile     |  17 ++++++++---------
 chat/jabberd2/distinfo     |   4 +++-
 chat/jabberd2/files/c2s.sh |   7 ++++++-
 3 files changed, 17 insertions(+), 11 deletions(-)

diffs (78 lines):

diff -r c8072c30c98c -r 0db319b220d6 chat/jabberd2/Makefile
--- a/chat/jabberd2/Makefile    Thu Apr 15 06:51:13 2010 +0000
+++ b/chat/jabberd2/Makefile    Thu Apr 15 07:01:22 2010 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2010/01/17 12:02:07 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2010/04/15 07:01:22 adam Exp $
 
 DISTNAME=              jabberd-2.2.9
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            chat
 MASTER_SITES=          http://codex.xiaoka.com/pub/jabberd2/releases/
 EXTRACT_SUFX=          .tar.bz2
@@ -27,19 +27,18 @@
 SUBST_SED.path+=       -e "s,\$$sysconfdir/jabberd,\$$sysconfdir,g"
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=       --disable-mysql
 CONFIGURE_ARGS+=       --enable-pipe
 CONFIGURE_ARGS+=       --enable-anon
 CONFIGURE_ARGS+=       --enable-ssl
 CONFIGURE_ARGS+=       --enable-fs
 
 .if (${MACHINE_ARCH} == alpha) || (${MACHINE_ARCH} == x86_64)
-CONFIGURE_ARGS+=       CXXFLAGS=${CXXFLAGS:M*:C/-O./-O1/:Q}
-CONFIGURE_ENV+=                CXXFLAGS=${CXXFLAGS:M*:C/-O./-O1/:Q}
-MAKE_ENV+=             CXXFLAGS=${CXXFLAGS:M*:C/-O./-O1/:Q}
-CONFIGURE_ARGS+=       CFLAGS=${CFLAGS:M*:C/-O./-O1/:Q}
-CONFIGURE_ENV+=                CFLAGS=${CFLAGS:M*:C/-O./-O1/:Q}
-MAKE_ENV+=             CFLAGS=${CFLAGS:M*:C/-O./-O1/:Q}
+CONFIGURE_ARGS+=       CXXFLAGS=${CXXFLAGS:M*:C/-O./-Os/:Q}
+CONFIGURE_ENV+=                CXXFLAGS=${CXXFLAGS:M*:C/-O./-Os/:Q}
+MAKE_ENV+=             CXXFLAGS=${CXXFLAGS:M*:C/-O./-Os/:Q}
+CONFIGURE_ARGS+=       CFLAGS=${CFLAGS:M*:C/-O./-Os/:Q}
+CONFIGURE_ENV+=                CFLAGS=${CFLAGS:M*:C/-O./-Os/:Q}
+MAKE_ENV+=             CFLAGS=${CFLAGS:M*:C/-O./-Os/:Q}
 .endif
 
 USE_TOOLS+=            perl:run
diff -r c8072c30c98c -r 0db319b220d6 chat/jabberd2/distinfo
--- a/chat/jabberd2/distinfo    Thu Apr 15 06:51:13 2010 +0000
+++ b/chat/jabberd2/distinfo    Thu Apr 15 07:01:22 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2009/09/06 04:18:11 schnoebe Exp $
+$NetBSD: distinfo,v 1.20 2010/04/15 07:01:23 adam Exp $
 
 SHA1 (jabberd-2.2.9.tar.bz2) = 1da9da3305e6fd402336ffba402b80dc767afa27
 RMD160 (jabberd-2.2.9.tar.bz2) = 7b8075653d14dbdf491d96b28894d5450a374a91
@@ -8,4 +8,6 @@
 SHA1 (patch-ac) = 7fce39dc745cf1e9cd793150840eac1543f3b597
 SHA1 (patch-ad) = 2930f23bc8616ba2a5783cc8bb2a42c5d1c5eff7
 SHA1 (patch-ae) = 0c57279c309ef4f6a226d65a491fd040e03ae4f0
+SHA1 (patch-af) = 8ff4e1779e1f925b7dee28e24d4d90fe50ef88a7
 SHA1 (patch-ag) = 64c5338daa59a5eb1eed70608ac766df36dc2f83
+SHA1 (patch-ah) = 358fa54c7e57396f30f763c794000a1b12250778
diff -r c8072c30c98c -r 0db319b220d6 chat/jabberd2/files/c2s.sh
--- a/chat/jabberd2/files/c2s.sh        Thu Apr 15 06:51:13 2010 +0000
+++ b/chat/jabberd2/files/c2s.sh        Thu Apr 15 07:01:22 2010 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: c2s.sh,v 1.2 2004/06/26 11:21:46 abs Exp $
+# $NetBSD: c2s.sh,v 1.3 2010/04/15 07:01:23 adam Exp $
 #
 # PROVIDE: c2s
 # REQUIRE: DAEMON
@@ -33,6 +33,11 @@
        fi
 }
 
+limits_precmd()
+{
+       ulimit -n 1024
+}
+
 if [ -f /etc/rc.subr ]; then
        load_rc_config $name
        run_rc_command "$1"