Fix building with db5; revision bump for db4 update

3 files changed, 38 insertions, 40 deletions

diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index c8326a3f108..199da9cc7c6 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,23 +1,39 @@
-# $NetBSD: Makefile,v 1.56 2010/04/15 07:01:22 adam Exp $
+# $NetBSD: Makefile,v 1.57 2010/06/02 13:14:47 adam Exp $
 
-DISTNAME=		jabberd-2.2.9
-PKGREVISION=		2
-CATEGORIES=		chat
-MASTER_SITES=		http://codex.xiaoka.com/pub/jabberd2/releases/
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	jabberd-2.2.9
+PKGREVISION=	3
+CATEGORIES=	chat
+MASTER_SITES=	http://codex.xiaoka.com/pub/jabberd2/releases/
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		eric@cirr.com
-HOMEPAGE=		http://jabberd2.xiaoka.com/
-COMMENT=		XMPP (Jabber) instant messaging server
-LICENSE=		gnu-gpl-v2
+MAINTAINER=	eric@cirr.com
+HOMEPAGE=	http://jabberd2.xiaoka.com/
+COMMENT=	XMPP (Jabber) instant messaging server
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 CONFLICTS=		jabberd-[0-9]*
 
+BDB_ACCEPTED=		db4 db5
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
+USE_TOOLS+=		perl:run
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-anon
+CONFIGURE_ARGS+=	--enable-pipe
+CONFIGURE_ARGS+=	--enable-ssl
+CONFIGURE_ARGS+=	--enable-fs
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+
+.if (${MACHINE_ARCH} == alpha) || (${MACHINE_ARCH} == x86_64)
+CONFIGURE_ARGS+=	CXXFLAGS=${CXXFLAGS:M*:C/-O./-Os/:M*:Q}
+CONFIGURE_ENV+=		CXXFLAGS=${CXXFLAGS:M*:C/-O./-Os/:M*:Q}
+MAKE_ENV+=		CXXFLAGS=${CXXFLAGS:M*:C/-O./-Os/:M*:Q}
+CONFIGURE_ARGS+=	CFLAGS=${CFLAGS:M*:C/-O./-Os/:M*:Q}
+CONFIGURE_ENV+=		CFLAGS=${CFLAGS:M*:C/-O./-Os/:M*:Q}
+MAKE_ENV+=		CFLAGS=${CFLAGS:M*:C/-O./-Os/:M*:Q}
+.endif
 
 SUBST_CLASSES+=		path
 SUBST_STAGE.path=	post-patch
@@ -26,22 +42,6 @@ SUBST_MESSAGE.path=	Fixing configure script.
 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+=	--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./-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
 REPLACE_PERL+=		tools/*.pl
 
 .include "../../mk/bsd.prefs.mk"
@@ -55,10 +55,10 @@ PKG_SYSCONFSUBDIR=	jabberd
 RCD_SCRIPTS=		jabberd c2s sm router s2s
 JABBERD_USER?=		jabberd
 JABBERD_GROUP?=		jabberd
-FILES_SUBST+=		JABBERD_USER=${JABBERD_USER:Q}
-FILES_SUBST+=		JABBERD_GROUP=${JABBERD_GROUP:Q}
-FILES_SUBST+=		JABBERD_PIDDIR=${JABBERD_PIDDIR:Q}
-FILES_SUBST+=		JABBERD_LOGDIR=${JABBERD_LOGDIR:Q}
+FILES_SUBST+=		JABBERD_USER=${JABBERD_USER}
+FILES_SUBST+=		JABBERD_GROUP=${JABBERD_GROUP}
+FILES_SUBST+=		JABBERD_PIDDIR=${JABBERD_PIDDIR}
+FILES_SUBST+=		JABBERD_LOGDIR=${JABBERD_LOGDIR}
 PKG_USERS_VARS+=	JABBERD_USER
 PKG_GROUPS_VARS+=	JABBERD_GROUP
 PKG_GROUPS=		${JABBERD_GROUP}
@@ -95,8 +95,7 @@ post-extract:
 
 pre-configure:
 .for f in ${FILES}
-	sed								\
-		-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"		\
+	sed	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"		\
 		-e "s|@PIDDIR@|${JABBERD_PIDDIR}|g"			\
 		-e "s|@LOGDIR@|${JABBERD_LOGDIR}|g"			\
 		-e "s|@SSLCERTS@|${SSLCERTS}|g"				\
@@ -121,9 +120,9 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}
 .endfor
 
-.include "../../net/udns/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
+.include "../../net/udns/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/jabberd2/PLIST b/chat/jabberd2/PLIST
index 99ab35d2ffb..807eee65246 100644
--- a/chat/jabberd2/PLIST
+++ b/chat/jabberd2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/08/21 02:28:12 schnoebe Exp $
+@comment $NetBSD: PLIST,v 1.12 2010/06/02 13:14:47 adam Exp $
 bin/c2s
 bin/jabberd
 bin/migrate.pl
@@ -32,8 +32,8 @@ lib/jabberd/mod_iq-version.la
 lib/jabberd/mod_offline.la
 lib/jabberd/mod_presence.la
 lib/jabberd/mod_privacy.la
-lib/jabberd/mod_roster.la
 lib/jabberd/mod_roster-publish.la
+lib/jabberd/mod_roster.la
 lib/jabberd/mod_session.la
 lib/jabberd/mod_status.la
 lib/jabberd/mod_template-roster.la
@@ -50,10 +50,10 @@ man/man8/jabberd.8
 man/man8/router.8
 man/man8/s2s.8
 man/man8/sm.8
+share/doc/jabberd/ChangeLog
 share/doc/jabberd/README
 share/doc/jabberd/README.protocol
 share/doc/jabberd/UPGRADE
-share/doc/jabberd/ChangeLog
 share/examples/jabberd/c2s.xml
 share/examples/jabberd/db-jd14-2-jd2.sql
 share/examples/jabberd/db-setup.mysql
diff --git a/chat/jabberd2/options.mk b/chat/jabberd2/options.mk
index 14d49033563..703c2003491 100644
--- a/chat/jabberd2/options.mk
+++ b/chat/jabberd2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.23 2009/09/06 04:18:11 schnoebe Exp $
+# $NetBSD: options.mk,v 1.24 2010/06/02 13:14:47 adam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.jabberd2
 PKG_OPTIONS_REQUIRED_GROUPS=	auth storage sasl mio
@@ -35,9 +35,8 @@ CONFIGURE_ARGS+=	--with-sasl=gsasl
 .if !empty(PKG_OPTIONS:Mauth-db) || !empty(PKG_OPTIONS:Mstorage-db)
 CONFIGURE_ARGS+=	--enable-db
 PLIST.db=		yes
-BDB_ACCEPTED=		db4
-BUILDLINK_TRANSFORM+=	l:db:db4
-.  include "../../databases/db4/buildlink3.mk"
+BUILDLINK_TRANSFORM+=	l:db:${BDB_TYPE}
+.  include "../../mk/bdb.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-db
 .endif