Pull up version 1.54 to the 1.6.1 pkgsrc branch.

Regquested by David Brownlee

> Date: Thu, 13 Feb 2003 21:22:44 +0200 (EET)
> From: David Brownlee <abs@netbsd.org>
>
>
> Module Name:    pkgsrc
> Committed By:   abs
> Date:           Thu Feb 13 19:22:44 UTC 2003
>
> Modified Files:
>         pkgsrc/mail/imap-uw: Makefile
>
> Log Message:
> Linux cp -R behaves differently to NetBSD when given a directory as a source
> argument. Handle differently.

mail/imap-uw/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2003/01/23 07:37:15 martti Exp $
+# $NetBSD: Makefile,v 1.53.2.1 2003/02/17 04:28:31 agc Exp $
 
 DISTNAME=       imap-2002b
 PKGNAME=        imap-uw-2002.2
@@ -54,11 +54,11 @@ PLIST_SUBST+=	CCLIENT_MINOR="${CCLIENT_MINOR}"
 
 MANFILES=	src/imapd/imapd.8c src/ipopd/ipopd.8c
 
-MAKE_ENV+=	SSLDIR="${SSLBASE}"
-MAKE_ENV+=	SSLCERTS="${SSLCERTS}"
-MAKE_ENV+=	CCLIENT_MAJOR="${CCLIENT_MAJOR}"
-MAKE_ENV+=	CCLIENT_MINOR="${CCLIENT_MINOR}"
-MAKE_ENV+=	CREATEPROTO=${IMAP_UW_CCLIENT_MBOX_FMT}proto
+MAKE_ENV+=	SSLDIR=${SSLBASE:Q}
+MAKE_ENV+=	SSLCERTS=${SSLCERTS:Q}
+MAKE_ENV+=	CCLIENT_MAJOR=${CCLIENT_MAJOR:Q}
+MAKE_ENV+=	CCLIENT_MINOR=${CCLIENT_MINOR:Q}
+MAKE_ENV+=	CREATEPROTO=${IMAP_UW_CCLIENT_MBOX_FMT:Q}proto
 
 ALL_TARGET+=	CC="${PKGLIBTOOL} ${CC}"
 ALL_TARGET+=	EXTRACFLAGS="${CFLAGS}"
@@ -128,7 +128,7 @@ do-install:
 	${LN} -sf ipopd.8 ${PREFIX}/man/man8/ipop2d.8
 	${LN} -sf ipopd.8 ${PREFIX}/man/man8/ipop3d.8
 	${INSTALL_DATA_DIR} ${DOC_DIR}
-	${CP} -R ${WRKSRC}/docs/ ${DOC_DIR}
+	${CP} -R ${WRKSRC}/docs/* ${DOC_DIR}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOC_DIR}
 	${CHMOD} -R a=rX ${DOC_DIR}