3 files changed, 6 insertions, 169 deletions

diff --git a/devel/cvs-devel/Makefile b/devel/cvs-devel/Makefile
index 040d18796c0a..4ed0bf3f0dfd 100644
--- a/devel/cvs-devel/Makefile
+++ b/devel/cvs-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cvs
-PORTVERSION=	1.11.15
+PORTVERSION=	1.11.16
 CATEGORIES=	devel ipv6
 MASTER_SITES=	http://ftp.cvshome.org/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/cvs/&,}
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	release/stable/${DISTNAME}
 PKGNAMESUFFIX=	+ipv6
 
 PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES=	${DISTNAME}-v6-20040416.diff.gz
+PATCHFILES=	${DISTNAME}-v6-20040521.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	sumikawa@FreeBSD.org
diff --git a/devel/cvs-devel/distinfo b/devel/cvs-devel/distinfo
index 14d7cdc8913f..aba23d0409c1 100644
--- a/devel/cvs-devel/distinfo
+++ b/devel/cvs-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (cvs-1.11.15.tar.bz2) = 63873ed6ae942b298cf1db15c85ea22e
-SIZE (cvs-1.11.15.tar.bz2) = 2248876
-MD5 (cvs-1.11.15-v6-20040416.diff.gz) = dc31e206359abfe2c9629473372f3dc1
-SIZE (cvs-1.11.15-v6-20040416.diff.gz) = 12806
+MD5 (cvs-1.11.16.tar.bz2) = dd1914374f95ac1f846505e590b106e6
+SIZE (cvs-1.11.16.tar.bz2) = 2268160
+MD5 (cvs-1.11.16-v6-20040521.diff.gz) = 819cc7a3874ab508a9d6747ab43bfb9f
+SIZE (cvs-1.11.16-v6-20040521.diff.gz) = 12823
diff --git a/devel/cvs-devel/files/patch-freebsdlocal b/devel/cvs-devel/files/patch-freebsdlocal
index d93d6ce27625..6ac3284903e1 100644
--- a/devel/cvs-devel/files/patch-freebsdlocal
+++ b/devel/cvs-devel/files/patch-freebsdlocal
@@ -197,169 +197,6 @@ diff -u src/contrib/cvs/lib/md5.h:1.1.1.3 src/contrib/cvs/lib/md5.h:1.2
 +#endif
  
  #endif /* !MD5_H */
-Index: man/cvs.1
-diff -u src/contrib/cvs/man/cvs.1:1.1.1.7 src/contrib/cvs/man/cvs.1:1.21
---- src/contrib/cvs/man/cvs.1:1.1.1.7	Thu Apr 15 10:01:56 2004
-+++ man/cvs.1	Thu Apr 15 10:17:26 2004
-@@ -1,3 +1,4 @@
-+.\" FreeBSD: src/contrib/cvs/man/cvs.1,v 1.21 2004/04/15 01:17:26 peter Exp $
- .de Id
- .ds Rv \\$3
- .ds Dt \\$4
-@@ -227,6 +228,16 @@
- .SM CVSREAD
- environment variable is set.
- .TP
-+.B \-R
-+Turns on read-only repository mode.  This allows one to check out from a
-+read-only repository, such as within an anoncvs server, or from a CDROM
-+repository.
-+Same effect as if the
-+.SM CVSREADONLYFS
-+environment variable is set.  Using
-+.B \-R
-+can also considerably speed up checkout's over NFS.
-+.TP
- .B \-v [ --version ]
- Displays version and copyright information for
- .BR cvs .
-@@ -237,6 +248,25 @@
- .SM CVSREAD
- environment variable.
- .TP
-+.B \-g
-+Forces group-write perms on working files.  This option is typically
-+used when you have multiple users sharing a single checked out source
-+tree, allowing them to operate their shells with a less dangerous umask.
-+To use this feature, create a directory to hold the checked-out source
-+tree, set it to a private group, and set up the directory such that
-+files created under it inherit the group id of the directory.  This occurs 
-+automatically with FreeBSD.  With SysV you must typically set the SGID bit
-+on the directory.  The users who are to share the checked out tree must
-+be placed in that group.  Note that the sharing of a single checked-out
-+source tree is very different from giving several users access to a common
-+CVS repository.  Access to a common CVS repository already maintains shared
-+group-write perms and does not require this option.
-+
-+To use the option transparently, simply place the line 'cvs -g' in your
-+~/.cvsrc file.  Doing this is not recommended unless you firewall all your
-+source checkouts within a private group or within a private mode 0700
-+directory.
-+.TP
- .B \-x
- Encrypt all communication between the client and the server.  As of
- this writing, this is only implemented when using a Kerberos
-@@ -551,6 +581,16 @@
- options of
- .BR checkout " and " export .
- .TP
-+.B \-T
-+Create/Update CVS/Template by copying it from the (local) repository.
-+This option is useful for developers maintaining a local cvs repository
-+but commiting to a remote repository.  By maintaining CVS/Template the
-+remote commits will still be able to bring up the proper template in the
-+commit editor session.
-+Available with the
-+.BR checkout " and " update
-+commands.
-+.TP
- .B \-p
- Pipe the files retrieved from the repository to standard output,
- rather than writing them in the current directory.  Available with the
-@@ -1038,7 +1078,7 @@
- .` "cvs checkout -rEXPR1 whatever_module"
- to work with you on the experimental change.
- .TP
--\fBdiff\fP [\fB\-kl\fP] [\fIformat_options\fP] [[\fB\-r\fP \fIrev1\fP | \fB\-D\fP \fIdate1\fP] [\fB\-r\fP \fIrev2\fP | \fB\-D\fP \fIdate2\fP]] [\fIfiles.\|.\|.\fP]
-+\fBdiff\fP [\fB\-kl\fP] [\fIformat_options\fP] [[\fB\-r\fP \fIrev1\fP | \fB\-D\fP \fIdate1\fP | \fB\-j\fP \fIrev1:date1\fP] [\fB\-r\fP \fIrev2\fP | \fB\-D\fP \fIdate2\fP | \fB\-j\fP \fIrev2:date2\fP]] [\fIfiles.\|.\|.\fP]
- .I Requires:
- working directory, repository.
- .br
-@@ -1061,11 +1101,16 @@
- repository.
- You can also specify
- .B \-D
--options to diff against a revision in the past.
-+options to diff against a revision (on the head branch) in the past, and
-+you can also specify
-+.B \-j
-+options to diff against a revision relative to a branch tag in the past.
- The
- .B \-r
- and
- .B \-D
-+and
-+.B \-j
- options can be mixed together with at most two options ever specified.
- .SP
- See
-@@ -2008,7 +2053,7 @@
- .TP
- #cvs.wfl.\fIpid\fP
- A write lock.
--.SH "ENVIRONMENT VARIABLES"
-+.SH "ENVIRONMENT"
- .TP
- .SM CVSROOT
- Should contain the full pathname to the root of the
-@@ -2023,9 +2068,7 @@
- .` "cvs \-d \fIcvsroot cvs_command\fP\|.\|.\|."
- You may not need to set
- .SM CVSROOT
--if your \fBcvs\fP binary has the right path compiled in; use
--.` "cvs \-v"
--to display all compiled-in paths.
-+if your \fBcvs\fP binary has the right path compiled in.
- .TP
- .SM CVSREAD
- If this is set,
-@@ -2036,6 +2079,13 @@
- When this is not set, the default behavior is to permit modification
- of your working files.
- .TP
-+.SM CVSREADONLYFS
-+If this is set, the
-+.B \-R
-+option is assumed, and
-+.B cvs
-+operates in read-only repository mode.
-+.TP
- .SM RCSBIN
- Specifies the full pathname where to find
- .SM RCS
-@@ -2057,18 +2107,31 @@
- .BR vi )
- is used.
- .TP
-+.SM CVS_CLIENT_PORT
-+If this variable is set then
-+.B cvs
-+will use this port in
-+\fIpserver mode\fP
-+rather than the default port (cvspserver 2401).
-+.TP
- .SM CVS_IGNORE_REMOTE_ROOT
- If this variable is set then
- .B cvs
- will ignore all references to remote repositories in the CVS/Root file.
- .TP
-+.SM CVS_OPTIONS
-+Specifies a set of default options for
-+.B cvs.
-+These options are interpreted before the startup file (\fI~/.cvsrc\fP) is read
-+and can be overridden by explicit command line parameters.
-+.TP
- .SM CVS_RSH
- .B cvs
- uses the contents of this variable to determine the name of the
- remote shell command to use when starting a
- .B cvs
- server.  If this variable is not set then
--.` "rsh"
-+.` "ssh"
- is used.
- .TP
- .SM CVS_SERVER
 Index: man/cvsbug.8
 diff -u src/contrib/cvs/man/cvsbug.8:1.1.1.4 src/contrib/cvs/man/cvsbug.8:1.3
 --- src/contrib/cvs/man/cvsbug.8:1.1.1.4	Mon Sep  2 14:50:19 2002