pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/pfe Fix broken build:

details:   https://anonhg.NetBSD.org/pkgsrc/rev/06d10a42a598
branches:  trunk
changeset: 373077:06d10a42a598
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Thu Dec 28 12:46:58 2017 +0000

description:
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.

diffstat:

 lang/pfe/Makefile                                    |   7 +-
 lang/pfe/PLIST                                       |  61 ++++++++++++++++++-
 lang/pfe/distinfo                                    |   3 +-
 lang/pfe/patches/patch-doc_pfedoc_docbookdocument.py |  16 +++++
 4 files changed, 79 insertions(+), 8 deletions(-)

diffs (151 lines):

diff -r 32b34063897b -r 06d10a42a598 lang/pfe/Makefile
--- a/lang/pfe/Makefile Thu Dec 28 07:01:46 2017 +0000
+++ b/lang/pfe/Makefile Thu Dec 28 12:46:58 2017 +0000
@@ -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 @@
 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 @@
 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"
diff -r 32b34063897b -r 06d10a42a598 lang/pfe/PLIST
--- a/lang/pfe/PLIST    Thu Dec 28 07:01:46 2017 +0000
+++ b/lang/pfe/PLIST    Thu Dec 28 12:46:58 2017 +0000
@@ -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/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/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.fs
 share/pfe/test/wordsets.4th
 share/pfe/test/wordsets.fs
-share/pfe/testmodule1.fs
-share/pfe/testmodule2.fs
 @pkgdir share/info
diff -r 32b34063897b -r 06d10a42a598 lang/pfe/distinfo
--- a/lang/pfe/distinfo Thu Dec 28 07:01:46 2017 +0000
+++ b/lang/pfe/distinfo Thu Dec 28 12:46:58 2017 +0000
@@ -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
diff -r 32b34063897b -r 06d10a42a598 lang/pfe/patches/patch-doc_pfedoc_docbookdocument.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/pfe/patches/patch-doc_pfedoc_docbookdocument.py      Thu Dec 28 12:46:58 2017 +0000
@@ -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"(<function>[^<>]+)\\&lt\\;/link>") >> "\\1</function>"
++    T = T & Match(r"(<literal>[^<>]+)\\&lt\\;/code>") >> "\\1</literal>"
+     if T != text:
+         pass # print "HACK FIXUP:", text
+     return T
Home | Main Index | Thread Index | Old Index