update to 4.7a

PR:     16545
Submitted by:   Akinori "Aki" MUSHA <knu@idaemons.org>

4 files changed, 32 insertions, 40 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index f0f50e9a5a3d..4bd5d7e8854d 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	imap-uw
-# Version required:	4.7
+# Version required:	4.7a
 # Date created:		9 Jan 1997
 # Whom:			pst
 #
 # $FreeBSD$
 #
 
-DISTNAME=	imap-4.7
-PKGNAME=	imap-uw-4.7
+DISTNAME=	imap-4.7a
+PKGNAME=	imap-uw-4.7a
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/ \
 		ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/mail/ \
@@ -15,8 +15,7 @@ MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/ \
 		ftp://ftp.uni-halle.de/pub/mail/pine/
 EXTRACT_SUFX=	.tar.Z
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		imap-utils${EXTRACT_SUFX} \
-		${DISTNAME}.lock-patch.tar
+		imap-utils${EXTRACT_SUFX}
 
 MAINTAINER=	imap-uw@freebsd.ady.ro
 
@@ -42,6 +41,9 @@ PLIST_SUB=	SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
 SHLIBNAME=	lib${SHLIBBASE}.so.${SHLIBMAJ}.0
 .endif
 
+post-extract:
+	@${CP} ${FILESDIR}/safegets.[ch] ${WRKSRC}/src/mtest/
+
 post-configure:
 	@${ECHO_MSG} ">> The c-client shared library will be named ${SHLIBNAME}"
 .if ${PAMAUTH} != "no"
@@ -50,9 +52,6 @@ post-configure:
 	@${ECHO_MSG} ">> You can use PAM authentication building with \"PAMAUTH=yes\""
 .endif
 
-pre-patch:
-	@${CP} -f ${WRKDIR}/lock-patch/*.c ${WRKSRC}/src/osdep/unix/
-
 post-build:
 	@(cd ${WRKDIR}/mlock; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all)
 
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index b06a65e94f49..3f24eca5db8d 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,5 +1,5 @@
-MD5 (imap-4.7.tar.Z) = 73fe0bb4878874945b5a692dd7205b58
-SIZE (imap-4.7.tar.Z) =  1862753
+MD5 (imap-4.7a.tar.Z) = 41bd88a2b0d726486ca723dcb1591e43
+SIZE (imap-4.7a.tar.Z) =  1919895
 MD5 (imap-4.7.lock-patch.tar) = 192b4edb5ecfefeb4374939fe39ff74f
 SIZE (imap-4.7.lock-patch.tar) =  180224
 MD5 (imap-utils.tar.Z) = 5fd2828029a0f91e5760ec1ab64377fc
diff --git a/mail/imap-uw/files/patch-ac b/mail/imap-uw/files/patch-ac
index 9d324e6b5e40..566d1b961bd9 100644
--- a/mail/imap-uw/files/patch-ac
+++ b/mail/imap-uw/files/patch-ac
@@ -32,9 +32,9 @@
  
  ipopd: ipop2d ipop3d
  
---- src/mtest/Makefile.orig	Wed Apr 15 01:42:04 1998
-+++ src/mtest/Makefile	Sat Oct 10 21:48:18 1998
-@@ -39,7 +39,7 @@
+--- src/mtest/Makefile.orig	Wed Apr 15 07:42:04 1998
++++ src/mtest/Makefile	Fri Feb  4 14:37:44 2000
+@@ -39,14 +39,16 @@
  
  CC = `cat $C/CCTYPE`
  CFLAGS = -I$C `cat $C/CFLAGS`
@@ -43,3 +43,15 @@
  
  all:	mtest
  
+-mtest: $(CCLIENTLIB) mtest.o
+-	$(CC) $(CFLAGS) -o mtest mtest.o $(LDFLAGS)
++mtest: $(CCLIENTLIB) mtest.o safegets.o
++	$(CC) $(CFLAGS) -o mtest mtest.o safegets.o $(LDFLAGS)
+ 
+-mtest.o: $C/mail.h $C/misc.h $C/osdep.h $C/rfc822.h $C/smtp.h $C/nntp.h
++mtest.o:  safegets.h $C/mail.h $C/misc.h $C/osdep.h $C/rfc822.h $C/smtp.h $C/nntp.h
++
++safegets.o: safegets.h $C/mail.h
+ 
+ $(CCLIENTLIB):
+ 	cd $C;make
diff --git a/mail/imap-uw/files/patch-ae b/mail/imap-uw/files/patch-ae
index a3b490909a09..7ede8619fd27 100644
--- a/mail/imap-uw/files/patch-ae
+++ b/mail/imap-uw/files/patch-ae
@@ -1,12 +1,12 @@
 --- src/mtest/mtest.c.orig	Sat May 29 08:07:06 1999
-+++ src/mtest/mtest.c	Sun Dec 19 15:29:29 1999
-@@ -95,6 +95,7 @@
- void status (MAILSTREAM *stream);
- void prompt (char *msg,char *txt);
- void smtptest (long debug);
-+char *safegets(char *buf);
- 
- /* Main program - initialization */
++++ src/mtest/mtest.c	Fri Feb  4 12:25:32 2000
+@@ -49,6 +49,7 @@
+ #include "rfc822.h"
+ #include "smtp.h"
+ #include "nntp.h"
++#include "safegets.h"
+ 
+ /* Excellent reasons to hate ifdefs, and why my real code never uses them */
  
 @@ -528,7 +529,7 @@
  void prompt (char *msg,char *txt)
@@ -26,22 +26,3 @@
      if (line[0] == '.') {
        if (line[1] == '\0') break;
        else strcat (text,".");
-@@ -744,4 +745,18 @@
-   else puts ("[Can't open connection to any server]");
-   mail_free_envelope (&msg);
-   mail_free_body (&body);
-+}
-+
-+char *safegets(char *buf) {
-+ char *p;
-+
-+ if (!fgets(buf, MAILTMPLEN, stdin)) {
-+  return NULL;
-+ }
-+
-+ if ((p = strchr(buf, '\n')) != NULL) {
-+  *p = '\0';
-+ }
-+
-+ return buf;
- }