[pkgsrc/trunk]: pkgsrc/chat/jabberd2 - Move JABBERD_DBDIR to Makefile.common,...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e12c5dfcef13
branches:  trunk
changeset: 529171:e12c5dfcef13
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sat May 26 13:33:56 2007 +0000

description:
- Move JABBERD_DBDIR to Makefile.common, because this is used by sqlite.
- Add VARBASE into BUILD_DEFS, as suggested by pkglint.
- Transform @pkglibdir@ appropiately in the configuration files.

diffstat:

 chat/jabberd2/Makefile   |  9 ++++++---
 chat/jabberd2/options.mk |  4 +---
 2 files changed, 7 insertions(+), 6 deletions(-)

diffs (48 lines):

diff -r b66c4fc7b1d6 -r e12c5dfcef13 chat/jabberd2/Makefile
--- a/chat/jabberd2/Makefile    Sat May 26 13:18:57 2007 +0000
+++ b/chat/jabberd2/Makefile    Sat May 26 13:33:56 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2007/05/26 11:50:12 xtraeme Exp $
+# $NetBSD: Makefile,v 1.36 2007/05/26 13:33:56 xtraeme Exp $
 #
 
 DISTNAME=              jabberd-2.1.6
@@ -36,8 +36,10 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILD_DEFS+=           JABBERD_USER JABBERD_GROUP
-BUILD_DEFS+=           JABBERD_LOGDIR JABBERD_PIDDIR
+JABBERD_DBDIR?=                ${VARBASE}/db/jabberd
+
+BUILD_DEFS+=           VARBASE JABBERD_USER JABBERD_GROUP
+BUILD_DEFS+=           JABBERD_LOGDIR JABBERD_PIDDIR JABBERD_DBDIR
 
 PKG_SYSCONFSUBDIR=     jabberd
 RCD_SCRIPTS=           jabberd c2s sm resolver router s2s
@@ -86,6 +88,7 @@
                -e "s|@SSLCERTS@|${SSLCERTS}|g"                         \
                -e "s|@BINDIR@|${PREFIX}/bin|g"                         \
                -e "s|@DBDIR@|${JABBERD_DBDIR}|g"                       \
+               -e "s|@pkglibdir@|${PREFIX}/lib/jabberd|g"              \
                ${WRKSRC}/etc/${f}.in > ${WRKSRC}/etc/${f}
 .endfor
 
diff -r b66c4fc7b1d6 -r e12c5dfcef13 chat/jabberd2/options.mk
--- a/chat/jabberd2/options.mk  Sat May 26 13:18:57 2007 +0000
+++ b/chat/jabberd2/options.mk  Sat May 26 13:33:56 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2007/05/26 11:50:12 xtraeme Exp $
+# $NetBSD: options.mk,v 1.14 2007/05/26 13:33:56 xtraeme Exp $
 #
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.jabberd2
@@ -16,8 +16,6 @@
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mauth-db) || !empty(PKG_OPTIONS:Mstorage-db)
-BUILD_DEFS+=           VARBASE JABBERD_DBDIR
-JABBERD_DBDIR?=                ${VARBASE}/db/jabberd
 PLIST_SUBST+=          DB_OPT=
 CONFIGURE_ARGS+=       --enable-db
 .  include "../../databases/db4/buildlink3.mk"