summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/exim-exiscan/Makefile4
-rw-r--r--mail/exim/Makefile4
-rw-r--r--mail/exim/Makefile.common10
3 files changed, 9 insertions, 9 deletions
diff --git a/mail/exim-exiscan/Makefile b/mail/exim-exiscan/Makefile
index bebf52b5951..c2cdf9c60d8 100644
--- a/mail/exim-exiscan/Makefile
+++ b/mail/exim-exiscan/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2004/06/04 00:10:34 reed Exp $
+# $NetBSD: Makefile,v 1.11 2004/06/04 23:21:34 reed Exp $
DISTNAME= exim-${EXIM_VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
PKGNAME= exim-exiscan-${EXIM_VERSION}_${EXISCAN_VERSION}
CATEGORIES= mail net
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 27034cb0fea..a1b7062c9a8 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2004/06/04 00:10:34 reed Exp $
+# $NetBSD: Makefile,v 1.49 2004/06/04 23:21:34 reed Exp $
DISTNAME= exim-${EXIM_VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= mail net
MAINTAINER= abs@NetBSD.org
diff --git a/mail/exim/Makefile.common b/mail/exim/Makefile.common
index 92cd8bf7a82..1d49ca9561c 100644
--- a/mail/exim/Makefile.common
+++ b/mail/exim/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2004/06/04 17:19:56 reed Exp $
+# $NetBSD: Makefile.common,v 1.10 2004/06/04 23:21:34 reed Exp $
MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \
ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
@@ -41,19 +41,19 @@ CFLAGS+= ${_STRIPFLAG_CC}
.if defined(EXIM_DB) && ${EXIM_DB} == "gdbm"
. include "../../databases/gdbm/buildlink3.mk"
EXIM_USE_DB_CONFIG= USE_GDBM=yes
-EXIM_DBMLIB= DBMLIB=-lgdbm
+EXIM_DBMLIB= DBMLIB=-Wl,${RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.gdbm} -lgdbm
EXIM_INCLUDE= -I${PREFIX}/include
.else # use native or Berkeley DB as defined by BDB_DEFAULT and BDB_ACCEPTED
. include "../../mk/bdb.buildlink3.mk"
EXIM_USE_DB_CONFIG= USE_DB=yes # the default
. if ${BDB_TYPE} == "db4"
-EXIM_DBMLIB= DBMLIB=-ldb4
+EXIM_DBMLIB= DBMLIB=-Wl,${RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db4} -ldb4
EXIM_INCLUDE= -I${PREFIX}/${BUILDLINK_INCDIRS.db4}
. elif ${BDB_TYPE} == "db3"
-EXIM_DBMLIB= DBMLIB=-ldb3
+EXIM_DBMLIB= DBMLIB=-Wl,${RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db3} -ldb3
EXIM_INCLUDE= -I${PREFIX}/${BUILDLINK_INCDIRS.db3}
. elif ${BDB_TYPE} == "db2"
-EXIM_DBMLIB= DBMLIB=-ldb2
+EXIM_DBMLIB= DBMLIB=-Wl,${RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db2} -ldb2
EXIM_INCLUDE= -I${PREFIX}/${BUILDLINK_INCDIRS.db2}
. else # using native
EXIM_DBMLIB= # empty so use defaults