devel/cvs: enslave devel/cvs+ipv6 to avoid bitrot

- devel/cvs: allow slave ports (?= vars)
- devel/cvs: define CONFLICTS against the slave and -devel
- devel/cvs: adjust for easier patching source (i.e. no ../cvs/ prefix)
- devel/cvs+ipv6: move most logic as IPV6 option to devel/cvs
- devel/cvs+ipv6: don't define HAVE_GETGROUPS twice or unused ENABLE_IPV6
- devel/cvs+ipv6: drop devel/cvsnt from CONFLICTS after 4.6 years being gone
- devel/cvs+ipv6: bump PORTREVISION for changes inherited from devel/cvs
- Convert CONFLICTS into CONFLICTS_INSTALL

PR:		199542
Reviewed by:	bapt
Approved by:	maintainer timeout (5 months)
Differential Revision:	https://reviews.freebsd.org/D3636

9 files changed, 25 insertions, 97 deletions

diff --git a/devel/cvs+ipv6/Makefile b/devel/cvs+ipv6/Makefile
index f8f1c3ef9d96..5fa35f25264b 100644
--- a/devel/cvs+ipv6/Makefile
+++ b/devel/cvs+ipv6/Makefile
@@ -1,42 +1,16 @@
 # $FreeBSD$
 
-PORTNAME=	cvs
-PORTVERSION=	1.20120905
-PORTREVISION=	2
-CATEGORIES=	devel ipv6
-MASTER_SITES=	LOCAL/eadler
+PORTREVISION=	3
 PKGNAMESUFFIX=	+ipv6
 
-PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES=	${DISTNAME}-v6-20140105.diff.gz
-PATCH_WRKSRC=	${WRKDIR}/call/cvs
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=	sumikawa@FreeBSD.org
 COMMENT=	IPv6 enabled cvs.  You can use IPv6 connection when using pserver
 
-CONFLICTS=	cvsnt-[12]* cvs-devel-[12]*
-LICENSE=	GPLv2
-
-USES=		makeinfo shebangfix tar:xz uidfix
-SHEBANG_FILES=	contrib/clmerge \
-		contrib/cln_hist \
-		contrib/commit_prep \
-		contrib/cvs_acls \
-		contrib/easy-import \
-		contrib/log \
-		contrib/log_accum \
-		contrib/mfpipe \
-		contrib/rcslock
-PATCHDIR=	${WRKDIR}/call/cvs-build
-WRKSRC=		${WRKDIR}/call/cvs-build
-INFO=		cvs cvsclient
+CONFLICTS_INSTALL=	cvs-[12]* cvs-devel-[12]*
 
-# bsd.stage.makes sets the wrong value for DESTDIR
-DESTDIRNAME=	NADA
-MAKE_ARGS=	DESTDIR=${STAGEDIR}${PREFIX}
+OPTIONS_SLAVE=		IPV6
+OPTIONS_EXCLUDE=	# empty
 
-pre-install:
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib
+MASTERDIR=	${.CURDIR}/../cvs
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/cvs+ipv6/distinfo b/devel/cvs+ipv6/distinfo
deleted file mode 100644
index f461692216d4..000000000000
--- a/devel/cvs+ipv6/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (cvs-1.20120905.tar.xz) = 39f23fa6e574a060425737c893423af8f0682d694a7875a472fc0c06215e21bb
-SIZE (cvs-1.20120905.tar.xz) = 1413320
-SHA256 (cvs-1.20120905-v6-20140105.diff.gz) = 6fdb4a0342275bb5668877b7f08f557b6505d7dee390a41a108f491b9b93f84e
-SIZE (cvs-1.20120905-v6-20140105.diff.gz) = 6333
diff --git a/devel/cvs+ipv6/files/patch-lib-config.h.proto b/devel/cvs+ipv6/files/patch-lib-config.h.proto
deleted file mode 100644
index 555c2783d4e6..000000000000
--- a/devel/cvs+ipv6/files/patch-lib-config.h.proto
+++ /dev/null
@@ -1,28 +0,0 @@
---- lib/config.h.proto-	2014-01-05 14:36:51.665354819 +0900
-+++ lib/config.h.proto	2014-01-05 14:38:44.557348262 +0900
-@@ -168,6 +168,9 @@
- /* Define to 1 if you have the `krb_get_err_text' function. */
- /* #undef HAVE_KRB_GET_ERR_TEXT */
-
-+/* Define if IPv6 is supported.  */
-+#define ENABLE_IPV6
-+
- /* Define to 1 if you have the `krb' library (-lkrb). */
- /* #undef HAVE_LIBKRB */
-
-@@ -189,6 +192,15 @@
- /* Define to 1 if you support file names longer than 14 characters. */
- #define HAVE_LONG_FILE_NAMES 1
-
-+/* Define if you have the getaddrinfo function.  */
-+#define HAVE_GETADDRINFO
-+
-+/* Define if you have the getgroups function.  */
-+#define HAVE_GETGROUPS
-+
-+/* Define if you have the getnameinfo function.  */
-+#define HAVE_GETNAMEINFO
-+
- /* Define if you have memchr (always for CVS). */
- #define HAVE_MEMCHR 1
-
diff --git a/devel/cvs+ipv6/pkg-descr b/devel/cvs+ipv6/pkg-descr
deleted file mode 100644
index a3916c2cc065..000000000000
--- a/devel/cvs+ipv6/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-CVS is a version control system.
-It fills a similar role to the free software RCS, PRCS, and Aegis packages.
diff --git a/devel/cvs+ipv6/pkg-plist b/devel/cvs+ipv6/pkg-plist
deleted file mode 100644
index 0ff97ca0a829..000000000000
--- a/devel/cvs+ipv6/pkg-plist
+++ /dev/null
@@ -1,23 +0,0 @@
-bin/cvs
-bin/cvsbug
-man/man1/cvs.1.gz
-man/man8/cvsbug.8.gz
-%%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
diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index cbb741cc304c..c88f37b2230b 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -2,18 +2,26 @@
 
 PORTNAME=	cvs
 PORTVERSION=	1.20120905
-PORTREVISION=	4
+PORTREVISION?=	4
 CATEGORIES=	devel
 MASTER_SITES=	LOCAL/eadler
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Version control system
+MAINTAINER?=	ports@FreeBSD.org
+COMMENT?=	Version control system
 
 LICENSE=	GPLv2 # or any later version
 
-OPTIONS_DEFINE=	KERBEROS EXAMPLES
+CONFLICTS_INSTALL?=	cvs+ipv6-[12]* cvs-devel-[12]*
+
+OPTIONS_DEFINE=	IPV6 KERBEROS EXAMPLES
 OPTIONS_DEFAULT=KERBEROS
+.if !make(makesum)
+OPTIONS_EXCLUDE?=IPV6
+.endif
 
+IPV6_CATEGORIES=	ipv6
+IPV6_PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/
+IPV6_PATCHFILES=	${DISTNAME}-v6-20140105.diff.gz:-p1
 KERBEROS_MAKE_ARGS=	KERBEROS_SUPPORT=yes
 
 USES=		makeinfo shebangfix tar:xz uidfix
@@ -22,6 +30,7 @@ SHEBANG_FILES=	contrib/clmerge contrib/cln_hist \
 		contrib/easy-import contrib/log \
 		contrib/log_accum contrib/mfpipe \
 		contrib/rcslock
+PATCH_WRKSRC=	${WRKDIR}/call/cvs
 WRKSRC=		${WRKDIR}/call/cvs-build
 INFO=		cvs cvsclient
 
diff --git a/devel/cvs/distinfo b/devel/cvs/distinfo
index 9da3b3d2353b..f461692216d4 100644
--- a/devel/cvs/distinfo
+++ b/devel/cvs/distinfo
@@ -1,2 +1,4 @@
 SHA256 (cvs-1.20120905.tar.xz) = 39f23fa6e574a060425737c893423af8f0682d694a7875a472fc0c06215e21bb
 SIZE (cvs-1.20120905.tar.xz) = 1413320
+SHA256 (cvs-1.20120905-v6-20140105.diff.gz) = 6fdb4a0342275bb5668877b7f08f557b6505d7dee390a41a108f491b9b93f84e
+SIZE (cvs-1.20120905-v6-20140105.diff.gz) = 6333
diff --git a/devel/cvs/files/patch-cvs.info.texinfo-5.x b/devel/cvs/files/patch-cvs.info.texinfo-5.x
index 5ce5044b92c6..ad920c450275 100644
--- a/devel/cvs/files/patch-cvs.info.texinfo-5.x
+++ b/devel/cvs/files/patch-cvs.info.texinfo-5.x
@@ -6,8 +6,8 @@ Subject: Make cvs.texinfo compatible with newer makeinfo (Closes: #711298)
 
 diff --git a/doc/cvs.texinfo b/doc/cvs.texinfo
 index a0136a5..d11a5e1 100644
---- ../cvs/doc/cvs.texinfo
-+++ ../cvs/doc/cvs.texinfo
+--- doc/cvs.texinfo
++++ doc/cvs.texinfo
 @@ -113,9 +113,9 @@ approved by the Free Software Foundation.
  @sp 4
  @comment The title is printed in a large font.
diff --git a/devel/cvs/files/patch-cvs__Makefile b/devel/cvs/files/patch-cvs__Makefile
index 490b16745d09..d2b0c67fbfe3 100644
--- a/devel/cvs/files/patch-cvs__Makefile
+++ b/devel/cvs/files/patch-cvs__Makefile
@@ -1,5 +1,5 @@
---- cvs/Makefile.orig	2012-09-06 06:25:43.000000000 +0400
-+++ cvs/Makefile	2014-07-15 12:37:28.000000000 +0400
+--- ../cvs-build/cvs/Makefile.orig	2012-09-06 06:25:43.000000000 +0400
++++ ../cvs-build/cvs/Makefile	2014-07-15 12:37:28.000000000 +0400
 @@ -32,7 +32,7 @@
  DPADD=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
  LDADD=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz