Attachment #198264 for bug #231663




USES=		tcl:tea

CONFIGURE_ARGS=	--enable-threads --disable-tdomalloc
CONFIGURE_ARGS+=--with-expat=/usr
EXTRACT_AFTER_ARGS=--exclude 'expat*/*.c' --exclude 'expat*/[a-mo-z]*.h' \
		--exclude 'domalloc*'


DOCS=		CHANGES README

OPTIONS_DEFINE=	DOCS HTML5
OPTIONS_DEFAULT=${OPTIONS_DEFINE} EBASE
OPTIONS_SINGLE=	EXPAT
OPTIONS_SINGLE_EXPAT=	EBASE EPORTS
EBASE_DESC=	Use Expat from base
EPORTS_DESC=	Use Expat from ports

HTML5_DESC=	Enable parsing of HTML5 (requires gumbo)
HTML5_LIB_DEPENDS=libgumbo.so:devel/gumbo

HTML5_CONFIGURE_ENABLE=html5
HTML5_CFLAGS=	-I${LOCALBASE}/include
HTML5_USES=	pkgconfig

EPORTS_LIB_DEPENDS=	libexpat.so:textproc/expat2
EPORTS_CONFIGURE_ON=	--with-expat=${LOCALBASE}
EBASE_CONFIGURE_ON=	--with-expat=/usr

MAKE_ARGS+=	RANLIB_STUB=:

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MEBASE}
post-patch:
	${REINPLACE_CMD} 's|expat\.h|bsdxml.h|g' \
	    ${WRKSRC}/configure \
	    ${WRKSRC}/generic/dom.h \
	    ${WRKSRC}/generic/tdom.h \
	    ${WRKSRC}/generic/tclexpat.h
	${REINPLACE_CMD} 's|-lexpat|-lbsdxml|' ${WRKSRC}/configure
	${REINPLACE_CMD} '553s|$$|knownBug} {|' ${WRKSRC}/tests/dom.test
.endif

post-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/

Lines 1-47 Link Here

(-)files/patch-bsdxml (-47 lines)
1	Use FreeBSD's Expat (a.k.a. bsdxml) instead of the bundled version.
2
3	-mi
4
5	--- configure 2017-08-24 09:59:41.657305804 -0400
6	+++ configure 2018-02-05 14:36:36.444830000 -0500
7	@@ -5443,8 +5443,8 @@
8	;;
9	*)
10	- if test -f "$with_expat/include/expat.h"; then
11	+ if test -f "$with_expat/include/bsdxml.h"; then
12	ac_cv_c_expat=`(cd $with_expat; pwd)`
13	else
14	- as_fn_error $? "${with_expat} directory doesn't contain expat.h" "$LINENO" 5
15	+ as_fn_error $? "${with_expat} directory doesn't contain bsdxml.h" "$LINENO" 5
16	fi
17	esac
18	@@ -5511,2 +5511,2 @@
19
20	- vars="-lexpat"
21	+ vars="-lbsdxml"
22	--- generic/dom.h 2017-08-23 10:19:33.726158496 -0400
23	+++ generic/dom.h 2018-02-05 14:34:53.308599000 -0500
24	@@ -39,5 +39,5 @@
25	#include <tcl.h>
26	#include <ctype.h>
27	-#include <expat.h>
28	+#include <bsdxml.h>
29	#include <utf8conv.h>
30
31	--- generic/tdom.h 2017-08-23 10:19:33.726158496 -0400
32	+++ generic/tdom.h 2018-02-05 14:34:53.308798000 -0500
33	@@ -1,5 +1,5 @@
34
35	#include "tcl.h"
36	-#include <expat.h>
37	+#include <bsdxml.h>
38
39
40	--- generic/tclexpat.h 2017-08-23 10:19:33.725158500 -0400
41	+++ generic/tclexpat.h 2018-02-05 14:34:53.309022000 -0500
42	@@ -1,4 +1,4 @@
43	#include <tcl.h>
44	-#include <expat.h>
45	+#include <bsdxml.h>
46
47	struct TclGenExpatInfo;

Lines 3-9 Link Here

(-)files/patch-generic-dom.h (-1 / +1 lines)
3	@@ -41,7 +41,6 @@	3	@@ -41,7 +41,6 @@
4	#include <string.h>	4	#include <string.h>
5	#include <ctype.h>	5	#include <ctype.h>
6	#include <bsdxml.h>	6	#include <expat.h>
7	-#include <domalloc.h>	7	-#include <domalloc.h>
8		8
9	/*	9	/*

Lines 1-10 Link Here

(-)files/patch-tests-tdom (-10 lines)
1	http://www.tdom.org/index.html/tktview/2ca7a4547a9820c824289fd20871f94a213d7a23
2
3	--- tests/dom.test 2018-07-23 18:03:51.445385785 -0400
4	+++ tests/dom.test 2018-10-14 10:38:17.742481000 -0400
5	@@ -552,4 +552,5 @@
6
7	test dom-2.29 {parse not well-formed document with undeclared xml prefix} {
8	+knownBug} {
9	catch {dom parse {<foo:e/>}} errMsg
10	string range $errMsg 0 30

Return to bug 231663

Lines 17-23 Link Here

(-)Makefile (-2 / +23 lines)
17	USES= tcl:tea	17	USES= tcl:tea
18		18
19	CONFIGURE_ARGS= --enable-threads --disable-tdomalloc	19	CONFIGURE_ARGS= --enable-threads --disable-tdomalloc
20	CONFIGURE_ARGS+=--with-expat=/usr
21	EXTRACT_AFTER_ARGS=--exclude 'expat/.c' --exclude 'expat/[a-mo-z].h' \	20	EXTRACT_AFTER_ARGS=--exclude 'expat/.c' --exclude 'expat/[a-mo-z].h' \
22	--exclude 'domalloc*'	21	--exclude 'domalloc*'
23		22
Lines 28-34 Link Here
28	DOCS= CHANGES README	27	DOCS= CHANGES README
29		28
30	OPTIONS_DEFINE= DOCS HTML5	29	OPTIONS_DEFINE= DOCS HTML5
31	OPTIONS_DEFAULT=${OPTIONS_DEFINE}	30	OPTIONS_DEFAULT=${OPTIONS_DEFINE} EBASE
		31	OPTIONS_SINGLE= EXPAT
		32	OPTIONS_SINGLE_EXPAT= EBASE EPORTS
		33	EBASE_DESC= Use Expat from base
		34	EPORTS_DESC= Use Expat from ports
32		35
33	HTML5_DESC= Enable parsing of HTML5 (requires gumbo)	36	HTML5_DESC= Enable parsing of HTML5 (requires gumbo)
34	HTML5_LIB_DEPENDS=libgumbo.so:devel/gumbo	37	HTML5_LIB_DEPENDS=libgumbo.so:devel/gumbo
Lines 35-42 Link Here
35	HTML5_CONFIGURE_ENABLE=html5	38	HTML5_CONFIGURE_ENABLE=html5
36	HTML5_CFLAGS= -I${LOCALBASE}/include	39	HTML5_CFLAGS= -I${LOCALBASE}/include
37	HTML5_USES= pkgconfig	40	HTML5_USES= pkgconfig
		41
		42	EPORTS_LIB_DEPENDS= libexpat.so:textproc/expat2
		43	EPORTS_CONFIGURE_ON= --with-expat=${LOCALBASE}
		44	EBASE_CONFIGURE_ON= --with-expat=/usr
		45
38	MAKE_ARGS+= RANLIB_STUB=:	46	MAKE_ARGS+= RANLIB_STUB=:
39		47
		48	.include <bsd.port.options.mk>
		49
		50	.if ${PORT_OPTIONS:MEBASE}
		51	post-patch:
		52	${REINPLACE_CMD} 's\|expat\.h\|bsdxml.h\|g' \
		53	${WRKSRC}/configure \
		54	${WRKSRC}/generic/dom.h \
		55	${WRKSRC}/generic/tdom.h \
		56	${WRKSRC}/generic/tclexpat.h
		57	${REINPLACE_CMD} 's\|-lexpat\|-lbsdxml\|' ${WRKSRC}/configure
		58	${REINPLACE_CMD} '553s\|$$\|knownBug} {\|' ${WRKSRC}/tests/dom.test
		59	.endif
		60
40	post-install-DOCS-on:	61	post-install-DOCS-on:
41	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html	62	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
42	${INSTALL_DATA} ${DOCS:S\|^\|${WRKSRC}/\|} ${STAGEDIR}${DOCSDIR}/	63	${INSTALL_DATA} ${DOCS:S\|^\|${WRKSRC}/\|} ${STAGEDIR}${DOCSDIR}/