From owner-svn-ports-all@freebsd.org Sat Sep 5 01:06:34 2020 Return-Path: Delivered-To: svn-ports-all@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 3481F3D4E65; Sat, 5 Sep 2020 01:06:34 +0000 (UTC) (envelope-from mi@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 4BjxFk07sdz4r0L; Sat, 5 Sep 2020 01:06:34 +0000 (UTC) (envelope-from mi@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 C36FC15A84; Sat, 5 Sep 2020 01:06:33 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08516X1s047923; Sat, 5 Sep 2020 01:06:33 GMT (envelope-from mi@FreeBSD.org) Received: (from mi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08516X2k047920; Sat, 5 Sep 2020 01:06:33 GMT (envelope-from mi@FreeBSD.org) Message-Id: <202009050106.08516X2k047920@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mi set sender to mi@FreeBSD.org using -f From: Mikhail Teterin Date: Sat, 5 Sep 2020 01:06:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547581 - in head/editors/xcoral: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mi X-SVN-Commit-Paths: in head/editors/xcoral: . files X-SVN-Commit-Revision: 547581 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 01:06:34 -0000 Author: mi Date: Sat Sep 5 01:06:32 2020 New Revision: 547581 URL: https://svnweb.freebsd.org/changeset/ports/547581 Log: Fix the "duplicate symbol" problem, which builds on -current have uncovered recently. While here, also: 1. Fix some compiler-warnings shown by the newer clang. 2. Stop patching the BR_Parser.c -- because we patch BR_Parser.y anyway, which necessitates regenerating the former. 3. Fix the concurrency problem with the bison-invocation which would, occasionally, break parallel builds. Reported by: pkg-fallout Sponsored by: United Marsupials Deleted: head/editors/xcoral/files/patch-BR_Parser.c Modified: head/editors/xcoral/Makefile head/editors/xcoral/distinfo head/editors/xcoral/files/patch-BR_Parser.y Modified: head/editors/xcoral/Makefile ============================================================================== --- head/editors/xcoral/Makefile Sat Sep 5 00:11:09 2020 (r547580) +++ head/editors/xcoral/Makefile Sat Sep 5 01:06:32 2020 (r547581) @@ -8,7 +8,7 @@ CATEGORIES= editors MASTER_SITES= http://xcoral.free.fr/ PATCH_SITES= http://aldan.algebra.com/~mi/port-stuff/ -PATCHFILES= xcoral-alpheus-and-peneus-2019.patch.bz2 +PATCHFILES= xcoral-alpheus-and-peneus-2020.patch.bz2 MAINTAINER= mi@aldan.algebra.com COMMENT= Multiwindow mouse-based text editor for X @@ -20,6 +20,7 @@ USE_XORG= x11 GNU_CONFIGURE= yes CONFIGURE_ARGS= --libdir=${PREFIX}/share LIBS+= -lgnuregex +EXTRACT_AFTER_ARGS= --exclude BR_Parser.[ch] PLIST_SUB= VERSION="${PORTVERSION}" Modified: head/editors/xcoral/distinfo ============================================================================== --- head/editors/xcoral/distinfo Sat Sep 5 00:11:09 2020 (r547580) +++ head/editors/xcoral/distinfo Sat Sep 5 01:06:32 2020 (r547581) @@ -1,5 +1,5 @@ -TIMESTAMP = 1567738907 +TIMESTAMP = 1599018160 SHA256 (xcoral-3.47.tar.gz) = 886e02eeb96e494d32969fcf41dcd09133896b717b714eb42affed1f460af3dd SIZE (xcoral-3.47.tar.gz) = 2760763 -SHA256 (xcoral-alpheus-and-peneus-2019.patch.bz2) = fcc31a3f7b1dfbcab1c10853ee69afe93e74fba3ac81cd23325e8f7b81852d45 -SIZE (xcoral-alpheus-and-peneus-2019.patch.bz2) = 71180 +SHA256 (xcoral-alpheus-and-peneus-2020.patch.bz2) = 716fcef19bf3e815473e99812d3a8193041637984226c7e81f9129c0596da614 +SIZE (xcoral-alpheus-and-peneus-2020.patch.bz2) = 71760 Modified: head/editors/xcoral/files/patch-BR_Parser.y ============================================================================== --- head/editors/xcoral/files/patch-BR_Parser.y Sat Sep 5 00:11:09 2020 (r547580) +++ head/editors/xcoral/files/patch-BR_Parser.y Sat Sep 5 01:06:32 2020 (r547581) @@ -1,8 +1,8 @@ --- BR_Parser.y.orig 2002-12-18 07:21:52 UTC +++ BR_Parser.y -@@ -79,7 +79,7 @@ +@@ -79,7 +79,6 @@ - #define YYDEBUG 1 +-#define YYDEBUG 1 -#define BR_YYERROR YYFAIL +#define BR_YYERROR YYERROR