Update to 3.1fc1.

Preserve popauth's name on installation, as it looks up argv[0] and
tries to change its default behavior according to it.

Reported in:	FreeBSD-users-jp@jp.FreeBSD.org mailing list

Cleanup Makefile & patches a bit.

5 files changed, 23 insertions, 53 deletions

diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index d45511f3733f..553186328385 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -6,10 +6,13 @@
 #
 
 PORTNAME=	qpopper
-PORTVERSION= 	3.1.b5
+PORTVERSION= 	3.1.f1
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.qualcomm.com/eudora/servers/unix/popper/beta/
-DISTNAME=	${PORTNAME}3.1b5
+MASTER_SITES=	ftp://ftp.qualcomm.com/eudora/servers/unix/popper/beta/ \
+		ftp://ftp.gmxuk.net/pub/qpopper/beta/ \
+		ftp://sunsite.doc.ic.ac.uk/Mirrors/ftp.qualcomm.com/eudora/servers/unix/popper/beta/ \
+		ftp://ftp.kracked.com/pub/qpopper/beta/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.f/fc/}
 
 MAINTAINER=	ports@freebsd.org
 
@@ -27,18 +30,16 @@ CONFIGURE_ARGS+=--enable-debugging
 
 CONFIGURE_ENV=	LIBS="${P_LIBS}" O_DEFS="${O_DEFS}"
 
-MAN8=		qpopauth.8 qpopper.8
+MAN8=		popauth.8 qpopper.8
 
 post-patch:
-	cd ${WRKSRC} && \
-		${PERL} -pi.orig -e "s:/usr/local:${PREFIX}:g" \
-			man/popper.8 man/popauth.8
+	${PERL} -pi -e 's:!!PREFIX!!:${PREFIX}$$1:g' ${WRKSRC}/man/*
 
 do-install:
 	cd ${WRKSRC} && \
-		${INSTALL_PROGRAM} popper/popauth ${PREFIX}/bin/qpopauth && \
+		${INSTALL_PROGRAM} popper/popauth ${PREFIX}/bin/ && \
 		${INSTALL_PROGRAM} popper/popper ${PREFIX}/libexec/qpopper && \
-		${INSTALL_MAN} man/popauth.8 ${PREFIX}/man/man8/qpopauth.8 && \
+		${INSTALL_MAN} man/popauth.8 ${PREFIX}/man/man8/ && \
 		${INSTALL_MAN} man/popper.8 ${PREFIX}/man/man8/qpopper.8
 
 post-install:
diff --git a/mail/qpopper/distinfo b/mail/qpopper/distinfo
index 897027ecee1f..8fae2de59811 100644
--- a/mail/qpopper/distinfo
+++ b/mail/qpopper/distinfo
@@ -1 +1 @@
-MD5 (qpopper3.1b5.tar.gz) = 3d7b01eb5e596a0a96f17ee409ebc9c0
+MD5 (qpopper3.1fc1.tar.gz) = 358fe47fbf8dfa0354bc01b60ca6c6ec
diff --git a/mail/qpopper/files/patch-ac b/mail/qpopper/files/patch-ac
index f04ccc81eca5..94ef07768384 100644
--- a/mail/qpopper/files/patch-ac
+++ b/mail/qpopper/files/patch-ac
@@ -1,11 +1,11 @@
---- man/popper.8.orig	Sat Jul 15 02:41:38 2000
-+++ man/popper.8	Wed Jul 19 10:18:40 2000
+--- man/popper.8.orig	Sun Sep 10 08:52:41 2000
++++ man/popper.8	Fri Oct  6 02:49:25 2000
 @@ -19,7 +19,7 @@
  .SH NAME
- qpopper \-\- pop 3 server (v3.1b5)
+ qpopper \-\- pop 3 server (v3.1b7)
  .SH SYNOPSIS
 -.B /usr/local/lib/popper
-+.B /usr/local/libexec/qpopper
- [ -b buildir ]
- [ -c ]
- [ -d ]
++.B !!PREFIX!!/libexec/qpopper
+ [
+ .I [ address ]
+ .I [ ":" ]
diff --git a/mail/qpopper/files/patch-ap b/mail/qpopper/files/patch-ap
index aab7b68b9aa2..97f4688c9e2e 100644
--- a/mail/qpopper/files/patch-ap
+++ b/mail/qpopper/files/patch-ap
@@ -1,42 +1,11 @@
---- /tmp/qpopper/work/qpopper3.1b5/man/popauth.8	Sat Jul 15 00:51:58 2000
-+++ man/popauth.8	Wed Jul 19 10:04:19 2000
-@@ -4,25 +4,25 @@
- .\" @(#)$Id: popauth.8,v 3.1b1 2000/06/07 05:01:06 qpop Exp $
- .TH POPAUTH 8
- .SH NAME
--popauth -- manipulate POP authorization DB
-+qpopauth -- manipulate POP authorization DB
- .SH SYNOPSIS
--popauth
-+qpopauth
- \%[\-init] \%[\-list] \%[\-delete\ name] \%[\-user\ name [password]]
- 
- popauth
- \%[/help]
- .SH DESCRIPTION
--The \fIpopauth\fR program allows a POP-subscriber to change the secret
-+The \fIqpopauth\fR program allows a POP-subscriber to change the secret
- value used to generate their authentication credentials.
- In addition,
- the super\-user or master POP user may use this program to either
- add or remove a user, or to print public information from it.  Only the
--super\-user may initialize the database.  \fIpopauth\fR is useful only when
-+super\-user may initialize the database.  \fIqpopauth\fR is useful only when
- the APOP configuration option is defined.  (This configuration option defines
- the name of the POP authorization DB.)
- 
- Under normal usage,
--\fIpopauth\fR prompts for a new secret,
-+\fIqpopauth\fR prompts for a new secret,
- just like the \fIpasswd\fR program.
- It then updates the POP authorization DB accordingly.
- 
-@@ -36,8 +36,8 @@
+--- man/popauth.8.orig	Mon Aug 21 06:18:08 2000
++++ man/popauth.8	Fri Oct  6 02:54:02 2000
+@@ -74,8 +74,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/qpopper/pop.auth.* POP authorization DB
++!!PREFIX!!/etc/qpopper/pop.auth.* POP authorization DB
  .SH ACKNOWLEDGEMENTS
  This program was derived from MH 6.8.3
  .SH SEE ALSO
diff --git a/mail/qpopper/pkg-plist b/mail/qpopper/pkg-plist
index 4450333f7c29..6f3f63e773a2 100644
--- a/mail/qpopper/pkg-plist
+++ b/mail/qpopper/pkg-plist
@@ -1,4 +1,4 @@
-bin/qpopauth
+bin/popauth
 libexec/qpopper
 @dirrm etc/qpopper
 @exec mkdir -p %D/etc/qpopper && chown pop.daemon %D/etc/qpopper && chmod 700 %D/etc/qpopper