Attachment #62375 for bug #93238

View | Details | Raw Unified | Return to bug 93238
Collapse All | Expand All




#

PORTNAME=	xcoral
PORTVERSION=	3.44
CATEGORIES=	editors
MASTER_SITES=	http://xcoral.free.fr/


USE_X_PREFIX=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--libdir=${PREFIX}/share
CONFIGURE_ENV=	LIBS="-lgnuregex"
PLIST_SUB=	VERSION="${PORTVERSION}"

.include <bsd.port.pre.mk>

.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

	${INSTALL_DATA} ${WRKSRC}/Doc/* ${DOCSDIR}
.endif

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)editors/xcoral/distinfo (-3 / +3 lines)
1	MD5 (xcoral-3.42b.tar.gz) = 070249fb6ba8eb37014a78d487d7e517	1	MD5 (xcoral-3.44.tar.gz) = 2c640813fb01c3c0b66738c198aa14ef
2	SHA256 (xcoral-3.42b.tar.gz) = d6a668aafb4c77ea8e90141fe98d8b2b57ac1bc3e19d1eb28a462c123a829183	2	SHA256 (xcoral-3.44.tar.gz) = f5e20b8026d89d7b73720758dd8f97d1127d2fafd7291fa80e67793ac929cdbb
3	SIZE (xcoral-3.42b.tar.gz) = 1915720	3	SIZE (xcoral-3.44.tar.gz) = 1916169




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 <sys/types.h>
 #define const
-#include "regex.h"
+#include <gnuregex.h>
 
 #include "main_text.h"




bin/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%%

Return to bug 93238

Lines 6-12 Link Here

(-)editors/xcoral/Makefile (-3 / +18 lines)
6	#	6	#
7		7
8	PORTNAME= xcoral	8	PORTNAME= xcoral
9	PORTVERSION= 3.42b	9	PORTVERSION= 3.44
10	CATEGORIES= editors	10	CATEGORIES= editors
11	MASTER_SITES= http://xcoral.free.fr/	11	MASTER_SITES= http://xcoral.free.fr/
12		12
Lines 16-22 Link Here
16	USE_X_PREFIX= yes	16	USE_X_PREFIX= yes
17	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
18	CONFIGURE_ARGS= --libdir=${PREFIX}/share	18	CONFIGURE_ARGS= --libdir=${PREFIX}/share
19	PLIST_SUB+= PORTVERSION=${PORTVERSION:S/b//}	19	CONFIGURE_ENV= LIBS="-lgnuregex"
		20	PLIST_SUB= VERSION="${PORTVERSION}"
		21
		22	.include <bsd.port.pre.mk>
		23
		24	.if ${OSVERSION} > 502010
		25	GNU_REGEX_H= gnu/regex.h
		26	.else
		27	GNU_REGEX_H= gnuregex.h
		28	.endif
		29
		30	post-patch:
		31	@${REINPLACE_CMD} -e \
		32	's\| regex\.c \| \|g' ${WRKSRC}/Makefile.in
		33	@${REINPLACE_CMD} -e \
		34	's\|"regex\.h"\|<${GNU_REGEX_H}>\|g' ${WRKSRC}/bm_search.c
20		35
21	do-install:	36	do-install:
22	${INSTALL_PROGRAM} ${WRKSRC}/xcoral ${PREFIX}/bin	37	${INSTALL_PROGRAM} ${WRKSRC}/xcoral ${PREFIX}/bin
Lines 27-30 Link Here
27	${INSTALL_DATA} ${WRKSRC}/Doc/* ${DOCSDIR}	42	${INSTALL_DATA} ${WRKSRC}/Doc/* ${DOCSDIR}
28	.endif	43	.endif
29		44
30	.include <bsd.port.mk>	45	.include <bsd.port.post.mk>

Lines 1-38 Link Here

(-)editors/xcoral/files/patch-regex (-38 lines)
1	This patch makes xcoral use the standard GNU regular expression library,
2	installed on FreeBSD as -lgnuregex, instead of compiling its own (of the
3	same version).
4
5	-mi
6
7	--- Makefile.in Thu Nov 15 16:29:49 2001
8	+++ Makefile.in Tue Apr 8 19:06:20 2003
9	@@ -15,5 +15,5 @@
10	@SET_MAKE@
11
12	-LDOPTIONS = @LDFLAGS@
13	+LDOPTIONS = @LDFLAGS@ -lgnuregex
14
15	XCORALLIBDIR = \"$(XC_LIBDIR)\"
16	@@ -32,5 +32,5 @@
17	file_dict.c proc_dict.c gen.tab.c lex.yy.c ie_func.c mode.c \
18	input_str.c process.c warn_box.c dial_box.c fs_box.c list_box.c \
19	- man_box.c justify.c macros.c ctr_version.c color_area.c regex.c \
20	+ man_box.c justify.c macros.c ctr_version.c color_area.c \
21	selection.c tool_bar.c buttons_bits.c tbox.c
22
23	@@ -44,5 +44,5 @@
24	global_dict.o file_dict.o proc_dict.o ie_func.o mode.o \
25	input_str.o process.o warn_box.o dial_box.o fs_box.o list_box.o \
26	- man_box.o justify.o macros.o ctr_version.o color_area.o regex.o \
27	+ man_box.o justify.o macros.o ctr_version.o color_area.o \
28	selection.o tool_bar.o buttons_bits.o tbox.o @ALLOCA@
29
30	--- bm_search.c Sun Sep 20 12:49:08 1998
31	+++ bm_search.c Tue Apr 8 19:04:23 2003
32	@@ -58,5 +58,5 @@
33	#include <sys/types.h>
34	#define const
35	-#include "regex.h"
36	+#include <gnuregex.h>
37
38	#include "main_text.h"

Lines 1-41 Link Here

(-)editors/xcoral/pkg-plist (-40 / +40 lines)
1	bin/xcoral	1	bin/xcoral
2	%%PORTDOCS%%share/doc/xcoral/xcoral-%%PORTVERSION%%.ps	2	%%PORTDOCS%%%%DOCSDIR%%/xcoral-%%VERSION%%.ps
3	%%PORTDOCS%%share/doc/xcoral/xcoral-card.ps	3	%%PORTDOCS%%%%DOCSDIR%%/xcoral-card.ps
4	share/xcoral/DEPEND	4	%%DATADIR%%/DEPEND
5	share/xcoral/README	5	%%DATADIR%%/README
6	share/xcoral/cmd.sc	6	%%DATADIR%%/cmd.sc
7	share/xcoral/color.sc	7	%%DATADIR%%/color.sc
8	share/xcoral/comments.sc	8	%%DATADIR%%/comments.sc
9	share/xcoral/compare-win.sc	9	%%DATADIR%%/compare-win.sc
10	share/xcoral/complete-word.sc	10	%%DATADIR%%/complete-word.sc
11	share/xcoral/describe.sc	11	%%DATADIR%%/describe.sc
12	share/xcoral/edir.sc	12	%%DATADIR%%/edir.sc
13	share/xcoral/edt.sc	13	%%DATADIR%%/edt.sc
14	share/xcoral/example.sc	14	%%DATADIR%%/example.sc
15	share/xcoral/french.sc	15	%%DATADIR%%/french.sc
16	share/xcoral/hack-filename.sc	16	%%DATADIR%%/hack-filename.sc
17	share/xcoral/hanoi.sc	17	%%DATADIR%%/hanoi.sc
18	share/xcoral/head.sc	18	%%DATADIR%%/head.sc
19	share/xcoral/html.sc	19	%%DATADIR%%/html.sc
20	share/xcoral/java.sc	20	%%DATADIR%%/java.sc
21	share/xcoral/keydef-ext.sc	21	%%DATADIR%%/keydef-ext.sc
22	share/xcoral/latex-macros.sc	22	%%DATADIR%%/latex-macros.sc
23	share/xcoral/latex.sc	23	%%DATADIR%%/latex.sc
24	share/xcoral/lex.sc	24	%%DATADIR%%/lex.sc
25	share/xcoral/man.dtex	25	%%DATADIR%%/man.dtex
26	share/xcoral/misc-commands.sc	26	%%DATADIR%%/misc-commands.sc
27	share/xcoral/mode-ext.sc	27	%%DATADIR%%/mode-ext.sc
28	share/xcoral/mode.sc	28	%%DATADIR%%/mode.sc
29	share/xcoral/mouse.sc	29	%%DATADIR%%/mouse.sc
30	share/xcoral/rcs.sc	30	%%DATADIR%%/rcs.sc
31	share/xcoral/save.sc	31	%%DATADIR%%/save.sc
32	share/xcoral/shell-script.sc	32	%%DATADIR%%/shell-script.sc
33	share/xcoral/sun-keydef.sc	33	%%DATADIR%%/sun-keydef.sc
34	share/xcoral/title.sc	34	%%DATADIR%%/title.sc
35	share/xcoral/top-ten.sc	35	%%DATADIR%%/top-ten.sc
36	share/xcoral/utilities.sc	36	%%DATADIR%%/utilities.sc
37	share/xcoral/version.sc	37	%%DATADIR%%/version.sc
38	share/xcoral/window-utilities.sc	38	%%DATADIR%%/window-utilities.sc
39	share/xcoral/xcoralrc.lf	39	%%DATADIR%%/xcoralrc.lf
40	@dirrm share/xcoral	40	@dirrm %%DATADIR%%
41	%%PORTDOCS%%@dirrm share/doc/xcoral	41	%%PORTDOCS%%@dirrm %%DOCSDIR%%