On 8/11/07, snowcrash+freebsd <[EMAIL PROTECTED]> wrote:
> hi,
>
> > Sounds great, just one point: I'd prefer seeing that exim would make use
> > of bsd.database.mk.
>
> i /thought/ that use of WITH_BDB_VER/USE_BDB *is* 'making use of'
> bsd.database.mk, wherein,
>
>  ...
>  .if defined(WITH_BDB_VER)
>  . if ${WITH_BDB_VER} == 4
>  USE_BDB=    40
>  . elif ${WITH_BDB_VER} != 1
>  USE_BDB=    ${WITH_BDB_VER}
>  . endif
>  .endif
>  _WANT_BDB_VER=  ${USE_BDB}
>  ...
>
> but, changes in exim port may well be required for 'compliance'.
>
> >   I have Cc'ed maintainer (krion@).
>

Here's the correct code for BDB detection:

.if ${WITH_BDB_VER} == 1
DB_LIBS=
DB_INCLUDES=
SEDLIST+=       -e 's,^(DBMLIB=),\# \1,'
.else
USE_BDB= 40+
INVALID_BDB_VER=        2 3
DB_LIBS=        -L${BDB_LIB_DIR} -l${BDB_LIB_NAME}
DB_INCLUDES=    -I${BDB_INCLUDE_DIR}
.endif

Scot
-- 
DISCLAIMER:
No electrons were mamed while sending this message. Only slightly bruised.
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/exim/Makefile,v
retrieving revision 1.228
diff -u -r1.228 Makefile
--- Makefile	4 Aug 2007 11:41:00 -0000	1.228
+++ Makefile	11 Aug 2007 17:35:33 -0000
@@ -327,28 +327,11 @@
 DB_LIBS=
 DB_INCLUDES=
 SEDLIST+=	-e 's,^(DBMLIB=),\# \1,'
-.elif (${WITH_BDB_VER} == 4)
-DB_LIBS=	-L${LOCALBASE}/lib -ldb4
-DB_INCLUDES=	-I${LOCALBASE}/include/db4
-LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
-.elif (${WITH_BDB_VER} == 41)
-DB_LIBS=	-L${LOCALBASE}/lib -ldb41
-DB_INCLUDES=	-I${LOCALBASE}/include/db41
-LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
-.elif (${WITH_BDB_VER} == 42)
-DB_LIBS=	-L${LOCALBASE}/lib -ldb-4.2
-DB_INCLUDES=	-I${LOCALBASE}/include/db42
-LIB_DEPENDS+=	db-4.2.2:${PORTSDIR}/databases/db42
-.elif (${WITH_BDB_VER} == 43)
-DB_LIBS=	-L${LOCALBASE}/lib -ldb-4.3
-DB_INCLUDES=	-I${LOCALBASE}/include/db43
-LIB_DEPENDS+=	db-4.3.0:${PORTSDIR}/databases/db43
-.elif (${WITH_BDB_VER} == 44)
-DB_LIBS=	-L${LOCALBASE}/lib -ldb-4.4
-DB_INCLUDES=	-I${LOCALBASE}/include/db44
-LIB_DEPENDS+=	db-4.4.0:${PORTSDIR}/databases/db44
 .else
-BROKEN=		WITH_BDB_VER must be either 1, 4, 41, 42, 43 or 44
+USE_BDB= 40+
+INVALID_BDB_VER=	2 3
+DB_LIBS=	-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}
+DB_INCLUDES=	-I${BDB_INCLUDE_DIR}
 .endif
 SEDLIST+=	-e 's,XX_DB_LIBS_XX,${DB_LIBS},' \
 		-e 's,XX_DB_INCLUDES_XX,${DB_INCLUDES},'
@@ -479,10 +462,10 @@
 .endif
 
 .if defined(WITH_SQLITE)
+USE_SQLITE=	yes
 SEDLIST+=	-e 's,XX_SQLITE_LIBS_XX,-L${LOCALBASE}/lib -lsqlite3,' \
 		-e 's,XX_SQLITE_FLAGS_XX,-I${LOCALBASE}/include,' \
 		-e 's,^\# (LOOKUP_SQLITE=),\1,'
-LIB_DEPENDS+=	sqlite3.8:${PORTSDIR}/databases/sqlite3
 .else
 SEDLIST+=	-e 's,XX_SQLITE_LIBS_XX,,' \
 		-e 's,XX_SQLITE_FLAGS_XX,,'
_______________________________________________
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to "[EMAIL PROTECTED]"

Reply via email to