[pkgsrc/trunk]: pkgsrc/chat/jabberd2 Fix a problem reported by Jim Wise: when...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1dfa6ff2e288
branches:  trunk
changeset: 529905:1dfa6ff2e288
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Tue Jun 12 15:26:07 2007 +0000

description:
Fix a problem reported by Jim Wise: when using auth-db4 and storage-db4
the shared libraries were not installed, the configure added -ldb and
we did not have this dependency to satisfy libtool.

Also use bdb.buildlink3.mk. Bump PKGREVISION.

diffstat:

 chat/jabberd2/Makefile   |   3 ++-
 chat/jabberd2/options.mk |  10 ++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diffs (39 lines):

diff -r dc6655e879fd -r 1dfa6ff2e288 chat/jabberd2/Makefile
--- a/chat/jabberd2/Makefile    Tue Jun 12 15:24:47 2007 +0000
+++ b/chat/jabberd2/Makefile    Tue Jun 12 15:26:07 2007 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2007/05/26 13:33:56 xtraeme Exp $
+# $NetBSD: Makefile,v 1.37 2007/06/12 15:26:07 xtraeme Exp $
 #
 
 DISTNAME=              jabberd-2.1.6
+PKGREVISION=           1
 CATEGORIES=            chat
 MASTER_SITES=          http://ftp.xiaoka.com/jabberd2/releases/
 EXTRACT_SUFX=          .tar.bz2
diff -r dc6655e879fd -r 1dfa6ff2e288 chat/jabberd2/options.mk
--- a/chat/jabberd2/options.mk  Tue Jun 12 15:24:47 2007 +0000
+++ b/chat/jabberd2/options.mk  Tue Jun 12 15:26:07 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2007/05/26 13:33:56 xtraeme Exp $
+# $NetBSD: options.mk,v 1.15 2007/06/12 15:26:07 xtraeme Exp $
 #
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.jabberd2
@@ -16,9 +16,15 @@
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mauth-db) || !empty(PKG_OPTIONS:Mstorage-db)
+SUBST_CLASSES+=                fixdb
+SUBST_STAGE.fixdb=     post-configure
+SUBST_FILES.fixdb=     storage/Makefile.in
+SUBST_SED.fixdb=       -e "s|@DB_LIBS@||g"
+BUILDLINK_TRANSFORM+=  rm:-ldb
+BDB_ACCEPTED=          db4
 PLIST_SUBST+=          DB_OPT=
 CONFIGURE_ARGS+=       --enable-db
-.  include "../../databases/db4/buildlink3.mk"
+.  include "../../mk/bdb.buildlink3.mk"
 .else
 PLIST_SUBST+=          DB_OPT='@comment '
 CONFIGURE_ARGS+=       --disable-db