Upgrade to 1.21

PR:		ports/4719
Submitted by:	Igor Vinokurov <igor@zynaps.ru>

7 files changed, 48 insertions, 61 deletions

diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index d2da5815e8a2..c048cdf15519 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	cucipop
-# Version required:     1.14
+# Version required:     1.21
 # Date created:		7 Jun 1997
 # Whom:			igor@zynaps.ru
 #
-# $Id$
+# $Id: Makefile,v 1.2 1997/07/15 06:58:05 asami Exp $
 #
 
-DISTNAME=       cucipop-1.14
+DISTNAME=       cucipop-1.21
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.informatik.rwth-aachen.de/pub/packages/cucipop/
 
diff --git a/mail/cucipop/distinfo b/mail/cucipop/distinfo
index 4e0526c7f20c..07d1f9f10a44 100644
--- a/mail/cucipop/distinfo
+++ b/mail/cucipop/distinfo
@@ -1 +1 @@
-MD5 (cucipop-1.14.tar.gz) = 6a50b18ecae0b28a139b8e18324e87f9
+MD5 (cucipop-1.21.tar.gz) = aed88f17ec45db1570970b48777f29b3
diff --git a/mail/cucipop/files/patch-aa b/mail/cucipop/files/patch-aa
index 472c052de2df..10781a88f988 100644
--- a/mail/cucipop/files/patch-aa
+++ b/mail/cucipop/files/patch-aa
@@ -1,7 +1,7 @@
---- Makefile.orig	Wed Oct 30 19:24:29 1996
-+++ Makefile	Mon Jul  7 14:27:28 1997
-@@ -1,29 +1,29 @@
- #$Id: Makefile,v 1.2 1996/10/30 16:24:29 srb Exp $
+--- Makefile.orig	Fri Aug  1 05:00:30 1997
++++ Makefile	Tue Oct  7 11:13:59 1997
+@@ -1,30 +1,29 @@
+ #$Id: Makefile,v 1.3 1997/08/01 01:00:30 srb Exp $
  
 -BASENAME= /usr
 +BASENAME= $(PREFIX)
@@ -33,13 +33,14 @@
  
  MD5_OBJ=md5/md5c.$(O)
  
--OBJS=cucipop.$(O) authenticate.$(O) locking.$(O) xcreat.$(O) $(MD5_OBJ)
-+OBJS=cucipop.$(O) authenticate.$(O) locking.$(O) xcreat.$(O) #$(MD5_OBJ)
+-OBJS=cucipop.$(O) authenticate.$(O) atotime.$(O) locking.$(O) xcreat.$(O) \
+-	$(MD5_OBJ)
++OBJS=cucipop.$(O) authenticate.$(O) atotime.$(O) locking.$(O) xcreat.$(O)
  
  all: cucipop
  
---- authenticate.c.orig	Fri Apr 11 18:08:31 1997
-+++ authenticate.c	Mon Jul  7 14:23:19 1997
+--- authenticate.c.orig	Fri Aug  1 05:00:31 1997
++++ authenticate.c	Tue Oct  7 11:14:31 1997
 @@ -36,7 +36,7 @@
  #include "authenticate.h"
  
@@ -50,7 +51,7 @@
  #ifndef MAILSPOOLHASH
  #define MAILSPOOLHASH	0      /* 2 would deliver to /var/spool/mail/b/a/bar */
 --- xcreat.c.orig	Thu Apr  3 05:53:24 1997
-+++ xcreat.c	Mon Jul  7 14:23:19 1997
++++ xcreat.c	Tue Oct  7 11:14:56 1997
 @@ -22,7 +22,7 @@
  /*#define NOuname		      /* uncomment if uname is not available */
  /*#define NOstrpbrk		    /* uncomment if strpbrk is not available */
@@ -60,3 +61,15 @@
  
  #include <unistd.h>			/* open() close() link() unlink()
  					   getpid() */
+
+--- config.h.orig	Fri Aug  1 05:13:05 1997
++++ config.h	Tue Oct  7 11:40:43 1997
+@@ -3,7 +3,7 @@
+ #define USEdot_lock	/**/
+ /*#define USEfcntl_lock /**/	    /* to test which combinations make sense */
+ /*#define USElockf	/**/	      /* run the lockingtest program part of */
+-/*#define USEflock	/**/		/* the procmail installation process */
++#define USEflock	/**/		/* the procmail installation process */
+ 
+ /*#define SHADOW_PASSWD /**/		  /* shadow password library support */
+ 
diff --git a/mail/cucipop/files/patch-ab b/mail/cucipop/files/patch-ab
index 257085945cfa..51fdd8ba13f9 100644
--- a/mail/cucipop/files/patch-ab
+++ b/mail/cucipop/files/patch-ab
@@ -1,20 +1,21 @@
---- cucipop.8.orig	Fri Apr 11 18:08:31 1997
-+++ cucipop.8	Mon Jul  7 11:19:01 1997
-@@ -48,11 +48,11 @@
+--- cucipop.8.orig	Fri Aug  1 05:05:59 1997
++++ cucipop.8	Tue Oct  7 11:18:59 1997
+@@ -48,12 +48,12 @@
  .SH NAME
  cucipop \- Cubic Circle POP3 daemon
  .SH SYNOPSIS
 -.B /usr/sbin/cucipop
-+.B cucipop
++.B !!PREFIX!!/libexec/cucipop
  .RB [ \-qaYdPUSDAT ]
+ .RB [ "\-E \fIage\fP" ]
  .RB [ "\-p \fIport\fP" ]
  .br
 -.B /usr/sbin/cucipop
-+.B cucipop
++.B !!PREFIX!!/libexec/cucipop
  .B \-v
  .ad
  .SH DESCRIPTION
-@@ -118,12 +118,12 @@
+@@ -132,12 +132,12 @@
  .IR port .
  .SH EXAMPLES
  Typically
@@ -25,22 +26,27 @@
  as follows:
  .Sx 1
 -pop-3           110/tcp
-+pop3           110/tcp
++pop3            110/tcp
  .Ex
  In order to start cucipop from within
  .BR inetd (8),
-@@ -131,22 +131,22 @@
+@@ -145,26 +145,26 @@
  .BR inetd.conf (5)
  would be suitable:
  .Sx 1
 -pop-3   stream  tcp     nowait  root    /usr/sbin/cucipop cucipop -Y
-+pop3   stream  tcp     nowait  root    /usr/local/libexec/cucipop cucipop -Y
++pop3    stream  tcp     nowait  root    !!PREFIX!!/libexec/cucipop cucipop -Y
  .Ex
  If your site gets many hits from popclients, it would be preferable
  to start cucipop standalone as in:
  .Sx 1
 -/usr/sbin/cucipop -Y
-+cucipop -Y
++!!PREFIX!!/libexec/cucipop -Y
+ .Ex
+ Your typical BOFH setting would be:
+ .Sx 1
+-/usr/sbin/cucipop -YaSE 6w
++!!PREFIX!!/libexec/cucipop -YaSE 6w
  .Ex
  .SH FILES
  .TP 2.3i
diff --git a/mail/cucipop/pkg-comment b/mail/cucipop/pkg-comment
index 39613636e550..2417a72daa97 100644
--- a/mail/cucipop/pkg-comment
+++ b/mail/cucipop/pkg-comment
@@ -1 +1 @@
-Cubic Circle's POP3 daemon (fully RFC1939 compliant)
+Cubic Circle's POP3 daemon (fully RFC1939 compliant).
diff --git a/mail/cucipop/pkg-descr b/mail/cucipop/pkg-descr
index cfcf07005f6c..e02fe807eb55 100644
--- a/mail/cucipop/pkg-descr
+++ b/mail/cucipop/pkg-descr
@@ -1,44 +1,8 @@
 A fast and robust implementation of the RFC1939 POP3 protocol.
 It supports both BSD-type and SysV-type mailbox formats. Cucipop
 assumes that the mailbox it serves is not simultaneously accessed
-by a mailreader.  Concurrency and locking issues are handled
+by a mailreader. Concurrency and locking issues are handled
 graciously if they restrict themselves to the mail delivery agent.
 
-Feature summary for cucipop:
-	+ It's fast (optimised for frequently polling POP3 clients)
-	+ It's less filling (i.e. small)
-	+ Does not use *any* temporary files (which also means that the
-	  startup time is spectacularly short, and there can never be
-	  any stale temporary files or doubled mailboxes)
-	+ It can therefore serve *any* size mailbox without requiring
-	  additional storage beyond what the file already occupies
-	+ A fully compliant, all frills attached, RFC1939 implementation of
-	  the POP3 protocol
-	+ This means that it supports APOP *and* UIDL
-	+ It includes the option to sabotage the UIDL command (to defeat
-	  undesirable "Leave mail on server" clients)
-	+ It also supports an optional autodelete mechanism, so that any
-	  RETReived message is automatically deleted
-	+ Autoadaptive, simply start it and it will know if it has been
-	  started from inetd or as a standalone daemon
-	+ Security conscious, i.e. the APOP support, already has hooks
-	  for shadowpasswords, and defeats password guessers by an adaptive
-	  verification delay
-	+ Supports both BSD and SysV (Content-Length) mailbox formats
-	+ Native support for /var/spool/mail/b/a/bar type mailspools
-	+ Is the only popd to perform reliable mailbox locking across
-	  NFS as well (it uses the same excellent and proven locking
-	  algorithms as does procmail)
-	+ Provides flexible logging of statistics and auditing events
-	+ Does not impose *any* limits on line lengths, mail length,
-	  or the use of any character (any 8-bit character, including '\0' is
-	  allowed) in the mail
-	+ Secure system mailbox handling
-	+ Has hooks to ease moving the mailboxes to any location you'd like
-	+ Has hooks for other authentication schemes (e.g. Radius)
-	+ Has hooks to virtualise the popserver
-	+ It runs on any POSIX and ANSI C compliant system
-	+ Is clock skew immune (e.g. in the case of NFS mounted mailboxes)
-
 - Igor
 igor@zynaps.ru
diff --git a/mail/cucipop/scripts/configure b/mail/cucipop/scripts/configure
new file mode 100644
index 000000000000..a16b87d22fd7
--- /dev/null
+++ b/mail/cucipop/scripts/configure
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+mv ${WRKSRC}/cucipop.8 ${WRKSRC}/cucipop.8.bak
+sed <${WRKSRC}/cucipop.8.bak >${WRKSRC}/cucipop.8 s+!!PREFIX!!+$PREFIX+g