Update for official 3.1beta5 (repo-copy from popper3)

Renames port to qpopper, since this is the official name Qualcomm gives it.
Add pkg/MESSAGE for the inetd.conf line.
Create ${PREFIX}/etc/popper directory also for pkg's.

PR 18568 (Sent in by Jeff Palmer <jeff@isni.net>) gave me the idea for
this update.

6 files changed, 35 insertions, 101 deletions

diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index f439ad5de3fd..9547295894f3 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,51 +1,43 @@
-# New ports collection makefile for:	popper 3.*
-# Date created:		1 April 1995
-# Whom:			pst
+# New ports collection makefile for:	qpopper 3.1.b5
+# Date created:				Di  18 Jul 2000 22:36:34 CEST
+# Whom:					alex
 #
 # $FreeBSD$
 #
 
-PORTNAME=	qpopper3
-PORTVERSION=	3.0.2
+PORTNAME=	qpopper
+PORTVERSION= 	3.1.b5
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.qualcomm.com/eudora/servers/unix/popper/
-DISTNAME=	qpopper${PORTVERSION}
+MASTER_SITES=	ftp://ftp.qualcomm.com/eudora/servers/unix/popper/beta/
+DISTNAME=	${PORTNAME}3.1b5
 
-MAINTAINER=	jeff@isni.net
+MAINTAINER=	ports@freebsd.org
 
-# 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.
-
-OS_DEFS=	-DSETPROCTITLE -DKEEP_TEMP_DROP -DBSD44_DBM \
-		-DNONAUTHFILE='\"/etc/ftpusers\"'
-
-.if defined(APOP_ONLY)
-OS_DEFS+=	-DAPOP_ONLY
-.endif
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-apop=${PREFIX}/etc/popper/pop.auth
 
-P_LIBS+=	-lmd -lutil
+O_DEFS=         -DSETPROCTITLE -DKEEP_TEMP_DROP -DBSD44_DBM -DBIND43 \
+		-DBULLDB -DNONAUTHFILE='\"/etc/ftpusers\"'
+P_LIBS+=        -lmd -lutil
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-apop=${PREFIX}/etc/popper/pop.auth \
-		--with-apopuid=pop
+# Set FULL_POPD_DEBUG for debug-mode. See also -d option to popper
 .if defined(FULL_POPD_DEBUG)
 CONFIGURE_ARGS+=--enable-debugging
 .endif
-CONFIGURE_ENV=	LIBS="${P_LIBS}" OS_DEFS="${OS_DEFS}"
 
-MAN8=		popauth3.8 popper3.8
+CONFIGURE_ENV=	LIBS="${P_LIBS}" O_DEFS="${O_DEFS}"
 
-post-patch:
-	@$(RM) -f ${WRKSRC}/popper/md5.h
+MAN8=		popauth.8 popper.8
 
 do-install:
 	cd ${WRKSRC} && \
-		${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
+		${INSTALL_PROGRAM} popper/popauth ${PREFIX}/bin
+	cd ${WRKSRC} && \
+		${INSTALL_PROGRAM} popper/popper ${PREFIX}/libexec
+	cd ${WRKSRC} && \
+		${INSTALL_MAN} man/popauth.8 man/popper.8 ${PREFIX}/man/man8
+
+post-install:
+	@${SED} -e "s:/usr/local:${PREFIX}:" ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/qpopper/distinfo b/mail/qpopper/distinfo
index 87a4a40c5b48..897027ecee1f 100644
--- a/mail/qpopper/distinfo
+++ b/mail/qpopper/distinfo
@@ -1 +1 @@
-MD5 (qpopper3.0.2.tar.gz) = cb8ac77a1d0275770c8037cbaf2326a7
+MD5 (qpopper3.1b5.tar.gz) = 3d7b01eb5e596a0a96f17ee409ebc9c0
diff --git a/mail/qpopper/files/patch-ac b/mail/qpopper/files/patch-ac
deleted file mode 100644
index 0c318b8cae4f..000000000000
--- a/mail/qpopper/files/patch-ac
+++ /dev/null
@@ -1,37 +0,0 @@
---- 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
- qpopper \-\- pop 3 server (v3.0)
- .SH SYNOPSIS
--.B /usr/local/lib/popper
-+.B /usr/local/libexec/popper3
- [ -b buildir ]
- [ -c ]
- [ -d ]
-@@ -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
--/usr/spool/mqueue/POPlog.  These can be changed, if desired.  On
-+/var/log/messages.  These can be changed, if desired.  On
- systems with 4.2 syslogging all messages are logged to the local log
- file, usually /usr/spool/mqueue/syslog.
- .SH DEBUGGING
-@@ -269,7 +269,7 @@
- .PP
- 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, 
-@@ -294,6 +294,7 @@
- .SH FILES
- .nf
- /var/mail               mail files
-+/etc/ftpusers           list of unwelcome/restricted users
- /etc/inetd.conf         pop program invocation
- /etc/syslog.conf        logging specifications
- /var/spool/bulls        bulletins
diff --git a/mail/qpopper/files/patch-ap b/mail/qpopper/files/patch-ap
deleted file mode 100644
index 408ae92b4b1c..000000000000
--- a/mail/qpopper/files/patch-ap
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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-message b/mail/qpopper/pkg-message
new file mode 100644
index 000000000000..7afa699da0b1
--- /dev/null
+++ b/mail/qpopper/pkg-message
@@ -0,0 +1,7 @@
+
+****************************************************************************
+To enable the popper-daemon, add the following line to your /etc/inetd.conf:
+
+   pop3 stream tcp nowait root /usr/local/libexec/popper qpopper -s
+****************************************************************************
+
diff --git a/mail/qpopper/pkg-plist b/mail/qpopper/pkg-plist
index 264bb4c593f0..45868e6a9c6d 100644
--- a/mail/qpopper/pkg-plist
+++ b/mail/qpopper/pkg-plist
@@ -1,3 +1,4 @@
-bin/popauth3
-libexec/popper3
+bin/popauth
+libexec/popper
 @dirrm etc/popper
+@exec mkdir -p %D/etc/popper && chown pop.daemon %D/etc/popper && chmod 700 %D/etc/popper