svn commit: r494145 - in head/www/tdom: . files

[Pietro Cerutti]

Author: gahr
Date: Thu Feb 28 12:05:42 2019
New Revision: 494145
URL: https://svnweb.freebsd.org/changeset/ports/494145

Log:
  www/tdom: add an OPTION (default off) to build against expat from ports
  
  PR:		231663 (was mentioned in comment #7)
  Submitted by:	gahr
  Approved by:	maintainer timeout

Deleted:
  head/www/tdom/files/patch-bsdxml
  head/www/tdom/files/patch-tests-tdom
Modified:
  head/www/tdom/Makefile
  head/www/tdom/files/patch-generic-dom.h

Modified: head/www/tdom/Makefile
==============================================================================
--- head/www/tdom/Makefile	Thu Feb 28 11:37:18 2019	(r494144)
+++ head/www/tdom/Makefile	Thu Feb 28 12:05:42 2019	(r494145)
@@ -17,7 +17,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 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*'
 
@@ -28,14 +27,36 @@ PLIST_SUB=	PORTVERSION=${PORTVERSION}
 DOCS=		CHANGES README
 
 OPTIONS_DEFINE=	DOCS HTML5
-OPTIONS_DEFAULT=${OPTIONS_DEFINE}
+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

Modified: head/www/tdom/files/patch-generic-dom.h
==============================================================================
--- head/www/tdom/files/patch-generic-dom.h	Thu Feb 28 11:37:18 2019	(r494144)
+++ head/www/tdom/files/patch-generic-dom.h	Thu Feb 28 12:05:42 2019	(r494145)
@@ -3,7 +3,7 @@
 @@ -41,7 +41,6 @@
  #include <string.h>
  #include <ctype.h>
- #include <bsdxml.h>
+ #include <expat.h>
 -#include <domalloc.h>
  
  /*