sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix the "duplicate symbol" problem, which builds on -current have

Browse source 
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
This commit is contained in:
Mikhail Teterin 2020-09-05 01:06:32 +00:00
parent 8881f1ce89
commit a704e6443c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=547581
4 changed files with 7 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
editors/xcoral/Makefile
View file

@ -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}"

6
editors/xcoral/distinfo
View file

@ -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

35
editors/xcoral/files/patch-BR_Parser.c
View file

@ -1,35 +0,0 @@
--- BR_Parser.c.orig 2002-12-18 07:22:09 UTC
+++ BR_Parser.c
@@ -116,7 +116,7 @@
#define YYDEBUG 1
-#define BR_YYERROR YYFAIL
+#define BR_YYERROR YYERROR
/*-----------------------------------------------------------------------*/
@@ -960,12 +960,7 @@ static const short yycheck[] = { 1,
#define YYEOF 0
#define YYACCEPT goto yyacceptlab
#define YYABORT goto yyabortlab
-#define YYERROR goto yyerrlab1
-/* Like YYERROR except do call yyerror.
- This remains here temporarily to ease the
- transition to the new meaning of YYERROR, for GCC.
- Once GCC version 2 has supplanted version 1, this can go. */
-#define YYFAIL goto yyerrlab
+#define YYERROR goto yyerrlab
#define YYRECOVERING() (!!yyerrstatus)
#define YYBACKUP(token, value) \
do \
@@ -2465,9 +2460,6 @@ yyerrlab: /* here on detecting error *
yyerror("parse error");
}
- goto yyerrlab1;
-yyerrlab1: /* here on error raised explicitly by an action */
-
if (yyerrstatus == 3)
{
/* if just tried and failed to reuse lookahead token after an error, discard it. */

4
editors/xcoral/files/patch-BR_Parser.y
View file

@ -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