Split up the manpage-patch in order to preserve history of the old

manpage-patch-files.

However, due to an odd bug in patch(1), 2 of the 3 hunks for
popper.8 fails (somehow, diff(1) thinks it is a binary file and
patch cannot patch it correctly if diff is used with the -a option).

So patch-ac only changes /usr/local/lib/popper to .../libexec/qpopper
and doesn't neither corrects the location of sendmail nor adds the
/etc/ftpusers file to the SEE ALSO section.

In the Makefile, /usr/local is now replaced with PREFIX for both manpages.

3 files changed, 57 insertions, 1 deletions

diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index d12f8a072f5b..d45511f3733f 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -31,7 +31,8 @@ MAN8=		qpopauth.8 qpopper.8
 
 post-patch:
 	cd ${WRKSRC} && \
-		${PERL} -pi.orig -e "s:/usr/local:${PREFIX}:g" man/popper.8
+		${PERL} -pi.orig -e "s:/usr/local:${PREFIX}:g" \
+			man/popper.8 man/popauth.8
 
 do-install:
 	cd ${WRKSRC} && \
diff --git a/mail/qpopper/files/patch-ac b/mail/qpopper/files/patch-ac
new file mode 100644
index 000000000000..f04ccc81eca5
--- /dev/null
+++ b/mail/qpopper/files/patch-ac
@@ -0,0 +1,11 @@
+--- man/popper.8.orig	Sat Jul 15 02:41:38 2000
++++ man/popper.8	Wed Jul 19 10:18:40 2000
+@@ -19,7 +19,7 @@
+ .SH NAME
+ qpopper \-\- pop 3 server (v3.1b5)
+ .SH SYNOPSIS
+-.B /usr/local/lib/popper
++.B /usr/local/libexec/qpopper
+ [ -b buildir ]
+ [ -c ]
+ [ -d ]
diff --git a/mail/qpopper/files/patch-ap b/mail/qpopper/files/patch-ap
new file mode 100644
index 000000000000..aab7b68b9aa2
--- /dev/null
+++ b/mail/qpopper/files/patch-ap
@@ -0,0 +1,44 @@
+--- /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 @@
+ 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
+ .SH ACKNOWLEDGEMENTS
+ This program was derived from MH 6.8.3
+ .SH SEE ALSO
+-popper(8)
++qpopper(8)