diff --git a/textproc/tdom/Makefile b/textproc/tdom/Makefile index 9015faa5d4c..56cd5f825f8 100644 --- a/textproc/tdom/Makefile +++ b/textproc/tdom/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2018/06/12 15:44:28 stu Exp $ +# $OpenBSD: Makefile,v 1.2 2018/07/26 01:56:52 stu Exp $ COMMENT = fast XML/DOM/XPath/XSLT/HTML/JSON extension for Tcl -V = 0.9.0 +V = 0.9.1 VER = ${V:S/.//g} DISTNAME = tdom-${V} diff --git a/textproc/tdom/distinfo b/textproc/tdom/distinfo index 879e1a90629..49b485f778f 100644 --- a/textproc/tdom/distinfo +++ b/textproc/tdom/distinfo @@ -1,2 +1,2 @@ -SHA256 (tdom-0.9.0-src.tgz) = IB5/Gw3yix8ZIdnsGPH/1aG1WMBQnFTIgga2WoG6J0A= -SIZE (tdom-0.9.0-src.tgz) = 1065288 +SHA256 (tdom-0.9.1-src.tgz) = Ox9kTPB1M/5K+qjLcJywComdnp6/pm9GdKotz7OYJCw= +SIZE (tdom-0.9.1-src.tgz) = 1100163 diff --git a/textproc/tdom/patches/patch-Makefile_in b/textproc/tdom/patches/patch-Makefile_in index 3863df2b024..8cd9701a553 100644 --- a/textproc/tdom/patches/patch-Makefile_in +++ b/textproc/tdom/patches/patch-Makefile_in @@ -1,28 +1,22 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2018/06/12 15:44:28 stu Exp $ +$OpenBSD: patch-Makefile_in,v 1.2 2018/07/26 01:56:52 stu Exp $ Install to OpenBSD locations and adjust pkgIndex.tcl accordingly. Index: Makefile.in --- Makefile.in.orig +++ Makefile.in -@@ -407,12 +407,12 @@ install-lib-binaries: binaries - @$(INSTALL_DATA_DIR) $(DESTDIR)$(pkglibdir) - @list='$(lib_BINARIES)'; for p in $$list; do \ - if test -f $$p; then \ +@@ -432,8 +432,8 @@ install-lib-binaries: binaries + echo " $(RANLIB) $$p"; \ + $(RANLIB) $$p; \ + fi; \ - echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ - $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p"; \ + $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p; \ stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ - if test "x$$stub" = "xstub"; then \ -- echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ -- $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ -+ echo " $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p"; \ -+ $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p; \ - else \ - echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ - $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ -@@ -427,8 +427,8 @@ install-lib-binaries: binaries + ext=`echo $$p|sed -e "s/.*\.//"`; \ + if test "x$$ext" = "xdll"; then \ +@@ -445,8 +445,8 @@ install-lib-binaries: binaries fi; \ fi; \ done @@ -33,7 +27,7 @@ Index: Makefile.in @list='$(PKG_TCL_SOURCES)'; for p in $$list; do \ if test -f $(srcdir)/$$p; then \ destp=`basename $$p`; \ -@@ -438,6 +438,7 @@ install-lib-binaries: binaries +@@ -456,6 +456,7 @@ install-lib-binaries: binaries done @if test "x$(SHARED_BUILD)" = "x1"; then \ echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \ diff --git a/textproc/tdom/patches/patch-configure b/textproc/tdom/patches/patch-configure index ea07a2442b3..ec93a5a0b20 100644 --- a/textproc/tdom/patches/patch-configure +++ b/textproc/tdom/patches/patch-configure @@ -1,11 +1,11 @@ -$OpenBSD: patch-configure,v 1.1.1.1 2018/06/12 15:44:28 stu Exp $ +$OpenBSD: patch-configure,v 1.2 2018/07/26 01:56:52 stu Exp $ Do this here so it propagates through everything. Index: configure --- configure.orig +++ configure -@@ -9131,7 +9131,7 @@ TDOMSHELL=tcldomsh +@@ -8804,7 +8804,7 @@ TDOMSHELL=tcldomsh #-------------------------------------------------------------------- # pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib) diff --git a/textproc/tdom/pkg/PLIST b/textproc/tdom/pkg/PLIST index 2312cd5d2f1..d5f02d3cba6 100644 --- a/textproc/tdom/pkg/PLIST +++ b/textproc/tdom/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2018/06/12 15:44:28 stu Exp $ +@comment $OpenBSD: PLIST,v 1.2 2018/07/26 01:56:52 stu Exp $ include/tdom.h @lib lib/libtdom${VER}.so.${LIBtdom${VER}_VERSION} lib/libtdomstub${VER}.a @@ -12,5 +12,6 @@ lib/tcl/tdom/tdomConfig.sh @man man/mann/domNode.n @man man/mann/expat.n @man man/mann/expatapi.n +@man man/mann/pullparser.n @man man/mann/tdomcmd.n @man man/mann/tnc.n