4 files changed, 112 insertions, 57 deletions

diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index c048cdf15519..a3a1bb2d1142 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	cucipop
-# Version required:     1.21
+# Version required:     1.31
 # Date created:		7 Jun 1997
 # Whom:			igor@zynaps.ru
 #
-# $Id: Makefile,v 1.2 1997/07/15 06:58:05 asami Exp $
+# $Id: Makefile,v 1.3 1997/11/16 09:19:07 fenner Exp $
 #
 
-DISTNAME=       cucipop-1.21
+DISTNAME=       cucipop-1.31
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.informatik.rwth-aachen.de/pub/packages/cucipop/
 
diff --git a/mail/cucipop/distinfo b/mail/cucipop/distinfo
index 07d1f9f10a44..735020bd97e5 100644
--- a/mail/cucipop/distinfo
+++ b/mail/cucipop/distinfo
@@ -1 +1 @@
-MD5 (cucipop-1.21.tar.gz) = aed88f17ec45db1570970b48777f29b3
+MD5 (cucipop-1.31.tar.gz) = e4dc7c3c6e3a4a83dde5cbbe21fee5f8
diff --git a/mail/cucipop/files/patch-aa b/mail/cucipop/files/patch-aa
index 10781a88f988..521b832d4da3 100644
--- a/mail/cucipop/files/patch-aa
+++ b/mail/cucipop/files/patch-aa
@@ -1,20 +1,72 @@
---- 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 $
+--- authenticate.c.orig	Tue Aug 25 17:35:12 1998
++++ authenticate.c	Tue Aug 25 17:35:28 1998
+@@ -44,7 +44,7 @@
+ #define VIRTUALUSER	"vpop"
+ 
+ #ifndef MAILSPOOLDIR
+-#define MAILSPOOLDIR	"/var/spool/mail/"	     /* watch the trailing / */
++#define MAILSPOOLDIR	"/var/mail/"	     /* watch the trailing / */
+ #endif
+ #ifndef MAILSPOOLHASH
+ #define MAILSPOOLHASH	0      /* 2 would deliver to /var/spool/mail/b/a/bar */
+--- xcreat.c.orig	Tue Aug 25 17:35:46 1998
++++ xcreat.c	Tue Aug 25 17:36:03 1998
+@@ -22,7 +22,7 @@
+ /*#define NOuname		      /* uncomment if uname is not available */
+ /*#define NOstrpbrk		    /* uncomment if strpbrk is not available */
+ /*#define strchr(s,c) index(s,c)     /* uncomment if strchr is not available */
+-#define const			      /* can be undefined for ANSI compilers */
++/*#define const			      /* can be undefined for ANSI compilers */
+ 
+ #include <unistd.h>			/* open() close() link() unlink()
+ 					   getpid() */
+--- config.h.orig	Wed May 13 05:09:14 1998
++++ config.h	Tue Aug 25 18:12:48 1998
+@@ -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 */
+ 
+@@ -84,6 +84,6 @@
+ #define MAXBULLETINS	64
+ #define MAXSTATEAGE	8388608				       /* > 3 months */
+ #define MEMORY_CACHE	(64*1024)
+-#define CUCIPOP_LIB	"/var/lib/cucipop"
++#define CUCIPOP_LIB	"/var/spool/cucipop"
+ #define STATE_DB	"state.db"
+ #define BULLETINS_PATH	CUCIPOP_LIB"/bulletins"
+--- Makefile.orig	Wed May 13 05:09:14 1998
++++ Makefile	Tue Aug 25 18:12:33 1998
+@@ -1,30 +1,30 @@
+ #$Id: Makefile,v 1.18 1998/05/12 21:09:14 srb Exp $
  
 -BASENAME= /usr
 +BASENAME= $(PREFIX)
  
- GCC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat \
-  -Wpointer-arith -Wconversion -Waggregate-return \
+-GCC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat \
+- -Wpointer-arith -Wconversion -Waggregate-return \
++#CC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat \
++# -Wpointer-arith -Wconversion -Waggregate-return \
   #-Wimplicit -Wshadow #-Wuninitialized
  
--CFLAGS	= -O #$(GCC_WARNINGS)
--LDFLAGS =
-+#CFLAGS	= -O #$(GCC_WARNINGS)
+ #
+ # Omit USE_DB if you don't have the -ldb2 library (Berkeley DB, v2.x)
+ # WARNING: bulletins are not remembered to have been deleted without USE_DB
+ 
+-CFLAGS	= -O -DUSE_DB #$(GCC_WARNINGS)
+-LDFLAGS = -lcrypt -ldb2
++#CFLAGS	= -O -DUSE_DB #$(GCC_WARNINGS)
 +LDFLAGS += -lcrypt -lmd
  
+ # If you change this, edit config.h as well
+-CUCIPOPLIB=/var/lib/cucipop
++CUCIPOPLIB=/var/spool/cucipop
+ CUCIPOPBULLETINS=$(CUCIPOPLIB)/bulletins
+ 
  O=o
  
 -BINDIR=$(BASENAME)/sbin
@@ -26,50 +78,33 @@
 -REGPERM=0644
 +INSTALL=install -o bin -m
 +BINPERM=02555 -s -g mail
-+REGPERM=0444 -g bin
++REGPERM=0444
  
  #
  # When compiling without APOP support, the md5 library can be omitted.
- 
+@@ -32,11 +32,11 @@
  MD5_OBJ=md5/md5c.$(O)
  
--OBJS=cucipop.$(O) authenticate.$(O) atotime.$(O) locking.$(O) xcreat.$(O) \
--	$(MD5_OBJ)
-+OBJS=cucipop.$(O) authenticate.$(O) atotime.$(O) locking.$(O) xcreat.$(O)
+ OBJS=cucipop.$(O) authenticate.$(O) atotime.$(O) locking.$(O) xcreat.$(O) \
+-	dbops.$(O) hsort.$(O) simplecrypt.$(O) $(MD5_OBJ)
++	dbops.$(O) hsort.$(O) simplecrypt.$(O)
  
- all: cucipop
+-BINS=cucipop makevpopdb
++BINS=cucipop# makevpopdb
  
---- 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"
- 
- #ifndef MAILSPOOLDIR
--#define MAILSPOOLDIR	"/var/spool/mail/"	     /* watch the trailing / */
-+#define MAILSPOOLDIR	"/var/mail/"		     /* watch the trailing / */
- #endif
- #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	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 */
- /*#define strchr(s,c) index(s,c)     /* uncomment if strchr is not available */
--#define const			      /* can be undefined for ANSI compilers */
-+/*#define const			      /* can be undefined for ANSI compilers */
+-MANS=cucipop.8 makevpopdb.8
++MANS=cucipop.8
  
- #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 */
+ all: $(BINS)
  
- /*#define SHADOW_PASSWD /**/		  /* shadow password library support */
+@@ -70,8 +70,8 @@
+ install: $(BINS) $(MANS)
+ 	$(INSTALL) $(BINPERM) $(BINS) $(BINDIR)
+ 	$(INSTALL) $(REGPERM) $(MANS) $(MANDIR)
+-	mkdir $(CUCIPOPLIB) 2>/dev/null; exit 0
+-	mkdir $(CUCIPOPBULLETINS) 2>/dev/null; exit 0
++	mkdir -p $(CUCIPOPLIB) 2>/dev/null; exit 0
++	mkdir -p $(CUCIPOPBULLETINS) 2>/dev/null; exit 0
+ 	@for a in $(BINS); do ls -l $(BINDIR)/$$a; done
+ 	@for a in $(MANS); do ls -l $(MANDIR)/$$a; done
  
diff --git a/mail/cucipop/files/patch-ab b/mail/cucipop/files/patch-ab
index 51fdd8ba13f9..ab9954c78984 100644
--- a/mail/cucipop/files/patch-ab
+++ b/mail/cucipop/files/patch-ab
@@ -1,5 +1,5 @@
---- cucipop.8.orig	Fri Aug  1 05:05:59 1997
-+++ cucipop.8	Tue Oct  7 11:18:59 1997
+--- cucipop.8.orig	Tue May 12 00:35:19 1998
++++ cucipop.8	Tue Aug 25 17:41:00 1998
 @@ -48,12 +48,12 @@
  .SH NAME
  cucipop \- Cubic Circle POP3 daemon
@@ -26,16 +26,16 @@
  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),
-@@ -145,26 +145,26 @@
+@@ -145,16 +145,16 @@
  .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    !!PREFIX!!/libexec/cucipop cucipop -Y
++pop3   stream  tcp     nowait  root    /usr/sbin/cucipop cucipop -Y
  .Ex
  If your site gets many hits from popclients, it would be preferable
  to start cucipop standalone as in:
@@ -50,15 +50,35 @@
  .Ex
  .SH FILES
  .TP 2.3i
- .B /etc/passwd
- for the default authentication method
+@@ -166,25 +166,25 @@
+ .BR makevpopdb (8)
+ man page on how this file is created
+ .TP
+-.B /var/lib/cucipop/state.db
++.B !!PREFIX!!/lib/cucipop/state.db
+ AI state information and bulletin history
+ .TP
+-.B "/var/lib/cucipop/bulletins/\fInn\fP"
++.B "!!PREFIX!!/lib/cucipop/bulletins/\fInn\fP"
+ .B 00
+ through
+ .B 63
+ optional bulletin files in regular mailbox format
  .TP
 -.B /var/spool/mail/$LOGNAME
 +.B /var/mail/$LOGNAME
  system mailbox
  .TP
+-.B /var/spool/mail/virtual.dom.ain/$LOGNAME
++.B /var/mail/virtual.dom.ain/$LOGNAME
+ virtual host system mailbox
+ .TP
 -.B /var/spool/mail/$LOGNAME.lock
 +.B /var/mail/$LOGNAME.lock
  lockfile for the system mailbox
  .TP
+-.B /var/spool/mail/virtual.dom.ain/$LOGNAME.lock
++.B /var/mail/virtual.dom.ain/$LOGNAME.lock
+ lockfile for the virtual host system mailbox
+ .TP
  .B _????`hostname`