Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 5 Sep 2020 01:06:33 +0000 (UTC)
From:      Mikhail Teterin <mi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r547581 - in head/editors/xcoral: . files
Message-ID:  <202009050106.08516X2k047920@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009050106.08516X2k047920>