From owner-svn-ports-all@freebsd.org Thu Feb 28 12:05:44 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 013D61504D7D; Thu, 28 Feb 2019 12:05:44 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 61E9E8EB96; Thu, 28 Feb 2019 12:05:43 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4D6764AF0; Thu, 28 Feb 2019 12:05:43 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1SC5h1r005608; Thu, 28 Feb 2019 12:05:43 GMT (envelope-from gahr@FreeBSD.org) Received: (from gahr@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1SC5g67005606; Thu, 28 Feb 2019 12:05:42 GMT (envelope-from gahr@FreeBSD.org) Message-Id: <201902281205.x1SC5g67005606@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gahr set sender to gahr@FreeBSD.org using -f From: Pietro Cerutti Date: Thu, 28 Feb 2019 12:05:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494145 - in head/www/tdom: . files X-SVN-Group: ports-head X-SVN-Commit-Author: gahr X-SVN-Commit-Paths: in head/www/tdom: . files X-SVN-Commit-Revision: 494145 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 61E9E8EB96 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.962,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Feb 2019 12:05:44 -0000 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 + +.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 #include - #include + #include -#include /*