Update mail/courier-imap to 1.4.0. Pkgsrc changes include splitting the

Makefile into package and common parts to facilitate creating sub-packages
for the separate authentication modules, and using the general INSTALL
scripts.  Changes from version 1.3.8.2 include:

	* bug fixes
	* move authentication modules into a separate daemon process
	* partial support of the IMAP QUOTA extension.
	* added experimental PostgreSQL authentication module.
	* added experimental LDAP_TLS option to LDAP authentication.
	* workarounds for Outlook
	* Disable MSIE 6.0 smart tags in all html files

17 files changed, 474 insertions, 374 deletions

diff --git a/mail/courier-imap/DEINSTALL b/mail/courier-imap/DEINSTALL
index 192036427c1..089cb1ad796 100644
--- a/mail/courier-imap/DEINSTALL
+++ b/mail/courier-imap/DEINSTALL
@@ -1,134 +1,20 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2001/11/01 00:59:42 zuntum Exp $
+# $NetBSD: DEINSTALL,v 1.2 2002/01/02 22:19:37 jlam Exp $
 
-PKGNAME=$1
-STAGE=$2
-
-CAT="@CAT@"
-CMP="@CMP@"
-RM="@RM@"
-RMDIR="@RMDIR@"
-TRUE="@TRUE@"
-
-SAMPLECONFDIR=${PKG_PREFIX}/share/examples/courier
-CONFDIR=/etc/courier
-SSLCERTS=@SSLCERTS@
-CONFFILES_1="imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist"
-CONFFILES_2="imapd.cnf pop3d.cnf"
-CONFFILES_3="quotawarnmsg"
-NONCONFFILES="userdb.dat userdbshadow.dat"
-RANDFILES="imapd.rand pop3d.rand"
-PEMFILES="imapd.pem pop3d.pem"
+# Additional files that are may be created for courier-imap.
+ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/userdb"
+ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/userdb.dat"
+ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/userdbshadow.dat"
+ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/imapd.rand"
+ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/pop3d.rand"
+ALL_FILES="${ALL_FILES} /dev/null @SSLCERTS@/imapd.pem"
+ALL_FILES="${ALL_FILES} /dev/null @SSLCERTS@/pop3d.pem"
 
 case ${STAGE} in
-DEINSTALL)
-	# Remove configuration files if they don't differ from the default
-	# config file.
-	#
-	GENERATED_CONFFILES=
-	for file in ${CONFFILES_1}
-	do
-		FILE=${SAMPLECONFDIR}/${file}
-		GENFILE=${CONFDIR}/${file%.dist}
-		GENERATED_CONFFILES="${GENERATED_CONFFILES} ${file%.dist}"
-		if ${CMP} -s ${GENFILE} ${FILE}
-		then
-			${RM} -f ${GENFILE}
-		fi
-        done
-	for file in ${CONFFILES_2}
-	do
-		FILE=${CONFDIR}/${file}
-		SAMPLEFILE=${SAMPLECONFDIR}/${file}
-		if ${CMP} -s ${FILE} ${SAMPLEFILE}
-		then
-			${RM} -f ${FILE}
-		fi
-	done
-	for file in ${CONFFILES_3}
-	do
-		FILE=${CONFDIR}/${file}
-		SAMPLEFILE=${SAMPLECONFDIR}/${file}.example
-		if ${CMP} -s ${FILE} ${SAMPLEFILE}
-		then
-			${RM} -f ${FILE}
-		fi
-	done
-	;;
-
 POST-DEINSTALL)
-	modified_files=''
-	for file in							\
-		${GENERATED_CONFFILES} ${CONFFILES_1}			\
-		${CONFFILES_2} ${CONFFILES_3} ${NONCONFFILES}		\
-		${RANDFILES}
-	do
-		FILE=${CONFDIR}/${file}
-		if [ -f ${FILE} ]
-		then
-			modified_files="${modified_files} ${FILE}"
-		fi
-	done
-	for file in ${PEMFILES}
-	do
-		FILE=${SSLCERTS}/${file}
-		if [ -f ${FILE} ]
-		then
-			modified_files="${modified_files} ${FILE}"
-		fi
-	done
-
-	${RMDIR} ${CONFDIR} 2>/dev/null || ${TRUE}
-
-	existing_dirs=''
-	for dir in ${CONFDIR}
-	do
-		if [ -d ${dir} ]
-		then
-			existing_dirs="${existing_dirs} ${dir}"
-		fi
-	done
-
-	if [ -n "${modified_files}" -o -n "${existing_dirs}" ]
-	then
-		${CAT} << EOF
-===========================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove:
-EOF
-		if [ -n "${modified_files}" ]
-		then
-			${CAT} << EOF
-
-  * the following files:
-
-EOF
-			for file in ${modified_files}
-			do
-				echo "	${file}"
-			done
-		fi
-		if [ -n "${existing_dirs}" ]
-		then
-			${CAT} << EOF
-
-  * the following directories:
-
-EOF
-			for dir in ${existing_dirs}
-			do
-				echo "	${dir}"
-			done
-		fi
-		${CAT} << EOF
-===========================================================================
-EOF
-	fi
-	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
+	#
+	# Unconditionally remove authdaemon state directory as it contains
+	# files and sockets that authdaemond creates every time it is
+	# started.
+	#
+	${RM} -rf /var/authdaemon
 esac
-exit 0
diff --git a/mail/courier-imap/INSTALL b/mail/courier-imap/INSTALL
index 001f4ac522a..4dffffc32eb 100644
--- a/mail/courier-imap/INSTALL
+++ b/mail/courier-imap/INSTALL
@@ -1,90 +1,18 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.1 2001/11/01 00:59:42 zuntum Exp $
+# $NetBSD: INSTALL,v 1.2 2002/01/02 22:19:37 jlam Exp $
 
-PKGNAME=$1
-STAGE=$2
-
-CAT="@CAT@"
-CHMOD="@CHMOD@"
-CHOWN="@CHOWN@"
-CP="@CP@"
-MKDIR="@MKDIR@"
-RM="@RM@"
-
-SAMPLECONFDIR=${PKG_PREFIX}/share/examples/courier
-CONFDIR=/etc/courier
-CONFFILES_1="imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist"
-CONFFILES_2="imapd.cnf pop3d.cnf"
-CONFFILES_3="quotawarnmsg"
+EGDIR=${PKG_PREFIX}/share/examples/courier
+GEN_FILES="${GEN_FILES}"
 
 case ${STAGE} in
-PRE-INSTALL)
-	;;
-
 POST-INSTALL)
-	${MKDIR} ${CONFDIR}
-	echo "Installing configuration files:"
-	for file in ${CONFFILES_2}
+	eval set -- ${GEN_FILES}
+	for file
 	do
-		FILE=${CONFDIR}/${file}
-		SAMPLEFILE=${SAMPLECONFDIR}/${file}
-		if [ -f ${FILE} ]
-		then
-			echo "    ${FILE} already exists"
-		else
-			echo "    ${FILE}"
-			${CP} ${SAMPLEFILE} ${FILE}
-			${CHMOD} 600 ${FILE}
-		fi
+		# Merge new config files with the old ones.
+		${CP} ${EGDIR}/${file}.dist @PKG_SYSCONFDIR@/${file}.dist
+		${PKG_PREFIX}/sbin/sysconftool @PKG_SYSCONFDIR@/${file}
+		${CHMOD} 0600 ${file}
+		${RM} -f @PKG_SYSCONFDIR@/${file}.dist
 	done
-	for file in ${CONFFILES_3}
-	do
-		FILE=${CONFDIR}/${file}
-		SAMPLEFILE=${SAMPLECONFDIR}/${file}.example
-		if [ -f ${FILE} ]
-		then
-			echo "    ${FILE} already exists"
-		else
-			echo "    ${FILE}"
-			${CP} ${SAMPLEFILE} ${FILE}
-			${CHMOD} 644 ${FILE}
-		fi
-	done
-
-	echo ""
-	echo "Updating configuration files:"
-	GENERATED_CONFFILES=
-	for file in ${CONFFILES_1}
-	do
-		FILE=${CONFDIR}/${file}
-		GENFILE=${CONFDIR}/${file%.dist}
-		SAMPLEFILE=${SAMPLECONFDIR}/${file}
-		${CP} ${SAMPLEFILE} ${FILE}
-		GENERATED_CONFFILES="${GENERATED_CONFFILES} ${file%.dist}"
-		${PKG_PREFIX}/sbin/sysconftool ${FILE}
-		${CHMOD} 600 ${GENFILE}
-		${RM} -f ${FILE}
-	done
-	${CAT} << EOF
-
-===========================================================================
-Some files you might need to customize include the following:
-
-EOF
-	for file in ${GENERATED_CONFFILES} ${CONFFILES_2} ${CONFFILES_3}
-	do
-		FILE=${CONFDIR}/${file}
-		echo "	${FILE}"
-	done
-	${CAT} << EOF
-===========================================================================
-EOF
-	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
 	;;
 esac
-exit 0
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 37d447cedbe..285a8a6077e 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,69 +1,47 @@
-# $NetBSD: Makefile,v 1.6 2001/08/16 06:56:50 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/01/02 22:19:38 jlam Exp $
 
-DISTNAME=	courier-imap-1.3.8.2
-CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
-
-MAINTAINER=	jlam@netbsd.org
-HOMEPAGE=	http://www.inter7.com/courierimap/
+PKGNAME=	courier-imap-${BASE_VERS}
+PKGREVISION?=	# empty
 COMMENT=	IMAP server for access to Maildir-style mailboxes
 
-DEPENDS+=	courier-maildirmake-[0-9]*:../../mail/courier-maildirmake
+DEPENDS+=	courier-maildirmake>=0.3:../../mail/courier-maildirmake
 
-USE_BUILDLINK_ONLY=	# defined
-USE_GMAKE=		# defined
-USE_PERL5=		# defined
+USE_BUILDLINK_ONLY=	yes
+USE_PERL5=		yes
 REPLACE_PERL=		sysconftool
 
-GNU_CONFIGURE=		# defined
-CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/courier
-CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/libexec/courier
-CONFIGURE_ARGS+=	--sysconfdir=/etc/courier
-CONFIGURE_ARGS+=	--enable-unicode
-CONFIGURE_ARGS+=	--with-db=db
-CONFIGURE_ARGS+=	--with-userdb=/etc/userdb
-CONFIGURE_ARGS+=	--disable-root-check
-CONFIGURE_ENV+=		OPENSSL=${BUILDLINK_PREFIX.openssl}/bin/openssl
-
 INSTALL_TARGET=		install-strip
 
-.include "../../mk/bsd.prefs.mk"
-
-#.if defined(USE_PAM)
-#.include "../../security/PAM/buildlink.mk"
-#.endif
-
-CONFIGURE_ARGS+=	--without-authpam
-CONFIGURE_ARGS+=	--without-authldap
-CONFIGURE_ARGS+=	--without-authmysql
-
-.if ${OPSYS} == "SunOS"
-.include "../../databases/db/buildlink.mk"
-CPPFLAGS+=	-I${BUILDLINK_DIR}/include/db2
-.endif
-
-DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
-INSTALL_FILE=		${WRKDIR}/INSTALL
-
-FILES_SUBST=		SSLCERTS=${SSLCERTS}
-FILES_SUBST+=		CAT=${CAT:Q}
-FILES_SUBST+=		CHMOD=${CHMOD:Q}
-FILES_SUBST+=		CHOWN=${CHOWN:Q}
-FILES_SUBST+=		CMP=${CMP:Q}
-FILES_SUBST+=		CP=${CP:Q}
-FILES_SUBST+=		MKDIR=${MKDIR:Q}
-FILES_SUBST+=		RM=${RM:Q}
-FILES_SUBST+=		RMDIR=${RMDIR:Q}
-FILES_SUBST+=		TRUE=${TRUE:Q}
-FILES_SUBST_SED=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
-
-post-extract:
+.include "../../scratch/courier-imap/Makefile.common"
+
+GEN_FILES=	authdaemonrc imapd imapd-ssl pop3d pop3d-ssl
+SSLCNF_FILES=	imapd.cnf pop3d.cnf
+CONF_FILES=	${EGDIR}/quotawarnmsg.example ${PKG_SYSCONFDIR}/quotawarnmsg
+RCD_SCRIPTS=	courierimap courierimaps courierpop courierpops
+OWN_DIRS_PERMS=	/var/authdaemon ${ROOT_USER} ${ROOT_GROUP} 700
+
+CONF_FILES_PERMS=	# empty
+.for FILE in ${GEN_FILES}
+CONF_FILES_PERMS+=	${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE}	\
+			${ROOT_USER} ${ROOT_GROUP} 0600
+.endfor
+.for FILE in ${SSLCNF_FILES}
+CONF_FILES_PERMS+=	${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}	\
+			${ROOT_USER} ${ROOT_GROUP} 0600
+.endfor
+
+DEINSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
+FILES_SUBST+=		SSLCERTS=${SSLCERTS}
+FILES_SUBST+=		GEN_FILES=${GEN_FILES:Q}
+
+pre-configure:
 	cd ${WRKSRC}; for file in					\
 		imap/imapd.dist.in imap/imapd-ssl.dist.in		\
 		imap/pop3d.dist.in imap/pop3d-ssl.dist.in		\
+		imap/imapd.cnf.in imap/pop3d.cnf.in			\
 		imap/mkimapdcert.in imap/mkpop3dcert.in;		\
 	do								\
-		${MV} -f $${file} $${file}.fixme;			\
 		${SED}	-e "s|^IMAPDSTART=.*|IMAPDSTART=YES|g"		\
 			-e "s|^IMAPDSSLSTART=.*|IMAPDSSLSTART=YES|g"	\
 			-e "s|^POP3DSTART=.*|POP3DSTART=YES|g"		\
@@ -72,35 +50,33 @@ post-extract:
 			-e "s|@datadir@/imapd.rand|@sysconfdir@/imapd.rand|g" \
 			-e "s|@datadir@/pop3d.pem|${SSLCERTS}/pop3d.pem|g" \
 			-e "s|@datadir@/pop3d.rand|@sysconfdir@/pop3d.rand|g" \
-			$${file}.fixme > $${file};			\
-		if [ -x $${file}.fixme ]; then				\
-			${CHMOD} +x $${file};				\
-		fi;							\
-		${RM} $${file}.fixme;					\
+			$${file} > $${file}.fixed;			\
+		${MV} -f $${file}.fixed $${file};			\
 	done
 
-pre-install:
-	${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
-	${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
-
 post-install:
-	for file in							\
-		courierimap.sh courierimaps.sh				\
-		courierpop.sh courierpops.sh;				\
-	do								\
-		src=${FILESDIR}/$${file};				\
-		dest=${PREFIX}/etc/rc.d/$${file%.sh};			\
-		${INSTALL_SCRIPT} $${src} $${dest};			\
+	@for file in ${RCD_SCRIPTS}; do					\
+		${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${file}.sh	\
+			> ${WRKDIR}/$${file}.sh;			\
+		${INSTALL_SCRIPT} ${WRKDIR}/$${file}.sh			\
+			${PREFIX}/etc/rc.d/$${file};			\
 	done
+	${INSTALL_DATA_DIR} ${EGDIR} ${DOCDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${PREFIX}/sbin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/courier
+	${INSTALL_DATA} ${WRKSRC}/imap/BUGS				\
+		${DOCDIR}/BUGS.imap
 	${INSTALL_DATA} ${WRKSRC}/imap/README				\
-		${PREFIX}/share/doc/courier/README.imap
+		${DOCDIR}/README.imap
 	${INSTALL_DATA} ${WRKSRC}/maildir/README.maildirquota.txt	\
-		${PREFIX}/share/doc/courier/README.maildirquota
+		${DOCDIR}/README.maildirquota
 	${INSTALL_DATA} ${WRKSRC}/maildir/README.sharedfolders.txt	\
-		${PREFIX}/share/doc/courier/README.sharedfolders
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
+		${DOCDIR}/README.sharedfolders
+	for file in authdaemonrc.dist; do				\
+		${INSTALL_DATA} ${PKG_SYSCONFDIR}/$${file} ${EGDIR};	\
+		${RM} -f ${PKG_SYSCONFDIR}/$${file};			\
+	done
+	cd ${WRKSRC}; ${INSTALL_DATA} imap/imapd.pam imap/pop3d.pam ${EGDIR}
 
 .include "../../security/openssl/buildlink.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-imap/Makefile.common b/mail/courier-imap/Makefile.common
new file mode 100644
index 00000000000..e63383dccea
--- /dev/null
+++ b/mail/courier-imap/Makefile.common
@@ -0,0 +1,58 @@
+# $NetBSD: Makefile.common,v 1.1 2002/01/02 22:19:38 jlam Exp $
+
+DISTNAME=	courier-imap-${DIST_VERS}
+CATEGORIES+=	mail
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
+
+MAINTAINER=	jlam@netbsd.org
+HOMEPAGE=	http://www.inter7.com/courierimap/
+
+# Version numbering scheme:
+#
+# DIST_VERS	version number on the distfile
+# BASE_BERS	pkgsrc-manged version number
+#
+DIST_VERS=	1.4.0
+BASE_VERS=	${DIST_VERS}
+
+USE_GMAKE=		yes
+
+PKG_SYSCONFSUBDIR?=	courier
+
+DISTINFO_FILE=		${.CURDIR}/../../scratch/courier-imap/distinfo
+PATCHDIR=		${.CURDIR}/../../scratch/courier-imap/patches
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/courier
+CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/libexec/courier
+CONFIGURE_ARGS+=	--localstatedir=/var
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+
+CONFIGURE_ARGS+=	--enable-unicode
+CONFIGURE_ARGS+=	--with-authchangepwdir=${PREFIX}/libexec/courier
+CONFIGURE_ARGS+=	--with-db=db
+CONFIGURE_ARGS+=	--with-userdb=${PKG_SYSCONFDIR}/userdb
+CONFIGURE_ARGS+=	--disable-root-check
+
+CONFIGURE_ARGS+=	--with-authdaemon
+CONFIGURE_ARGS+=	--without-authcustom
+CONFIGURE_ARGS+=	--without-authldap
+CONFIGURE_ARGS+=	--without-authmysql
+CONFIGURE_ARGS+=	--without-authpgsql
+
+CONFIGURE_ENV+=		OPENSSL=${BUILDLINK_PREFIX.openssl}/bin/openssl
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+.include "../../databases/db/buildlink.mk"
+CPPFLAGS+=	-I${BUILDLINK_DIR}/include/db2
+.endif
+
+.if defined(USE_PAM)
+.include "../../security/PAM/buildlink.mk"
+.endif
+
+AUTHLIBDIR=	${PREFIX}/libexec/courier/authlib
+DOCDIR=		${PREFIX}/share/doc/courier
+EGDIR=		${PREFIX}/share/examples/courier
diff --git a/mail/courier-imap/PLIST b/mail/courier-imap/PLIST
index ecb47e2555b..ae8592cf432 100644
--- a/mail/courier-imap/PLIST
+++ b/mail/courier-imap/PLIST
@@ -1,16 +1,15 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:59:42 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/02 22:19:38 jlam Exp $
 bin/couriertls
 bin/imapd
-bin/imapd.maildirmake
+bin/maildirmake.imapd
 bin/pop3d
 etc/rc.d/courierimap
 etc/rc.d/courierimaps
 etc/rc.d/courierpop
 etc/rc.d/courierpops
-libexec/courier/authlib/authcram
-libexec/courier/authlib/authcustom
-libexec/courier/authlib/authpwd
-libexec/courier/authlib/authuserdb
+libexec/courier/authlib/authdaemon
+libexec/courier/authlib/authdaemond
+libexec/courier/authlib/authdaemond.plain
 libexec/courier/couriertcpd
 libexec/courier/deliverquota
 libexec/courier/imapd-ssl.rc
@@ -19,18 +18,18 @@ libexec/courier/logger
 libexec/courier/makedatprog
 libexec/courier/pop3d-ssl.rc
 libexec/courier/pop3d.rc
-man/man1/imapd.maildirmake.1
-man/man8/authcram.8
-man/man8/authdaemon.8
-man/man8/authdaemond.8
-man/man8/authldap.8
-man/man8/authlib.8
-man/man8/authmysql.8
-man/man8/authpam.8
-man/man8/authpwd.8
-man/man8/authshadow.8
-man/man8/authuserdb.8
-man/man8/authvchkpw.8
+man/man1/maildirmake.imapd.1
+man/man7/authcram.7
+man/man7/authdaemon.7
+man/man7/authdaemond.7
+man/man7/authldap.7
+man/man7/authlib.7
+man/man7/authmysql.7
+man/man7/authpam.7
+man/man7/authpwd.7
+man/man7/authshadow.7
+man/man7/authuserdb.7
+man/man7/authvchkpw.7
 man/man8/courier-imapd.8
 man/man8/couriertcpd.8
 man/man8/deliverquota.8
@@ -57,17 +56,22 @@ share/courier/mkpop3dcert
 share/courier/pw2userdb
 share/courier/userdb
 share/courier/vchkpw2userdb
+share/doc/courier/BUGS.imap
 share/doc/courier/README.imap
 share/doc/courier/README.maildirquota
 share/doc/courier/README.sharedfolders
+share/examples/courier/authdaemonrc.dist
 share/examples/courier/imapd-ssl.dist
 share/examples/courier/imapd.cnf
 share/examples/courier/imapd.dist
+share/examples/courier/imapd.pam
 share/examples/courier/pop3d-ssl.dist
 share/examples/courier/pop3d.cnf
 share/examples/courier/pop3d.dist
+share/examples/courier/pop3d.pam
 share/examples/courier/quotawarnmsg.example
-@unexec rmdir -p %D/share/examples/courier 2>/dev/null || true
-@unexec rmdir -p %D/share/doc/courier 2>/dev/null || true
-@unexec rmdir -p %D/share/courier 2>/dev/null || true
-@unexec rmdir -p %D/libexec/courier 2>/dev/null || true
+@unexec ${RMDIR} -p %D/share/examples/courier 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} -p %D/share/doc/courier 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} -p %D/share/courier 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} -p %D/libexec/courier/authlib 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} -p %D/libexec/courier 2>/dev/null || ${TRUE}
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index e741ae2510a..45d854ead03 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.4 2001/08/16 06:49:12 jlam Exp $
+$NetBSD: distinfo,v 1.5 2002/01/02 22:19:38 jlam Exp $
 
-SHA1 (courier-imap-1.3.8.2.tar.gz) = 7e199dee58eb125df2b897f0621ffa5eb6d7fbde
-Size (courier-imap-1.3.8.2.tar.gz) = 1131541 bytes
-SHA1 (patch-aa) = 591afc3e231fe4b2607b8087791d6822722e9110
-SHA1 (patch-ab) = da50612c40a7882353eec09abeebb4ad89720d94
+SHA1 (courier-imap-1.4.0.tar.gz) = 3a1d5eec1db132b03bb295738aa615eaed4f0b84
+Size (courier-imap-1.4.0.tar.gz) = 1168483 bytes
+SHA1 (patch-aa) = d1dba22e273fd954faa1bea0f437e12d808f4a9c
+SHA1 (patch-ab) = e9da6801d310f792a205ccf7e4b6bce958b9a8ee
+SHA1 (patch-ac) = c5c3d03a06fa6c3818dad633fa89464a60a4f4f9
+SHA1 (patch-ad) = 3941221a4dd780a2b73c95028cb59774e4755089
+SHA1 (patch-ae) = f735159979ed63fdf19e0940ba7e8b39ac5134bf
+SHA1 (patch-af) = f85ae9f2f56c1885180ae86b156ff508aa2491c4
+SHA1 (patch-ag) = 9611ac1fddef554ce12f7e3a64213dc129702e68
diff --git a/mail/courier-imap/files/courierimap.sh b/mail/courier-imap/files/courierimap.sh
index 090482a03f5..146f0731687 100755
--- a/mail/courier-imap/files/courierimap.sh
+++ b/mail/courier-imap/files/courierimap.sh
@@ -1,20 +1,23 @@
 #! /bin/sh
 #
+# $NetBSD: courierimap.sh,v 1.3 2002/01/02 22:19:39 jlam Exp $
+#
 # Courier IMAP services daemon
 #
 # PROVIDE: courierimap
 # REQUIRE: DAEMON
 
-if [ -d /etc/rc.d -a -f /etc/rc.subr ]
+if [ -e /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
 
 name="courierimap"
 rcvar=${name}
-command="/usr/pkg/libexec/courier/couriertcpd"
-ctl_command="/usr/pkg/libexec/courier/imapd.rc"
+command="@PREFIX@/libexec/courier/couriertcpd"
+ctl_command="@PREFIX@/libexec/courier/imapd.rc"
 pidfile="/var/run/imapd.pid"
+required_files="@PKG_SYSCONFDIR@/imapd @PKG_SYSCONFDIR@/imapd-ssl"
 
 start_cmd="courier_doit start"
 stop_cmd="courier_doit stop"
@@ -23,18 +26,18 @@ courier_doit()
 {
 	action=$1
 	case ${action} in
-	start)		echo "Starting ${rcvar}." ;;
-	stop)		echo "Stopping ${rcvar}." ;;
+	start)	echo "Starting ${name}." ;;
+	stop)	echo "Stopping ${name}." ;;
 	esac
 
 	${ctl_command} ${action}
 }
 
-if [ ! -d /etc/rc.d ]
+if [ -e /etc/rc.subr ]
 then
+	load_rc_config $name
+	run_rc_command "$1"
+else
 	echo -n " ${name}"
-	exec ${ctl_command} start
+	${start_cmd}
 fi
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/courier-imap/files/courierimaps.sh b/mail/courier-imap/files/courierimaps.sh
index ca0c25c9ada..16ae7fc63d4 100755
--- a/mail/courier-imap/files/courierimaps.sh
+++ b/mail/courier-imap/files/courierimaps.sh
@@ -1,20 +1,24 @@
 #! /bin/sh
 #
+# $NetBSD: courierimaps.sh,v 1.3 2002/01/02 22:19:39 jlam Exp $
+#
 # Courier IMAP/SSL services daemon
 #
 # PROVIDE: courierimaps
 # REQUIRE: DAEMON
 
-if [ -d /etc/rc.d -a -f /etc/rc.subr ]
+if [ -e /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
 
 name="courierimaps"
 rcvar=${name}
-command="/usr/pkg/libexec/courier/couriertcpd"
-ctl_command="/usr/pkg/libexec/courier/imapd-ssl.rc"
+command="@PREFIX@/libexec/courier/couriertcpd"
+ctl_command="@PREFIX@/libexec/courier/imapd-ssl.rc"
 pidfile="/var/run/imapd-ssl.pid"
+required_files="@PKG_SYSCONFDIR@/imapd @PKG_SYSCONFDIR@/imapd-ssl"
+required_files="${required_files} @SSLCERTS@/imapd.pem"
 
 start_cmd="courier_doit start"
 stop_cmd="courier_doit stop"
@@ -23,18 +27,18 @@ courier_doit()
 {
 	action=$1
 	case ${action} in
-	start)		echo "Starting ${rcvar}." ;;
-	stop)		echo "Stopping ${rcvar}." ;;
+	start)	echo "Starting ${name}." ;;
+	stop)	echo "Stopping ${name}." ;;
 	esac
 
 	${ctl_command} ${action}
 }
 
-if [ ! -d /etc/rc.d ]
+if [ -e /etc/rc.subr ]
 then
+	load_rc_config $name
+	run_rc_command "$1"
+else
 	echo -n " ${name}"
-	exec ${ctl_command} start
+	${start_cmd}
 fi
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/courier-imap/files/courierpop.sh b/mail/courier-imap/files/courierpop.sh
index 9f963ed4297..c1008a2676d 100755
--- a/mail/courier-imap/files/courierpop.sh
+++ b/mail/courier-imap/files/courierpop.sh
@@ -1,20 +1,23 @@
 #! /bin/sh
 #
+# $NetBSD: courierpop.sh,v 1.3 2002/01/02 22:19:39 jlam Exp $
+#
 # Courier POP services daemon
 #
 # PROVIDE: courierpop
 # REQUIRE: DAEMON
 
-if [ -d /etc/rc.d -a -f /etc/rc.subr ]
+if [ -e /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
 
 name="courierpop"
 rcvar=${name}
-command="/usr/pkg/libexec/courier/couriertcpd"
-ctl_command="/usr/pkg/libexec/courier/pop3d.rc"
+command="@PREFIX@/libexec/courier/couriertcpd"
+ctl_command="@PREFIX@/libexec/courier/pop3d.rc"
 pidfile="/var/run/pop3d.pid"
+required_files="@PKG_SYSCONFDIR@/pop3d @PKG_SYSCONFDIR@/pop3d-ssl"
 
 start_cmd="courier_doit start"
 stop_cmd="courier_doit stop"
@@ -23,18 +26,18 @@ courier_doit()
 {
 	action=$1
 	case ${action} in
-	start)		echo "Starting ${rcvar}." ;;
-	stop)		echo "Stopping ${rcvar}." ;;
+	start)	echo "Starting ${name}." ;;
+	stop)	echo "Stopping ${name}." ;;
 	esac
 
 	${ctl_command} ${action}
 }
 
-if [ ! -d /etc/rc.d ]
+if [ -e /etc/rc.subr ]
 then
+	load_rc_config $name
+	run_rc_command "$1"
+else
 	echo -n " ${name}"
-	exec ${ctl_command} start
+	${start_cmd}
 fi
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/courier-imap/files/courierpops.sh b/mail/courier-imap/files/courierpops.sh
index 4f070f4a66b..b59a6b23b9a 100755
--- a/mail/courier-imap/files/courierpops.sh
+++ b/mail/courier-imap/files/courierpops.sh
@@ -1,20 +1,24 @@
 #! /bin/sh
 #
+# $NetBSD: courierpops.sh,v 1.3 2002/01/02 22:19:39 jlam Exp $
+#
 # Courier POP3/SSL services daemon
 #
 # PROVIDE: courierpops
 # REQUIRE: DAEMON
 
-if [ -d /etc/rc.d -a -f /etc/rc.subr ]
+if [ -e /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
 
 name="courierpops"
 rcvar=${name}
-command="/usr/pkg/libexec/courier/couriertcpd"
-ctl_command="/usr/pkg/libexec/courier/pop3d-ssl.rc"
+command="@PREFIX@/libexec/courier/couriertcpd"
+ctl_command="@PREFIX@/libexec/courier/pop3d-ssl.rc"
 pidfile="/var/run/pop3d-ssl.pid"
+required_files="@PKG_SYSCONFDIR@/pop3d @PKG_SYSCONFDIR@/pop3d-ssl"
+required_files="${required_files} @SSLCERTS@/pop3d.pem"
 
 start_cmd="courier_doit start"
 stop_cmd="courier_doit stop"
@@ -23,18 +27,18 @@ courier_doit()
 {
 	action=$1
 	case ${action} in
-	start)		echo "Starting ${rcvar}." ;;
-	stop)		echo "Stopping ${rcvar}." ;;
+	start)	echo "Starting ${name}." ;;
+	stop)	echo "Stopping ${name}." ;;
 	esac
 
 	${ctl_command} ${action}
 }
 
-if [ ! -d /etc/rc.d ]
+if [ -e /etc/rc.subr ]
 then
+	load_rc_config $name
+	run_rc_command "$1"
+else
 	echo -n " ${name}"
 	exec ${ctl_command} start
 fi
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/courier-imap/patches/patch-aa b/mail/courier-imap/patches/patch-aa
index 30bc7a93b93..e1d07589dd2 100644
--- a/mail/courier-imap/patches/patch-aa
+++ b/mail/courier-imap/patches/patch-aa
@@ -1,36 +1,48 @@
-$NetBSD: patch-aa,v 1.3 2001/08/16 06:49:13 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2002/01/02 22:19:39 jlam Exp $
 
---- Makefile.in.orig	Wed Jun 13 18:37:56 2001
+--- Makefile.in.orig	Wed Dec  5 08:26:31 2001
 +++ Makefile.in
 @@ -30,3 +30,3 @@
  datadir = @datadir@
 -sysconfdir = @sysconfdir@
 +sysconfdir = ${prefix}/share/examples/courier
  sharedstatedir = @sharedstatedir@
-@@ -91,5 +91,5 @@
+@@ -95,5 +95,5 @@
  
 -bin_PROGRAMS = imapd pop3d maildirmake
-+bin_PROGRAMS = imapd pop3d imapd.maildirmake
++bin_PROGRAMS = imapd pop3d maildirmake.imapd
  sbin_PROGRAMS = imaplogin pop3login userdbpw
 -man_MANS = makeuserdb.8 userdb.8 userdbpw.8 couriertcpd.8 deliverquota.8 maildirmake.1 imapd.8 mkimapdcert.8 mkpop3dcert.8
-+man_MANS = makeuserdb.8 userdb.8 userdbpw.8 couriertcpd.8 deliverquota.8 imapd.maildirmake.1 courier-imapd.8 mkimapdcert.8 mkpop3dcert.8
++man_MANS = makeuserdb.8 userdb.8 userdbpw.8 couriertcpd.8 deliverquota.8 maildirmake.imapd.1 courier-imapd.8 mkimapdcert.8 mkpop3dcert.8
  
-@@ -753,4 +753,4 @@
+@@ -758,4 +758,4 @@
  
 -maildirmake: maildir/maildirmake
 -	cp maildir/maildirmake .
-+imapd.maildirmake: maildir/maildirmake
-+	cp maildir/maildirmake ./imapd.maildirmake
++maildirmake.imapd: maildir/maildirmake
++	cp maildir/maildirmake ./maildirmake.imapd
  
-@@ -783,7 +783,7 @@
+@@ -789,7 +789,7 @@
  
 -maildirmake.1: maildir/maildirmake.1
 -	cp maildir/maildirmake.1 .
-+imapd.maildirmake.1: maildir/maildirmake.1
-+	cp maildir/maildirmake.1 ./imapd.maildirmake.1
++maildirmake.imapd.1: maildir/maildirmake.1
++	cp maildir/maildirmake.1 ./maildirmake.imapd.1
  
 -imapd.8: imap/imapd.8
 -	cp imap/imapd.8 .
 +courier-imapd.8: imap/imapd.8
-+	cp imap/imapd.8 courier-imapd.8
++	cp imap/imapd.8 ./courier-imapd.8
  
+@@ -843,11 +843,2 @@
+ install-data-local: install-man
+-	for f in `cat authlib/modulelist ; . authlib/authdaemonrc ; echo $$authmodulelist ` ; do \
+-		test "$$f" = "authpam" || continue ; \
+-		test -d $(DESTDIR)/etc/pam.d || continue ; \
+-		test -w $(DESTDIR)/etc/pam.d || continue ; \
+-		$(INSTALL_DATA) $(srcdir)/imap/imapd.pam \
+-			$(DESTDIR)/etc/pam.d/imap || exit 1 ;\
+-		$(INSTALL_DATA) $(srcdir)/imap/pop3d.pam \
+-			$(DESTDIR)/etc/pam.d/pop3 || exit 1 ;\
+-	done
+ 	rm -f $(DESTDIR)$(man8dir)/pw2userdb.8
diff --git a/mail/courier-imap/patches/patch-ab b/mail/courier-imap/patches/patch-ab
index eb306c6712d..9089d67c2d7 100644
--- a/mail/courier-imap/patches/patch-ab
+++ b/mail/courier-imap/patches/patch-ab
@@ -1,13 +1,12 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/07/31 22:48:50 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2002/01/02 22:19:40 jlam Exp $
 
---- configure.orig	Wed Jun 13 18:28:55 2001
-+++ configure
-@@ -1689,8 +1689,6 @@
- fi
+--- authlib/Makefile.in.orig	Wed Dec  5 08:26:53 2001
++++ authlib/Makefile.in
+@@ -2067,7 +2067,6 @@
+ 		for f in $(man_LINKS) "" ; do \
+ 			test "$$f" = "" && continue ; \
+ 			rm -f $$f; $(LN_S) authlib.7 $$f ; \
+-			test -w /etc && chown bin $$f && chgrp bin $$f ; \
+ 			done ; exit 0
  
- 
--INSTALL_DATA='${INSTALL} -m 0600'
--
- #
- # autoconf bug
- #
+ uninstall-local: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc
diff --git a/mail/courier-imap/patches/patch-ac b/mail/courier-imap/patches/patch-ac
new file mode 100644
index 00000000000..e02ba0cfdba
--- /dev/null
+++ b/mail/courier-imap/patches/patch-ac
@@ -0,0 +1,166 @@
+$NetBSD: patch-ac,v 1.3 2002/01/02 22:19:40 jlam Exp $
+
+--- authlib/authldaplib.c.orig	Wed Nov 28 22:52:51 2001
++++ authlib/authldaplib.c
+@@ -26,6 +26,17 @@
+  */
+ 
+ /*
++ * Modified 28/11/2001 Iustin Pop <iusty@intensit.de>
++ * There was a bug regarding the LDAP_TLS option: if both LDAP_TLS
++ * and was LDAP_AUTHBIND were enabled, the ldap_start_tls function
++ * was called only for the first connection, resulting in the fact
++ * that the bind for checking the password was done without TLS,
++ * sending the password in clear text over the network. Detected 
++ * when using OpenLDAP with "security ssf=128" (which disalows any 
++ * clear-text communication).
++*/
++
++/*
+    Modified 01/21/2000 James Golovich <james@wwnet.net>
+ 
+ 1. If LDAP_AUTHBIND is set in the config file, then the ldap server will
+@@ -467,6 +478,53 @@
+ 	return (rc);
+ }
+ 
++/* This function takes a ldap connection and 
++ * tries to enable TLS on it.
++*/
++static int enable_tls_on(LDAP *conn) {
++#if HAVE_LDAP_TLS
++	int version;
++	int ldrc;
++
++	if (ldaperror(ldrc=ldap_get_option (conn,
++				    LDAP_OPT_PROTOCOL_VERSION,
++				    &version))
++	    != LDAP_SUCCESS)
++	{
++		const char *s=ldap_err2string(ldrc);
++
++#if	HAVE_SYSLOG_H
++		syslog(LOG_DAEMON|LOG_CRIT,
++		       "ldap_get_option failed: %s", s);
++#endif
++		return (-1);
++	}
++
++	if (version < LDAP_VERSION3)
++	{
++		version = LDAP_VERSION3;
++		(void)ldap_set_option (conn,
++				       LDAP_OPT_PROTOCOL_VERSION,
++				       &version);
++	}
++
++	if (ldaperror(ldrc=ldap_start_tls_s(conn, NULL, NULL))
++	    != LDAP_SUCCESS)
++	{
++		const char *s=ldap_err2string(ldrc);
++
++#if	HAVE_SYSLOG_H
++		syslog(LOG_DAEMON|LOG_CRIT,
++		       "ldap_start_tls_s failed: %s", s);
++#endif
++		return (-1);
++	}
++	return 0;
++#else
++	return (-1);
++#endif
++}
++
+ static LDAP *ldapconnect()
+ {
+ LDAP	*p;
+@@ -518,47 +576,11 @@
+ 	}
+ 
+ #if HAVE_LDAP_TLS
+-	if (my_ldap.tls)
++	if (my_ldap.tls && enable_tls_on(my_ldap_fp))
+ 	{
+-		int version;
+-
+-		if (ldaperror(ldrc=ldap_get_option (my_ldap_fp,
+-						    LDAP_OPT_PROTOCOL_VERSION,
+-						    &version))
+-		    != LDAP_SUCCESS)
+-		{
+-			const char *s=ldap_err2string(ldrc);
+-
+-#if	HAVE_SYSLOG_H
+-			syslog(LOG_DAEMON|LOG_CRIT,
+-			       "ldap_get_option failed: %s", s);
+-#endif
+-			authldapclose();
+-			ldapconnfailure();
+-			return (-1);
+-		}
+-
+-		if (version < LDAP_VERSION3)
+-		{
+-			version = LDAP_VERSION3;
+-			(void)ldap_set_option (my_ldap_fp,
+-					       LDAP_OPT_PROTOCOL_VERSION,
+-					       &version);
+-		}
+-
+-		if (ldaperror(ldrc=ldap_start_tls_s(my_ldap_fp, NULL, NULL))
+-		    != LDAP_SUCCESS)
+-		{
+-			const char *s=ldap_err2string(ldrc);
+-
+-#if	HAVE_SYSLOG_H
+-			syslog(LOG_DAEMON|LOG_CRIT,
+-			       "ldap_start_tls_s failed: %s", s);
+-#endif
+-			authldapclose();
+-			ldapconnfailure();
+-			return (-1);
+-		}
++		authldapclose();
++		ldapconnfailure();
++		return (-1);
+ 	}
+ #endif
+ 
+@@ -828,17 +850,28 @@
+ 				rc=1;
+ 			else
+ 			{
+-				switch (ldap_simple_bind_s(bindp, dn, (char *)pass))
+-				{
+-				case LDAP_SUCCESS:
+-					break;
+-				case LDAP_INVALID_CREDENTIALS:
+-					rc = -1;
+-					break;
+-				default:
++#if HAVE_LDAP_TLS
++				if(my_ldap.tls && enable_tls_on(bindp)) {
++#if HAVE_SYSLOG_H
++					syslog(LOG_DAEMON|LOG_CRIT, "authlib: LDAP_TLS enabled but I'm unable to start tls, check your config\n");
++#endif
+ 					rc = 1;
+-					break;
++				} else {
++#endif
++					switch (ldap_simple_bind_s(bindp, dn, (char *)pass))
++					{
++					case LDAP_SUCCESS:
++						break;
++					case LDAP_INVALID_CREDENTIALS:
++						rc = -1;
++						break;
++					default:
++						rc = 1;
++						break;
++					}
++#if HAVE_LDAP_TLS
+ 				}
++#endif
+ 				ldap_unbind(bindp);
+ 			}
+ 			if (rc == 0 && newpass)
diff --git a/mail/courier-imap/patches/patch-ad b/mail/courier-imap/patches/patch-ad
new file mode 100644
index 00000000000..1a5c0aacffb
--- /dev/null
+++ b/mail/courier-imap/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2002/01/02 22:19:41 jlam Exp $
+
+--- authlib/configure.in.orig	Sat Nov 24 14:39:03 2001
++++ authlib/configure.in
+@@ -411,8 +411,6 @@
+ 	STATIC_LIST="authldap_info $STATIC_LIST"
+ 	LIBAUTH="$LIBAUTH libauth-authldap.a"
+ 	echo authldaprc.dist >>authconfiglist
+-else
+-	authldaprc=""
+ fi
+ AC_SUBST(LDAPLIBS)
+ 
diff --git a/mail/courier-imap/patches/patch-ae b/mail/courier-imap/patches/patch-ae
new file mode 100644
index 00000000000..aa946f2cfea
--- /dev/null
+++ b/mail/courier-imap/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2002/01/02 22:19:41 jlam Exp $
+
+--- authlib/configure.orig	Sat Nov 24 14:39:36 2001
++++ authlib/configure
+@@ -2689,8 +2689,6 @@
+ 	STATIC_LIST="authldap_info $STATIC_LIST"
+ 	LIBAUTH="$LIBAUTH libauth-authldap.a"
+ 	echo authldaprc.dist >>authconfiglist
+-else
+-	authldaprc=""
+ fi
+ 
+ 
diff --git a/mail/courier-imap/patches/patch-af b/mail/courier-imap/patches/patch-af
new file mode 100644
index 00000000000..52f0ba5217e
--- /dev/null
+++ b/mail/courier-imap/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1 2002/01/02 22:19:41 jlam Exp $
+
+--- authlib/cryptpassword.c.orig	Wed Jun 20 21:44:04 2001
++++ authlib/cryptpassword.c
+@@ -6,6 +6,7 @@
+ #if	HAVE_CONFIG_H
+ #include	"config.h"
+ #endif
++#include	<stdlib.h>
+ #include	<string.h>
+ #if	HAVE_UNISTD_H
+ #include	<unistd.h>
diff --git a/mail/courier-imap/patches/patch-ag b/mail/courier-imap/patches/patch-ag
new file mode 100644
index 00000000000..b9b473708dd
--- /dev/null
+++ b/mail/courier-imap/patches/patch-ag
@@ -0,0 +1,14 @@
+$NetBSD: patch-ag,v 1.1 2002/01/02 22:19:42 jlam Exp $
+
+--- configure.in.orig	Wed Dec  5 08:16:41 2001
++++ configure.in
+@@ -162,9 +162,6 @@
+ AC_ARG_WITH(authchangepwdir, [], ,
+ 	ac_configure_args="$ac_configure_args --with-authchangepwdir=/var/tmp/dev/null")
+ 
+-INSTALL_DATA='${INSTALL} -m 0600'
+-INSTALL_SCRIPT='${INSTALL}'
+-
+ #
+ # autoconf bug
+ #