Attachment #64619 for bug #96013

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

Lines 32-37 Link Here

(-)textproc/gsed/Makefile (-1 / +9 lines)
32	PORTDOCS= AUTHORS BUGS COPYING COPYING.DOC NEWS README THANKS	32	PORTDOCS= AUTHORS BUGS COPYING COPYING.DOC NEWS README THANKS
33	DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}	33	DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
34		34
		35	.include <bsd.port.pre.mk>
		36
		37	# Required for gcc 2.95 since it is pre-C99
		38	# and doesn't handle the 'bool' datatype properly.
		39	.if ${OSVERSION} < 500000
		40	EXTRA_PATCHES= ${FILESDIR}/extrapatch-lib-regexec.c
		41	.endif
		42
35	post-patch:	43	post-patch:
36	@${REINPLACE_CMD} -e 's,^\* sed:,* CNU sed:,' \	44	@${REINPLACE_CMD} -e 's,^\* sed:,* CNU sed:,' \
37	${WRKSRC}/doc/config.texi	45	${WRKSRC}/doc/config.texi
Lines 59-62 Link Here
59	test:	67	test:
60	@cd ${WRKSRC}/testsuite; ${MAKE} check	68	@cd ${WRKSRC}/testsuite; ${MAKE} check
61		69
62	.include <bsd.port.mk>	70	.include <bsd.port.post.mk>




#
# Required for gcc 2.95 since it is pre-C99
# and doesn't handle the 'bool' datatype properly.
#
--- lib/regexec.c.orig	Sat Apr 15 20:53:36 2006
+++ lib/regexec.c	Sat Apr 15 21:17:03 2006
@@ -3296,8 +3296,7 @@
   reg_errcode_t err;
   int i, j, ch, need_word_trtable = 0;
   bitset_word_t elem, mask;
-  bool dests_node_malloced = false;
-  bool dest_states_malloced = false;
+  int dests_node_malloced = 0, dest_states_malloced = 0;
   int ndests; /* Number of the destination states from `state'.  */
   re_dfastate_t **trtable;
   re_dfastate_t **dest_states = NULL, **dest_states_word, **dest_states_nl;
@@ -3322,7 +3321,7 @@
       dests_alloc = re_malloc (struct dests_alloc, 1);
       if (BE (dests_alloc == NULL, 0))
 	return 0;
-      dests_node_malloced = true;
+      dests_node_malloced = 1;
     }
   dests_node = dests_alloc->dests_node;
   dests_ch = dests_alloc->dests_ch;
@@ -3371,7 +3370,7 @@
 	    free (dests_alloc);
 	  return 0;
 	}
-      dest_states_malloced = true;
+      dest_states_malloced = 1;
     }
   dest_states_word = dest_states + ndests;
   dest_states_nl = dest_states_word + ndests;
@@ -3576,7 +3575,7 @@
 	{
 	  if (constraint & NEXT_NEWLINE_CONSTRAINT)
 	    {
-	      bool accepts_newline = bitset_contain (accepts, NEWLINE_CHAR);
+	      int accepts_newline = bitset_contain (accepts, NEWLINE_CHAR);
 	      bitset_empty (accepts);
 	      if (accepts_newline)
 		bitset_set (accepts, NEWLINE_CHAR);

Return to bug 96013

Line 0 Link Here

(-)textproc/gsed/files/extrapatch-lib-regexec.c (+43 lines)
	1	#
	2	# Required for gcc 2.95 since it is pre-C99
	3	# and doesn't handle the 'bool' datatype properly.
	4	#
	5	--- lib/regexec.c.orig Sat Apr 15 20:53:36 2006
	6	+++ lib/regexec.c Sat Apr 15 21:17:03 2006
	7	@@ -3296,8 +3296,7 @@
	8	reg_errcode_t err;
	9	int i, j, ch, need_word_trtable = 0;
	10	bitset_word_t elem, mask;
	11	- bool dests_node_malloced = false;
	12	- bool dest_states_malloced = false;
	13	+ int dests_node_malloced = 0, dest_states_malloced = 0;
	14	int ndests; /* Number of the destination states from `state'. */
	15	re_dfastate_t **trtable;
	16	re_dfastate_t dest_states = NULL, dest_states_word, **dest_states_nl;
	17	@@ -3322,7 +3321,7 @@
	18	dests_alloc = re_malloc (struct dests_alloc, 1);
	19	if (BE (dests_alloc == NULL, 0))
	20	return 0;
	21	- dests_node_malloced = true;
	22	+ dests_node_malloced = 1;
	23	}
	24	dests_node = dests_alloc->dests_node;
	25	dests_ch = dests_alloc->dests_ch;
	26	@@ -3371,7 +3370,7 @@
	27	free (dests_alloc);
	28	return 0;
	29	}
	30	- dest_states_malloced = true;
	31	+ dest_states_malloced = 1;
	32	}
	33	dest_states_word = dest_states + ndests;
	34	dest_states_nl = dest_states_word + ndests;
	35	@@ -3576,7 +3575,7 @@
	36	{
	37	if (constraint & NEXT_NEWLINE_CONSTRAINT)
	38	{
	39	- bool accepts_newline = bitset_contain (accepts, NEWLINE_CHAR);
	40	+ int accepts_newline = bitset_contain (accepts, NEWLINE_CHAR);
	41	bitset_empty (accepts);
	42	if (accepts_newline)
	43	bitset_set (accepts, NEWLINE_CHAR);