diff options
| author | adam <adam@pkgsrc.org> | 2010-04-15 07:01:22 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2010-04-15 07:01:22 +0000 |
| commit | 759be9b10a45b38345fc152ec4f4b246f3a52a64 (patch) | |
| tree | 57f0fdafad1ef74f0de03eeb1cc3f9532f6033c5 | |
| parent | 91a8932016286a278de00e92d6805d54c623be7d (diff) | |
| download | pkgsrc-759be9b10a45b38345fc152ec4f4b246f3a52a64.tar.gz | |
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.
| -rw-r--r-- | chat/jabberd2/Makefile | 17 | ||||
| -rw-r--r-- | chat/jabberd2/distinfo | 4 | ||||
| -rwxr-xr-x | chat/jabberd2/files/c2s.sh | 7 |
3 files changed, 17 insertions, 11 deletions
diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile index a0958888745..c8326a3f108 100644 --- a/chat/jabberd2/Makefile +++ b/chat/jabberd2/Makefile @@ -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,/usr/local,${PREFIX},g" 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 --git a/chat/jabberd2/distinfo b/chat/jabberd2/distinfo index 42c3bb4c6e8..6f280bb4e19 100644 --- a/chat/jabberd2/distinfo +++ b/chat/jabberd2/distinfo @@ -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-ab) = c33cefcb0ddbcec732e475eaf5b931cdc8dd6cc7 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 --git a/chat/jabberd2/files/c2s.sh b/chat/jabberd2/files/c2s.sh index 278f29a3901..a783b7c8d50 100755 --- a/chat/jabberd2/files/c2s.sh +++ b/chat/jabberd2/files/c2s.sh @@ -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 @@ remove_pidfile() fi } +limits_precmd() +{ + ulimit -n 1024 +} + if [ -f /etc/rc.subr ]; then load_rc_config $name run_rc_command "$1" |