Update to version 4.60, the latest from UW. Several new features and many

bug fixes are included. See
http://www.washington.edu/pine/changes/4.58-to-4.60.html for more information.

One wonky master site is removed, thanks to fenner's distfile survey,
and patches are regenerated as needed.

The idea for the patch to obey ${CC} came from the PR, the implementation is
my own.

PR:		ports/65232
Submitted by:	michael johnson <ahze@ahze.net>

4 files changed, 18 insertions, 15 deletions

diff --git a/mail/pine4/Makefile b/mail/pine4/Makefile
index 065aaa2a6d39..b3ffd6504310 100644
--- a/mail/pine4/Makefile
+++ b/mail/pine4/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	pine
-PORTVERSION=	4.58
+PORTVERSION=	4.60
 CATEGORIES=	mail news
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
 		http://mirror.sit.wisc.edu/pub/net/mail/pine/ \
 		ftp://sunsite.icm.edu.pl/pub/unix/mail/pine/ \
-		ftp://mirrors.unam.mx/pub/pine/ \
 		ftp://ftp.uni-magdeburg.de/pub/mirror/ftp.cac.washington.edu/pine/ \
 		ftp://ftp.fu-berlin.de/unix/mail/pine/ \
 		ftp://ftp.ut.ee/pub/unix/mail/pine/ \
@@ -49,6 +48,10 @@ pre-fetch:
 .endif
 
 post-patch:
+.for f in build buildcyg
+	@${CP} ${WRKSRC}/${f} ${WRKSRC}/${f}.presed
+	@${SED} -e 's:CC=cc:CC=${CC}:g' ${WRKSRC}/${f}.presed > ${WRKSRC}/${f}
+.endfor
 	@for i in ${WRKSRC}/README ${WRKSRC}/doc/pine.1 \
 		${WRKSRC}/doc/tech-notes.txt ${WRKSRC}/doc/tech-notes/*.html \
 		${WRKSRC}/pico/osdep/os-bsf.h \
diff --git a/mail/pine4/distinfo b/mail/pine4/distinfo
index 5c41a5e579c2..f84ad6e5bbb7 100644
--- a/mail/pine4/distinfo
+++ b/mail/pine4/distinfo
@@ -1,2 +1,2 @@
-MD5 (pine4.58.tar.gz) = 9fff1ca5fa2363f5684c144a9da4c7ef
-SIZE (pine4.58.tar.gz) = 3841914
+MD5 (pine4.60.tar.gz) = 4d9e42e00d7a1bef3d55355e022f0d91
+SIZE (pine4.60.tar.gz) = 4026311
diff --git a/mail/pine4/files/patch-af b/mail/pine4/files/patch-af
index 59fc8fa4300c..d623644d0bf4 100644
--- a/mail/pine4/files/patch-af
+++ b/mail/pine4/files/patch-af
@@ -1,6 +1,6 @@
---- imap/src/osdep/unix/Makefile.orig	Mon Jul 14 18:35:30 2003
-+++ imap/src/osdep/unix/Makefile	Fri Sep  5 01:44:20 2003
-@@ -98,7 +98,7 @@
+--- imap/src/osdep/unix/Makefile.orig	Thu Apr 29 19:10:25 2004
++++ imap/src/osdep/unix/Makefile	Sat May 22 14:28:29 2004
+@@ -99,7 +99,7 @@
  # Commands possibly overriden by the individual port
  
  ARRC=ar rc
@@ -9,16 +9,16 @@
  LN=ln -s
  RANLIB=ranlib
  
-@@ -116,7 +116,7 @@
+@@ -117,7 +117,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
+  unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
 -CFLAGS=-g
-+CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
++CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS)
  
  CAT=cat
  MAKE=make
-@@ -218,8 +218,9 @@
+@@ -219,8 +219,9 @@
  	 SPOOLDIR=/var \
  	 ACTIVEFILE=/usr/local/news/lib/active \
  	 RSHPATH=/usr/bin/rsh \
diff --git a/mail/pine4/files/patch-ax b/mail/pine4/files/patch-ax
index 4d71b65d2f4c..5e8c3ca662c8 100644
--- a/mail/pine4/files/patch-ax
+++ b/mail/pine4/files/patch-ax
@@ -1,12 +1,12 @@
-*** pine/makefile.bsf.orig	Tue Sep 10 14:39:15 2002
---- pine/makefile.bsf	Sat Feb  7 20:14:42 2004
+*** pine/makefile.bsf.orig	Mon Nov 24 22:47:28 2003
+--- pine/makefile.bsf	Sat May 22 14:31:22 2004
 ***************
 *** 67,73 ****
                `cat $(CCLIENTDIR)/LDFLAGS`
   
   STDCFLAGS=   -DBSDI -DSYSTYPE=\"BSF\" -DMOUSE
 ! CFLAGS=      $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
-  	     $(STDCFLAGS)
+  	     $(LOCALPINECFLAGS) $(STDCFLAGS)
   
   OFILES=	addrbook.o adrbkcmd.o adrbklib.o args.o bldaddr.o context.o filter.o \
 --- 67,73 ----
@@ -14,6 +14,6 @@
   
   STDCFLAGS=   -DBSDI -DSYSTYPE=\"BSF\" -DMOUSE
 ! CFLAGS+=      $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
-  	     $(STDCFLAGS)
+  	     $(LOCALPINECFLAGS) $(STDCFLAGS)
   
   OFILES=	addrbook.o adrbkcmd.o adrbklib.o args.o bldaddr.o context.o filter.o \