ports/51754: [PATCH] update of ports mail/imap-uw and mail/cclient to 2002c1

[Oliver Eikemeier]

>Number:         51754
>Category:       ports
>Synopsis:       [PATCH] update of ports mail/imap-uw and mail/cclient to 2002c1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 04 11:10:12 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Oliver Eikemeier
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
Fillmore Labs - http://www.fillmore-labs.com
>Environment:
System: FreeBSD nuuk.fillmore-labs.com 4.8-STABLE FreeBSD 4.8-STABLE #0: Sun Apr 6 14:21:01 CEST 2003 root at nuuk.fillmore-labs.com:/usr/obj/usr/src/sys/FILLMORE-LABS i386

>Description:

- update to the 2002c1 uw imap distribution
- use up-to-date mirror sites
- 'make extract' in port imap-uw did not work when port cclient was not installed

>How-To-Repeat:
>Fix:

cd /usr/ports
cat ~/imap-uw-2002c1.patch ~/cclient-2002c1.patch | patch
find mail/imap-uw mail/cclient -name '*.orig' -delete


--- imap-uw-2002c1.patch begins here ---
diff -Nur mail/imap-uw/Makefile.orig mail/imap-uw/Makefile
--- mail/imap-uw/Makefile.orig	Fri Mar  7 21:17:15 2003
+++ mail/imap-uw/Makefile	Sun May  4 19:49:59 2003
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	imap
-PORTVERSION=	2002
-PORTREVISION=	1
+PORTVERSION=	2002c1
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \
-		ftp://ftp.nuug.no/pub/anders/distfiles/%SUBDIR%/ \
-		http://atreides.freenix.no/~anders/%SUBDIR%/ \
+		ftp://ftp.ayamura.org/pub/uw-imap/%SUBDIR%/ \
+		ftp://ftp.ukc.mirror.ac.uk/sites/ftp.cac.washington.edu/mail/%SUBDIR%/ \
 		ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/mail/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. old
 PKGNAMESUFFIX=	-uw
 DISTNAME=	imap-${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
@@ -55,10 +55,8 @@
 
 .include <bsd.port.pre.mk>
 
-pre-extract:
-	@${SH} ${PKGREQ}.rev ${LOCALBASE}/include/c-client/portrevision.h ${PORTVERSION}
-
 pre-build:
+	@${SH} ${PKGREQ}.rev ${LOCALBASE}/include/c-client/portrevision.h ${PORTVERSION}
 .if !defined(WITHOUT_SSL)
 	@${SH} ${PKGREQ}.ssl ${LOCALBASE}/include/c-client/portrevision.h yes
 .else
diff -Nur mail/imap-uw/distinfo.orig mail/imap-uw/distinfo
--- mail/imap-uw/distinfo.orig	Wed Nov 27 15:00:20 2002
+++ mail/imap-uw/distinfo	Sun May  4 19:15:11 2003
@@ -1 +1 @@
-MD5 (imap-2002.tar.Z) = ab5a7afb25cbd037b4490c42e0fe235e
+MD5 (imap-2002c1.tar.Z) = 90c255dcf3ee373e3fb174ea5d820f4d
diff -Nur mail/imap-uw/files/patch-ah.orig mail/imap-uw/files/patch-ah
--- mail/imap-uw/files/patch-ah.orig	Wed Nov 27 15:00:20 2002
+++ mail/imap-uw/files/patch-ah	Sun May  4 19:28:45 2003
@@ -22,7 +22,7 @@
 +extern char *getenv ();
 +#endif /* DRAC_AUTH */
 +
- char *version = "2001.80";	/* server version */
+ char *version = "2003.83";	/* server version */
  short state = AUTHORIZATION;	/* server state */
  short critical = NIL;		/* non-zero if in critical code */
 @@ -88,7 +99,53 @@
diff -Nur mail/imap-uw/files/patch-ai.orig mail/imap-uw/files/patch-ai
--- mail/imap-uw/files/patch-ai.orig	Wed Nov 27 15:00:20 2002
+++ mail/imap-uw/files/patch-ai	Sun May  4 19:30:09 2003
@@ -22,7 +22,7 @@
 +extern char *getenv ();
 +#endif /* DRAC_AUTH */
 +
- char *version = "2002.332";	/* version number of this server */
+ char *version = "2003.337";	/* version number of this server */
  time_t alerttime = 0;		/* time of last alert */
  time_t sysalerttime = 0;	/* time of last system alert */
 @@ -238,7 +249,50 @@
--- imap-uw-2002c1.patch ends here ---

--- cclient-2002c1.patch begins here ---
diff -Nur mail/cclient/Makefile.orig mail/cclient/Makefile
--- mail/cclient/Makefile.orig	Fri Mar  7 21:17:13 2003
+++ mail/cclient/Makefile	Sun May  4 19:10:56 2003
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	cclient
-PORTVERSION=	2002
+PORTVERSION=	2002c1
 PORTEPOCH=	1
 CATEGORIES=	mail devel
-MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/ \
-		http://atreides.freenix.no/~anders/ \
-		ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/imap/ \
-		ftp://ftp.nuug.no/pub/anders/distfiles/
+MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \
+		ftp://ftp.ayamura.org/pub/uw-imap/%SUBDIR%/ \
+		ftp://ftp.ukc.mirror.ac.uk/sites/ftp.cac.washington.edu/mail/%SUBDIR%/ \
+		ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/mail/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. old
 DISTNAME=	imap-${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
 
diff -Nur mail/cclient/distinfo.orig mail/cclient/distinfo
--- mail/cclient/distinfo.orig	Wed Nov 27 15:00:19 2002
+++ mail/cclient/distinfo	Sun May  4 19:15:28 2003
@@ -1 +1 @@
-MD5 (imap-2002.tar.Z) = ab5a7afb25cbd037b4490c42e0fe235e
+MD5 (imap-2002c1.tar.Z) = 90c255dcf3ee373e3fb174ea5d820f4d
--- cclient-2002c1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: