From owner-freebsd-ports  Sun Aug 15 12:20:34 1999
Delivered-To: freebsd-ports@freebsd.org
Received: from server.mindstep.com (cr480472-a.slnt1.on.wave.home.com [24.112.33.138])
	by hub.freebsd.org (Postfix) with SMTP id E01EC14E90
	for <freebsd-ports@FreeBSD.org>; Sun, 15 Aug 1999 12:20:27 -0700 (PDT)
	(envelope-from patrick@server.mindstep.com)
Received: (qmail 32308 invoked by uid 0); 15 Aug 1999 19:18:58 -0000
Message-ID: <19990815191858.32307.qmail@server.mindstep.com>
From: patrick@server.mindstep.com
Subject: Re: ports/13158: IMAP-uw is not up to date
In-Reply-To: <199908151900.MAA10685@freefall.freebsd.org> from "gnats-admin@FreeBSD.org" at "Aug 15, 1999 12: 0: 1 pm"
To: gnats-admin@FreeBSD.org, freebsd-ports@FreeBSD.org
Date: Sun, 15 Aug 1999 15:18:58 -0400 (EDT)
Cc: patrick@mindstep.com
X-Mailer: ELM [version 2.4ME+ PL43 (25)]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org

There is a typo in the submitted patch for imap-uw-4.6.BETA:
the new patch-ab will incorrectly be applied to Makefile instead of 
src/osdep/unix/Makefile.

This new patch is a corrected version of the port patch submitted earlier...

Sorry for the incovenience.

Patrick


diff -ruN imap-uw/Makefile imap-uw-4.6.STABLE/Makefile
--- imap-uw/Makefile	Sat May  8 04:07:03 1999
+++ imap-uw-4.6.STABLE/Makefile	Sun Aug 15 13:54:55 1999
@@ -6,8 +6,8 @@
 # $Id: Makefile,v 1.28 1999/05/04 14:41:35 dirk Exp $
 #
 
-DISTNAME=	imap-4.5
-PKGNAME=	imap-uw-4.5
+DISTNAME=	imap-4.6.BETA
+PKGNAME=	imap-uw-4.6.BETA
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/ \
 		ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/mail/ \
diff -ruN imap-uw/files/md5 imap-uw-4.6.STABLE/files/md5
--- imap-uw/files/md5	Fri Apr 23 20:16:56 1999
+++ imap-uw-4.6.STABLE/files/md5	Sun Aug 15 14:31:45 1999
@@ -1,2 +1,2 @@
-MD5 (imap-4.5.tar.Z) = 24e5ff01e0f14ecc647f10a9148a9dbd
-SIZE (imap-4.5.tar.Z) =  1656569
+MD5 (imap-4.6.BETA.tar.Z) = 5cf2e2c08f9dee43f215c60b865c7e21
+SIZE (imap-4.6.BETA.tar.Z) =  1773287
diff -ruN imap-uw/patches/patch-ab imap-uw-4.6.STABLE/patches/patch-ab
--- imap-uw/patches/patch-ab	Sat May  8 04:07:03 1999
+++ imap-uw-4.6.STABLE/patches/patch-ab	Sun Aug 15 14:59:28 1999
@@ -1,6 +1,6 @@
---- src/osdep/unix/Makefile.orig	Wed Jan 27 01:17:39 1999
-+++ src/osdep/unix/Makefile	Sat Feb 27 17:16:00 1999
-@@ -100,7 +100,7 @@
+--- src/osdep/unix/Makefile.orig	Wed Jul 14 15:21:40 1999
++++ src/osdep/unix/Makefile	Sun Aug 15 14:09:16 1999
+@@ -103,7 +103,7 @@
   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
   unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
@@ -9,8 +9,8 @@
  MAKE=make
  MV=mv
  RM=rm -rf
-@@ -115,6 +115,10 @@
-  PASSWDTYPE=$(PASSWDTYPE)
+@@ -118,6 +118,10 @@
+  PASSWDTYPE=$(PASSWDTYPE) SPECIALAUTHENTICATORS="$(SPECIALAUTHENTICATORS)"
  BUILD=$(MAKE) build $(BUILDOPTIONS)
  
 +# Need this for the shared library rule to work correctly
@@ -20,7 +20,7 @@
  # Here if no make argument established
  
  missing: osdep.h
-@@ -190,7 +194,7 @@
+@@ -193,7 +197,7 @@
  	 SPOOLDIR=/var \
  	 ACTIVEFILE=/usr/local/news/lib/active \
  	 RSHPATH=/usr/bin/rsh \
@@ -29,7 +29,7 @@
  	 BASELDFLAGS="-lcrypt"
  
  bsi:	# BSD/i386
-@@ -606,19 +610,31 @@
+@@ -612,19 +616,31 @@
  
  # Build it!
  
@@ -63,7 +63,7 @@
  
  
  # Dependencies
-@@ -652,7 +668,7 @@
+@@ -658,7 +674,7 @@
  
  # OS-dependent
  
@@ -72,7 +72,7 @@
  	osdep.h env_unix.h tcp_unix.h \
  	osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c \
  	auths.c flock.c flockbsd.c flcksafe.c fsync.c gethstid.c \
-@@ -664,7 +680,12 @@
+@@ -670,7 +686,12 @@
  	write.c \
  	strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
  	OSCFLAGS


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message