CVS commit: pkgsrc/textproc/docbook2mdoc

["ng0" <ng0%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ng0
Date:           Sun Aug 25 17:53:59 UTC 2019

Modified Files:
        pkgsrc/textproc/docbook2mdoc: Makefile distinfo
        pkgsrc/textproc/docbook2mdoc/patches: patch-Makefile

Log Message:
textproc/docbook2mdoc: Update to version 1.1.0 (from wip)

Adjust patch to new version.
Remove expat bl3, upstream dropped the expat dependency
by rewriting the code.

ChangeLog:

    Changes in version 1.1.0, released on May 2, 2019

       --- NEW PARSER FEATURES ---
     * Handle <funcparams> inside <paramdef> inside <funcprototype>.
     * Ignore <jobtitle> and <orgdiv> elements.
       --- NEW FORMATTER FEATURES --
     * Write a comment "automatically generated" at the beginning.
     * Provide an -s command line option to override the section in .Dt.
     * Large numbers of improvements to horizontal and vertical whitespace.
     * End of sentence detection: new sentence, new line.
     * Drop trailing parentheses in <function> elements.
     * Print commas between Copyright years.

    Changes in version 1.0.2, released on April 29, 2019

       --- NEW PARSER FEATURES ---
     * Handle <abstract>: better formatting of many non-<refentry> documents.
     * Handle <reference> like <section>.
     * Explicitly ignore <keycombo>.
       --- STRUCTURAL IMPROVEMENTS ---
     * Start a new module reorg.c, to edit and move around nodes.
     * Provide a new function pnode_alloc_text() to generate a text node.
     * Introduce an xmalloc.c module to automatically exit when out of memory.

    Changes in version 1.0.1, released on April 24, 2019

       --- NEW PARSER FEATURES ---
     * Handle file inclusion via "<!ENTITY %".
     * Translate decimal character entities to Unicode escapes.
     * Handle <tag> like <sgmltag> and <markup>.
       --- RELIABILITY BUGFIX ---
     * Do not crash when an ignored element contains an attribute.
       --- FORMATTING IMPROVEMENTS ---
     * Correctly translate input to output line breaks in no-fill elements.
     * Improve spacing of text nodes inside macro arguments.
     * Better handle <void> as a child of <funcprototype>.
     * Better handle <info> as a child of <refentry>.
     * Correct delimiter spacing between <term> elements.
     * Insert a paragraph break after displays and after non-compact lists.
       --- THANKS TO ---
     * Stephen Gregoratto for a small patch and two bug reports.
     * Jan Stary for a bug report.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/docbook2mdoc/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/docbook2mdoc/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/docbook2mdoc/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/docbook2mdoc/Makefile
diff -u pkgsrc/textproc/docbook2mdoc/Makefile:1.4 pkgsrc/textproc/docbook2mdoc/Makefile:1.5
--- pkgsrc/textproc/docbook2mdoc/Makefile:1.4   Wed Apr 30 13:57:15 2014
+++ pkgsrc/textproc/docbook2mdoc/Makefile       Sun Aug 25 17:53:58 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2014/04/30 13:57:15 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2019/08/25 17:53:58 ng0 Exp $
 
-DISTNAME=      docbook2mdoc-0.0.9
+DISTNAME=      docbook2mdoc-1.1.0
 CATEGORIES=    textproc
 MASTER_SITES=  http://mdocml.bsd.lv/docbook2mdoc/snapshots/
 EXTRACT_SUFX=  .tgz
@@ -13,5 +13,4 @@ LICENSE=      isc
 BUILD_TARGET=  docbook2mdoc
 MAKE_FLAGS+=   PREFIX=${PREFIX}
 
-.include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/docbook2mdoc/distinfo
diff -u pkgsrc/textproc/docbook2mdoc/distinfo:1.7 pkgsrc/textproc/docbook2mdoc/distinfo:1.8
--- pkgsrc/textproc/docbook2mdoc/distinfo:1.7   Wed Jul 12 12:55:51 2017
+++ pkgsrc/textproc/docbook2mdoc/distinfo       Sun Aug 25 17:53:58 2019
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2017/07/12 12:55:51 wiz Exp $
+$NetBSD: distinfo,v 1.8 2019/08/25 17:53:58 ng0 Exp $
 
-SHA1 (docbook2mdoc-0.0.9.tgz) = c95f34cc6c3905443ea63a25a408a82e6fd6e7ff
-RMD160 (docbook2mdoc-0.0.9.tgz) = 73705dfbfb07c0fd39c7a00d23c135bb0c678c01
-SHA512 (docbook2mdoc-0.0.9.tgz) = 1945acdaf137972b1fcae4c699177ebec27ae8550ec874899a3ad29d5cff185adff2dbb236dd88063da3b7acb6305ba696b6679ae51cf59612fe9c1f8a30ac18
-Size (docbook2mdoc-0.0.9.tgz) = 13022 bytes
-SHA1 (patch-Makefile) = 637dcd3082d7c097c533c3e40e611e99275096cf
+SHA1 (docbook2mdoc-1.1.0.tgz) = 2797e0362e84c01eaa46ea40c2089fe773b97c4c
+RMD160 (docbook2mdoc-1.1.0.tgz) = dfe77e13a6ccbe413b55a7f7106be1e000ea4f98
+SHA512 (docbook2mdoc-1.1.0.tgz) = d935a12de59a1b91f51b3ddcc1047ce6e46f0490852c3ab1191402f6c2f9d8e79c57b1ad67ac7b2527c9aa4788f027ca6b83dffbcfed756af0422858713101be
+Size (docbook2mdoc-1.1.0.tgz) = 26732 bytes
+SHA1 (patch-Makefile) = 2848a21684f577a9990d51abbbb7a0a09cccbddb

Index: pkgsrc/textproc/docbook2mdoc/patches/patch-Makefile
diff -u pkgsrc/textproc/docbook2mdoc/patches/patch-Makefile:1.2 pkgsrc/textproc/docbook2mdoc/patches/patch-Makefile:1.3
--- pkgsrc/textproc/docbook2mdoc/patches/patch-Makefile:1.2     Wed Jul 12 12:55:51 2017
+++ pkgsrc/textproc/docbook2mdoc/patches/patch-Makefile Sun Aug 25 17:53:59 2019
@@ -1,24 +1,28 @@
-$NetBSD: patch-Makefile,v 1.2 2017/07/12 12:55:51 wiz Exp $
+$NetBSD: patch-Makefile,v 1.3 2019/08/25 17:53:59 ng0 Exp $
 
 Honor LDFLAGS.
 Support PKGMANDIR.
 
 --- Makefile.orig      2014-04-30 13:21:35.000000000 +0000
 +++ Makefile
-@@ -6,15 +6,15 @@ PREFIX = /usr/local
+@@ -11,18 +11,18 @@
  all: docbook2mdoc
  
- docbook2mdoc: docbook2mdoc.o rules.o
--      $(CC) -o $@ docbook2mdoc.o rules.o -lexpat
-+      $(CC) $(LDFLAGS) -o $@ docbook2mdoc.o rules.o -lexpat
+ docbook2mdoc: $(OBJS)
+-      $(CC) -g -o $@ $(OBJS)
++      $(CC) $(LDFLAGS) -g -o $@ $(OBJS)
  
- www: index.html docbook2mdoc.1.html docbook2mdoc-$(VERSION).tgz README.txt
+ statistics: statistics.o xmalloc.o
+-      $(CC) -g -o $@ statistics.o xmalloc.o
++      $(CC) $(LDFLAGS) -g -o $@ statistics.o xmalloc.o
+ 
+ www: docbook2mdoc.1.html docbook2mdoc-$(VERSION).tgz README.txt
  
  install: all
-       mkdir -p $(DESTDIR)$(PREFIX)/bin
+       mkdir -p $(DESTDIR)$(PREFIX)/bin
 -      mkdir -p $(DESTDIR)$(PREFIX)/man/man1
 +      mkdir -p $(DESTDIR)$(PREFIX)/${PKGMANDIR}/man1
-       install -m 0755 docbook2mdoc $(DESTDIR)$(PREFIX)/bin
+       install -m 0755 docbook2mdoc $(DESTDIR)$(PREFIX)/bin
 -      install -m 0444 docbook2mdoc.1 $(DESTDIR)$(PREFIX)/man/man1
 +      install -m 0444 docbook2mdoc.1 $(DESTDIR)$(PREFIX)/${PKGMANDIR}/man1