From owner-svn-ports-branches@freebsd.org Sun Jan 3 19:22:38 2021 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8D73E4DAE2D; Sun, 3 Jan 2021 19:22:38 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D87v23bnsz3qpv; Sun, 3 Jan 2021 19:22:38 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6E1C04F2D; Sun, 3 Jan 2021 19:22:38 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 103JMcfQ066508; Sun, 3 Jan 2021 19:22:38 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 103JMbkH066505; Sun, 3 Jan 2021 19:22:37 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <202101031922.103JMbkH066505@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Sun, 3 Jan 2021 19:22:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r560034 - in branches/2021Q1/devel/cvs: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: in branches/2021Q1/devel/cvs: . files X-SVN-Commit-Revision: 560034 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jan 2021 19:22:38 -0000 Author: delphij Date: Sun Jan 3 19:22:37 2021 New Revision: 560034 URL: https://svnweb.freebsd.org/changeset/ports/560034 Log: MFH: r560033 devel/cvs: remove libgnuregex dependency. The only usage of regular expression in cvs was in import.c, and for that particular usage, no GNU extension was used; with the removal of libgnuregex, we could just drop the dependency and use the base system regex(3) instead. This fixes build on -CURRENT. PR: 252248 Approved by: portmgr (build fix blanket) Added: branches/2021Q1/devel/cvs/files/patch-cvs__lib_Makefile - copied unchanged from r560033, head/devel/cvs/files/patch-cvs__lib_Makefile Modified: branches/2021Q1/devel/cvs/Makefile branches/2021Q1/devel/cvs/files/patch-cvs__Makefile Directory Properties: branches/2021Q1/ (props changed) Modified: branches/2021Q1/devel/cvs/Makefile ============================================================================== --- branches/2021Q1/devel/cvs/Makefile Sun Jan 3 19:21:21 2021 (r560033) +++ branches/2021Q1/devel/cvs/Makefile Sun Jan 3 19:22:37 2021 (r560034) @@ -2,7 +2,7 @@ PORTNAME= cvs PORTVERSION= 1.20120905 -PORTREVISION?= 6 +PORTREVISION?= 7 CATEGORIES= devel MASTER_SITES= LOCAL/eadler Modified: branches/2021Q1/devel/cvs/files/patch-cvs__Makefile ============================================================================== --- branches/2021Q1/devel/cvs/files/patch-cvs__Makefile Sun Jan 3 19:21:21 2021 (r560033) +++ branches/2021Q1/devel/cvs/files/patch-cvs__Makefile Sun Jan 3 19:22:37 2021 (r560034) @@ -1,8 +1,13 @@ ---- ../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) Copied: branches/2021Q1/devel/cvs/files/patch-cvs__lib_Makefile (from r560033, head/devel/cvs/files/patch-cvs__lib_Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2021Q1/devel/cvs/files/patch-cvs__lib_Makefile Sun Jan 3 19:22:37 2021 (r560034, copy of r560033, head/devel/cvs/files/patch-cvs__lib_Makefile) @@ -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 +