From 890498139885cd85b68ef278899818a64bcb30a1 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Thu, 19 May 2005 17:05:38 +0000
Subject: The courier-imap and sqwebmail packages embed ${SETENV} into scripts,
 so pass the real "env" command path to the configure script.  This avoids the
 configure script just detecting "env" in the tools directory and assuming
 that's the path to the real thing.  This fixes PR pkg/30282.

---
 mail/courier-imap/Makefile | 4 +++-
 mail/sqwebmail/Makefile    | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'mail')

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 8083af788a7..fc5a3f8d216 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/05/13 05:20:48 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2005/05/19 17:05:38 jlam Exp $
 
 DISTNAME=	courier-imap-4.0.2
 PKGBASE=	${DISTNAME:C/-[^-]*$//}
@@ -16,6 +16,7 @@ USE_GNU_TOOLS+=		make
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PERL5=		build
+USE_TOOLS+=		env
 
 .include "../../mail/courier-maildir/Makefile.common"
 
@@ -26,6 +27,7 @@ CONFIGURE_ARGS+=	--with-mailuser=${ROOT_USER}
 CONFIGURE_ARGS+=	--with-piddir=${VARBASE}/run
 CONFIGURE_ARGS+=	--program-transform-name='s/\.rc$$//'
 CONFIGURE_ENV+=		OPENSSL=${SSLBASE}/bin/openssl
+CONFIGURE_ENV+=		SETENV=${TOOLS_SETENV:Q}
 
 INSTALL_AM_MAKEFLAGS=	sysconfdir=${EGDIR}
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q}
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index b74abfd9859..a1942bc94f7 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/05/13 02:35:40 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2005/05/19 17:05:38 jlam Exp $
 
 DISTNAME=	sqwebmail-5.0.1
 PKGBASE=	${DISTNAME:C/-[^-]*$//}
@@ -17,6 +17,7 @@ USE_GNU_TOOLS+=		make
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PERL5=		yes
+USE_TOOLS+=		env
 
 .include "../../mail/courier-maildir/Makefile.common"
 .include "../../security/courier-authlib/Makefile.common"
@@ -58,6 +59,7 @@ CONFIGURE_ARGS+=	--with-mailer="${SENDMAIL} -oi -t"
 CONFIGURE_ARGS+=	--with-mailgroup=${COURIER_GROUP}
 CONFIGURE_ARGS+=	--with-piddir=${VARBASE}/run
 
+CONFIGURE_ENV+=		SETENV=${TOOLS_SETENV:Q}
 CONFIGURE_ENV+=		GPG="${LOCALBASE}/bin/gpg"
 CONFIGURE_ENV+=		ldapsearch="${LOCALBASE}/bin/ldapsearch"
 
-- 
cgit v1.2.3