From 5e24c5be98c99a5982703e6276c8102ea9638a44 Mon Sep 17 00:00:00 2001 From: Anders Nordby Date: Sat, 8 Dec 2001 16:36:01 +0000 Subject: Update cclient & imap-uw ports to imap-2001a. Fix typos in imap-uw's pkg-req.ssl. Submitted by: dougb (parts of this) --- mail/imap-uw/Makefile | 6 +++--- mail/imap-uw/distinfo | 2 +- mail/imap-uw/files/patch-ad | 26 +++++++++----------------- mail/imap-uw/files/patch-ah | 8 ++++---- mail/imap-uw/files/patch-ai | 13 ++++++------- mail/imap-uw/pkg-req.ssl | 4 ++-- 6 files changed, 25 insertions(+), 34 deletions(-) (limited to 'mail/imap-uw') diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile index c979923c3afd..8ea5128bff9b 100644 --- a/mail/imap-uw/Makefile +++ b/mail/imap-uw/Makefile @@ -6,7 +6,7 @@ # PORTNAME= imap -PORTVERSION= 2001 +PORTVERSION= 2001a PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \ @@ -17,7 +17,7 @@ MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \ ftp://ftp.uni-halle.de/pub/mail/pine/%SUBDIR%/ MASTER_SITE_SUBDIR= . old PKGNAMESUFFIX= -uw -DISTNAME= imap-2001.FINAL +DISTNAME= imap-2001a DISTFILES= ${DISTNAME}.tar.Z imap-utils.tar.Z MAINTAINER= anders@fix.no @@ -27,7 +27,7 @@ LIB_DEPENDS= c-client4.8:${PORTSDIR}/mail/cclient BUILD_DEPENDS= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac .endif -WRKSRC= ${WRKDIR}/imap-2001.RELEASE-CANDIDATE.1 +WRKSRC= ${WRKDIR}/imap-2001a MAN8= ipopd.8 imapd.8 diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo index 9e20987f5241..860da8426fd5 100644 --- a/mail/imap-uw/distinfo +++ b/mail/imap-uw/distinfo @@ -1,2 +1,2 @@ -MD5 (imap-2001.FINAL.tar.Z) = b26456af47ba63c5624d0ed434690e4d +MD5 (imap-2001a.tar.Z) = 42c5c8d049c209b15513a4f6ebba34d2 MD5 (imap-utils.tar.Z) = a6453029f201b32e9ed761e662c47b0f diff --git a/mail/imap-uw/files/patch-ad b/mail/imap-uw/files/patch-ad index 4aa7189d9a0d..8c7ea66ecfdc 100644 --- a/mail/imap-uw/files/patch-ad +++ b/mail/imap-uw/files/patch-ad @@ -1,14 +1,6 @@ ---- Makefile.orig Tue Jul 3 08:00:09 2001 -+++ Makefile Mon Oct 1 03:27:22 2001 -@@ -43,6 +43,7 @@ - # art AIX 2.2.1 for RT - # asv Altos SVR4 - # aux A/UX -+# bfp FreeBSD with Pluggable Authentication Modules (PAM) - # bs3 BSD/i386 3.0 and higher - # bsd generic BSD 4.3 (as in ancient 1980s version) - # bsf FreeBSD -@@ -146,7 +147,7 @@ +--- Makefile.orig Sat Dec 8 14:11:42 2001 ++++ Makefile Sat Dec 8 14:13:19 2001 +@@ -147,7 +147,7 @@ # std system standard (typically passwd file), determined by port # two try alternative (defined by CHECKPWALT), then std @@ -17,7 +9,7 @@ # SSL type. Defines whether or not SSL support is on this system -@@ -211,12 +212,12 @@ +@@ -212,12 +212,12 @@ # gradually-increasing intervals, starting at 2800-2900, and becoming # permanent at 48,300. @@ -32,11 +24,11 @@ # Special make flags (e.g. to override make environment variables) -@@ -256,13 +257,7 @@ +@@ -253,13 +253,7 @@ # Make the IMAP Toolkit --all: c-client rebuild bundled +-all: SPECIALS c-client rebuild bundled - -c-client: - @echo Not processed yet. In a first-time build, you must specify @@ -45,9 +37,9 @@ - +all: bundled - # Note on SCO you may have to set LN to "ln". - -@@ -367,7 +362,7 @@ + SPECIALS: + echo $(SPECIALS) > SPECIALS +@@ -374,7 +368,7 @@ $(TOOLS)/$@ "$(LN)" src/imapd imapd $(LN) $(TOOLS)/$@ . diff --git a/mail/imap-uw/files/patch-ah b/mail/imap-uw/files/patch-ah index 3fd5bc6471b4..70295361688d 100644 --- a/mail/imap-uw/files/patch-ah +++ b/mail/imap-uw/files/patch-ah @@ -1,5 +1,5 @@ ---- src/ipopd/ipop3d.c.orig Mon Oct 1 02:53:55 2001 -+++ src/ipopd/ipop3d.c Mon Oct 1 02:56:46 2001 +--- src/ipopd/ipop3d.c.orig Sat Dec 8 14:22:36 2001 ++++ src/ipopd/ipop3d.c Sat Dec 8 14:22:41 2001 @@ -28,6 +28,11 @@ #include #include "c-client.h" @@ -22,7 +22,7 @@ +extern char *getenv (); +#endif /* DRAC_AUTH */ + - char *version = "2001.77"; /* server version */ + char *version = "2001.78"; /* server version */ short state = AUTHORIZATION; /* server state */ short critical = NIL; /* non-zero if in critical code */ @@ -100,7 +111,7 @@ @@ -34,7 +34,7 @@ challenge[0] = '\0'; /* find the CRAM-MD5 authenticator */ if (i = mail_lookup_auth_name ("CRAM-MD5",NIL)) { AUTHENTICATOR *a = mail_lookup_auth (i); -@@ -692,6 +703,46 @@ +@@ -694,6 +705,46 @@ } sprintf (tmp,"+OK Mailbox open, %lu messages\015\012",nmsgs); PSOUT (tmp); diff --git a/mail/imap-uw/files/patch-ai b/mail/imap-uw/files/patch-ai index 4eddf7323157..2d8eeaeb3a0d 100644 --- a/mail/imap-uw/files/patch-ai +++ b/mail/imap-uw/files/patch-ai @@ -1,6 +1,6 @@ ---- src/imapd/imapd.c.orig Mon Oct 1 02:51:23 2001 -+++ src/imapd/imapd.c Mon Oct 1 02:52:59 2001 -@@ -29,6 +29,12 @@ +--- src/imapd/imapd.c.orig Sat Dec 8 14:25:00 2001 ++++ src/imapd/imapd.c Sat Dec 8 14:28:55 2001 +@@ -29,6 +29,11 @@ #include "c-client.h" #include @@ -9,11 +9,10 @@ +#include +#include +#endif /* DRAC_AUTH */ -+ #define CRLF PSOUT ("\015\012") /* primary output terpri */ -@@ -173,6 +179,12 @@ +@@ -173,6 +178,12 @@ /* Global storage */ @@ -23,10 +22,10 @@ +extern char *getenv (); +#endif /* DRAC_AUTH */ + - char *version = "2001.313"; /* version number of this server */ + char *version = "2001.315"; /* version number of this server */ time_t alerttime = 0; /* time of last alert */ time_t sysalerttime = 0; /* time of last system alert */ -@@ -1229,6 +1241,45 @@ +@@ -1226,6 +1237,45 @@ lasterror ()); return; } diff --git a/mail/imap-uw/pkg-req.ssl b/mail/imap-uw/pkg-req.ssl index 9290be0cd4ca..881c5ef9049e 100644 --- a/mail/imap-uw/pkg-req.ssl +++ b/mail/imap-uw/pkg-req.ssl @@ -11,7 +11,7 @@ yes) echo "SSL check passed. We want SSL support, and cclient has it. Good." exit 0 else - echo "SSL check failed. Wa want SSL support, but cclient doesn't have it." + echo "SSL check failed. We want SSL support, but cclient doesn't have it." echo "Please recompile and reinstall the cclient port with WITH_SSL=yes set." exit 1 fi @@ -19,7 +19,7 @@ yes) *) if [ "$sslenabled" = "yes" ] then - echo "You did not want SSL (by not defining WANT_SSL). Funny thing is, your cclient" + echo "You did not want SSL (by not defining WITH_SSL). Funny thing is, your cclient" echo "port has SSL support installed." exit 0 fi -- cgit v1.2.3