Index: head/devel/cvs/Makefile =================================================================== --- head/devel/cvs/Makefile (revision 396728) +++ head/devel/cvs/Makefile (revision 396729) @@ -1,35 +1,44 @@ # $FreeBSD$ 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 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 +PATCH_WRKSRC= ${WRKDIR}/call/cvs WRKSRC= ${WRKDIR}/call/cvs-build INFO= cvs cvsclient # bsd.stage.makes sets the wrong value for DESTDIR DESTDIRNAME= NADA MAKE_ARGS= DESTDIR=${STAGEDIR}${PREFIX} pre-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib .include Index: head/devel/cvs/distinfo =================================================================== --- head/devel/cvs/distinfo (revision 396728) +++ head/devel/cvs/distinfo (revision 396729) @@ -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: head/devel/cvs/files/patch-cvs.info.texinfo-5.x =================================================================== --- head/devel/cvs/files/patch-cvs.info.texinfo-5.x (revision 396728) +++ head/devel/cvs/files/patch-cvs.info.texinfo-5.x (revision 396729) @@ -1,22 +1,22 @@ From 6733b1455f97531bace80bf7118dc644fe73fd3d Mon Sep 17 00:00:00 2001 From: tg Date: Wed, 26 Jun 2013 18:15:51 +0000 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. @center @titlefont{Version Management} -@sp +@sp 1 @center @titlefont{with} -@sp +@sp 1 @center @titlefont{CVS} @sp 2 @center for @sc{cvs} @value{VERSION} Index: head/devel/cvs/files/patch-cvs__Makefile =================================================================== --- head/devel/cvs/files/patch-cvs__Makefile (revision 396728) +++ head/devel/cvs/files/patch-cvs__Makefile (revision 396729) @@ -1,11 +1,11 @@ ---- 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 -.if ${MK_KERBEROS_SUPPORT} != "no" +.if defined(KERBEROS_SUPPORT) CFLAGS+= -DHAVE_GSSAPI -DENCRYPTION LDADD+= -lgssapi -lkrb5 -lhx509 -lasn1 -lcrypto -lroken -lcrypt -lcom_err DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCRYPTO} ${LIBROKEN} Index: head/devel/cvs+ipv6/pkg-descr =================================================================== --- head/devel/cvs+ipv6/pkg-descr (revision 396728) +++ head/devel/cvs+ipv6/pkg-descr (nonexistent) @@ -1,2 +0,0 @@ -CVS is a version control system. -It fills a similar role to the free software RCS, PRCS, and Aegis packages. Property changes on: head/devel/cvs+ipv6/pkg-descr ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/cvs+ipv6/distinfo =================================================================== --- head/devel/cvs+ipv6/distinfo (revision 396728) +++ head/devel/cvs+ipv6/distinfo (nonexistent) @@ -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 Property changes on: head/devel/cvs+ipv6/distinfo ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/cvs+ipv6/pkg-plist =================================================================== --- head/devel/cvs+ipv6/pkg-plist (revision 396728) +++ head/devel/cvs+ipv6/pkg-plist (nonexistent) @@ -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 Property changes on: head/devel/cvs+ipv6/pkg-plist ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/cvs+ipv6/files/patch-lib-config.h.proto =================================================================== --- head/devel/cvs+ipv6/files/patch-lib-config.h.proto (revision 396728) +++ head/devel/cvs+ipv6/files/patch-lib-config.h.proto (nonexistent) @@ -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 - Property changes on: head/devel/cvs+ipv6/files/patch-lib-config.h.proto ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/cvs+ipv6/Makefile =================================================================== --- head/devel/cvs+ipv6/Makefile (revision 396728) +++ head/devel/cvs+ipv6/Makefile (revision 396729) @@ -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 +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 -pre-install: - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib - -.include +.include "${MASTERDIR}/Makefile"