From 6d88d1d8d731dc5a92740f3dffa40f4dd9b1c7a1 Mon Sep 17 00:00:00 2001
From: jakob <jakob@openbsd.org>
Date: Wed, 18 Sep 2002 08:20:45 +0000
Subject: [PATCH] remove imaputils-uw, now integrated into imap-uw

---
 mail/Makefile                                 |  3 +-
 mail/imaputils-uw/Makefile                    | 50 -------------------
 mail/imaputils-uw/distinfo                    |  3 --
 mail/imaputils-uw/patches/patch-tmail_tmail_c | 11 ----
 mail/imaputils-uw/pkg/DESCR                   | 16 ------
 mail/imaputils-uw/pkg/PLIST                   | 25 ----------
 6 files changed, 1 insertion(+), 107 deletions(-)
 delete mode 100644 mail/imaputils-uw/Makefile
 delete mode 100644 mail/imaputils-uw/distinfo
 delete mode 100644 mail/imaputils-uw/patches/patch-tmail_tmail_c
 delete mode 100644 mail/imaputils-uw/pkg/DESCR
 delete mode 100644 mail/imaputils-uw/pkg/PLIST

diff --git a/mail/Makefile b/mail/Makefile
index c2849948fba..81dba66f77e 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.95 2002/09/11 18:43:34 danh Exp $
+# $OpenBSD: Makefile,v 1.96 2002/09/18 08:20:45 jakob Exp $
 # $FreeBSD: Makefile,v 1.51 1997/11/14 22:56:43 hoek Exp $
 #
 
@@ -29,7 +29,6 @@
      SUBDIR += hypermail
      SUBDIR += hypermail,gdbm
      SUBDIR += imap-uw
-     SUBDIR += imaputils-uw
      SUBDIR += imp
      SUBDIR += isync
      SUBDIR += kbiff
diff --git a/mail/imaputils-uw/Makefile b/mail/imaputils-uw/Makefile
deleted file mode 100644
index eb7fbe0d01f..00000000000
--- a/mail/imaputils-uw/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# $OpenBSD: Makefile,v 1.8 2002/07/15 07:16:43 pvalchev Exp $
-
-COMMENT=	University of Washington IMAP utilities
-
-DISTNAME=	imap-utils
-PKGNAME=	imaputils-uw-20020402
-CATEGORIES=	mail
-NEED_VERSION=	1.489
-
-HOMEPAGE=	http://www.washington.edu/imap/
-
-MAINTAINER=     Jakob Schlyter <jakob@openbsd.org>
-
-PERMIT_PACKAGE_CDROM=	no
-PERMIT_PACKAGE_FTP=	yes
-PERMIT_DISTFILES_CDROM=	no
-PERMIT_DISTFILES_FTP=	yes
-
-MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/
-EXTRACT_SUFX=	.tar.Z
-DIST_SUBDIR=	${PKGNAME}
-
-LIB_DEPENDS=	c-client.3:c-client->=4.40p1:mail/c-client
-
-WRKDIST=	${WRKDIR}
-SUBDIRS=	chkmail dmail icat ifrom imapcopy imapxfer \
-		mbxcopy mbxcreat mbxcvt tmail
-
-CFLAGS+=	-I${LOCALBASE}/include/c-client
-LIBS+=		-L${LOCALBASE}/lib -lc-client \
-		-lssl -lcrypto -ldes \
-		-lkrb -lkafs -lgssapi -lkrb5 -lasn1 -lcom_err
-
-do-build:
-.for prog in ${SUBDIRS}
-	cd ${WRKDIST}/${prog}; \
-	${CC} ${CFLAGS} ${LDFLAGS} -o ${prog} ${prog}.c ${LIBS}
-.endfor
-
-do-install:
-.for prog in ${SUBDIRS}
-	${INSTALL_PROGRAM} ${WRKDIST}/${prog}/${prog} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKDIST}/${prog}/${prog}.1 ${PREFIX}/man/man1
-.endfor
-	@cd ${PREFIX}/bin; ln -sf imapcopy imapmove
-	@cd ${PREFIX}/bin; ln -sf mbxcopy mbxmove
-	@cd ${PREFIX}/man/man1; ln -sf imapcopy.1 imapmove.1
-	@cd ${PREFIX}/man/man1; ln -sf mbxcopy.1 mbxmove.1
-
-.include <bsd.port.mk>
diff --git a/mail/imaputils-uw/distinfo b/mail/imaputils-uw/distinfo
deleted file mode 100644
index 93c893977b3..00000000000
--- a/mail/imaputils-uw/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (imaputils-uw-20020402/imap-utils.tar.Z) = a54772a4954ecc145a5f962d8e6012bf
-RMD160 (imaputils-uw-20020402/imap-utils.tar.Z) = 0a28f556a8682fa4654ac9c182f4ab9344d50d81
-SHA1 (imaputils-uw-20020402/imap-utils.tar.Z) = ebe4fa180c70ba11b35359e7543422cdee4f55c9
diff --git a/mail/imaputils-uw/patches/patch-tmail_tmail_c b/mail/imaputils-uw/patches/patch-tmail_tmail_c
deleted file mode 100644
index a560d8583ff..00000000000
--- a/mail/imaputils-uw/patches/patch-tmail_tmail_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-tmail_tmail_c,v 1.1 2002/08/02 20:43:00 jakob Exp $
---- tmail/tmail.c.orig	Fri Aug  2 22:41:13 2002
-+++ tmail/tmail.c	Fri Aug  2 22:41:24 2002
-@@ -190,7 +190,6 @@ int main (int argc,char *argv[])
-       while ((c = getchar ()) != EOF) putc (c,f);
-     }
-     else {
--      mm_log ("tmail called with LF-only newlines",WARN);
-       if ((tmp[0] != 'F') || (tmp[1] != 'r') || (tmp[2] != 'o') ||
- 	  (tmp[3] != 'm') || (tmp[4] != ' ')) {
- 	*s++ = '\015';		/* overwrite NL with CRLF */
diff --git a/mail/imaputils-uw/pkg/DESCR b/mail/imaputils-uw/pkg/DESCR
deleted file mode 100644
index 7231ef34df3..00000000000
--- a/mail/imaputils-uw/pkg/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-University of Washington IMAP 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
-
-
-WWW: ${HOMEPAGE}
diff --git a/mail/imaputils-uw/pkg/PLIST b/mail/imaputils-uw/pkg/PLIST
deleted file mode 100644
index de4d3eee75a..00000000000
--- a/mail/imaputils-uw/pkg/PLIST
+++ /dev/null
@@ -1,25 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.2 2001/09/28 06:11:11 jakob Exp $
-bin/chkmail
-bin/dmail
-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/imapmove.1
-man/man1/imapxfer.1
-man/man1/mbxcopy.1
-man/man1/mbxcreat.1
-man/man1/mbxcvt.1
-man/man1/mbxmove.1
-man/man1/tmail.1