Date: Sat, 12 Sep 2015 00:11:54 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396729 - in head/devel: cvs cvs+ipv6 cvs+ipv6/files cvs/files Message-ID: <201509120011.t8C0BsL8025887@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat Sep 12 00:11:54 2015 New Revision: 396729 URL: https://svnweb.freebsd.org/changeset/ports/396729 Log: 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 Deleted: head/devel/cvs+ipv6/distinfo head/devel/cvs+ipv6/files/ head/devel/cvs+ipv6/pkg-descr head/devel/cvs+ipv6/pkg-plist Modified: head/devel/cvs+ipv6/Makefile head/devel/cvs/Makefile head/devel/cvs/distinfo head/devel/cvs/files/patch-cvs.info.texinfo-5.x head/devel/cvs/files/patch-cvs__Makefile Modified: head/devel/cvs+ipv6/Makefile ============================================================================== --- head/devel/cvs+ipv6/Makefile Sat Sep 12 00:11:06 2015 (r396728) +++ head/devel/cvs+ipv6/Makefile Sat Sep 12 00:11:54 2015 (r396729) @@ -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 +CONFLICTS_INSTALL= cvs-[12]* cvs-devel-[12]* -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 - -# 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" Modified: head/devel/cvs/Makefile ============================================================================== --- head/devel/cvs/Makefile Sat Sep 12 00:11:06 2015 (r396728) +++ head/devel/cvs/Makefile Sat Sep 12 00:11:54 2015 (r396729) @@ -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 -OPTIONS_DEFAULT=KERBEROS +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/c 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 Modified: head/devel/cvs/distinfo ============================================================================== --- head/devel/cvs/distinfo Sat Sep 12 00:11:06 2015 (r396728) +++ head/devel/cvs/distinfo Sat Sep 12 00:11:54 2015 (r396729) @@ -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 Modified: head/devel/cvs/files/patch-cvs.info.texinfo-5.x ============================================================================== --- head/devel/cvs/files/patch-cvs.info.texinfo-5.x Sat Sep 12 00:11:06 2015 (r396728) +++ head/devel/cvs/files/patch-cvs.info.texinfo-5.x Sat Sep 12 00:11:54 2015 (r396729) @@ -6,8 +6,8 @@ Subject: Make cvs.texinfo compatible wit 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. Modified: head/devel/cvs/files/patch-cvs__Makefile ============================================================================== --- head/devel/cvs/files/patch-cvs__Makefile Sat Sep 12 00:11:06 2015 (r396728) +++ head/devel/cvs/files/patch-cvs__Makefile Sat Sep 12 00:11:54 2015 (r396729) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509120011.t8C0BsL8025887>