Received: by mail.netbsd.org (Postfix, from userid 605) id 64E5F84D54; Thu, 28 Dec 2017 12:47:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B93BC84CED for ; Thu, 28 Dec 2017 12:46:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id kXr5tJA7Q5Yv for ; Thu, 28 Dec 2017 12:46:59 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 01D3484CDC for ; Thu, 28 Dec 2017 12:46:59 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id F16EDFB40; Thu, 28 Dec 2017 12:46:58 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1514465218240260" MIME-Version: 1.0 Date: Thu, 28 Dec 2017 12:46:58 +0000 From: "David A. Holland" Subject: CVS commit: pkgsrc/lang/pfe To: pkgsrc-changes@NetBSD.org Reply-To: dholland@netbsd.org X-Mailer: log_accum Message-Id: <20171228124658.F16EDFB40@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1514465218240260 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: dholland Date: Thu Dec 28 12:46:58 UTC 2017 Modified Files: pkgsrc/lang/pfe: Makefile PLIST distinfo Added Files: pkgsrc/lang/pfe/patches: patch-doc_pfedoc_docbookdocument.py Log Message: Fix broken build: - extend upstream hack to work around invalid xml generated by the docstrings tool; - add a bunch of missing html files to the PLIST; - disable build/install of the test modules as they don't understand the distinction between build dirs and install dirs; - bump PKGREVISION to 10 for the PLIST changes, although this is probably unnecessary. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/pfe/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/pfe/PLIST cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/pfe/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/lang/pfe/patches/patch-doc_pfedoc_docbookdocument.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1514465218240260 Content-Disposition: inline Content-Length: 7130 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/pfe/Makefile diff -u pkgsrc/lang/pfe/Makefile:1.14 pkgsrc/lang/pfe/Makefile:1.15 --- pkgsrc/lang/pfe/Makefile:1.14 Wed Dec 27 22:58:55 2017 +++ pkgsrc/lang/pfe/Makefile Thu Dec 28 12:46:58 2017 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2017/12/27 22:58:55 dholland Exp $ +# $NetBSD: Makefile,v 1.15 2017/12/28 12:46:58 dholland Exp $ DISTNAME= pfe-0.33.71 -PKGREVISION= 9 +PKGREVISION= 10 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pfe/} EXTRACT_SUFX= .tar.bz2 @@ -11,6 +11,7 @@ HOMEPAGE= http://pfe.sourceforge.net/ COMMENT= Portable FORTH Environment GNU_CONFIGURE= yes +CONFIGURE_ARGS= --without-testmodule USE_LIBTOOL= yes USE_TOOLS+= perl pkg-config MAKE_ENV+= SHELL=${CONFIG_SHELL} @@ -20,7 +21,7 @@ BUILD_TARGET= all mans docs INSTALL_TARGET= install install-mans install-docs TEST_TARGET= tests -TOOL_DEPENDS= xmlto-[0-9]*:../../textproc/xmlto # documentation +TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto # documentation PYTHON_FOR_BUILD_ONLY= tool .include "../../lang/python/pyversion.mk" Index: pkgsrc/lang/pfe/PLIST diff -u pkgsrc/lang/pfe/PLIST:1.2 pkgsrc/lang/pfe/PLIST:1.3 --- pkgsrc/lang/pfe/PLIST:1.2 Sun May 6 00:14:08 2012 +++ pkgsrc/lang/pfe/PLIST Thu Dec 28 12:46:58 2017 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2012/05/06 00:14:08 dholland Exp $ +@comment $NetBSD: PLIST,v 1.3 2017/12/28 12:46:58 dholland Exp $ bin/pfe bin/pfe-exec bin/pfe-exec-forth @@ -137,7 +137,6 @@ lib/pfe-forth/structs.la lib/pfe-forth/termcatch.la lib/pfe-forth/toolbelt.la lib/pfe-forth/zchar.la -lib/pfe/testmodule1.la lib/pkgconfig/pfe.pc man/man1/pfe.1 man/man3/P4_LISTWORDS.3 @@ -1347,6 +1346,62 @@ share/doc/pfe/${PKGVERSION}/pfe-manual/c share/doc/pfe/${PKGVERSION}/pfe-manual/ch01s19.html share/doc/pfe/${PKGVERSION}/pfe-manual/index.html share/doc/pfe/${PKGVERSION}/pfe-manual/pfe-manual.proc +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re01.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re02.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re03.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re04.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re05.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re06.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re07.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re08.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re09.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re10.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re11.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re12.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re13.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re14.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re15.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re16.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re17.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re18.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re19.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re20.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re21.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re22.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re23.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re24.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re25.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re26.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re27.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re28.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re29.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re30.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re31.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re32.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re33.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re34.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re35.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re36.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re37.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re38.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re39.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re40.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re41.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re42.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re43.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re44.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re45.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re46.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re47.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re48.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re49.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re50.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re51.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re52.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re53.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re54.html +share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re55.html share/doc/pfe/${PKGVERSION}/pfe-words.html share/doc/pfe/${PKGVERSION}/pfe-wordsets.html share/doc/pfe/${PKGVERSION}/pfe-wordsets/assembler.html @@ -1497,6 +1552,4 @@ share/pfe/test/tt.4th share/pfe/test/tt.fs share/pfe/test/wordsets.4th share/pfe/test/wordsets.fs -share/pfe/testmodule1.fs -share/pfe/testmodule2.fs @pkgdir share/info Index: pkgsrc/lang/pfe/distinfo diff -u pkgsrc/lang/pfe/distinfo:1.3 pkgsrc/lang/pfe/distinfo:1.4 --- pkgsrc/lang/pfe/distinfo:1.3 Tue Nov 3 22:50:41 2015 +++ pkgsrc/lang/pfe/distinfo Thu Dec 28 12:46:58 2017 @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.3 2015/11/03 22:50:41 agc Exp $ +$NetBSD: distinfo,v 1.4 2017/12/28 12:46:58 dholland Exp $ SHA1 (pfe-0.33.71.tar.bz2) = 2e61bbf550767793b20bffc544b625fc4e889f44 RMD160 (pfe-0.33.71.tar.bz2) = 5bfdc5561c281f5d506151ec17552b03e6a411ab SHA512 (pfe-0.33.71.tar.bz2) = d038ec9b6ca0ae5082c5cb68b1af40b4cdfce34d7706c9a3802246e5db4b1ffb13889e4898257c6ff55a9fe985084f22ff90559d3be247be09567643cb8b821a Size (pfe-0.33.71.tar.bz2) = 1789663 bytes SHA1 (patch-aa) = 8e2612bb1a828e531c023011f8ff4bb64d16c511 +SHA1 (patch-doc_pfedoc_docbookdocument.py) = b44293561361253074518fcfa3fa2d47137b5893 SHA1 (patch-pfe_configure) = c1b2aaa1a2cc2d5dac1d9717e5450c45067bdbb8 Added files: Index: pkgsrc/lang/pfe/patches/patch-doc_pfedoc_docbookdocument.py diff -u /dev/null pkgsrc/lang/pfe/patches/patch-doc_pfedoc_docbookdocument.py:1.1 --- /dev/null Thu Dec 28 12:46:58 2017 +++ pkgsrc/lang/pfe/patches/patch-doc_pfedoc_docbookdocument.py Thu Dec 28 12:46:58 2017 @@ -0,0 +1,16 @@ +$NetBSD: patch-doc_pfedoc_docbookdocument.py,v 1.1 2017/12/28 12:46:58 dholland Exp $ + +Extend existing upstream hack in the docstrings processor to an +apparently similar case of garbled output that's currently breaking +the build. + +--- doc/pfedoc/docbookdocument.py~ 2009-10-04 13:06:40.000000000 +0000 ++++ doc/pfedoc/docbookdocument.py +@@ -4,6 +4,7 @@ from match import Match + + def _hack_fixup(text): + T = text & Match(r"([^<>]+)\\<\\;/link>") >> "\\1" ++ T = T & Match(r"([^<>]+)\\<\\;/code>") >> "\\1" + if T != text: + pass # print "HACK FIXUP:", text + return T --_----------=_1514465218240260--