diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2007-06-12 15:26:07 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2007-06-12 15:26:07 +0000 |
| commit | dca0c77ff9f074fcaf3dc5c73fd824a3ca84452e (patch) | |
| tree | 1512c1ba9b09a9e5574693bd6f3f7ed91876435d /chat/jabberd2 | |
| parent | a04cb73fef85655314c61b0b2605f6b09ecf1310 (diff) | |
| download | pkgsrc-dca0c77ff9f074fcaf3dc5c73fd824a3ca84452e.tar.gz | |
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 (limited to 'chat/jabberd2')
| -rw-r--r-- | chat/jabberd2/Makefile | 3 | ||||
| -rw-r--r-- | chat/jabberd2/options.mk | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile index 4a717e14643..59ae770dad8 100644 --- a/chat/jabberd2/Makefile +++ b/chat/jabberd2/Makefile @@ -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 --git a/chat/jabberd2/options.mk b/chat/jabberd2/options.mk index c099b529952..dae8588a370 100644 --- a/chat/jabberd2/options.mk +++ b/chat/jabberd2/options.mk @@ -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 @@ PKG_SUGGESTED_OPTIONS= auth-sqlite storage-sqlite gnusasl .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 |