Fix tcl and db dependencies. With help from naddy@.
This commit is contained in:
parent
c7bd5f7791
commit
c00b0f015b
@ -1,10 +1,9 @@
|
||||
# $OpenBSD: Makefile.inc,v 1.24 2008/10/28 11:53:33 steven Exp $
|
||||
# $OpenBSD: Makefile.inc,v 1.25 2009/03/11 21:28:45 bernd Exp $
|
||||
|
||||
COMMENT-main= Berkeley DB package, revision ${REVISION}
|
||||
COMMENT-tcl= TCL bindings for Berkeley DB, revision ${REVISION}
|
||||
|
||||
DISTNAME= db-${VERSION}
|
||||
PKGNAME-tcl= db-tcl-${VERSION}p4
|
||||
CATEGORIES= databases
|
||||
HOMEPAGE= http://www.oracle.com/technology/products/berkeley-db/
|
||||
MASTER_SITES= http://download.oracle.com/berkeley-db/
|
||||
@ -48,8 +47,7 @@ MODULES+= lang/tcl
|
||||
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
|
||||
|
||||
WANTLIB-tcl?=
|
||||
RUN_DEPENDS-tcl= :db-${REVISION}.*:databases/db/v${REVISION} \
|
||||
${MODTCL_RUN_DEPENDS}
|
||||
RUN_DEPENDS-tcl+= ${MODTCL_RUN_DEPENDS}
|
||||
|
||||
BUILD_DEPENDS+= ${MODTCL_BUILD_DEPENDS}
|
||||
CFLAGS+= -I${MODTCL_INCDIR}
|
||||
|
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.16 2008/10/28 11:53:33 steven Exp $
|
||||
# $OpenBSD: Makefile,v 1.17 2009/03/11 21:28:45 bernd Exp $
|
||||
|
||||
REVISION= 3
|
||||
DBLIBDIR= lib/db
|
||||
VERSION= ${REVISION}.1.17
|
||||
PKGNAME= ${DISTNAME}p8
|
||||
PKGNAME-main= ${DISTNAME}p8
|
||||
PKGNAME-tcl= db-tcl-${VERSION}p5
|
||||
SHARED_LIBS += db 3.1 # .0.0
|
||||
SHARED_LIBS += db_cxx 4.0 # .0.0
|
||||
SHARED_LIBS += db_tcl 4.0 # .0.0
|
||||
@ -16,6 +16,7 @@ WANTLIB=c
|
||||
|
||||
WANTLIB-tcl= m
|
||||
LIB_DEPENDS-tcl= ${MODTCL_LIB_DEPENDS}
|
||||
RUN_DEPENDS-tcl= :db->=3,<4:databases/db/v${REVISION}
|
||||
|
||||
pre-configure:
|
||||
@${SUBST_CMD} ${WRKSRC}/test/include.tcl
|
||||
|
@ -1,12 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.34 2008/10/28 11:53:33 steven Exp $
|
||||
# $OpenBSD: Makefile,v 1.35 2009/03/11 21:28:45 bernd Exp $
|
||||
|
||||
COMMENT-java= Java bindings for Berkeley DB, revision ${REVISION}
|
||||
|
||||
REVISION= 4
|
||||
VERSION= ${REVISION}.6.21
|
||||
PKGNAME= ${DISTNAME}
|
||||
PKGNAME-main= ${DISTNAME}
|
||||
PKGNAME-java= db-java-${VERSION}p1
|
||||
PKGNAME-java= db-java-${VERSION}p2
|
||||
PKGNAME-tcl= db-tcl-${VERSION}p5
|
||||
DBLIBDIR= lib/db4
|
||||
SHARED_LIBS += db 5.0 # .0.0
|
||||
SHARED_LIBS += db_cxx 6.0 # .0.0
|
||||
@ -23,8 +23,9 @@ WANTLIB= c
|
||||
PSEUDO_FLAVORS= java
|
||||
FLAVOR?=
|
||||
|
||||
RUN_DEPENDS-java= :db-${REVISION}.*:databases/db/v${REVISION} \
|
||||
RUN_DEPENDS-java= :db->=4,<5:databases/db/v${REVISION} \
|
||||
${MODJAVA_RUN_DEPENDS}
|
||||
RUN_DEPENDS-tcl= :db->=4,<5:databases/db/v${REVISION}
|
||||
WANTLIB-java=
|
||||
|
||||
.if ${FLAVOR:L:Mjava}
|
||||
|
Loading…
Reference in New Issue
Block a user