From c5df12939243d8016e1ef1dd273b385292ab1ef9 Mon Sep 17 00:00:00 2001 From: Mikhail Teterin Date: Wed, 31 Dec 2014 04:42:38 +0000 Subject: [PATCH] Although it continued to build -- with lots of warnings -- the editor quietly stopped working over the years. It would not come up on 64-bit at all, and, even where it worked, the copy/pasting was broken due to, apparently, some unwarranted assumptions about X11, that were no longer true with modern Xorg. This change makes use of a major patch, that provides for reasonably warning-free compile -- which, by itself, fixes the crashes. Also included in the patch are fixes for copy/pasting as well for parallel building. (Awareness raised upstream.) Because BR_Parser.y is among the patched files, bison is now needed at build-time (found by KATO Tsuguru). Bump PORTREVISION and take maintainership for the time being. Reviewed by: KATO Tsuguru Sponsored by: Fatherly Love --- editors/xcoral/Makefile | 14 +++++++++----- editors/xcoral/distinfo | 2 ++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/editors/xcoral/Makefile b/editors/xcoral/Makefile index e8c8f3fe654a..a03c3b895735 100644 --- a/editors/xcoral/Makefile +++ b/editors/xcoral/Makefile @@ -3,27 +3,31 @@ PORTNAME= xcoral PORTVERSION= 3.47 +PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= http://xcoral.free.fr/ -MAINTAINER= ports@FreeBSD.org +PATCH_SITES= http://aldan.algebra.com/~mi/port-stuff/ +PATCHFILES= xcoral-alpheus-and-peneus.patch.bz2 + +MAINTAINER= mi@aldan.algebra.com COMMENT= Multiwindow mouse-based text editor for X +LICENSE= GPLv2 + USE_XORG= x11 +USES= bison GNU_CONFIGURE= yes CONFIGURE_ARGS= --libdir=${PREFIX}/share LIBS+= -lgnuregex -MAKE_JOBS_UNSAFE= yes PLIST_SUB= VERSION="${PORTVERSION}" OPTIONS_DEFINE= DOCS post-patch: - @${REINPLACE_CMD} -e 's| regex\.c | |g ; \ + @${REINPLACE_CMD} -e 's| regex\.[co] | |g ; \ s| -g | |g' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e \ - 's|"regex\.h"||g' ${WRKSRC}/bm_search.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xcoral ${STAGEDIR}${PREFIX}/bin diff --git a/editors/xcoral/distinfo b/editors/xcoral/distinfo index 0b737ba418c2..0cd3d67c23cc 100644 --- a/editors/xcoral/distinfo +++ b/editors/xcoral/distinfo @@ -1,2 +1,4 @@ SHA256 (xcoral-3.47.tar.gz) = 886e02eeb96e494d32969fcf41dcd09133896b717b714eb42affed1f460af3dd SIZE (xcoral-3.47.tar.gz) = 2760763 +SHA256 (xcoral-alpheus-and-peneus.patch.bz2) = f04cc61f0cf05cbdfe720e7b6f4f743d26f2a04dc109a2ead445394a739456a0 +SIZE (xcoral-alpheus-and-peneus.patch.bz2) = 71099