From owner-svn-ports-head@FreeBSD.ORG Sun Jan 5 05:55:50 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6CB32E3F; Sun, 5 Jan 2014 05:55:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 57E3112CD; Sun, 5 Jan 2014 05:55:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s055toVC010562; Sun, 5 Jan 2014 05:55:50 GMT (envelope-from sumikawa@svn.freebsd.org) Received: (from sumikawa@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s055tngY010557; Sun, 5 Jan 2014 05:55:49 GMT (envelope-from sumikawa@svn.freebsd.org) Message-Id: <201401050555.s055tngY010557@svn.freebsd.org> From: Munechika SUMIKAWA Date: Sun, 5 Jan 2014 05:55:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338747 - in head/devel/cvs+ipv6: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Jan 2014 05:55:50 -0000 Author: sumikawa Date: Sun Jan 5 05:55:48 2014 New Revision: 338747 URL: http://svnweb.freebsd.org/changeset/ports/338747 Log: Sync with devel/cvs and apply latest IPv6 patch. Added: head/devel/cvs+ipv6/files/patch-lib-config.h.proto (contents, props changed) Deleted: head/devel/cvs+ipv6/files/missing head/devel/cvs+ipv6/files/patch-contrib-Makefile.in head/devel/cvs+ipv6/files/patch-freebsdlocal head/devel/cvs+ipv6/files/patch-lib-Makefile.in head/devel/cvs+ipv6/files/patch-src-Makefile.in Modified: head/devel/cvs+ipv6/Makefile head/devel/cvs+ipv6/distinfo head/devel/cvs+ipv6/pkg-descr head/devel/cvs+ipv6/pkg-plist Modified: head/devel/cvs+ipv6/Makefile ============================================================================== --- head/devel/cvs+ipv6/Makefile Sun Jan 5 05:52:23 2014 (r338746) +++ head/devel/cvs+ipv6/Makefile Sun Jan 5 05:55:48 2014 (r338747) @@ -1,63 +1,39 @@ -# Created by: sumikawa # $FreeBSD$ PORTNAME= cvs -PORTVERSION= 1.11.17 -PORTREVISION= 1 +PORTVERSION= 1.20120905 CATEGORIES= devel ipv6 -MASTER_SITES= ${MASTER_SITE_GNU} -MASTER_SITE_SUBDIR= non-gnu/${PORTNAME}/source/stable/${PORTVERSION} +MASTER_SITES= LOCAL/eadler PKGNAMESUFFIX= +ipv6 PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ -PATCHFILES= ${DISTNAME}-v6-20040610.diff.gz +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 -GNU_CONFIGURE= yes -USE_BZIP2= yes -CONFIGURE_ARGS= --enable-ipv6 --without-gssapi \ - --with-editor="vi" \ - --with-tmpdir="/tmp" - -MAN1= cvs.1 -MAN5= cvs.5 -MAN8= cvsbug.8 +USES= uidfix +PATCHDIR= ${WRKDIR}/call/cvs-build +WRKSRC= ${WRKDIR}/call/cvs-build +USE_XZ= yes INFO= cvs cvsclient -CVS_SITE?= :pserver:anoncvs@anoncvs.jp.FreeBSD.org:/home/ncvs -CVS_VER?= v${PORTVERSION:S/./_/g} +# bsd.stage.makes sets the wrong value for DESTDIR +DESTDIRNAME= NADA +MAKE_ARGS= DESTDIR=${STAGEDIR}${PREFIX} -NO_STAGE= yes -post-patch: - ${REINPLACE_CMD} 's/${PORTVERSION:S/./\./g}/&+IPv6/g' ${WRKSRC}/configure - @${CP} ${FILESDIR}/missing ${WRKSRC} - -replace: -.for f in cvs cvsbug - ${MV} /usr/bin/${f} /usr/bin/${f}.orig - ${CP} -p ${PREFIX}/bin/${f} /usr/bin/ -.endfor - -generate-patch: - cvs -R -d ${CVS_SITE} rdiff -u -r ${CVS_VER} -r HEAD \ - src/contrib/cvs \ - | ${SED} \ - -e 's,^\+\+\+ src/contrib/cvs/,+++ ,' \ - -e 's,^Index: src/contrib/cvs/,Index: ,' \ - -e 's,\$$FreeBSD: ,FreeBSD: ,' \ - > ${FILESDIR}/patch-freebsdlocal - cvs -R -d ${CVS_SITE} rdiff -u -D 1999-12-01 -r HEAD \ - gnu/usr.bin/cvs/cvs/prepend_args.c \ - gnu/usr.bin/cvs/cvs/prepend_args.h \ - | ${SED} \ - -e 's,^\+\+\+ src/gnu/usr.bin/cvs/cvs/,+++ src/,' \ - -e 's,^Index: src/gnu/usr.bin/cvs/cvs/,Index: src/,' \ - -e 's,\$$FreeBSD: ,FreeBSD: ,' \ - >> ${FILESDIR}/patch-freebsdlocal +.include -.include +.if ${OSVERSION} < 900000 +BROKEN= does not link +.endif + +pre-install: + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib + +.include Modified: head/devel/cvs+ipv6/distinfo ============================================================================== --- head/devel/cvs+ipv6/distinfo Sun Jan 5 05:52:23 2014 (r338746) +++ head/devel/cvs+ipv6/distinfo Sun Jan 5 05:55:48 2014 (r338747) @@ -1,4 +1,4 @@ -SHA256 (cvs-1.11.17.tar.bz2) = a5486a3224140e7bd94ba77c5f690da8142fa9ee241e1a75612d6228c459e97e -SIZE (cvs-1.11.17.tar.bz2) = 2343366 -SHA256 (cvs-1.11.17-v6-20040610.diff.gz) = 16aa61329485fbd94c3a2c117e49ee99612f5f0281e9a85c13c22349e39eed11 -SIZE (cvs-1.11.17-v6-20040610.diff.gz) = 12807 +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 Added: head/devel/cvs+ipv6/files/patch-lib-config.h.proto ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/cvs+ipv6/files/patch-lib-config.h.proto Sun Jan 5 05:55:48 2014 (r338747) @@ -0,0 +1,28 @@ +--- 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 + Modified: head/devel/cvs+ipv6/pkg-descr ============================================================================== --- head/devel/cvs+ipv6/pkg-descr Sun Jan 5 05:52:23 2014 (r338746) +++ head/devel/cvs+ipv6/pkg-descr Sun Jan 5 05:55:48 2014 (r338747) @@ -1,3 +1,2 @@ -IPv6 enabled cvs. You can use IPv6 connection when using pserver. - -WWW: http://www.cvshome.org/ +CVS is a version control system. +It fills a similar role to the free software RCS, PRCS, and Aegis packages. Modified: head/devel/cvs+ipv6/pkg-plist ============================================================================== --- head/devel/cvs+ipv6/pkg-plist Sun Jan 5 05:52:23 2014 (r338746) +++ head/devel/cvs+ipv6/pkg-plist Sun Jan 5 05:55:48 2014 (r338747) @@ -1,24 +1,26 @@ bin/cvs bin/cvsbug -bin/rcs2log -share/cvs/contrib/README -share/cvs/contrib/check_cvs -share/cvs/contrib/clmerge -share/cvs/contrib/cln_hist -share/cvs/contrib/commit_prep -share/cvs/contrib/cvs2vendor -share/cvs/contrib/cvs_acls -share/cvs/contrib/cvscheck -share/cvs/contrib/cvscheck.man -share/cvs/contrib/debug_check_log -share/cvs/contrib/intro.doc -share/cvs/contrib/log -share/cvs/contrib/log_accum -share/cvs/contrib/mfpipe -share/cvs/contrib/pvcs2rcs -share/cvs/contrib/rcs-to-cvs -share/cvs/contrib/rcs2log -share/cvs/contrib/rcslock -share/cvs/contrib/sccs2rcs -@dirrm share/cvs/contrib -@dirrm share/cvs +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 +@exec mkdir -p %%EXAMPLESDIR%%/contrib +@dirrm %%EXAMPLESDIR%%/contrib +@dirrm %%EXAMPLESDIR%%