Thu Dec 28 12:46:58 2017 UTC ()
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.


(dholland)
diff -r1.14 -r1.15 pkgsrc/lang/pfe/Makefile
diff -r1.2 -r1.3 pkgsrc/lang/pfe/PLIST
diff -r1.3 -r1.4 pkgsrc/lang/pfe/distinfo
diff -r0 -r1.1 pkgsrc/lang/pfe/patches/patch-doc_pfedoc_docbookdocument.py
cvs diff -r1.14 -r1.15 pkgsrc/lang/pfe/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/pfe/Makefile 2017/12/27 22:58:55 1.14
+++ pkgsrc/lang/pfe/Makefile 2017/12/28 12:46:58 1.15
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1# $NetBSD: Makefile,v 1.14 2017/12/27 22:58:55 dholland Exp $ 1# $NetBSD: Makefile,v 1.15 2017/12/28 12:46:58 dholland Exp $
2 2
3DISTNAME= pfe-0.33.71 3DISTNAME= pfe-0.33.71
4PKGREVISION= 9 4PKGREVISION= 10
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pfe/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pfe/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= asau@inbox.ru 9MAINTAINER= asau@inbox.ru
10HOMEPAGE= http://pfe.sourceforge.net/ 10HOMEPAGE= http://pfe.sourceforge.net/
11COMMENT= Portable FORTH Environment 11COMMENT= Portable FORTH Environment
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
 14CONFIGURE_ARGS= --without-testmodule
14USE_LIBTOOL= yes 15USE_LIBTOOL= yes
15USE_TOOLS+= perl pkg-config 16USE_TOOLS+= perl pkg-config
16MAKE_ENV+= SHELL=${CONFIG_SHELL} 17MAKE_ENV+= SHELL=${CONFIG_SHELL}
17 18
18MAKE_JOBS_SAFE= no 19MAKE_JOBS_SAFE= no
19BUILD_TARGET= all mans docs 20BUILD_TARGET= all mans docs
20INSTALL_TARGET= install install-mans install-docs 21INSTALL_TARGET= install install-mans install-docs
21TEST_TARGET= tests 22TEST_TARGET= tests
22 23
23TOOL_DEPENDS= xmlto-[0-9]*:../../textproc/xmlto # documentation 24TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto # documentation
24PYTHON_FOR_BUILD_ONLY= tool 25PYTHON_FOR_BUILD_ONLY= tool
25 26
26.include "../../lang/python/pyversion.mk" 27.include "../../lang/python/pyversion.mk"
27.include "../../mk/termcap.buildlink3.mk" 28.include "../../mk/termcap.buildlink3.mk"
28.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/lang/pfe/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/pfe/PLIST 2012/05/06 00:14:08 1.2
+++ pkgsrc/lang/pfe/PLIST 2017/12/28 12:46:58 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2012/05/06 00:14:08 dholland Exp $ 1@comment $NetBSD: PLIST,v 1.3 2017/12/28 12:46:58 dholland Exp $
2bin/pfe 2bin/pfe
3bin/pfe-exec 3bin/pfe-exec
4bin/pfe-exec-forth 4bin/pfe-exec-forth
5bin/pfe-forth 5bin/pfe-forth
6include/pfe/_config.h 6include/pfe/_config.h
7include/pfe/_target.h 7include/pfe/_target.h
8include/pfe/assembler-ext.h 8include/pfe/assembler-ext.h
9include/pfe/block-ext.h 9include/pfe/block-ext.h
10include/pfe/block-mix.h 10include/pfe/block-mix.h
11include/pfe/block-sub.h 11include/pfe/block-sub.h
12include/pfe/cdecl-ext.h 12include/pfe/cdecl-ext.h
13include/pfe/chain-ext.h 13include/pfe/chain-ext.h
14include/pfe/chainlist-ext.h 14include/pfe/chainlist-ext.h
@@ -127,27 +127,26 @@ lib/pfe-forth/renamed/libstackhelp.so @@ -127,27 +127,26 @@ lib/pfe-forth/renamed/libstackhelp.so
127lib/pfe-forth/renamed/libstruct.so 127lib/pfe-forth/renamed/libstruct.so
128lib/pfe-forth/renamed/libstructs.so 128lib/pfe-forth/renamed/libstructs.so
129lib/pfe-forth/renamed/libtermcatch.so 129lib/pfe-forth/renamed/libtermcatch.so
130lib/pfe-forth/renamed/libtoolbelt.so 130lib/pfe-forth/renamed/libtoolbelt.so
131lib/pfe-forth/renamed/libzchar.so 131lib/pfe-forth/renamed/libzchar.so
132lib/pfe-forth/smart-go.la 132lib/pfe-forth/smart-go.la
133lib/pfe-forth/socket.la 133lib/pfe-forth/socket.la
134lib/pfe-forth/stackhelp.la 134lib/pfe-forth/stackhelp.la
135lib/pfe-forth/struct.la 135lib/pfe-forth/struct.la
136lib/pfe-forth/structs.la 136lib/pfe-forth/structs.la
137lib/pfe-forth/termcatch.la 137lib/pfe-forth/termcatch.la
138lib/pfe-forth/toolbelt.la 138lib/pfe-forth/toolbelt.la
139lib/pfe-forth/zchar.la 139lib/pfe-forth/zchar.la
140lib/pfe/testmodule1.la 
141lib/pkgconfig/pfe.pc 140lib/pkgconfig/pfe.pc
142man/man1/pfe.1 141man/man1/pfe.1
143man/man3/P4_LISTWORDS.3 142man/man3/P4_LISTWORDS.3
144man/man3/_p4_access.3 143man/man3/_p4_access.3
145man/man3/_p4_rename.3 144man/man3/_p4_rename.3
146man/man3/_p4_smart_interpret_init.3 145man/man3/_p4_smart_interpret_init.3
147man/man3/p4_AddOptions.3 146man/man3/p4_AddOptions.3
148man/man3/p4_Exec.3 147man/man3/p4_Exec.3
149man/man3/p4_FreeOptions.3 148man/man3/p4_FreeOptions.3
150man/man3/p4_Q_comp.3 149man/man3/p4_Q_comp.3
151man/man3/p4_Q_cr.3 150man/man3/p4_Q_cr.3
152man/man3/p4_Q_csp.3 151man/man3/p4_Q_csp.3
153man/man3/p4_Q_do.3 152man/man3/p4_Q_do.3
@@ -1337,26 +1336,82 @@ share/doc/pfe/${PKGVERSION}/pfe-manual/c @@ -1337,26 +1336,82 @@ share/doc/pfe/${PKGVERSION}/pfe-manual/c
1337share/doc/pfe/${PKGVERSION}/pfe-manual/ch01s09.html 1336share/doc/pfe/${PKGVERSION}/pfe-manual/ch01s09.html
1338share/doc/pfe/${PKGVERSION}/pfe-manual/ch01s10.html 1337share/doc/pfe/${PKGVERSION}/pfe-manual/ch01s10.html
1339share/doc/pfe/${PKGVERSION}/pfe-manual/ch01s11.html 1338share/doc/pfe/${PKGVERSION}/pfe-manual/ch01s11.html
1340share/doc/pfe/${PKGVERSION}/pfe-manual/ch01s12.html 1339share/doc/pfe/${PKGVERSION}/pfe-manual/ch01s12.html
1341share/doc/pfe/${PKGVERSION}/pfe-manual/ch01s13.html 1340share/doc/pfe/${PKGVERSION}/pfe-manual/ch01s13.html
1342share/doc/pfe/${PKGVERSION}/pfe-manual/ch01s14.html 1341share/doc/pfe/${PKGVERSION}/pfe-manual/ch01s14.html
1343share/doc/pfe/${PKGVERSION}/pfe-manual/ch01s15.html 1342share/doc/pfe/${PKGVERSION}/pfe-manual/ch01s15.html
1344share/doc/pfe/${PKGVERSION}/pfe-manual/ch01s16.html 1343share/doc/pfe/${PKGVERSION}/pfe-manual/ch01s16.html
1345share/doc/pfe/${PKGVERSION}/pfe-manual/ch01s17.html 1344share/doc/pfe/${PKGVERSION}/pfe-manual/ch01s17.html
1346share/doc/pfe/${PKGVERSION}/pfe-manual/ch01s18.html 1345share/doc/pfe/${PKGVERSION}/pfe-manual/ch01s18.html
1347share/doc/pfe/${PKGVERSION}/pfe-manual/ch01s19.html 1346share/doc/pfe/${PKGVERSION}/pfe-manual/ch01s19.html
1348share/doc/pfe/${PKGVERSION}/pfe-manual/index.html 1347share/doc/pfe/${PKGVERSION}/pfe-manual/index.html
1349share/doc/pfe/${PKGVERSION}/pfe-manual/pfe-manual.proc 1348share/doc/pfe/${PKGVERSION}/pfe-manual/pfe-manual.proc
 1349share/doc/pfe/${PKGVERSION}/pfe-manual/rn01.html
 1350share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re01.html
 1351share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re02.html
 1352share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re03.html
 1353share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re04.html
 1354share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re05.html
 1355share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re06.html
 1356share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re07.html
 1357share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re08.html
 1358share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re09.html
 1359share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re10.html
 1360share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re11.html
 1361share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re12.html
 1362share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re13.html
 1363share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re14.html
 1364share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re15.html
 1365share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re16.html
 1366share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re17.html
 1367share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re18.html
 1368share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re19.html
 1369share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re20.html
 1370share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re21.html
 1371share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re22.html
 1372share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re23.html
 1373share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re24.html
 1374share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re25.html
 1375share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re26.html
 1376share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re27.html
 1377share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re28.html
 1378share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re29.html
 1379share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re30.html
 1380share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re31.html
 1381share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re32.html
 1382share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re33.html
 1383share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re34.html
 1384share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re35.html
 1385share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re36.html
 1386share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re37.html
 1387share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re38.html
 1388share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re39.html
 1389share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re40.html
 1390share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re41.html
 1391share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re42.html
 1392share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re43.html
 1393share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re44.html
 1394share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re45.html
 1395share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re46.html
 1396share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re47.html
 1397share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re48.html
 1398share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re49.html
 1399share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re50.html
 1400share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re51.html
 1401share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re52.html
 1402share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re53.html
 1403share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re54.html
 1404share/doc/pfe/${PKGVERSION}/pfe-manual/rn01re55.html
1350share/doc/pfe/${PKGVERSION}/pfe-words.html 1405share/doc/pfe/${PKGVERSION}/pfe-words.html
1351share/doc/pfe/${PKGVERSION}/pfe-wordsets.html 1406share/doc/pfe/${PKGVERSION}/pfe-wordsets.html
1352share/doc/pfe/${PKGVERSION}/pfe-wordsets/assembler.html 1407share/doc/pfe/${PKGVERSION}/pfe-wordsets/assembler.html
1353share/doc/pfe/${PKGVERSION}/pfe-wordsets/block.html 1408share/doc/pfe/${PKGVERSION}/pfe-wordsets/block.html
1354share/doc/pfe/${PKGVERSION}/pfe-wordsets/block_misc.html 1409share/doc/pfe/${PKGVERSION}/pfe-wordsets/block_misc.html
1355share/doc/pfe/${PKGVERSION}/pfe-wordsets/cdecl.html 1410share/doc/pfe/${PKGVERSION}/pfe-wordsets/cdecl.html
1356share/doc/pfe/${PKGVERSION}/pfe-wordsets/chain.html 1411share/doc/pfe/${PKGVERSION}/pfe-wordsets/chain.html
1357share/doc/pfe/${PKGVERSION}/pfe-wordsets/chainlist.html 1412share/doc/pfe/${PKGVERSION}/pfe-wordsets/chainlist.html
1358share/doc/pfe/${PKGVERSION}/pfe-wordsets/complex.html 1413share/doc/pfe/${PKGVERSION}/pfe-wordsets/complex.html
1359share/doc/pfe/${PKGVERSION}/pfe-wordsets/core.html 1414share/doc/pfe/${PKGVERSION}/pfe-wordsets/core.html
1360share/doc/pfe/${PKGVERSION}/pfe-wordsets/core_misc.html 1415share/doc/pfe/${PKGVERSION}/pfe-wordsets/core_misc.html
1361share/doc/pfe/${PKGVERSION}/pfe-wordsets/debug.html 1416share/doc/pfe/${PKGVERSION}/pfe-wordsets/debug.html
1362share/doc/pfe/${PKGVERSION}/pfe-wordsets/dlfcn.html 1417share/doc/pfe/${PKGVERSION}/pfe-wordsets/dlfcn.html
@@ -1487,16 +1542,14 @@ share/pfe/test/speedwhile.fs @@ -1487,16 +1542,14 @@ share/pfe/test/speedwhile.fs
1487share/pfe/test/stack.4th 1542share/pfe/test/stack.4th
1488share/pfe/test/string.4th 1543share/pfe/test/string.4th
1489share/pfe/test/suite.4th 1544share/pfe/test/suite.4th
1490share/pfe/test/test-num-prefixes.4th 1545share/pfe/test/test-num-prefixes.4th
1491share/pfe/test/test-num-prefixes.fs 1546share/pfe/test/test-num-prefixes.fs
1492share/pfe/test/test-num-prefixes2.4th 1547share/pfe/test/test-num-prefixes2.4th
1493share/pfe/test/test-num-prefixes2.fs 1548share/pfe/test/test-num-prefixes2.fs
1494share/pfe/test/tester.fs 1549share/pfe/test/tester.fs
1495share/pfe/test/trydstrings.fs 1550share/pfe/test/trydstrings.fs
1496share/pfe/test/tt.4th 1551share/pfe/test/tt.4th
1497share/pfe/test/tt.fs 1552share/pfe/test/tt.fs
1498share/pfe/test/wordsets.4th 1553share/pfe/test/wordsets.4th
1499share/pfe/test/wordsets.fs 1554share/pfe/test/wordsets.fs
1500share/pfe/testmodule1.fs 
1501share/pfe/testmodule2.fs 
1502@pkgdir share/info 1555@pkgdir share/info
cvs diff -r1.3 -r1.4 pkgsrc/lang/pfe/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/pfe/distinfo 2015/11/03 22:50:41 1.3
+++ pkgsrc/lang/pfe/distinfo 2017/12/28 12:46:58 1.4
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.3 2015/11/03 22:50:41 agc Exp $ 1$NetBSD: distinfo,v 1.4 2017/12/28 12:46:58 dholland Exp $
2 2
3SHA1 (pfe-0.33.71.tar.bz2) = 2e61bbf550767793b20bffc544b625fc4e889f44 3SHA1 (pfe-0.33.71.tar.bz2) = 2e61bbf550767793b20bffc544b625fc4e889f44
4RMD160 (pfe-0.33.71.tar.bz2) = 5bfdc5561c281f5d506151ec17552b03e6a411ab 4RMD160 (pfe-0.33.71.tar.bz2) = 5bfdc5561c281f5d506151ec17552b03e6a411ab
5SHA512 (pfe-0.33.71.tar.bz2) = d038ec9b6ca0ae5082c5cb68b1af40b4cdfce34d7706c9a3802246e5db4b1ffb13889e4898257c6ff55a9fe985084f22ff90559d3be247be09567643cb8b821a 5SHA512 (pfe-0.33.71.tar.bz2) = d038ec9b6ca0ae5082c5cb68b1af40b4cdfce34d7706c9a3802246e5db4b1ffb13889e4898257c6ff55a9fe985084f22ff90559d3be247be09567643cb8b821a
6Size (pfe-0.33.71.tar.bz2) = 1789663 bytes 6Size (pfe-0.33.71.tar.bz2) = 1789663 bytes
7SHA1 (patch-aa) = 8e2612bb1a828e531c023011f8ff4bb64d16c511 7SHA1 (patch-aa) = 8e2612bb1a828e531c023011f8ff4bb64d16c511
 8SHA1 (patch-doc_pfedoc_docbookdocument.py) = b44293561361253074518fcfa3fa2d47137b5893
8SHA1 (patch-pfe_configure) = c1b2aaa1a2cc2d5dac1d9717e5450c45067bdbb8 9SHA1 (patch-pfe_configure) = c1b2aaa1a2cc2d5dac1d9717e5450c45067bdbb8
File Added: pkgsrc/lang/pfe/patches/patch-doc_pfedoc_docbookdocument.py
$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"(<function>[^<>]+)\\&lt\\;/link>") >> "\\1</function>"
+    T = T & Match(r"(<literal>[^<>]+)\\&lt\\;/code>") >> "\\1</literal>"
     if T != text:
         pass # print "HACK FIXUP:", text
     return T