From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Feb 12 18:10:05 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E30416A420 for ; Sun, 12 Feb 2006 18:10:05 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24B1243D49 for ; Sun, 12 Feb 2006 18:10:03 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k1CIA2on096179 for ; Sun, 12 Feb 2006 18:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k1CIA2CS096178; Sun, 12 Feb 2006 18:10:02 GMT (envelope-from gnats) Resent-Date: Sun, 12 Feb 2006 18:10:02 GMT Resent-Message-Id: <200602121810.k1CIA2CS096178@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 42E2B16A420 for ; Sun, 12 Feb 2006 18:01:13 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from nm05omta05d.dion.ne.jp (nm05mta.dion.ne.jp [219.125.112.14]) by mx1.FreeBSD.org (Postfix) with SMTP id C37EF43D46 for ; Sun, 12 Feb 2006 18:01:12 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from localhost ([218.222.70.147]) by nm05mta.dion.ne.jp id <20060213030107065.MAC9.81283D8@nm05mta.dion.ne.jp>; Mon, 13 Feb 2006 03:01:07 +0900 Message-Id: <20060213030008.1bdc9056.tkato432@yahoo.com> Date: Mon, 13 Feb 2006 03:00:08 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/93238: Update port: editors/xcoral to 3.44 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Feb 2006 18:10:05 -0000 X-List-Received-Date: Sun, 12 Feb 2006 18:10:05 -0000 X-List-Received-Date: Sun, 12 Feb 2006 18:10:05 -0000 >Number: 93238 >Category: ports >Synopsis: Update port: editors/xcoral to 3.44 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Feb 12 18:10:02 GMT 2006 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.11-RELEASE-p14 i386 >Organization: >Environment: >Description: - Update to version 3.44 Remove file: files/patch-regex >How-To-Repeat: >Fix: diff -urN /usr/ports/editors/xcoral/Makefile editors/xcoral/Makefile --- /usr/ports/editors/xcoral/Makefile Fri Jun 6 07:53:55 2003 +++ editors/xcoral/Makefile Thu Feb 2 23:38:27 2006 @@ -6,7 +6,7 @@ # PORTNAME= xcoral -PORTVERSION= 3.42b +PORTVERSION= 3.44 CATEGORIES= editors MASTER_SITES= http://xcoral.free.fr/ @@ -16,7 +16,22 @@ USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --libdir=${PREFIX}/share -PLIST_SUB+= PORTVERSION=${PORTVERSION:S/b//} +CONFIGURE_ENV= LIBS="-lgnuregex" +PLIST_SUB= VERSION="${PORTVERSION}" + +.include + +.if ${OSVERSION} > 502010 +GNU_REGEX_H= gnu/regex.h +.else +GNU_REGEX_H= gnuregex.h +.endif + +post-patch: + @${REINPLACE_CMD} -e \ + 's| regex\.c | |g' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e \ + 's|"regex\.h"|<${GNU_REGEX_H}>|g' ${WRKSRC}/bm_search.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xcoral ${PREFIX}/bin @@ -27,4 +42,4 @@ ${INSTALL_DATA} ${WRKSRC}/Doc/* ${DOCSDIR} .endif -.include +.include diff -urN /usr/ports/editors/xcoral/distinfo editors/xcoral/distinfo --- /usr/ports/editors/xcoral/distinfo Sat Nov 26 19:23:36 2005 +++ editors/xcoral/distinfo Thu Feb 2 23:23:06 2006 @@ -1,3 +1,3 @@ -MD5 (xcoral-3.42b.tar.gz) = 070249fb6ba8eb37014a78d487d7e517 -SHA256 (xcoral-3.42b.tar.gz) = d6a668aafb4c77ea8e90141fe98d8b2b57ac1bc3e19d1eb28a462c123a829183 -SIZE (xcoral-3.42b.tar.gz) = 1915720 +MD5 (xcoral-3.44.tar.gz) = 2c640813fb01c3c0b66738c198aa14ef +SHA256 (xcoral-3.44.tar.gz) = f5e20b8026d89d7b73720758dd8f97d1127d2fafd7291fa80e67793ac929cdbb +SIZE (xcoral-3.44.tar.gz) = 1916169 diff -urN /usr/ports/editors/xcoral/files/patch-regex editors/xcoral/files/patch-regex --- /usr/ports/editors/xcoral/files/patch-regex Wed Apr 9 08:16:28 2003 +++ editors/xcoral/files/patch-regex Thu Jan 1 09:00:00 1970 @@ -1,38 +0,0 @@ -This patch makes xcoral use the standard GNU regular expression library, -installed on FreeBSD as -lgnuregex, instead of compiling its own (of the -same version). - - -mi - ---- Makefile.in Thu Nov 15 16:29:49 2001 -+++ Makefile.in Tue Apr 8 19:06:20 2003 -@@ -15,5 +15,5 @@ - @SET_MAKE@ - --LDOPTIONS = @LDFLAGS@ -+LDOPTIONS = @LDFLAGS@ -lgnuregex - - XCORALLIBDIR = \"$(XC_LIBDIR)\" -@@ -32,5 +32,5 @@ - file_dict.c proc_dict.c gen.tab.c lex.yy.c ie_func.c mode.c \ - input_str.c process.c warn_box.c dial_box.c fs_box.c list_box.c \ -- man_box.c justify.c macros.c ctr_version.c color_area.c regex.c \ -+ man_box.c justify.c macros.c ctr_version.c color_area.c \ - selection.c tool_bar.c buttons_bits.c tbox.c - -@@ -44,5 +44,5 @@ - global_dict.o file_dict.o proc_dict.o ie_func.o mode.o \ - input_str.o process.o warn_box.o dial_box.o fs_box.o list_box.o \ -- man_box.o justify.o macros.o ctr_version.o color_area.o regex.o \ -+ man_box.o justify.o macros.o ctr_version.o color_area.o \ - selection.o tool_bar.o buttons_bits.o tbox.o @ALLOCA@ - ---- bm_search.c Sun Sep 20 12:49:08 1998 -+++ bm_search.c Tue Apr 8 19:04:23 2003 -@@ -58,5 +58,5 @@ - #include - #define const --#include "regex.h" -+#include - - #include "main_text.h" diff -urN /usr/ports/editors/xcoral/pkg-plist editors/xcoral/pkg-plist --- /usr/ports/editors/xcoral/pkg-plist Sat Apr 12 22:45:21 2003 +++ editors/xcoral/pkg-plist Thu Feb 2 22:43:25 2006 @@ -1,41 +1,41 @@ bin/xcoral -%%PORTDOCS%%share/doc/xcoral/xcoral-%%PORTVERSION%%.ps -%%PORTDOCS%%share/doc/xcoral/xcoral-card.ps -share/xcoral/DEPEND -share/xcoral/README -share/xcoral/cmd.sc -share/xcoral/color.sc -share/xcoral/comments.sc -share/xcoral/compare-win.sc -share/xcoral/complete-word.sc -share/xcoral/describe.sc -share/xcoral/edir.sc -share/xcoral/edt.sc -share/xcoral/example.sc -share/xcoral/french.sc -share/xcoral/hack-filename.sc -share/xcoral/hanoi.sc -share/xcoral/head.sc -share/xcoral/html.sc -share/xcoral/java.sc -share/xcoral/keydef-ext.sc -share/xcoral/latex-macros.sc -share/xcoral/latex.sc -share/xcoral/lex.sc -share/xcoral/man.dtex -share/xcoral/misc-commands.sc -share/xcoral/mode-ext.sc -share/xcoral/mode.sc -share/xcoral/mouse.sc -share/xcoral/rcs.sc -share/xcoral/save.sc -share/xcoral/shell-script.sc -share/xcoral/sun-keydef.sc -share/xcoral/title.sc -share/xcoral/top-ten.sc -share/xcoral/utilities.sc -share/xcoral/version.sc -share/xcoral/window-utilities.sc -share/xcoral/xcoralrc.lf -@dirrm share/xcoral -%%PORTDOCS%%@dirrm share/doc/xcoral +%%PORTDOCS%%%%DOCSDIR%%/xcoral-%%VERSION%%.ps +%%PORTDOCS%%%%DOCSDIR%%/xcoral-card.ps +%%DATADIR%%/DEPEND +%%DATADIR%%/README +%%DATADIR%%/cmd.sc +%%DATADIR%%/color.sc +%%DATADIR%%/comments.sc +%%DATADIR%%/compare-win.sc +%%DATADIR%%/complete-word.sc +%%DATADIR%%/describe.sc +%%DATADIR%%/edir.sc +%%DATADIR%%/edt.sc +%%DATADIR%%/example.sc +%%DATADIR%%/french.sc +%%DATADIR%%/hack-filename.sc +%%DATADIR%%/hanoi.sc +%%DATADIR%%/head.sc +%%DATADIR%%/html.sc +%%DATADIR%%/java.sc +%%DATADIR%%/keydef-ext.sc +%%DATADIR%%/latex-macros.sc +%%DATADIR%%/latex.sc +%%DATADIR%%/lex.sc +%%DATADIR%%/man.dtex +%%DATADIR%%/misc-commands.sc +%%DATADIR%%/mode-ext.sc +%%DATADIR%%/mode.sc +%%DATADIR%%/mouse.sc +%%DATADIR%%/rcs.sc +%%DATADIR%%/save.sc +%%DATADIR%%/shell-script.sc +%%DATADIR%%/sun-keydef.sc +%%DATADIR%%/title.sc +%%DATADIR%%/top-ten.sc +%%DATADIR%%/utilities.sc +%%DATADIR%%/version.sc +%%DATADIR%%/window-utilities.sc +%%DATADIR%%/xcoralrc.lf +@dirrm %%DATADIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted: