diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2007-05-26 13:33:56 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2007-05-26 13:33:56 +0000 |
| commit | 111003ff5ec620cd7f533c7cd88f556453375f8c (patch) | |
| tree | 11cde53be2576dd25054fbd0ceea43d66a1a7529 /chat | |
| parent | 1a050e81a494bce39ab43108335eb57576904f67 (diff) | |
| download | pkgsrc-111003ff5ec620cd7f533c7cd88f556453375f8c.tar.gz | |
- 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 (limited to 'chat')
| -rw-r--r-- | chat/jabberd2/Makefile | 9 | ||||
| -rw-r--r-- | chat/jabberd2/options.mk | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile index 9cf6ad61062..4a717e14643 100644 --- a/chat/jabberd2/Makefile +++ b/chat/jabberd2/Makefile @@ -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 @@ REPLACE_PERL+= tools/*.pl .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 @@ pre-configure: -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 --git a/chat/jabberd2/options.mk b/chat/jabberd2/options.mk index bdb6458cc72..c099b529952 100644 --- a/chat/jabberd2/options.mk +++ b/chat/jabberd2/options.mk @@ -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 @@ PKG_SUGGESTED_OPTIONS= auth-sqlite storage-sqlite gnusasl .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" |