diff --git a/devel/Makefile b/devel/Makefile
index 4e9c27df5c77..e98e9b3e2569 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -888,6 +888,7 @@
     SUBDIR += oniguruma
     SUBDIR += oniguruma4
     SUBDIR += open-beagle
+    SUBDIR += opencvs
     SUBDIR += openwince-include
     SUBDIR += openzz
     SUBDIR += orbitcpp
diff --git a/devel/opencvs/Makefile b/devel/opencvs/Makefile
new file mode 100644
index 000000000000..bb239ed38ae1
--- /dev/null
+++ b/devel/opencvs/Makefile
@@ -0,0 +1,27 @@
+# New ports collection makefile for:	opencvs
+# Date created:				1 November 2008
+# Whom:					Gabor Kovesdan <gabor@FreeBSD.org>
+#
+# $FreeBSD$
+
+PORTNAME=	opencvs
+PORTVERSION=	20081101
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	gabor
+
+MAINTAINER=	gabor@FreeBSD.org
+COMMENT=	BSD-licensed CVS implementation
+
+WRKSRC=		${WRKDIR}/cvs
+MANCOMPRESSED=	maybe
+
+MAN7=		cvsintro.7
+
+MAKE_ENV+=	BINDIR="${PREFIX}/bin" \
+		MANDIR="${MANPREFIX}/man/man" \
+		CATDIR="${MANPREFIX}/man/man"
+
+PLIST_FILES=	bin/opencvs
+
+.include <bsd.port.mk>
diff --git a/devel/opencvs/distinfo b/devel/opencvs/distinfo
new file mode 100644
index 000000000000..393f5bab1f3c
--- /dev/null
+++ b/devel/opencvs/distinfo
@@ -0,0 +1,3 @@
+MD5 (opencvs-20081101.tar.gz) = c62341da9e79a5fe30063003df9c68ae
+SHA256 (opencvs-20081101.tar.gz) = c6397493fc480dddbd70b47e99f31f6147a0f35f7b2be85773e78460122d5929
+SIZE (opencvs-20081101.tar.gz) = 160631
diff --git a/devel/opencvs/files/patch-Makefile b/devel/opencvs/files/patch-Makefile
new file mode 100644
index 000000000000..d30782e06507
--- /dev/null
+++ b/devel/opencvs/files/patch-Makefile
@@ -0,0 +1,19 @@
+--- Makefile	2008-06-21 17:39:15.000000000 +0200
++++ Makefile	2008-11-01 14:42:14.000000000 +0100
+@@ -12,14 +12,7 @@
+ 	server.c status.c tag.c trigger.c worklist.c util.c update.c version.c \
+ 	watch.c xmalloc.c
+ 
+-CFLAGS+=-Wall
+-CFLAGS+=-Wstrict-prototypes -Wmissing-prototypes
+-CFLAGS+=-Wmissing-declarations
+-CFLAGS+=-Wshadow -Wpointer-arith -Wcast-qual
+-CFLAGS+=-Wsign-compare
+-DEBUG=	-g -ggdb
+-YFLAGS=
+-
+-INSTALL_STRIP=
++DPADD+= ${LIBZ}
++LDADD+= -lz -lmd
+ 
+ .include <bsd.prog.mk>
diff --git a/devel/opencvs/files/patch-admin.c b/devel/opencvs/files/patch-admin.c
new file mode 100644
index 000000000000..e3dd5c7d41dd
--- /dev/null
+++ b/devel/opencvs/files/patch-admin.c
@@ -0,0 +1,10 @@
+--- admin.c	12 Sep 2008 13:20:36 -0000	1.64
++++ admin.c	17 Oct 2008 08:51:45 -0000
+@@ -24,6 +24,7 @@
+ #include <fcntl.h>
+ #include <libgen.h>
+ #include <string.h>
++#include <time.h>
+ #include <unistd.h>
+ 
+ #include "cvs.h"
diff --git a/devel/opencvs/files/patch-atomicio.h b/devel/opencvs/files/patch-atomicio.h
new file mode 100644
index 000000000000..31ab6bc2575e
--- /dev/null
+++ b/devel/opencvs/files/patch-atomicio.h
@@ -0,0 +1,20 @@
+--- atomicio.h	17 Sep 2007 10:07:21 -0000	1.1
++++ atomicio.h	17 Oct 2008 08:51:45 -0000
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: atomicio.h,v 1.1 2007/09/17 10:07:21 tobias Exp $ */
++/* $OpenBSD: atomicio.h,v 1.10 2006/08/03 03:34:41 deraadt Exp $ */
+ 
+ /*
+  * Copyright (c) 2006 Damien Miller.  All rights reserved.
+@@ -35,5 +35,11 @@
+ size_t	atomicio(ssize_t (*)(int, void *, size_t), int, void *, size_t);
+ 
+ #define vwrite (ssize_t (*)(int, void *, size_t))write
++
++/*
++ * ensure all of data on socket comes through. f==readv || f==writev
++ */
++size_t	atomiciov(ssize_t (*)(int, const struct iovec *, int),
++    int, const struct iovec *, int);
+ 
+ #endif /* _ATOMICIO_H */
diff --git a/devel/opencvs/files/patch-checkout.c b/devel/opencvs/files/patch-checkout.c
new file mode 100644
index 000000000000..681da9741ab0
--- /dev/null
+++ b/devel/opencvs/files/patch-checkout.c
@@ -0,0 +1,11 @@
+--- checkout.c	8 Jul 2008 12:29:58 -0000	1.156
++++ checkout.c	17 Oct 2008 08:51:45 -0000
+@@ -352,6 +352,7 @@
+ 				xfree(module_repo_root);
+ 		}
+ 
++#define TAILQ_END(head)                 NULL
+ 		if (mc->mc_canfree == 1) {
+ 			for (fl = TAILQ_FIRST(&(mc->mc_modules));
+ 			    fl != TAILQ_END(&(mc->mc_modules)); fl = nxt) {
+
diff --git a/devel/opencvs/files/patch-cmd.c b/devel/opencvs/files/patch-cmd.c
new file mode 100644
index 000000000000..b44d814b5946
--- /dev/null
+++ b/devel/opencvs/files/patch-cmd.c
@@ -0,0 +1,11 @@
+--- cmd.c	3 Feb 2008 18:18:44 -0000	1.68
++++ cmd.c	17 Oct 2008 08:51:45 -0000
+@@ -27,6 +27,7 @@
+ #include <sys/dirent.h>
+ 
+ #include <string.h>
++#include <time.h>
+ 
+ #include "cvs.h"
+ 
+
diff --git a/devel/opencvs/files/patch-config.c b/devel/opencvs/files/patch-config.c
new file mode 100644
index 000000000000..d962d6897e30
--- /dev/null
+++ b/devel/opencvs/files/patch-config.c
@@ -0,0 +1,11 @@
+--- config.c	2 Mar 2008 11:58:45 -0000	1.15
++++ config.c	17 Oct 2008 08:51:45 -0000
+@@ -23,6 +23,7 @@
+ #include <limits.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <time.h>
+ 
+ #include "cvs.h"
+ #include "config.h"
+
diff --git a/devel/opencvs/files/patch-cvs.c b/devel/opencvs/files/patch-cvs.c
new file mode 100644
index 000000000000..60a4f1185f3a
--- /dev/null
+++ b/devel/opencvs/files/patch-cvs.c
@@ -0,0 +1,21 @@
+--- cvs.c	21 Jun 2008 15:39:15 -0000	1.150
++++ cvs.c	17 Oct 2008 08:51:45 -0000
+@@ -70,7 +70,7 @@
+ struct cvs_cmd *cmdp;			/* struct of command we are running */
+ 
+ int		cvs_getopt(int, char **);
+-__dead void	usage(void);
++void	usage(void);
+ static void	cvs_read_rcfile(void);
+ 
+ struct cvs_wklhead temp_files;
+@@ -122,7 +122,7 @@
+ 		cvs_ent_close(current_list, ENT_SYNC);
+ }
+ 
+-__dead void
++void
+ usage(void)
+ {
+ 	(void)fprintf(stderr,
+
diff --git a/devel/opencvs/files/patch-cvs.h b/devel/opencvs/files/patch-cvs.h
new file mode 100644
index 000000000000..23cba723f936
--- /dev/null
+++ b/devel/opencvs/files/patch-cvs.h
@@ -0,0 +1,10 @@
+--- cvs.h	27 Jun 2008 21:14:15 -0000	1.172
++++ cvs.h	17 Oct 2008 08:51:45 -0000
+@@ -433,5 +433,6 @@
+ int	cvs_watch(int, char **);
+ int	cvs_watchers(int, char **);
+ 
++#define SIZE_MAX ULONG_MAX
+ 
+ #endif
+
diff --git a/devel/opencvs/files/patch-date.y b/devel/opencvs/files/patch-date.y
new file mode 100644
index 000000000000..7cef0a6f9afd
--- /dev/null
+++ b/devel/opencvs/files/patch-date.y
@@ -0,0 +1,11 @@
+--- date.y	16 Feb 2008 01:00:00 -0000	1.18
++++ date.y	17 Oct 2008 08:51:45 -0000
+@@ -14,6 +14,7 @@
+ /* SUPPRESS 287 on yaccpar_sccsid *//* Unused static variable */
+ /* SUPPRESS 288 on yyerrlab *//* Label unused */
+ 
++#include <time.h>
+ #include <sys/timeb.h>
+ 
+ #include <ctype.h>
+
diff --git a/devel/opencvs/files/patch-diff3.c b/devel/opencvs/files/patch-diff3.c
new file mode 100644
index 000000000000..eb32890fea25
--- /dev/null
+++ b/devel/opencvs/files/patch-diff3.c
@@ -0,0 +1,11 @@
+--- diff3.c	9 Mar 2008 01:52:55 -0000	1.48
++++ diff3.c	17 Oct 2008 08:51:45 -0000
+@@ -81,6 +81,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <time.h>
+ #include <unistd.h>
+ 
+ #include "atomicio.h"
+
diff --git a/devel/opencvs/files/patch-getlog.c b/devel/opencvs/files/patch-getlog.c
new file mode 100644
index 000000000000..bac8a30f2700
--- /dev/null
+++ b/devel/opencvs/files/patch-getlog.c
@@ -0,0 +1,11 @@
+--- getlog.c	12 Sep 2008 13:38:35 -0000	1.90
++++ getlog.c	17 Oct 2008 08:51:45 -0000
+@@ -19,6 +19,7 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <errno.h>
++#include <time.h>
+ 
+ #include "cvs.h"
+ #include "remote.h"
+
diff --git a/devel/opencvs/files/patch-hash.c b/devel/opencvs/files/patch-hash.c
new file mode 100644
index 000000000000..20824d44534c
--- /dev/null
+++ b/devel/opencvs/files/patch-hash.c
@@ -0,0 +1,11 @@
+--- hash.c	21 Jun 2008 15:39:15 -0000	1.1
++++ hash.c	17 Oct 2008 08:51:45 -0000
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <time.h>
+ 
+ #include "cvs.h"
+ #include "hash.h"
+
diff --git a/devel/opencvs/files/patch-log.c b/devel/opencvs/files/patch-log.c
new file mode 100644
index 000000000000..08f108b74377
--- /dev/null
+++ b/devel/opencvs/files/patch-log.c
@@ -0,0 +1,11 @@
+--- log.c	12 Jun 2008 16:53:12 -0000	1.45
++++ log.c	17 Oct 2008 08:51:45 -0000
+@@ -27,6 +27,7 @@
+ 
+ #include <errno.h>
+ #include <string.h>
++#include <time.h>
+ 
+ #include "cvs.h"
+ 
+
diff --git a/devel/opencvs/files/patch-log.h b/devel/opencvs/files/patch-log.h
new file mode 100644
index 000000000000..bc65b4fba1ed
--- /dev/null
+++ b/devel/opencvs/files/patch-log.h
@@ -0,0 +1,11 @@
+--- log.h	10 Jun 2008 01:00:34 -0000	1.23
++++ log.h	17 Oct 2008 08:51:46 -0000
+@@ -47,6 +47,6 @@
+ void	cvs_vlog(u_int, const char *, va_list);
+ int	cvs_printf(const char *, ...) __attribute__((format(printf, 1, 2)));
+ int	cvs_vprintf(const char *, va_list);
+-void	fatal(const char *, ...) __dead __attribute__((format(printf, 1,2)));
++void	fatal(const char *, ...) __attribute__((format(printf, 1,2)));
+ 
+ #endif	/* LOG_H */
+
diff --git a/devel/opencvs/files/patch-modules.c b/devel/opencvs/files/patch-modules.c
new file mode 100644
index 000000000000..a1296b499495
--- /dev/null
+++ b/devel/opencvs/files/patch-modules.c
@@ -0,0 +1,10 @@
+--- modules.c	8 Mar 2008 21:58:34 -0000	1.13
++++ modules.c	17 Oct 2008 08:51:46 -0000
+@@ -22,6 +22,7 @@
+ #include <ctype.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <time.h>
+ 
+ #include "cvs.h"
+ #include "config.h"
diff --git a/devel/opencvs/files/patch-rcsnum.c b/devel/opencvs/files/patch-rcsnum.c
new file mode 100644
index 000000000000..3c32160c3d85
--- /dev/null
+++ b/devel/opencvs/files/patch-rcsnum.c
@@ -0,0 +1,11 @@
+--- rcsnum.c	22 May 2008 07:03:02 -0000	1.53
++++ rcsnum.c	17 Oct 2008 08:51:46 -0000
+@@ -26,6 +26,7 @@
+ 
+ #include <ctype.h>
+ #include <string.h>
++#include <time.h>
+ 
+ #include "cvs.h"
+ 
+
diff --git a/devel/opencvs/files/patch-remove.c b/devel/opencvs/files/patch-remove.c
new file mode 100644
index 000000000000..7cc9b363b1ce
--- /dev/null
+++ b/devel/opencvs/files/patch-remove.c
@@ -0,0 +1,11 @@
+--- remove.c	23 Jun 2008 20:51:08 -0000	1.79
++++ remove.c	17 Oct 2008 08:51:46 -0000
+@@ -17,6 +17,7 @@
+ 
+ #include <errno.h>
+ #include <string.h>
++#include <time.h>
+ #include <unistd.h>
+ 
+ #include "cvs.h"
+
diff --git a/devel/opencvs/files/patch-root.c b/devel/opencvs/files/patch-root.c
new file mode 100644
index 000000000000..ddd2db51dc39
--- /dev/null
+++ b/devel/opencvs/files/patch-root.c
@@ -0,0 +1,11 @@
+--- root.c	20 Jun 2008 23:00:13 -0000	1.45
++++ root.c	17 Oct 2008 08:51:46 -0000
+@@ -27,6 +27,7 @@
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <time.h>
+ 
+ #include "cvs.h"
+ 
+
diff --git a/devel/opencvs/files/patch-tag.c b/devel/opencvs/files/patch-tag.c
new file mode 100644
index 000000000000..74979aa106e0
--- /dev/null
+++ b/devel/opencvs/files/patch-tag.c
@@ -0,0 +1,11 @@
+--- tag.c	20 Jun 2008 14:04:29 -0000	1.76
++++ tag.c	17 Oct 2008 08:51:46 -0000
+@@ -17,6 +17,7 @@
+ 
+ #include <errno.h>
+ #include <string.h>
++#include <time.h>
+ #include <unistd.h>
+ 
+ #include "cvs.h"
+
diff --git a/devel/opencvs/files/patch-trigger.c b/devel/opencvs/files/patch-trigger.c
new file mode 100644
index 000000000000..db6d61a042eb
--- /dev/null
+++ b/devel/opencvs/files/patch-trigger.c
@@ -0,0 +1,11 @@
+--- trigger.c	29 Aug 2008 09:51:21 -0000	1.16
++++ trigger.c	17 Oct 2008 08:51:46 -0000
+@@ -27,6 +27,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <time.h>
+ #include <unistd.h>
+ 
+ #include "config.h"
+
diff --git a/devel/opencvs/files/patch-util.c b/devel/opencvs/files/patch-util.c
new file mode 100644
index 000000000000..799293580127
--- /dev/null
+++ b/devel/opencvs/files/patch-util.c
@@ -0,0 +1,12 @@
+--- util.c	21 Jun 2008 15:39:15 -0000	1.147
++++ util.c	17 Oct 2008 08:51:46 -0000
+@@ -30,7 +30,7 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ 
+-#include <atomicio.h>
++#include "atomicio.h"
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <md5.h>
+
diff --git a/devel/opencvs/files/patch-version.c b/devel/opencvs/files/patch-version.c
new file mode 100644
index 000000000000..e84f774a8acc
--- /dev/null
+++ b/devel/opencvs/files/patch-version.c
@@ -0,0 +1,12 @@
+--- version.c	2 May 2007 16:26:50 -0000	1.25
++++ version.c	17 Oct 2008 08:51:46 -0000
+@@ -16,6 +16,8 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#include <time.h>
++
+ #include "cvs.h"
+ #include "remote.h"
+ 
+
diff --git a/devel/opencvs/files/patch-watch.c b/devel/opencvs/files/patch-watch.c
new file mode 100644
index 000000000000..e9dc80ee7df1
--- /dev/null
+++ b/devel/opencvs/files/patch-watch.c
@@ -0,0 +1,11 @@
+--- watch.c	23 Jun 2008 20:51:08 -0000	1.21
++++ watch.c	17 Oct 2008 08:51:46 -0000
+@@ -16,6 +16,7 @@
+  */
+ 
+ #include <string.h>
++#include <time.h>
+ #include <unistd.h>
+ 
+ #include "cvs.h"
+
diff --git a/devel/opencvs/files/patch-worklist.c b/devel/opencvs/files/patch-worklist.c
new file mode 100644
index 000000000000..2785e6cd6f69
--- /dev/null
+++ b/devel/opencvs/files/patch-worklist.c
@@ -0,0 +1,11 @@
+--- worklist.c	22 Feb 2007 06:42:10 -0000	1.6
++++ worklist.c	17 Oct 2008 08:51:46 -0000
+@@ -25,6 +25,7 @@
+  */
+ 
+ #include <string.h>
++#include <time.h>
+ #include <unistd.h>
+ 
+ #include "cvs.h"
+
diff --git a/devel/opencvs/files/patch-xmalloc.c b/devel/opencvs/files/patch-xmalloc.c
new file mode 100644
index 000000000000..a0155666c560
--- /dev/null
+++ b/devel/opencvs/files/patch-xmalloc.c
@@ -0,0 +1,12 @@
+--- xmalloc.c	22 Feb 2007 06:42:10 -0000	1.8
++++ xmalloc.c	17 Oct 2008 08:51:46 -0000
+@@ -13,6 +13,8 @@
+  * called by a name other than "ssh" or "Secure Shell".
+  */
+ 
++#include <sys/types.h>
++
+ #include <limits.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+
diff --git a/devel/opencvs/files/patch-xmalloc.h b/devel/opencvs/files/patch-xmalloc.h
new file mode 100644
index 000000000000..08a220c75a34
--- /dev/null
+++ b/devel/opencvs/files/patch-xmalloc.h
@@ -0,0 +1,11 @@
+--- xmalloc.h	29 Jan 2007 16:22:29 -0000	1.3
++++ xmalloc.h	17 Oct 2008 08:51:46 -0000
+@@ -29,7 +29,6 @@
+                 __attribute__((__nonnull__ (2)));
+ int	 xsnprintf(char *, size_t, const char *, ...)
+ 		__attribute__((__format__ (printf, 3, 4)))
+-		__attribute__((__nonnull__ (3)))
+-		__attribute__((__bounded__ (__string__,1,2)));
++		__attribute__((__nonnull__ (3)));
+ 
+ #endif	/* XMALLOC_H */
diff --git a/devel/opencvs/pkg-descr b/devel/opencvs/pkg-descr
new file mode 100644
index 000000000000..4f24b924fdd0
--- /dev/null
+++ b/devel/opencvs/pkg-descr
@@ -0,0 +1,8 @@
+OpenCVS is a FREE implementation of the Concurrent Versions System, the most
+popular open source revision control software. It can be used as both client
+and server for repositories and provides granular access control over data
+stored in the repository. It aims to be as compatible as possible with other
+CVS implementations, except when particular features reduce the overall
+security of the system.
+
+WWW: http://www.opencvs.org/