Update to 3.0.2 (repo-copied from mail/popper).

Authors or any interesting parties are welcomed to merge functionality-extending
patches from the popper 2.53 (skey support, youbin support etc).

PR:		18745
Submitted by:	Jeff Palmer <jeff@isni.net>

5 files changed, 68 insertions, 67 deletions

diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 097d8d9d8c82..f439ad5de3fd 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,66 +1,51 @@
-# New ports collection makefile for:	popper
+# New ports collection makefile for:	popper 3.*
 # Date created:		1 April 1995
 # Whom:			pst
 #
 # $FreeBSD$
 #
 
-PORTNAME=	qpopper
-PORTVERSION= 	2.53
+PORTNAME=	qpopper3
+PORTVERSION=	3.0.2
 CATEGORIES=	mail
-MASTER_SITES=   ftp://ftp.qualcomm.com/eudora/servers/unix/popper/old/
-DISTNAME=	${PORTNAME}${PORTVERSION}
-EXTRACT_SUFX=	.tar.Z
+MASTER_SITES=	ftp://ftp.qualcomm.com/eudora/servers/unix/popper/
+DISTNAME=	qpopper${PORTVERSION}
 
-MAINTAINER=	ache@freebsd.org
+MAINTAINER=	jeff@isni.net
 
-# Set POPD_YOUBIN_SUPPORT variable in the environment to enable
-# youbin support.
-#
 # If APOP_ONLY variable present in the environment, popper builds
 # with APOP authentification only.
 #
 # If FULL_POPD_DEBUG variable present in the environment, popper builds
 # with more verbose debugging.
 
-O_DEFS=         -DSETPROCTITLE -DKEEP_TEMP_DROP -DBSD44_DBM -DBIND43 \
-		-DBULLDB -DNONAUTHFILE='\"/etc/ftpusers\"'
-
-.if !defined(APOP_ONLY)
-.if exists(/usr/lib/libskey.a)
-P_LIBS=         -lskey
-O_DEFS+=        -DSKEY
-.endif
-.else
-O_DEFS+=        -DAPOP_ONLY
-.endif
+OS_DEFS=	-DSETPROCTITLE -DKEEP_TEMP_DROP -DBSD44_DBM \
+		-DNONAUTHFILE='\"/etc/ftpusers\"'
 
-.if defined(POPD_YOUBIN_SUPPORT)
-O_DEFS+=        -DYOUBIN -DCALLED_FROM_POPD
+.if defined(APOP_ONLY)
+OS_DEFS+=	-DAPOP_ONLY
 .endif
 
-P_LIBS+=        -lmd -lutil
+P_LIBS+=	-lmd -lutil
 
-GNU_CONFIGURE=          yes
-CONFIGURE_ARGS=         --enable-apop=${PREFIX}/etc/popper/pop.auth \
-			--with-apopuid=pop
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-apop=${PREFIX}/etc/popper/pop.auth \
+		--with-apopuid=pop
 .if defined(FULL_POPD_DEBUG)
-CONFIGURE_ARGS+=        --enable-debugging
+CONFIGURE_ARGS+=--enable-debugging
 .endif
-CONFIGURE_ENV=          LIBS="${P_LIBS}" O_DEFS="${O_DEFS}"
+CONFIGURE_ENV=	LIBS="${P_LIBS}" OS_DEFS="${OS_DEFS}"
 
-MAN8=   popauth.8 popper.8
+MAN8=		popauth3.8 popper3.8
 
 post-patch:
-	$(RM) ${WRKSRC}/md5.h
-	$(CP) ${FILESDIR}/sendto.c ${WRKSRC}
+	@$(RM) -f ${WRKSRC}/popper/md5.h
 
 do-install:
 	cd ${WRKSRC} && \
-		${INSTALL_PROGRAM} -o pop -m 4111 popauth ${PREFIX}/bin
-	cd ${WRKSRC} && \
-		${INSTALL_PROGRAM} popper ${PREFIX}/libexec
-	cd ${WRKSRC} && \
-		${INSTALL_MAN} ${MAN8} ${PREFIX}/man/man8
+		${INSTALL_PROGRAM} popper/popauth ${PREFIX}/bin/popauth3 && \
+		${INSTALL_PROGRAM} popper/popper ${PREFIX}/libexec/popper3 && \
+		${INSTALL_MAN} man/popauth.8 ${PREFIX}/man/man8/popauth3.8 && \
+		${INSTALL_MAN} man/popper.8 ${PREFIX}/man/man8/popper3.8
 
 .include <bsd.port.mk>
diff --git a/mail/qpopper/distinfo b/mail/qpopper/distinfo
index bcbf215513b3..87a4a40c5b48 100644
--- a/mail/qpopper/distinfo
+++ b/mail/qpopper/distinfo
@@ -1 +1 @@
-MD5 (qpopper2.53.tar.Z) = fc8ef705510369692ca514808423b723
+MD5 (qpopper3.0.2.tar.gz) = cb8ac77a1d0275770c8037cbaf2326a7
diff --git a/mail/qpopper/files/patch-ac b/mail/qpopper/files/patch-ac
index b396d290ae77..0c318b8cae4f 100644
--- a/mail/qpopper/files/patch-ac
+++ b/mail/qpopper/files/patch-ac
@@ -1,15 +1,15 @@
---- popper.8.orig	Fri Jul 10 08:44:08 1998
-+++ popper.8	Tue Feb 16 13:17:13 1999
-@@ -16,7 +16,7 @@
+--- man/popper.8.orig	Wed May 10 01:35:13 2000
++++ man/popper.8	Wed May 31 09:55:43 2000
+@@ -17,7 +17,7 @@
  .SH NAME
- popper \- pop 3 server
+ qpopper \-\- pop 3 server (v3.0)
  .SH SYNOPSIS
--.B /usr/etc/popper
-+.B /usr/local/libexec/popper
+-.B /usr/local/lib/popper
++.B /usr/local/libexec/popper3
+ [ -b buildir ]
+ [ -c ]
  [ -d ]
- [ -s ]
- [ -k ]
-@@ -136,7 +136,7 @@
+@@ -234,7 +234,7 @@
  systems with BSD 4.3 syslogging, the server logs (by default) to the
  "local0" facility at priority "notice" for all messages except
  debugging which is logged at priority "debug".  The default log file is
@@ -18,33 +18,20 @@
  systems with 4.2 syslogging all messages are logged to the local log
  file, usually /usr/spool/mqueue/syslog.
  .SH DEBUGGING
-@@ -170,7 +170,7 @@
+@@ -269,7 +269,7 @@
  .PP
- The server implements two extended commands.
+ The server implements several extended commands.
  .PP
 -XTND XMIT: Sends a mail message using /usr/lib/sendmail.
 +XTND XMIT: Sends a mail message using /usr/sbin/sendmail.
  .PP
  XTND XLIST header [num]: Extracts and returns the specified header line
  for the specified message number. If the "num" parameter is missing, 
-@@ -178,7 +178,8 @@
- marked for deletion.
+@@ -294,6 +294,7 @@
  .SH FILES
  .nf
--/usr/spool/mail         mail files
-+/var/mail               mail files
+ /var/mail               mail files
 +/etc/ftpusers           list of unwelcome/restricted users
  /etc/inetd.conf         pop program invocation
  /etc/syslog.conf        logging specifications
- ~/.popbull              largest bulletin number seen by user
---- popauth.8.orig	Thu May 30 09:40:04 1996
-+++ popauth.8	Fri Dec  6 17:12:21 1996
-@@ -34,7 +34,7 @@
- With the `\-delete' switch, the super-user or master POP user can remove
- a user entry from the authorization DB.
- .SH FILES
--/etc/pop.auth.* POP authorization DB
-+/usr/local/etc/popper/pop.auth.* POP authorization DB
- .SH ACKNOWLEDGEMENTS
- This program was derived from MH 6.8.3
- .SH SEE ALSO
+ /var/spool/bulls        bulletins
diff --git a/mail/qpopper/files/patch-ap b/mail/qpopper/files/patch-ap
new file mode 100644
index 000000000000..408ae92b4b1c
--- /dev/null
+++ b/mail/qpopper/files/patch-ap
@@ -0,0 +1,29 @@
+--- man/popauth.8.orig	Wed May 10 01:35:13 2000
++++ man/popauth.8	Wed May 31 09:51:11 2000
+@@ -4,12 +4,12 @@
+ .\" @(#)$Id: popauth.8,v 1.1.1.1 2000/03/09 05:01:06 qpop Exp $
+ .TH POPAUTH 8
+ .SH NAME
+-popauth - manipulate POP authorization DB
++popauth3 - manipulate POP authorization DB
+ .SH SYNOPSIS
+-popauth
++popauth3
+ \%[\-init] \%[\-list] \%[\-delete\ name] \%[\-user\ name]
+ 
+-popauth
++popauth3
+ \%[/help]
+ .SH DESCRIPTION
+ The \fIpopauth\fR program allows a POP-subscriber to change the secret
+@@ -36,8 +36,8 @@
+ With the `\-delete' switch, the super-user or master POP user can remove
+ a user entry from the authorization DB.
+ .SH FILES
+-/etc/pop.auth.* POP authorization DB
++/usr/local/etc/popper/pop.auth.* POP authorization DB
+ .SH ACKNOWLEDGEMENTS
+ This program was derived from MH 6.8.3
+ .SH SEE ALSO
+-popper(8)
++popper3(8)
diff --git a/mail/qpopper/pkg-plist b/mail/qpopper/pkg-plist
index c53c69855e84..f113e3468cb7 100644
--- a/mail/qpopper/pkg-plist
+++ b/mail/qpopper/pkg-plist
@@ -1,2 +1,2 @@
-bin/popauth
-libexec/popper
+bin/popauth3
+libexec/popper3