summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorSheldon Hearn <sheldonh@FreeBSD.org>2003-03-07 09:39:52 +0000
committerSheldon Hearn <sheldonh@FreeBSD.org>2003-03-07 09:39:52 +0000
commitd7c7b3627445e5ca310366bfe92950bec6e8d700 (patch)
treeb65ef8638fabd8c25c4e57f7e32f727935052b21 /mail
parentClear moonlight beckons. (diff)
Fix the DB_LIB_VERSION=4 case.
Reported by: Andrew Filonov <aef@antar.bryansk.ru> Approved by: portmgr
Notes
Notes: svn path=/head/; revision=77048
Diffstat (limited to 'mail')
-rw-r--r--mail/exim/Makefile8
-rw-r--r--mail/exim/files/patch-src::EDITME7
2 files changed, 10 insertions, 5 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index d74d951dd1bf..b1961b25b057 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -169,13 +169,17 @@ SEDLIST+= -e 's,XX_LDAP_[^ ]*_XX,,' \
.if (${DB_LIB_VERSION} == 1)
DB_LIBS=
+DB_INCLUDES=
+SEDLIST+= -e 's,^DBMLIB=,\#DBMLIB=,'
.elif (${DB_LIB_VERSION} == 4)
-DB_LIBS= -ldb4
+DB_LIBS= -L${LOCALBASE}/lib -ldb4
+DB_INCLUDES= -I${LOCALBASE}/include/db4
LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4
.else
.error DB_LIB_VERSION must be either 1 or 4
.endif
-SEDLIST+= -e 's,XX_DB_LIBS_XX,${DB_LIBS},'
+SEDLIST+= -e 's,XX_DB_LIBS_XX,${DB_LIBS},' \
+ -e 's,XX_DB_INCLUDES_XX,${DB_INCLUDES},'
.if defined(WITH_MYSQL)
LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
diff --git a/mail/exim/files/patch-src::EDITME b/mail/exim/files/patch-src::EDITME
index d239b5e0b420..dc7ff7373dbd 100644
--- a/mail/exim/files/patch-src::EDITME
+++ b/mail/exim/files/patch-src::EDITME
@@ -43,15 +43,16 @@
# If you don't set any of these, Exim assumes the original University of
# Michigan (OpenLDAP 1) library.
-@@ -276,8 +277,9 @@
+@@ -276,8 +277,10 @@
# don't need to set LOOKUP_INCLUDE if the relevant directories are already
# specified in INCLUDE.
-# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include
-# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq
-+INCLUDE=-I XX_PREFIX_XX/include
++INCLUDE=-IXX_PREFIX_XX/include XX_DB_INCLUDES_XX
+LOOKUP_INCLUDE=XX_MYSQL_INCLUDE_XX XX_PGSQL_INCLUDE_XX XX_LDAP_INCLUDE_XX
-+LOOKUP_LIBS=XX_MYSQL_LIBS_XX XX_PGSQL_LIBS_XX XX_LDAP_LIBS_XX XX_DB_LIBS_XX
++LOOKUP_LIBS=XX_MYSQL_LIBS_XX XX_PGSQL_LIBS_XX XX_LDAP_LIBS_XX
++DBMLIB=XX_DB_LIBS_XX
#------------------------------------------------------------------------------