5 files changed, 47 insertions, 55 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 03f5cd1c38f1..86883254299c 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -6,30 +6,25 @@
 #
 
 PORTNAME=	imap-uw
-PORTVERSION=	4.7c
+PORTVERSION=	4.8
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \
 		ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/mail/%SUBDIR%/ \
 		http://mirror.nucba.ac.jp/mirror/imap/%SUBDIR%/ \
 		ftp://ftp.uni-halle.de/pub/mail/pine/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. old
-DISTNAME=	imap-${PORTVERSION}
+DISTNAME=	imap-2000a
 EXTRACT_SUFX=	.tar.Z
-DISTFILES=	${DISTNAME}2${EXTRACT_SUFX} \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		imap-utils${EXTRACT_SUFX}
+ALL_TARGET=	bsf
 
-MAINTAINER=	imap-uw@freebsd.ady.ro
+MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	c-client4.7:${PORTSDIR}/mail/cclient
+LIB_DEPENDS=	c-client4.8:${PORTSDIR}/mail/cclient
 
 Y2K=		http://www.washington.edu/imap/IMAP-FAQs/faqs.xml#general1
 
-PAMAUTH?=	yes
-.if ${PAMAUTH} != "no"
-ALL_TARGET=	bfp
-.else
-ALL_TARGET=	bsf
-.endif
 MAN8=		ipopd.8 imapd.8
 
 .include <bsd.port.pre.mk>
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index 13975bd017ca..93141a65f67b 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,2 +1,2 @@
-MD5 (imap-4.7c2.tar.Z) = 1a27c7684094a8c94baf294552467060
-MD5 (imap-utils.tar.Z) = 090ae9906ed1993d55ba88bb8b08a8f7
+MD5 (imap-2000a.tar.Z) = d642c114b55ffe2e172b8e1bef6a1a52
+MD5 (imap-utils.tar.Z) = 24df2e1530eba56407f1c035acb60bb6
diff --git a/mail/imap-uw/files/patch-ab b/mail/imap-uw/files/patch-ab
index 528cd9025a23..44a4727a76be 100644
--- a/mail/imap-uw/files/patch-ab
+++ b/mail/imap-uw/files/patch-ab
@@ -1,6 +1,6 @@
---- src/osdep/unix/Makefile.orig	Tue Nov 16 18:05:48 1999
-+++ src/osdep/unix/Makefile	Fri Jul  7 00:38:22 2000
-@@ -86,7 +86,7 @@
+--- src/osdep/unix/Makefile.orig	Tue Oct 31 13:55:01 2000
++++ src/osdep/unix/Makefile	Sun Dec 17 23:39:05 2000
+@@ -74,7 +74,7 @@
  # Commands possibly overriden by the individual port
  
  ARRC=ar rc
@@ -9,17 +9,17 @@
  LN=ln -s
  RANLIB=ranlib
  
-@@ -104,7 +104,7 @@
+@@ -92,7 +92,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
 -CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS)
 +CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
+ 
+ CAT=cat
  MAKE=make
- MV=mv
- RM=rm -rf
-@@ -178,6 +178,15 @@
- 	 BASECFLAGS="-g -B/usr/lib/big/ -Dvoid=char -Dconst= -DNFSKLUDGE" \
+@@ -175,6 +175,15 @@
+ 	 BASECFLAGS="-g -B/usr/lib/big/ -Dvoid=char -Dconst=" \
  	 RANLIB=true ARRC="ar -rc"
  
 +bfp:	# FreeBSD Pluggable Authentication Modules
@@ -32,24 +32,28 @@
 +	 BASELDFLAGS="-lpam -lcrypt"
 +
  bs3:	# BSD/i386 3.0 or higher
- 	$(BUILD) `cat EXTRASPECIALS` OS=bsi CHECKPW=bsi LOGINPW=bsi \
- 	 SPOOLDIR=/var NEWSSPOOL=/var/news/spool \
-@@ -194,7 +203,8 @@
+ 	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
+ 	 CHECKPW=bsi LOGINPW=bsi CRXTYPE=nfs \
+@@ -190,12 +199,13 @@
+ 
+ bsf:	# FreeBSD
+ 	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
+-	 SIGTYPE=psx CRXTYPE=nfs \
++	 SIGTYPE=psx CRXTYPE=nfs CHECKPW=pam \
  	 SPOOLDIR=/var \
  	 ACTIVEFILE=/usr/local/news/lib/active \
  	 RSHPATH=/usr/bin/rsh \
--	 BASECFLAGS="-g -O -pipe -DNFSKLUDGE" \
+-	 BASECFLAGS="-g -O -pipe" \
+-	 BASELDFLAGS="-lcrypt"
 +	 LOCKPGM=$(PREFIX)/libexec/mlock \
 +	 BASECFLAGS="-DNFSKLUDGE" \
- 	 BASELDFLAGS="-lcrypt"
++	 BASELDFLAGS="-lpam -lcrypt"
  
  bsi:	# BSD/i386
-@@ -627,9 +637,9 @@
- 
- # Build it!
+ 	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
+@@ -704,7 +714,7 @@
  
--build:	clean once $(ARCHIVE)
-+build:	clean all
+ build:	clean once $(ARCHIVE)
  
 -all:	$(ARCHIVE)
 +all:	onceenv
diff --git a/mail/imap-uw/files/patch-ac b/mail/imap-uw/files/patch-ac
index 5d635ea2d0a1..acdbce7da49e 100644
--- a/mail/imap-uw/files/patch-ac
+++ b/mail/imap-uw/files/patch-ac
@@ -1,7 +1,7 @@
---- src/imapd/Makefile.orig	Wed Nov  3 23:50:56 1999
-+++ src/imapd/Makefile	Fri Jul  7 00:31:53 2000
-@@ -31,9 +31,9 @@
- # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+--- src/imapd/Makefile.orig	Tue Oct 24 16:54:32 2000
++++ src/imapd/Makefile	Sun Dec 17 23:44:22 2000
+@@ -18,30 +18,25 @@
+ # CPYRIGHT, included with this Distribution.
  
  
 -ALERT=/etc/imapd.alert
@@ -11,16 +11,15 @@
 +ANO=$(PREFIX)/etc/anonymous.newsgroups
  SHELL= /bin/sh
  
- #  The "Manage Mail" menu item of Netscape Messager puts up an error message
-@@ -54,21 +54,16 @@
+ 
  # Get local definitions from c-client directory
  
  C = ../c-client
 -CCLIENTLIB = $C/c-client.a
 +#CCLIENTLIB = $C/c-client.a
  CC = `cat $C/CCTYPE`
--CFLAGS = -I$C `cat $C/CFLAGS` $(EXTRACFLAGS) -DANOFILE=\"$(ANO)\" \
-+CFLAGS = `cat $C/CFLAGS` $(EXTRACFLAGS) -DANOFILE=\"$(ANO)\" \
+-CFLAGS = -I$C `cat $C/CFLAGS` -DANOFILE=\"$(ANO)\" \
++CFLAGS = `cat $C/CFLAGS` -DANOFILE=\"$(ANO)\" \
  	-DALERTFILE=\"$(ALERT)\" -DUSERALERTFILE=\"$(USERALERT)\"
 -LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
 +LDFLAGS = $(EXTRALDFLAGS) `cat $C/LDFLAGS`
diff --git a/mail/imap-uw/files/patch-ad b/mail/imap-uw/files/patch-ad
index d5c962c5dfae..8e996395b886 100644
--- a/mail/imap-uw/files/patch-ad
+++ b/mail/imap-uw/files/patch-ad
@@ -1,6 +1,6 @@
---- Makefile.orig	Mon Nov 15 12:20:34 1999
-+++ Makefile	Fri Jul  7 00:35:00 2000
-@@ -49,6 +49,7 @@
+--- Makefile.orig	Thu Nov  2 13:04:11 2000
++++ Makefile	Mon Dec 18 01:13:25 2000
+@@ -43,6 +43,7 @@
  # art	AIX 2.2.1 for RT
  # asv	Altos SVR4
  # aux	A/UX
@@ -8,7 +8,7 @@
  # bs3	BSD/i386 3.0 and higher
  # bsd	generic BSD 4.3 (as in ancient 1980s version)
  # bsf	FreeBSD
-@@ -244,12 +245,12 @@
+@@ -272,12 +273,12 @@
  #	gradually-increasing intervals, starting at 2800-2900, and becoming
  #	permanent at 48,300.
  
@@ -23,24 +23,18 @@
  
  
  # Special make flags (e.g. to override make environment variables)
-@@ -285,15 +286,15 @@
+@@ -314,13 +315,7 @@
  
- all:	c-client rebuild bundled
+ # Make the IMAP Toolkit
  
+-all:	c-client rebuild bundled
+-
 -c-client:
 -	@echo Not processed yet.  In a first-time build, you must specify
 -	@echo the system type so that the sources are properly processed.
 -	@false
-+#c-client:
-+#	@echo Not processed yet.  In a first-time build, you must specify
-+#	@echo the system type so that the sources are properly processed.
-+#	@false
- 
+-
++all:	rebuild bundled
  
  # Note on SCO you may have to set LN to "ln".
  
--a32 a41 aix bs3 bsf bsi bso d-g d54 do4 drs epx gas gh9 ghp gs5 gso gsu gul hpp hpx lnp lyn mct mnt neb nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx sol sos uw2: an
-+a32 a41 aix bfp bs3 bsf bsi bso d-g d54 do4 drs epx gas gh9 ghp gs5 gso gsu gul hpp hpx lnp lyn mct mnt neb nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx sol sos uw2: an
- 	$(BUILD) OS=$@
- 
- # If you use sv4, you may find that it works to move it to use the an process.