Attachment #155729 for bug #199542

Lines 2-22 Link Here

(-)devel/cvs/Makefile (-4 / +13 lines)
2		2
3	PORTNAME= cvs	3	PORTNAME= cvs
4	PORTVERSION= 1.20120905	4	PORTVERSION= 1.20120905
5	PORTREVISION= 3	5	PORTREVISION?= 3
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= LOCAL/eadler	7	MASTER_SITES= LOCAL/eadler
8		8
9	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER?= ports@FreeBSD.org
10	COMMENT= Version control system	10	COMMENT?= Version control system
11		11
12	LICENSE= GPLv2 # or any later version	12	LICENSE= GPLv2 # or any later version
13		13
14	OPTIONS_DEFINE= KERBEROS EXAMPLES	14	CONFLICTS?= cvs+ipv6-[12]* cvs-devel-[12]*
		15
		16	OPTIONS_DEFINE= IPV6 KERBEROS EXAMPLES
15	OPTIONS_DEFAULT=KERBEROS	17	OPTIONS_DEFAULT=KERBEROS
		18	.if !make(makesum)
		19	OPTIONS_EXCLUDE?=IPV6
		20	.endif
16		21
		22	IPV6_CATEGORIES= ipv6
		23	IPV6_PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/
		24	IPV6_PATCHFILES= ${DISTNAME}-v6-20140105.diff.gz:-p1
17	KERBEROS_MAKE_ARGS= KERBEROS_SUPPORT=yes	25	KERBEROS_MAKE_ARGS= KERBEROS_SUPPORT=yes
18		26
19	USES= makeinfo tar:xz uidfix	27	USES= makeinfo tar:xz uidfix
		28	PATCH_WRKSRC= ${WRKDIR}/call/cvs
20	WRKSRC= ${WRKDIR}/call/cvs-build	29	WRKSRC= ${WRKDIR}/call/cvs-build
21	INFO= cvs cvsclient	30	INFO= cvs cvsclient
22		31

Lines 1-2 Link Here

(-)devel/cvs/distinfo (+2 lines)
1	SHA256 (cvs-1.20120905.tar.xz) = 39f23fa6e574a060425737c893423af8f0682d694a7875a472fc0c06215e21bb	1	SHA256 (cvs-1.20120905.tar.xz) = 39f23fa6e574a060425737c893423af8f0682d694a7875a472fc0c06215e21bb
2	SIZE (cvs-1.20120905.tar.xz) = 1413320	2	SIZE (cvs-1.20120905.tar.xz) = 1413320
		3	SHA256 (cvs-1.20120905-v6-20140105.diff.gz) = 6fdb4a0342275bb5668877b7f08f557b6505d7dee390a41a108f491b9b93f84e
		4	SIZE (cvs-1.20120905-v6-20140105.diff.gz) = 6333

Lines 6-13 Subject: Make cvs.texinfo compatible with newer ma Link Here

(-)devel/cvs/files/patch-cvs.info.texinfo-5.x (-2 / +2 lines)
6		6
7	diff --git a/doc/cvs.texinfo b/doc/cvs.texinfo	7	diff --git a/doc/cvs.texinfo b/doc/cvs.texinfo
8	index a0136a5..d11a5e1 100644	8	index a0136a5..d11a5e1 100644
9	--- ../cvs/doc/cvs.texinfo	9	--- doc/cvs.texinfo
10	+++ ../cvs/doc/cvs.texinfo	10	+++ doc/cvs.texinfo
11	@@ -113,9 +113,9 @@ approved by the Free Software Foundation.	11	@@ -113,9 +113,9 @@ approved by the Free Software Foundation.
12	@sp 4	12	@sp 4
13	@comment The title is printed in a large font.	13	@comment The title is printed in a large font.

Lines 1-5 Link Here

(-)devel/cvs/files/patch-cvs__Makefile (-2 / +2 lines)
1	--- cvs/Makefile.orig 2012-09-06 06:25:43.000000000 +0400	1	--- ../cvs-build/cvs/Makefile.orig 2012-09-06 06:25:43.000000000 +0400
2	+++ cvs/Makefile 2014-07-15 12:37:28.000000000 +0400	2	+++ ../cvs-build/cvs/Makefile 2014-07-15 12:37:28.000000000 +0400
3	@@ -32,7 +32,7 @@	3	@@ -32,7 +32,7 @@
4	DPADD= ${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}	4	DPADD= ${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
5	LDADD= ${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz	5	LDADD= ${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz




--- ../cvs-build/lib/config.h.proto-	2014-01-05 14:36:51.665354819 +0900
+++ ../cvs-build/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 to 1 if you have the `krb' library (-lkrb). */
 /* #undef HAVE_LIBKRB */

@@ -189,5 +192,11 @@
 /* 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
+




# $FreeBSD$

PORTREVISION=	2
PORTVERSION=	1.20120905
PORTREVISION=	1
CATEGORIES=	devel ipv6
MASTER_SITES=	LOCAL/eadler
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=	cvs-[12]* cvs-devel-[12]*
LICENSE=	GPLv2

OPTIONS_SLAVE=	IPV6
OPTIONS_EXCLUDE= # empty
WRKSRC=		${WRKDIR}/call/cvs-build
INFO=		cvs cvsclient

MASTERDIR=	${.CURDIR}/../cvs
DESTDIRNAME=	NADA
MAKE_ARGS=	DESTDIR=${STAGEDIR}${PREFIX}

.include "${MASTERDIR}/Makefile"

.if ${OSVERSION} < 900000
BROKEN=	does not link
.endif

pre-install:
	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib

.include <bsd.port.post.mk>

Lines 1-4 Link Here

(-)devel/cvs+ipv6/distinfo (-4 lines)
1	SHA256 (cvs-1.20120905.tar.xz) = 39f23fa6e574a060425737c893423af8f0682d694a7875a472fc0c06215e21bb
2	SIZE (cvs-1.20120905.tar.xz) = 1413320
3	SHA256 (cvs-1.20120905-v6-20140105.diff.gz) = 6fdb4a0342275bb5668877b7f08f557b6505d7dee390a41a108f491b9b93f84e
4	SIZE (cvs-1.20120905-v6-20140105.diff.gz) = 6333




--- 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


Lines 1-2 Link Here

(-)devel/cvs+ipv6/pkg-descr (-2 lines)
1	CVS is a version control system.
2	It fills a similar role to the free software RCS, PRCS, and Aegis packages.




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

Return to bug 199542

Lines 1-5 Link Here

(-)devel/cvs/files/patch-lib-config.h.proto (-6 / +3 lines)
1	--- lib/config.h.proto- 2014-01-05 14:36:51.665354819 +0900	1	--- ../cvs-build/lib/config.h.proto- 2014-01-05 14:36:51.665354819 +0900
2	+++ lib/config.h.proto 2014-01-05 14:38:44.557348262 +0900	2	+++ ../cvs-build/lib/config.h.proto 2014-01-05 14:38:44.557348262 +0900
3	@@ -168,6 +168,9 @@	3	@@ -168,6 +168,9 @@
4	/* Define to 1 if you have the `krb_get_err_text' function. */	4	/* Define to 1 if you have the `krb_get_err_text' function. */
5	/* #undef HAVE_KRB_GET_ERR_TEXT */	5	/* #undef HAVE_KRB_GET_ERR_TEXT */
Lines 10-16 Link Here
10	/* Define to 1 if you have the `krb' library (-lkrb). */	10	/* Define to 1 if you have the `krb' library (-lkrb). */
11	/* #undef HAVE_LIBKRB */	11	/* #undef HAVE_LIBKRB */
12		12
13	@@ -189,6 +192,15 @@	13	@@ -189,5 +192,11 @@
14	/* Define to 1 if you support file names longer than 14 characters. */	14	/* Define to 1 if you support file names longer than 14 characters. */
15	#define HAVE_LONG_FILE_NAMES 1	15	#define HAVE_LONG_FILE_NAMES 1
16		16
Lines 17-25 Link Here
17	+/* Define if you have the getaddrinfo function. */	17	+/* Define if you have the getaddrinfo function. */
18	+#define HAVE_GETADDRINFO	18	+#define HAVE_GETADDRINFO
19	+	19	+
20	+/* Define if you have the getgroups function. */
21	+#define HAVE_GETGROUPS
22	+
23	+/* Define if you have the getnameinfo function. */	20	+/* Define if you have the getnameinfo function. */
24	+#define HAVE_GETNAMEINFO	21	+#define HAVE_GETNAMEINFO
25	+	22	+

Lines 1-39 Link Here

(-)devel/cvs+ipv6/Makefile (-29 / +6 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= cvs	3	PORTREVISION= 2
4	PORTVERSION= 1.20120905
5	PORTREVISION= 1
6	CATEGORIES= devel ipv6
7	MASTER_SITES= LOCAL/eadler
8	PKGNAMESUFFIX= +ipv6	4	PKGNAMESUFFIX= +ipv6
9		5
10	PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/
11	PATCHFILES= ${DISTNAME}-v6-20140105.diff.gz
12	PATCH_WRKSRC= ${WRKDIR}/call/cvs
13	PATCH_DIST_STRIP= -p1
14
15	MAINTAINER= sumikawa@FreeBSD.org	6	MAINTAINER= sumikawa@FreeBSD.org
16	COMMENT= IPv6 enabled cvs. You can use IPv6 connection when using pserver	7	COMMENT= IPv6 enabled cvs. You can use IPv6 connection when using pserver
17		8
18	CONFLICTS= cvsnt-[12]* cvs-devel-[12]*	9	CONFLICTS= cvs-[12]* cvs-devel-[12]*
19	LICENSE= GPLv2
20		10
21	USES= makeinfo tar:xz uidfix	11	OPTIONS_SLAVE= IPV6
22	PATCHDIR= ${WRKDIR}/call/cvs-build	12	OPTIONS_EXCLUDE= # empty
23	WRKSRC= ${WRKDIR}/call/cvs-build
24	INFO= cvs cvsclient
25		13
26	# bsd.stage.makes sets the wrong value for DESTDIR	14	MASTERDIR= ${.CURDIR}/../cvs
27	DESTDIRNAME= NADA
28	MAKE_ARGS= DESTDIR=${STAGEDIR}${PREFIX}
29		15
30	.include <bsd.port.pre.mk>	16	.include "${MASTERDIR}/Makefile"
31
32	.if ${OSVERSION} < 900000
33	BROKEN= does not link
34	.endif
35
36	pre-install:
37	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib
38
39	.include <bsd.port.post.mk>

Lines 1-28 Link Here

(-)devel/cvs+ipv6/files/patch-lib-config.h.proto (-28 lines)
1	--- lib/config.h.proto- 2014-01-05 14:36:51.665354819 +0900
2	+++ lib/config.h.proto 2014-01-05 14:38:44.557348262 +0900
3	@@ -168,6 +168,9 @@
4	/* Define to 1 if you have the `krb_get_err_text' function. */
5	/* #undef HAVE_KRB_GET_ERR_TEXT */
6
7	+/* Define if IPv6 is supported. */
8	+#define ENABLE_IPV6
9	+
10	/* Define to 1 if you have the `krb' library (-lkrb). */
11	/* #undef HAVE_LIBKRB */
12
13	@@ -189,6 +192,15 @@
14	/* Define to 1 if you support file names longer than 14 characters. */
15	#define HAVE_LONG_FILE_NAMES 1
16
17	+/* Define if you have the getaddrinfo function. */
18	+#define HAVE_GETADDRINFO
19	+
20	+/* Define if you have the getgroups function. */
21	+#define HAVE_GETGROUPS
22	+
23	+/* Define if you have the getnameinfo function. */
24	+#define HAVE_GETNAMEINFO
25	+
26	/* Define if you have memchr (always for CVS). */
27	#define HAVE_MEMCHR 1
28

Lines 1-23 Link Here

(-)devel/cvs+ipv6/pkg-plist (-23 lines)
1	bin/cvs
2	bin/cvsbug
3	man/man1/cvs.1.gz
4	man/man8/cvsbug.8.gz
5	%%EXAMPLESDIR%%/contrib/README
6	%%EXAMPLESDIR%%/contrib/clmerge
7	%%EXAMPLESDIR%%/contrib/cln_hist
8	%%EXAMPLESDIR%%/contrib/commit_prep
9	%%EXAMPLESDIR%%/contrib/cvs2vendor
10	%%EXAMPLESDIR%%/contrib/cvs_acls
11	%%EXAMPLESDIR%%/contrib/cvscheck
12	%%EXAMPLESDIR%%/contrib/intro.doc
13	%%EXAMPLESDIR%%/contrib/log
14	%%EXAMPLESDIR%%/contrib/log_accum
15	%%EXAMPLESDIR%%/contrib/mfpipe
16	%%EXAMPLESDIR%%/contrib/rcs-to-cvs
17	%%EXAMPLESDIR%%/contrib/rcslock
18	%%EXAMPLESDIR%%/contrib/sccs2rcs
19	%%EXAMPLESDIR%%/contrib/rcs2log
20	%%EXAMPLESDIR%%/contrib/easy-import
21	%%EXAMPLESDIR%%/contrib/cvscheck.man
22	%%EXAMPLESDIR%%/contrib/cvshelp.man
23	%%EXAMPLESDIR%%/contrib/descend.man