Attachment 155736 Details for Bug 199542 – option slave, v1

[patch] option slave, v1

ipv6_slave.diff (text/plain), 6.71 KB, created by Jan Beich on 2015-04-19 15:20:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2015-04-19 15:20:35 UTC

Size: 6.71 KB

patch

obsolete

>Index: devel/cvs/Makefile
>===================================================================
>--- devel/cvs/Makefile	(revision 384063)
>+++ devel/cvs/Makefile	(working copy)
>@@ -2,21 +2,30 @@
> 
> PORTNAME=	cvs
> PORTVERSION=	1.20120905
>-PORTREVISION=	3
>+PORTREVISION?=	3
> 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?=	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 tar:xz uidfix
>+PATCH_WRKSRC=	${WRKDIR}/call/cvs
> WRKSRC=		${WRKDIR}/call/cvs-build
> INFO=		cvs cvsclient
> 
>Index: devel/cvs/distinfo
>===================================================================
>--- devel/cvs/distinfo	(revision 384059)
>+++ devel/cvs/distinfo	(working copy)
>@@ -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
>Index: devel/cvs/files/patch-cvs.info.texinfo-5.x
>===================================================================
>--- devel/cvs/files/patch-cvs.info.texinfo-5.x	(revision 384063)
>+++ devel/cvs/files/patch-cvs.info.texinfo-5.x	(working copy)
>@@ -6,8 +6,8 @@ Subject: Make cvs.texinfo compatible with newer ma
> 
> 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.
>Index: devel/cvs/files/patch-cvs__Makefile
>===================================================================
>--- devel/cvs/files/patch-cvs__Makefile	(revision 384063)
>+++ devel/cvs/files/patch-cvs__Makefile	(working copy)
>@@ -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
>Index: devel/cvs+ipv6/Makefile
>===================================================================
>--- devel/cvs+ipv6/Makefile	(revision 384290)
>+++ devel/cvs+ipv6/Makefile	(working copy)
>@@ -1,39 +1,16 @@
> # $FreeBSD$
> 
>-PORTNAME=	cvs
>-PORTVERSION=	1.20120905
>-PORTREVISION=	1
>-CATEGORIES=	devel ipv6
>-MASTER_SITES=	LOCAL/eadler
>+PORTREVISION=	2
> 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
>+CONFLICTS=	cvs-[12]* cvs-devel-[12]*
> 
>-USES=		makeinfo tar:xz uidfix
>-PATCHDIR=	${WRKDIR}/call/cvs-build
>-WRKSRC=		${WRKDIR}/call/cvs-build
>-INFO=		cvs cvsclient
>+OPTIONS_SLAVE=	IPV6
>+OPTIONS_EXCLUDE= # empty
> 
>-# bsd.stage.makes sets the wrong value for DESTDIR
>-DESTDIRNAME=	NADA
>-MAKE_ARGS=	DESTDIR=${STAGEDIR}${PREFIX}
>+MASTERDIR=	${.CURDIR}/../cvs
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${OSVERSION} < 900000
>-BROKEN=	does not link
>-.endif
>-
>-pre-install:
>-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib
>-
>-.include <bsd.port.post.mk>
>+.include "${MASTERDIR}/Makefile"
>Index: devel/cvs+ipv6/distinfo
>===================================================================
>--- devel/cvs+ipv6/distinfo	(revision 384290)
>+++ devel/cvs+ipv6/distinfo	(working copy)
>@@ -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
>Index: devel/cvs+ipv6/files/patch-lib-config.h.proto
>===================================================================
>--- devel/cvs+ipv6/files/patch-lib-config.h.proto	(revision 384290)
>+++ devel/cvs+ipv6/files/patch-lib-config.h.proto	(working copy)
>@@ -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
>-
>Index: devel/cvs+ipv6/pkg-descr
>===================================================================
>--- devel/cvs+ipv6/pkg-descr	(revision 384290)
>+++ devel/cvs+ipv6/pkg-descr	(working copy)
>@@ -1,2 +0,0 @@
>-CVS is a version control system.
>-It fills a similar role to the free software RCS, PRCS, and Aegis packages.
>Index: devel/cvs+ipv6/pkg-plist
>===================================================================
>--- devel/cvs+ipv6/pkg-plist	(revision 384290)
>+++ devel/cvs+ipv6/pkg-plist	(working copy)
>@@ -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

Flags:

jbeich: maintainer-approval? (sumikawa)

Actions: View | Diff

Attachments on bug 199542: 155729 | 155730 | 155731 | 155734 | 155735 | 155736