ports/66560: [PATCH] mail/pine4: update from 4.58 to 4.60

[Christian Kratzer]

>Number:         66560
>Category:       ports
>Synopsis:       [PATCH] mail/pine4: update from 4.58 to 4.60
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 12 01:10:22 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Christian Kratzer
>Release:        FreeBSD 5.2-RELEASE i386
>Organization:
CK Software GmbH
>Environment:
System: FreeBSD hirvi.cksoft.de 5.2-RELEASE FreeBSD 5.2-RELEASE #0: Sun Jan 11 04:21:45 GMT 2004 root at wv1u.btc.adaptec.com:/usr/obj/usr/src/sys/GENERIC i386

>Description:

Update mail/pine4 port from 4.58 to 4.60. This brings to pine port inline
with the new versions of cclient and imap4 submitted yesterday. 

For consistency the SSL directories were changed from the pine defaults to 
the same directories already used by the cclient port.

>How-To-Repeat:
>Fix:

diff -urN -x work -x pine-4.60.tgz pine4.orig/Makefile pine4/Makefile
--- pine4.orig/Makefile	Thu Sep 11 03:00:47 2003
+++ pine4/Makefile	Tue May 11 09:39:18 2004
@@ -6,7 +6,7 @@
 #
 
 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/ \
diff -urN -x work -x pine-4.60.tgz pine4.orig/distinfo pine4/distinfo
--- pine4.orig/distinfo	Sun Mar 14 03:38:39 2004
+++ pine4/distinfo	Tue May 11 09:39:47 2004
@@ -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 -urN -x work -x pine-4.60.tgz pine4.orig/files/patch-af pine4/files/patch-af
--- pine4.orig/files/patch-af	Thu Sep 11 03:00:47 2003
+++ pine4/files/patch-af	Tue May 11 10:01:08 2004
@@ -1,6 +1,31 @@
---- 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	Fri Apr 30 04:10:25 2004
++++ imap/src/osdep/unix/Makefile	Tue May 11 10:00:17 2004
+@@ -24,18 +24,18 @@
+ EXTRADRIVERS=mbox
+ PASSWDTYPE=std
+ SSLTYPE=nopwd
+-IP=4
++IP=6
+ 
+ 
+ # Extended flags needed for SSL.  You may need to modify.
+ 
+-SSLDIR=/usr/local/ssl
+-SSLCERTS=$(SSLDIR)/certs
++SSLDIR=$(OPENSSLBASE)
++SSLCERTS=$(PREFIX)/certs
+ SSLKEYS=$(SSLCERTS)
+-SSLINCLUDE=$(SSLDIR)/include
+-SSLLIB=$(SSLDIR)/lib
++SSLINCLUDE=$(OPENSSLINC)
++SSLLIB=$(OPENSSLLIB)
+ 
+-SSLCRYPTO=-lcrypto
++SSLCRYPTO=-lcrypto -lcrypt
+ 
+ # Older versions of MIT Kerberos also have a libcrypto.  If so, you may need
+ # to use this instead
+@@ -99,7 +99,7 @@
  # Commands possibly overriden by the individual port
  
  ARRC=ar rc
@@ -9,16 +34,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+=-g $(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 -urN -x work -x pine-4.60.tgz pine4.orig/files/patch-ax pine4/files/patch-ax
--- pine4.orig/files/patch-ax	Mon Feb  9 03:01:26 2004
+++ pine4/files/patch-ax	Tue May 11 10:04:10 2004
@@ -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	Tue Nov 25 07:47:28 2003
+--- pine/makefile.bsf	Tue May 11 10:03:08 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 \

>Release-Note:
>Audit-Trail:
>Unformatted: