- Update to 20050108 to avoid conflicts with imap-uw package

- Issue spotted by diro (at) nixsys.bz in PR #28966

This distribution now contains two unsupported programs, icat and ifrom,
which may be of use to some sites.

The old chkmail, imapcopy, imapxfer, mbxcopy, mbxcreat, and mbxcvt
programs have been replaced with the mailutil program, which is
included in the mail/imap-uw package.

The dmail, mlock, and tmail programs are also bundled in the mail/imap-uw
package.

4 files changed, 27 insertions, 47 deletions

diff --git a/mail/imap-uw-utils/DESCR b/mail/imap-uw-utils/DESCR
index ad2ce6fb46d..2d87d9c0e80 100644
--- a/mail/imap-uw-utils/DESCR
+++ b/mail/imap-uw-utils/DESCR
@@ -1,13 +1,14 @@
-UW IMAP mailbox utilities:
-
-	chkmail			check for new mail
-	dmail			procmail Mail Delivery Module
-	icat			"cat" a mailbox from an IMAP source
-	ifrom			one line per message summary of IMAP mailbox
-	imapcopy, imapmove	copy or move messages from an IMAP inbox to a
-				local mailbox
-	mbxcopy, mbxmove	copy or move messages to a new mailbox
-	mbxcreat		create a new mailbox
-	mbxcvt			copy or move messages to a new mailbox,
-				converting mailbox format
-	tmail			Mail Delivery Module
+This distribution contains two unsupported programs, icat and ifrom,
+which may be of use to some sites.
+
+	icat		"cat" a mailbox from an IMAP source
+	ifrom		one line per message summary of IMAP mailbox
+
+There were once other programs in this distribution as well:
+
+The old chkmail, imapcopy, imapxfer, mbxcopy, mbxcreat, and mbxcvt
+programs have been replaced with the mailutil program, which is
+included in the mail/imap-uw package.
+
+The dmail, mlock, and tmail programs are also bundled in the mail/imap-uw
+package.
diff --git a/mail/imap-uw-utils/Makefile b/mail/imap-uw-utils/Makefile
index cbaac16e189..7577552cb5e 100644
--- a/mail/imap-uw-utils/Makefile
+++ b/mail/imap-uw-utils/Makefile
@@ -1,22 +1,21 @@
-# $NetBSD: Makefile,v 1.19 2005/02/09 18:30:27 reed Exp $
+# $NetBSD: Makefile,v 1.20 2005/03/06 14:37:15 adrianp Exp $
 
 DISTNAME=	imap-utils
-PKGNAME=	imap-uw-utils-20020102
-PKGREVISION=	4
+PKGNAME=	imap-uw-utils-20050108
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/old/
+MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.washington.edu/imap/
 COMMENT=	UW IMAP mailbox utilities
 
-WRKSRC=			${WRKDIR}
-DIST_SUBDIR=		${PKGNAME_NOREV}
-USE_BUILDLINK3=		yes
+DIST_SUBDIR=	${PKGNAME_NOREV}
+USE_BUILDLINK3=	yes
 
-SRCDIRS=	chkmail dmail icat ifrom imapcopy imapxfer \
-		mbxcopy mbxcreat mbxcvt tmail
+BUILDLINK_DEPENDS.imap-uw+=	imap-uw>=2004c1nb1
+
+SRCDIRS=	icat ifrom
 
 CFLAGS+=	-I${BUILDLINK_PREFIX.imap-uw}/include/c-client
 LIBS+=		-lc-client -lssl -lcrypto
@@ -35,8 +34,6 @@ do-install:
 		${INSTALL_PROGRAM} $${prog} ${PREFIX}/bin;		\
 		${INSTALL_MAN} $${prog}.1 ${PREFIX}/man/man1;		\
 	done
-	${LN} -sf imapcopy ${PREFIX}/bin/imapmove
-	${LN} -sf mbxcopy ${PREFIX}/bin/mbxmove
 
 .include "../../mail/imap-uw/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/mail/imap-uw-utils/PLIST b/mail/imap-uw-utils/PLIST
index 22b9e2a2e82..df31ac37933 100644
--- a/mail/imap-uw-utils/PLIST
+++ b/mail/imap-uw-utils/PLIST
@@ -1,23 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:14 zuntum Exp $
-bin/chkmail
-bin/dmail
+@comment $NetBSD: PLIST,v 1.2 2005/03/06 14:37:15 adrianp Exp $
 bin/icat
 bin/ifrom
-bin/imapcopy
-bin/imapmove
-bin/imapxfer
-bin/mbxcopy
-bin/mbxcreat
-bin/mbxcvt
-bin/mbxmove
-bin/tmail
-man/man1/chkmail.1
-man/man1/dmail.1
 man/man1/icat.1
 man/man1/ifrom.1
-man/man1/imapcopy.1
-man/man1/imapxfer.1
-man/man1/mbxcopy.1
-man/man1/mbxcreat.1
-man/man1/mbxcvt.1
-man/man1/tmail.1
diff --git a/mail/imap-uw-utils/distinfo b/mail/imap-uw-utils/distinfo
index cbca1244002..fa99a94a4c3 100644
--- a/mail/imap-uw-utils/distinfo
+++ b/mail/imap-uw-utils/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 09:59:23 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/03/06 14:37:15 adrianp Exp $
 
-SHA1 (imap-uw-utils-20020102/imap-utils.tar.Z) = ebe4fa180c70ba11b35359e7543422cdee4f55c9
-RMD160 (imap-uw-utils-20020102/imap-utils.tar.Z) = 0a28f556a8682fa4654ac9c182f4ab9344d50d81
-Size (imap-uw-utils-20020102/imap-utils.tar.Z) = 61495 bytes
+SHA1 (imap-uw-utils-20050108/imap-utils.tar.Z) = 0453d669d4208b1c7a8101393654f551aee06b96
+RMD160 (imap-uw-utils-20050108/imap-utils.tar.Z) = eb00b3f90aad728be9df581514e076ed002e4bca
+Size (imap-uw-utils-20050108/imap-utils.tar.Z) = 14720 bytes