Index: head/devel/cvs/Makefile
===================================================================
--- head/devel/cvs/Makefile	(revision 560032)
+++ head/devel/cvs/Makefile	(revision 560033)
@@ -1,53 +1,53 @@
 # $FreeBSD$
 
 PORTNAME=	cvs
 PORTVERSION=	1.20120905
-PORTREVISION?=	6
+PORTREVISION?=	7
 CATEGORIES=	devel
 MASTER_SITES=	LOCAL/eadler
 
 MAINTAINER?=	schaiba@gmail.com
 COMMENT?=	Version control system
 
 LICENSE=	GPLv2+
 
 USES=		cpe shebangfix tar:xz uidfix
 
 CONFLICTS_INSTALL?=	cvs+ipv6-[12]* cvs-devel-[12]*
 
 OPTIONS_DEFINE=	INFO IPV6 KERBEROS EXAMPLES
 OPTIONS_DEFAULT=INFO KERBEROS
 .if !make(makesum)
 OPTIONS_EXCLUDE?=IPV6
 .endif
 
 INFO_INFO=		cvs cvsclient
 INFO_USES=		makeinfo
 IPV6_PATCH_SITES=	LOCAL/ume
 IPV6_PATCHFILES=	${DISTNAME}-v6-20140105.diff.gz:-p1
 KERBEROS_MAKE_ARGS=	KERBEROS_SUPPORT=yes
 
 CPE_VENDOR=	gnu
 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
 
 # bsd.stage.makes sets the wrong value for DESTDIR
 DESTDIRNAME=	NADA
 MAKE_ARGS=	DESTDIR=${STAGEDIR}${PREFIX}
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,/info/,/${INFO_PATH}/,g" ${WRKSRC}/Makefile.inc
 .if !${PORT_OPTIONS:MINFO}
 	@${REINPLACE_CMD} -e "s,doc,,g" ${WRKSRC}/Makefile
 .endif
 pre-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib
 
 .include <bsd.port.mk>
Index: head/devel/cvs/files/patch-cvs__Makefile
===================================================================
--- head/devel/cvs/files/patch-cvs__Makefile	(revision 560032)
+++ head/devel/cvs/files/patch-cvs__Makefile	(revision 560033)
@@ -1,11 +1,16 @@
---- ../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
+--- ../cvs-build/cvs/Makefile.orig	2012-09-05 19:25:43.000000000 -0700
++++ ../cvs-build/cvs/Makefile	2021-01-02 17:11:22.159883000 -0800
+@@ -29,10 +29,10 @@
+ 	 -I/usr/include/gnu \
+ 	 -I${CVSDIR}/lib -I${CVSDIR}/diff -I.
+ 
+-DPADD=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
+-LDADD=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
++DPADD=	${LIBCVS} ${LIBDIFF} ${LIBMD} ${LIBCRYPT} ${LIBZ}
++LDADD=	${LIBCVS} ${LIBDIFF} -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/files/patch-cvs__lib_Makefile
===================================================================
--- head/devel/cvs/files/patch-cvs__lib_Makefile	(nonexistent)
+++ head/devel/cvs/files/patch-cvs__lib_Makefile	(revision 560033)
@@ -0,0 +1,22 @@
+--- ../cvs-build/lib/Makefile.orig	2012-09-05 19:19:41.000000000 -0700
++++ ../cvs-build/lib/Makefile	2021-01-02 17:10:09.173277000 -0800
+@@ -11,9 +11,7 @@
+ LIB=		cvs
+ INTERNALLIB=
+ 
+-# gnu must be before lib to pick correct regex.h
+-CFLAGS+= -I. -I${CVSDIR}/src -I/usr/include/gnu \
+-	 -I${CVSDIR}/lib
++CFLAGS+= -I. -I${CVSDIR}/src -I${CVSDIR}/lib
+ CFLAGS+= -DHAVE_CONFIG_H
+ YFLAGS=
+ CLEANFILES+=	config.h
+@@ -23,7 +21,7 @@
+ CVS_TMPDIR_DFLT?=	/tmp
+ 
+ SRCS=	config.h argmatch.c getdate.y getline.c \
+-	getopt.c getopt1.c savecwd.c \
++	getopt.c getopt1.c regex.c savecwd.c \
+ 	sighandle.c stripslash.c \
+ 	xgetwd.c yesno.c
+ 

Property changes on: head/devel/cvs/files/patch-cvs__lib_Makefile
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property