From 7c21c9235e6a9738987e5f449c3329063630c23d Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Sun, 16 Jan 2011 19:13:40 +0000
Subject: [PATCH] * rename cpasswd to csuppasswd to avoid a collision with
 security/cfs * install unformatted mandoc pages

---
 net/csup/Makefile                | 11 +++++++----
 net/csup/patches/patch-cpasswd_1 | 25 +++++++++++++++++++++++++
 net/csup/patches/patch-csup_1    | 21 +++++++++++++++++++++
 net/csup/pkg/PLIST               |  8 ++++----
 4 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 net/csup/patches/patch-cpasswd_1
 create mode 100644 net/csup/patches/patch-csup_1

diff --git a/net/csup/Makefile b/net/csup/Makefile
index b93def00e56..0122afbd2c9 100644
--- a/net/csup/Makefile
+++ b/net/csup/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2010/10/19 20:11:49 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2011/01/16 19:13:40 naddy Exp $
 
 COMMENT=	network distribution package for CVS repositories
 
 DISTNAME=	csup-20101019
+REVISION=	0
 CATEGORIES=	net
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
@@ -20,9 +21,11 @@ WANTLIB=	c crypto pthread z
 
 WRKDIST=	${WRKDIR}/csup
 ALL_TARGET=	depend all
-FAKE_FLAGS=	BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/cat
 
-post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/cpasswd.sh ${PREFIX}/bin/cpasswd
+do-install:
+	${INSTALL_PROGRAM} ${WRKBUILD}/csup ${PREFIX}/bin/csup
+	${INSTALL_MAN} ${WRKSRC}/csup.1 ${PREFIX}/man/man1/csup.1
+	${INSTALL_SCRIPT} ${WRKSRC}/cpasswd.sh ${PREFIX}/bin/csuppasswd
+	${INSTALL_MAN} ${WRKSRC}/cpasswd.1 ${PREFIX}/man/man1/csuppasswd.1
 
 .include <bsd.port.mk>
diff --git a/net/csup/patches/patch-cpasswd_1 b/net/csup/patches/patch-cpasswd_1
new file mode 100644
index 00000000000..0722dc9c07e
--- /dev/null
+++ b/net/csup/patches/patch-cpasswd_1
@@ -0,0 +1,25 @@
+$OpenBSD: patch-cpasswd_1,v 1.1 2011/01/16 19:13:40 naddy Exp $
+--- cpasswd.1.orig	Sun Jan 16 20:06:24 2011
++++ cpasswd.1	Sun Jan 16 20:06:46 2011
+@@ -30,10 +30,10 @@
+ .\" $FreeBSD: src/usr.bin/csup/cpasswd.1,v 1.5 2010/10/08 12:40:16 uqs Exp $
+ .\"
+ .Dd June 27, 2007
+-.Dt CPASSWD 1
++.Dt CSUPPASSWD 1
+ .Os FreeBSD
+ .Sh NAME
+-.Nm cpasswd
++.Nm csuppasswd
+ .Nd scramble passwords for csup authentication
+ .Sh SYNOPSIS
+ .Nm
+@@ -79,7 +79,7 @@ Choose an arbitrary secret
+ .Ar password .
+ .It
+ Run
+-.Nm cpasswd ,
++.Nm csuppasswd ,
+ and type in the
+ .Ar password
+ when prompted for it.  The utility will print out a line to send
diff --git a/net/csup/patches/patch-csup_1 b/net/csup/patches/patch-csup_1
new file mode 100644
index 00000000000..aa5b810876c
--- /dev/null
+++ b/net/csup/patches/patch-csup_1
@@ -0,0 +1,21 @@
+$OpenBSD: patch-csup_1,v 1.1 2011/01/16 19:13:40 naddy Exp $
+--- csup.1.orig	Sun Jan 16 20:06:02 2011
++++ csup.1	Sun Jan 16 20:06:16 2011
+@@ -875,7 +875,7 @@ Choose an arbitrary secret
+ .Ar password .
+ .It
+ Run the
+-.Nm cpasswd
++.Nm csuppasswd
+ utility, and type in the
+ .Ar password
+ when prompted for it.  The utility will print out a line to send
+@@ -967,7 +967,7 @@ subdirectory.
+ List files.
+ .El
+ .Sh SEE ALSO
+-.Xr cpasswd 1 ,
++.Xr csuppasswd 1 ,
+ .Xr cvs 1 ,
+ .Xr rcsintro 1 ,
+ .Xr ssh 1 .
diff --git a/net/csup/pkg/PLIST b/net/csup/pkg/PLIST
index 8337f9a524c..70c94d60093 100644
--- a/net/csup/pkg/PLIST
+++ b/net/csup/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2010/10/19 20:11:49 naddy Exp $
-bin/cpasswd
+@comment $OpenBSD: PLIST,v 1.4 2011/01/16 19:13:40 naddy Exp $
 @bin bin/csup
-@man man/cat1/cpasswd.0
-@man man/cat1/csup.0
+bin/csuppasswd
+@man man/man1/csup.1
+@man man/man1/csuppasswd.1