summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/exim/Makefile9
-rw-r--r--mail/exim/options.mk8
2 files changed, 12 insertions, 5 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 884f37f057f..987507e0584 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2007/01/10 12:54:36 abs Exp $
+# $NetBSD: Makefile,v 1.82 2007/05/18 14:24:11 abs Exp $
DISTNAME= exim-4.66
CATEGORIES= mail net
@@ -22,7 +22,7 @@ MAKE_FLAGS+= FULLECHO=''
.include "../../mk/bsd.prefs.mk"
-BUILD_DEFS+= EXIM_USER EXIM_GROUP EXIM_DB
+BUILD_DEFS+= EXIM_USER EXIM_GROUP EXIM_DB EXIM_MAX_INCLUDE_SIZE
PKG_GROUPS= ${EXIM_GROUP}
PKG_USERS= ${EXIM_USER}:${EXIM_GROUP}
@@ -80,8 +80,11 @@ pre-configure:
< ${WRKSRC}/Local/Makefile.pkgsrc \
> ${WRKSRC}/Local/Makefile
.for opt in ${LOCAL_MAKEFILE_OPTIONS}
- @${ECHO} ${opt} >> ${WRKSRC}/Local/Makefile
+ ${ECHO} ${opt} >> ${WRKSRC}/Local/Makefile
.endfor
+.if !empty(EXIM_MAX_INCLUDE_SIZE)
+ ${ECHO} MAX_INCLUDE_SIZE=${EXIM_MAX_INCLUDE_SIZE} >> ${WRKSRC}/Local/Makefile
+.endif
${SED} -e 's:@PREFIX@:${PREFIX}:' \
-e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:' \
< ${WRKSRC}/Local/eximon.conf.pkgsrc \
diff --git a/mail/exim/options.mk b/mail/exim/options.mk
index ed5ca3064b2..76ac01d684d 100644
--- a/mail/exim/options.mk
+++ b/mail/exim/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.11 2006/12/22 21:04:14 joerg Exp $
+# $NetBSD: options.mk,v 1.12 2007/05/18 14:24:17 abs Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.exim
PKG_SUPPORTED_OPTIONS= exim-appendfile-maildir exim-appendfile-mailstore
-PKG_SUPPORTED_OPTIONS+= exim-appendfile-mbx exim-build-eximon
+PKG_SUPPORTED_OPTIONS+= exim-appendfile-mbx exim-auth-dovecot exim-build-eximon
PKG_SUPPORTED_OPTIONS+= exim-content-scan exim-lookup-cdb exim-lookup-dnsdb
PKG_SUPPORTED_OPTIONS+= exim-lookup-dsearch exim-lookup-ldap exim-lookup-mysql
PKG_SUPPORTED_OPTIONS+= exim-lookup-pgsql exim-lookup-sqlite exim-lookup-whoson
@@ -26,6 +26,10 @@ LOCAL_MAKEFILE_OPTIONS+=SUPPORT_MAILDIR=yes
LOCAL_MAKEFILE_OPTIONS+=SUPPORT_MAILSTORE=yes
.endif
+.if !empty(PKG_OPTIONS:Mexim-auth-dovecot)
+LOCAL_MAKEFILE_OPTIONS+=AUTH_DOVECOT=yes
+.endif
+
.if !empty(PKG_OPTIONS:Mexim-appendfile-mbx)
LOCAL_MAKEFILE_OPTIONS+=SUPPORT_MBX=yes
.endif