Change upstream to the exact sources used by FreeBSD.

Reviewed by:	bdrewery
Discussed with:	des

6 files changed, 44 insertions, 130 deletions

diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index 30067269cba4..dccbbf5a35e0 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,23 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	cvs
-PORTVERSION=	1.11.23
+PORTVERSION=	1.20120905
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	non-gnu/${PORTNAME}/source/stable/${PORTVERSION}
+MASTER_SITES=	LOCAL/eadler
 
 MAINTAINER=	eadler@FreeBSD.org
 COMMENT=	Version control system
 
 LICENSE=	GPLv2
 
-GNU_CONFIGURE=	yes
+WRKSRC=	${WRKDIR}/call/cvs-build
+
 MAKE_JOBS_SAFE=	yes
 
+USE_XZ=	yes
+
 MAN1=	cvs.1
-MAN5=	cvs.5
 MAN8=	cvsbug.8
 
+MANCOMPRESSED=	yes
+
 INFO=	cvs cvsclient
 
-.include <bsd.port.mk>
+MAKE_ENV+=	DESTDIR=${PREFIX}
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 900000
+BROKEN=	does not link
+.endif
+
+pre-install:
+	${MKDIR} ${EXAMPLESDIR}/contrib
+
+.include <bsd.port.post.mk>
diff --git a/devel/cvs/distinfo b/devel/cvs/distinfo
index 00e66e7e3415..9da3b3d2353b 100644
--- a/devel/cvs/distinfo
+++ b/devel/cvs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cvs-1.11.23.tar.gz) = 0ad692e3c22e4b33274a53ad22a194deb3024ec833b9e87ad7968d9b0b58cdcf
-SIZE (cvs-1.11.23.tar.gz) = 3512175
+SHA256 (cvs-1.20120905.tar.xz) = 39f23fa6e574a060425737c893423af8f0682d694a7875a472fc0c06215e21bb
+SIZE (cvs-1.20120905.tar.xz) = 1413320
diff --git a/devel/cvs/files/patch-config.h.in b/devel/cvs/files/patch-config.h.in
deleted file mode 100644
index a253524f8b02..000000000000
--- a/devel/cvs/files/patch-config.h.in
+++ /dev/null
@@ -1,32 +0,0 @@
---- ./config.h.in.orig	2008-05-07 16:13:06.000000000 -0400
-+++ ./config.h.in	2012-09-04 22:07:00.000000000 -0400
-@@ -121,9 +121,6 @@
- /* Define to 1 if you have the `getpagesize' function. */
- #undef HAVE_GETPAGESIZE
- 
--/* Define to 1 if you have the `getpid' function. */
--#undef HAVE_GETPID
--
- /* Define if you have the getspnam function. */
- #undef HAVE_GETSPNAM
- 
-@@ -214,9 +211,6 @@
- /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
- #undef HAVE_NDIR_H
- 
--/* Define to 1 if you have the <process.h> header file. */
--#undef HAVE_PROCESS_H
--
- /* Define to 1 if you have the `putenv' function. */
- #undef HAVE_PUTENV
- 
-@@ -327,9 +321,6 @@
- /* Define to 1 if you have the <sys/types.h> header file. */
- #undef HAVE_SYS_TYPES_H
- 
--/* Define to 1 if you have the <sys/utime.h> header file. */
--#undef HAVE_SYS_UTIME_H
--
- /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
- #undef HAVE_SYS_WAIT_H
- 
diff --git a/devel/cvs/files/patch-configure b/devel/cvs/files/patch-configure
deleted file mode 100644
index 694a19d05b5c..000000000000
--- a/devel/cvs/files/patch-configure
+++ /dev/null
@@ -1,43 +0,0 @@
---- ./configure.orig	2008-05-07 16:12:30.000000000 -0400
-+++ ./configure	2012-09-04 22:07:00.000000000 -0400
-@@ -5642,8 +5642,6 @@
- 
- 
- 
--
--
- for ac_header in \
- 	errno.h \
- 	direct.h \
-@@ -5653,7 +5651,6 @@
- 	limits.h \
- 	memory.h \
- 	ndbm.h \
--	process.h \
- 	string.h \
- 	syslog.h \
- 	sys/bsdtypes.h \
-@@ -5663,7 +5660,6 @@
- 	sys/select.h \
- 	sys/time.h \
- 	sys/timeb.h \
--	sys/utime.h \
- 	unistd.h \
- 	utime.h\
- 
-@@ -8090,7 +8086,6 @@
- 
- 
- 
--
- for ac_func in \
- 	fchdir \
- 	fchmod \
-@@ -8100,7 +8095,6 @@
- 	getgroups \
- 	getopt \
- 	getpagesize \
--	getpid \
- 	gettimeofday \
- 	initgroups \
- 	login \
diff --git a/devel/cvs/files/patch-configure.in b/devel/cvs/files/patch-configure.in
deleted file mode 100644
index df12cd412e06..000000000000
--- a/devel/cvs/files/patch-configure.in
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./configure.in.orig	2008-05-07 16:10:34.000000000 -0400
-+++ ./configure.in	2012-09-04 22:07:00.000000000 -0400
-@@ -148,7 +148,6 @@
- 	limits.h \
- 	memory.h \
- 	ndbm.h \
--	process.h \
- 	string.h \
- 	syslog.h \
- 	sys/bsdtypes.h \
-@@ -158,7 +157,6 @@
- 	sys/select.h \
- 	sys/time.h \
- 	sys/timeb.h \
--	sys/utime.h \
- 	unistd.h \
- 	utime.h\
- )
-@@ -218,7 +216,6 @@
- 	getgroups \
- 	getopt \
- 	getpagesize \
--	getpid \
- 	gettimeofday \
- 	initgroups \
- 	login \
diff --git a/devel/cvs/pkg-plist b/devel/cvs/pkg-plist
index 746a8e3a9fad..47fcc432018e 100644
--- a/devel/cvs/pkg-plist
+++ b/devel/cvs/pkg-plist
@@ -1,23 +1,24 @@
 bin/cvs
 bin/cvsbug
-bin/rcs2log
-%%DATADIR%%/contrib/README
-%%DATADIR%%/contrib/check_cvs
-%%DATADIR%%/contrib/clmerge
-%%DATADIR%%/contrib/cln_hist
-%%DATADIR%%/contrib/commit_prep
-%%DATADIR%%/contrib/cvs2vendor
-%%DATADIR%%/contrib/cvs_acls
-%%DATADIR%%/contrib/cvscheck
-%%DATADIR%%/contrib/debug_check_log
-%%DATADIR%%/contrib/intro.doc
-%%DATADIR%%/contrib/log
-%%DATADIR%%/contrib/log_accum
-%%DATADIR%%/contrib/mfpipe
-%%DATADIR%%/contrib/pvcs2rcs
-%%DATADIR%%/contrib/rcs-to-cvs
-%%DATADIR%%/contrib/rcs2log
-%%DATADIR%%/contrib/rcslock
-%%DATADIR%%/contrib/sccs2rcs
-@dirrm %%DATADIR%%/contrib
-@dirrm %%DATADIR%%
+%%EXAMPLESDIR%%/contrib/README
+%%EXAMPLESDIR%%/contrib/clmerge
+%%EXAMPLESDIR%%/contrib/cln_hist
+%%EXAMPLESDIR%%/contrib/commit_prep
+%%EXAMPLESDIR%%/contrib/cvs2vendor
+%%EXAMPLESDIR%%/contrib/cvs_acls
+%%EXAMPLESDIR%%/contrib/cvscheck
+%%EXAMPLESDIR%%/contrib/intro.doc
+%%EXAMPLESDIR%%/contrib/log
+%%EXAMPLESDIR%%/contrib/log_accum
+%%EXAMPLESDIR%%/contrib/mfpipe
+%%EXAMPLESDIR%%/contrib/rcs-to-cvs
+%%EXAMPLESDIR%%/contrib/rcslock
+%%EXAMPLESDIR%%/contrib/sccs2rcs
+%%EXAMPLESDIR%%/contrib/rcs2log
+%%EXAMPLESDIR%%/contrib/easy-import
+%%EXAMPLESDIR%%/contrib/cvscheck.man
+%%EXAMPLESDIR%%/contrib/cvshelp.man
+%%EXAMPLESDIR%%/contrib/descend.man
+@exec mkdir -p %%EXAMPLESDIR%%/contrib
+@dirrm %%EXAMPLESDIR%%/contrib
+@dirrm %%EXAMPLESDIR%%