[pkgsrc/trunk]: pkgsrc/mail The courier-imap and sqwebmail packages embed ${S...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c09321cb04e2
branches:  trunk
changeset: 494125:c09321cb04e2
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu May 19 17:05:38 2005 +0000

description:
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.

diffstat:

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

diffs (50 lines):

diff -r bc5506c58f8e -r c09321cb04e2 mail/courier-imap/Makefile
--- a/mail/courier-imap/Makefile        Thu May 19 16:45:33 2005 +0000
+++ b/mail/courier-imap/Makefile        Thu May 19 17:05:38 2005 +0000
@@ -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_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-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 -r bc5506c58f8e -r c09321cb04e2 mail/sqwebmail/Makefile
--- a/mail/sqwebmail/Makefile   Thu May 19 16:45:33 2005 +0000
+++ b/mail/sqwebmail/Makefile   Thu May 19 17:05:38 2005 +0000
@@ -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_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-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"