Attachment 198264 Details for Bug 231663 – Allow building with Expat from ports OR base

[patch] Allow building with Expat from ports OR base

tdom-expat-base-ports.diff.txt (text/plain), 4.67 KB, created by Pietro Cerutti on 2018-10-17 12:06:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pietro Cerutti

Created: 2018-10-17 12:06:40 UTC

Size: 4.67 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 482290)
>+++ Makefile	(working copy)
>@@ -17,7 +17,6 @@
> 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,7 +27,11 @@
> 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
>@@ -35,8 +38,26 @@
> 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}/
>Index: files/patch-bsdxml
>===================================================================
>--- files/patch-bsdxml	(revision 482290)
>+++ files/patch-bsdxml	(nonexistent)
>@@ -1,47 +0,0 @@
>-Use FreeBSD's Expat (a.k.a. bsdxml) instead of the bundled version.
>-
>-	-mi
>-
>---- configure	2017-08-24 09:59:41.657305804 -0400
>-+++ configure	2018-02-05 14:36:36.444830000 -0500
>-@@ -5443,8 +5443,8 @@
>-                 ;;
>-             *)
>--                if test -f "$with_expat/include/expat.h"; then
>-+                if test -f "$with_expat/include/bsdxml.h"; then
>-                     ac_cv_c_expat=`(cd $with_expat; pwd)`
>-                 else
>--                     as_fn_error $? "${with_expat} directory doesn't contain expat.h" "$LINENO" 5
>-+                     as_fn_error $? "${with_expat} directory doesn't contain bsdxml.h" "$LINENO" 5
>-                 fi
>-         esac
>-@@ -5511,2 +5511,2 @@
>- 
>--    vars="-lexpat"
>-+    vars="-lbsdxml"
>---- generic/dom.h	2017-08-23 10:19:33.726158496 -0400
>-+++ generic/dom.h	2018-02-05 14:34:53.308599000 -0500
>-@@ -39,5 +39,5 @@
>- #include <tcl.h>
>- #include <ctype.h>
>--#include <expat.h>
>-+#include <bsdxml.h>
>- #include <utf8conv.h>
>- 
>---- generic/tdom.h	2017-08-23 10:19:33.726158496 -0400
>-+++ generic/tdom.h	2018-02-05 14:34:53.308798000 -0500
>-@@ -1,5 +1,5 @@
>- 
>- #include "tcl.h"
>--#include <expat.h>
>-+#include <bsdxml.h>
>- 
>- 
>---- generic/tclexpat.h	2017-08-23 10:19:33.725158500 -0400
>-+++ generic/tclexpat.h	2018-02-05 14:34:53.309022000 -0500
>-@@ -1,4 +1,4 @@
>- #include <tcl.h>
>--#include <expat.h>
>-+#include <bsdxml.h>
>- 
>- struct TclGenExpatInfo;
>
>Property changes on: files/patch-bsdxml
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-generic-dom.h
>===================================================================
>--- files/patch-generic-dom.h	(revision 482290)
>+++ files/patch-generic-dom.h	(working copy)
>@@ -3,7 +3,7 @@
> @@ -41,7 +41,6 @@
>  #include <string.h>
>  #include <ctype.h>
>- #include <bsdxml.h>
>+ #include <expat.h>
> -#include <domalloc.h>
>  
>  /*
>Index: files/patch-tests-tdom
>===================================================================
>--- files/patch-tests-tdom	(revision 482290)
>+++ files/patch-tests-tdom	(nonexistent)
>@@ -1,10 +0,0 @@
>-http://www.tdom.org/index.html/tktview/2ca7a4547a9820c824289fd20871f94a213d7a23
>-
>---- tests/dom.test	2018-07-23 18:03:51.445385785 -0400
>-+++ tests/dom.test	2018-10-14 10:38:17.742481000 -0400
>-@@ -552,4 +552,5 @@
>- 
>- test dom-2.29 {parse not well-formed document with undeclared xml prefix} {
>-+knownBug} {
>-     catch {dom parse {<foo:e/>}} errMsg
>-     string range $errMsg 0 30
>
>Property changes on: files/patch-tests-tdom
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 231663: 197433 | 198136 | 198264