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

Mon Feb 5 20:28:45 UTC 2018

Author: mi
Date: Mon Feb  5 20:28:44 2018
New Revision: 461018
URL: https://svnweb.freebsd.org/changeset/ports/461018

Log:
  Upgrade from 0.8.3 to 0.9.0 -- the option to parse HTML5 texts using gumbo
  is the most significant improvement.
  
  While here, (almost) get rid of the bundled expat code in favor of libbsdxml.

Added:
  head/www/tdom/files/patch-bsdxml   (contents, props changed)
Deleted:
  head/www/tdom/files/patch-configure
  head/www/tdom/files/patch-expat_xmlparse.c
  head/www/tdom/files/patch-generic-tcldom.c
  head/www/tdom/files/patch-generic-tclexpat.c
Modified:
  head/www/tdom/Makefile
  head/www/tdom/distinfo
  head/www/tdom/pkg-descr
  head/www/tdom/pkg-plist

Modified: head/www/tdom/Makefile
==============================================================================

--- head/www/tdom/Makefile	Mon Feb  5 20:11:24 2018	(r461017)
+++ head/www/tdom/Makefile	Mon Feb  5 20:28:44 2018	(r461018)
@@ -2,48 +2,41 @@
 # $FreeBSD$
 
 PORTNAME=	tDOM
-PORTVERSION=	0.8.3
+PORTVERSION=	0.9.0
 CATEGORIES=	www
-MASTER_SITES=	GHC http://mirrors.rit.edu/zi/
+MASTER_SITES=	http://tdom.org/downloads/
+DISTNAME=	${PORTNAME:tl}-${PORTVERSION}
+EXTRACT_SUFX=	-src.tgz
 
 MAINTAINER=	mi at aldan.algebra.com
-COMMENT=	High performance XML data processing with Tcl (ARGS for OpenACS)
+COMMENT=	High performance processing of XML and HTML data with Tcl
 
-LICENSE=	MPL11 MIT
-LICENSE_COMB=	multi
-LICENSE_FILE_MIT=	${WRKSRC}/expat/COPYING
+LICENSE=	MPL11
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TDOMBASE=	${PREFIX}/lib/tdom${PORTVERSION}
-
-USES=		gmake tar:tgz tcl:tea
-USE_GITHUB=	yes
+USES=		gmake 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*'
 
 TEST_TARGET=	test
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-DOCS=		CHANGES README README.AOL
-HTMLDOCS=	category-index.html dom.html domDoc.html domNode.html \
-		expat.html expatapi.html index.html keyword-index.html \
-		tdomcmd.html tnc.html
+DOCS=		CHANGES README
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS HTML5
+OPTIONS_DEFAULT=${OPTIONS_DEFINE}
 
-pre-configure:
-	@${RM} ${WRKSRC}/generic/domalloc.?
+HTML5_DESC=	Enable parsing of HTML5 (requires gumbo)
+HTML5_LIB_DEPENDS=libgumbo.so:devel/gumbo
+HTML5_CONFIGURE_ENABLE=html5
+HTML5_CFLAGS=	-I${LOCALBASE}/include
 
-post-install:
-	${CHMOD} 755 ${STAGEDIR}${TDOMBASE}
-	${CHMOD} 644 ${STAGEDIR}${TDOMBASE}/*
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
-.for FILE in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}/${FILE}
-.endfor
-.for FILE in ${HTMLDOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}/html/${FILE}
-.endfor
+	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}/html/
 
 .include <bsd.port.mk>

Modified: head/www/tdom/distinfo
==============================================================================
--- head/www/tdom/distinfo	Mon Feb  5 20:11:24 2018	(r461017)
+++ head/www/tdom/distinfo	Mon Feb  5 20:28:44 2018	(r461018)
@@ -1,2 +1,3 @@
-SHA256 (tDOM-0.8.3.tgz) = 496d5950907dd70db61bc20c55a05a5521363ce3c076e2fdd97270181bc720b9
-SIZE (tDOM-0.8.3.tgz) = 990367
+TIMESTAMP = 1517858044
+SHA256 (tdom-0.9.0-src.tgz) = 201e7f1b0df28b1f1921d9ec18f1ffd5a1b558c0509c54c88206b65a81ba2740
+SIZE (tdom-0.9.0-src.tgz) = 1065288

Added: head/www/tdom/files/patch-bsdxml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/tdom/files/patch-bsdxml	Mon Feb  5 20:28:44 2018	(r461018)
@@ -0,0 +1,47 @@
+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;

Modified: head/www/tdom/pkg-descr
==============================================================================
--- head/www/tdom/pkg-descr	Mon Feb  5 20:11:24 2018	(r461017)
+++ head/www/tdom/pkg-descr	Mon Feb  5 20:28:44 2018	(r461018)
@@ -7,5 +7,4 @@ recommendation in XML (160K) needs only about 450K in 
 
 Configured for OpenACS (http://openacs.org)
 
-WWW: http://wiki.tcl.tk/1948
-     http://tdom.github.com/
+WWW: http://www.tdom.org/

Modified: head/www/tdom/pkg-plist
==============================================================================
--- head/www/tdom/pkg-plist	Mon Feb  5 20:11:24 2018	(r461017)
+++ head/www/tdom/pkg-plist	Mon Feb  5 20:28:44 2018	(r461018)
@@ -23,4 +23,3 @@ man/mann/tnc.n.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/tnc.html
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.AOL
