CVS commit: pkgsrc/textproc/lowdown

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/textproc/lowdown
From: "Amitai Schleier" <schmonz%netbsd.org@localhost>
Date: Fri, 26 May 2023 20:38:47 +0000

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri May 26 20:38:47 UTC 2023

Modified Files:
        pkgsrc/textproc/lowdown: Makefile PLIST buildlink3.mk distinfo
Added Files:
        pkgsrc/textproc/lowdown/patches: patch-Makefile

Log Message:
Update to 1.0.2. From the changelog:

1.0.2:

Accept DOS CRLF newlines in all situations. Prior to this, CRLF newlines
would cause problems in some contexts.

Add support for pandoc title blocks as a metadata block syntax choice.
Pandoc and MMD syntaxes are mutually exclusive, so only one may be used
in any given document. The syntax is documented in lowdown(5).

While there, support starting and ending an MMD metadata block with
"---" on its own line, as in the MMD specification.

Add the --html-titleblock option. If specified, output a Pandoc-style
title header.

Pandoc has a poorly-executed feature where -stman outputs have the title
metadata line additionally parsed into a manpage title, section, and
optional source and volume. This allows titles like `TITLE(1) Source |
Volume` to be split into their respective manpage parts -- but only when
in -stman mode, so an HTML document generated from the same page will
not inherit the additional parsing. In lowdown(5), introduce this
parsing for all outputs if --parse-mantitle is specified, which is now
the default.

Behaviour change: do not use "Untitled article" as the default title for
media supporting (or requiring) titles when in standalone -s mode.
Instead, just the empty string if a title is required. This is a more
logical choice: not only is "Untitled article" language-specific, it
also assumes the output is an article. For the previous behaviour,
`--mtitle="Untitled article"` may always be used.

Fix support for GFM tables. Specifically, don't arbitrarily require a
certain three or more dashes/colons per cell in the layout row. Also
allow for escaped vertical bars in the header row.

1.0.1:

Numerous build and configuration improvements (via oconfigure) for
building into WASI targets and on Mac OS X.

Add -L for listing all metadata keys.

Some fixes to smart typography around hard linebreaks. These aren't
likely to affect normal documents.

Recognise void HTML elements as block elements.

Switch between types (e.g., unordered to ordered) instead of continuing
with the current list type. Fix parsing of block versus non-block lists
when switching between list types. Fix parsing of block versus non-block
lists when sublists contain block elements, but top-level lists don't.
The Markdown spec isn't clear on how to accept these instances, so use
pandoc as a guiding tool.

For -tman output, normalise list marker widths (unordered or ordered)
to three spaces by default, increasing for ordered lists depending on
the number of entries. For -tms, it's five. Make other small cleanups
to -tms, making sure that paragraph indentation looks the same as
with -tlatex.

Fix that escaped text (e.g., `\-\-foo`) is not changed by the smart
typography formatter.

Use `TP` in -tman for definition lists. To align with existing
lists, use a subsequent paragraph offset of three. Similarly, use
`XP` for -tms.

pkgsrc changes:

- Libtoolize for portable shared libraries.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/textproc/lowdown/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/lowdown/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/lowdown/buildlink3.mk
cvs rdiff -u -r1.30 -r1.31 pkgsrc/textproc/lowdown/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/textproc/lowdown/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/lowdown/Makefile
diff -u pkgsrc/textproc/lowdown/Makefile:1.32 pkgsrc/textproc/lowdown/Makefile:1.33
--- pkgsrc/textproc/lowdown/Makefile:1.32       Fri May 26 18:03:31 2023
+++ pkgsrc/textproc/lowdown/Makefile    Fri May 26 20:38:47 2023
@@ -1,15 +1,19 @@
-# $NetBSD: Makefile,v 1.32 2023/05/26 18:03:31 schmonz Exp $
+# $NetBSD: Makefile,v 1.33 2023/05/26 20:38:47 schmonz Exp $
 
-DISTNAME=              lowdown-1.0.0
+DISTNAME=              lowdown-1.0.2
 CATEGORIES=            textproc
-MASTER_SITES=          https://kristaps.bsd.lv/lowdown/snapshots/
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=kristapsdz/}
+GITHUB_TAG=            refs/tags/VERSION_${PKGVERSION_NOREV:S/./_/g}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              https://kristaps.bsd.lv/lowdown/
 COMMENT=               Simple Markdown translator
 LICENSE=               isc
 
+WRKSRC=                        ${WRKDIR}/${PKGBASE}-${GITHUB_TAG:C/.*\///}
+
 HAS_CONFIGURE=         yes
+USE_LIBTOOL=           yes
 
 SUBST_CLASSES+=                install
 SUBST_SED.install=     -e 's|/usr/local|${PREFIX}|'
@@ -21,8 +25,11 @@ SUBST_FILES.install+=        configure
 SUBST_STAGE.install=   pre-configure
 SUBST_MESSAGE.install= Fixing installation path.
 
-INSTALL_TARGET=                install install_libs
+INSTALL_TARGET=                install install_pkgsrc
 
 TEST_TARGET=           regress
 
+pre-configure:
+       ${ECHO} HAVE_SANDBOX_INIT=0 >> ${WRKSRC}/configure.local
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/lowdown/PLIST
diff -u pkgsrc/textproc/lowdown/PLIST:1.11 pkgsrc/textproc/lowdown/PLIST:1.12
--- pkgsrc/textproc/lowdown/PLIST:1.11  Wed Feb 23 08:20:29 2022
+++ pkgsrc/textproc/lowdown/PLIST       Fri May 26 20:38:47 2023
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.11 2022/02/23 08:20:29 fcambus Exp $
+@comment $NetBSD: PLIST,v 1.12 2023/05/26 20:38:47 schmonz Exp $
 bin/lowdown
 bin/lowdown-diff
 include/lowdown.h
-lib/liblowdown.a
-lib/liblowdown.so.1
+lib/liblowdown.la
 lib/pkgconfig/lowdown.pc
 man/man1/lowdown-diff.1
 man/man1/lowdown.1

Index: pkgsrc/textproc/lowdown/buildlink3.mk
diff -u pkgsrc/textproc/lowdown/buildlink3.mk:1.1 pkgsrc/textproc/lowdown/buildlink3.mk:1.2
--- pkgsrc/textproc/lowdown/buildlink3.mk:1.1   Wed Feb 23 08:20:29 2022
+++ pkgsrc/textproc/lowdown/buildlink3.mk       Fri May 26 20:38:47 2023
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2022/02/23 08:20:29 fcambus Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2023/05/26 20:38:47 schmonz Exp $
 
 BUILDLINK_TREE+=       lowdown
 
 .if !defined(LOWDOWN_BUILDLINK3_MK)
 LOWDOWN_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.lowdown+=        lowdown>=0.11.0
+BUILDLINK_API_DEPENDS.lowdown+=        lowdown>=1.0.2
 BUILDLINK_PKGSRCDIR.lowdown?=  ../../textproc/lowdown
 .endif # LOWDOWN_BUILDLINK3_MK
 

Index: pkgsrc/textproc/lowdown/distinfo
diff -u pkgsrc/textproc/lowdown/distinfo:1.30 pkgsrc/textproc/lowdown/distinfo:1.31
--- pkgsrc/textproc/lowdown/distinfo:1.30       Sun May 29 15:54:09 2022
+++ pkgsrc/textproc/lowdown/distinfo    Fri May 26 20:38:47 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.30 2022/05/29 15:54:09 fcambus Exp $
+$NetBSD: distinfo,v 1.31 2023/05/26 20:38:47 schmonz Exp $
 
-BLAKE2s (lowdown-1.0.0.tar.gz) = ecc1092912b8cfdaea62049f9950145974ab5d20d8efa4d94dbb12ab4220e980
-SHA512 (lowdown-1.0.0.tar.gz) = 9dd065f26b101f55b5f8112052fb030aef1b4938caf6782590862e009a726f76840cc05d4d8f87d2b2a17c352c8d95ae44560f029680ae3384e2cf31f33ffca3
-Size (lowdown-1.0.0.tar.gz) = 247307 bytes
+BLAKE2s (lowdown-1.0.2.tar.gz) = 6af5e137dfe1897371d3326b4be3ca915d81a907b4fe9b9ae05f18b07468091b
+SHA512 (lowdown-1.0.2.tar.gz) = b4e7e7e71bf5dad2ff7f9e15409fa86c82f20ddf2304a1c3678f677adeab2aa3e609410316b7c0a4fd4019de25bb05e2f6cf9823c6d71df5ba5d23490e08de30
+Size (lowdown-1.0.2.tar.gz) = 591591 bytes
+SHA1 (patch-Makefile) = ba5c37257ca7be0b9dd711040ea3494ff6b81c6f

Added files:

Index: pkgsrc/textproc/lowdown/patches/patch-Makefile
diff -u /dev/null pkgsrc/textproc/lowdown/patches/patch-Makefile:1.3
--- /dev/null   Fri May 26 20:38:47 2023
+++ pkgsrc/textproc/lowdown/patches/patch-Makefile      Fri May 26 20:38:47 2023
@@ -0,0 +1,102 @@
+$NetBSD: patch-Makefile,v 1.3 2023/05/26 20:38:47 schmonz Exp $
+
+Libtoolize for portable shared libraries.
+
+--- Makefile.orig      2023-05-20 19:09:00.000000000 +0000
++++ Makefile
+@@ -1,5 +1,6 @@
+ .PHONY: regress regen_regress
+ .SUFFIXES: .xml .md .html .pdf .1 .1.html .3 .3.html .5 .5.html .thumb.jpg .png .in.pc .pc .valgrind .old.md .diff-valgrind
++.SUFFIXES: .lo
+ 
+ include Makefile.configure
+ 
+@@ -125,7 +126,11 @@ REGRESS_ARGS      += "--parse-no-deflists"
+ 
+ VALGRIND_ARGS  = -q --leak-check=full --leak-resolution=high --show-reachable=yes
+ 
+-all: bins lowdown.pc liblowdown.so
++LIBTOOL                = libtool --tag=CC
++LT_OBJS                = $(OBJS:C/\.o$/.lo/g)
++LT_COMPAT_OBJS         = $(COMPAT_OBJS:C/\.o$/.lo/g)
++
++all: bins lowdown.pc liblowdown.la
+ bins: lowdown lowdown-diff
+ 
+ valgrind: $(VALGRINDS) $(VALGRINDDIFFS)
+@@ -173,11 +178,13 @@ installwww: www
+       $(INSTALL) -m 0444 lowdown.tar.gz $(WWWDIR)/snapshots
+       $(INSTALL) -m 0444 lowdown.tar.gz.sha512 $(WWWDIR)/snapshots
+ 
+-lowdown: liblowdown.a main.o
+-      $(CC) -o $@ main.o liblowdown.a $(LDFLAGS) $(LDADD_MD5) -lm $(LDADD)
++lowdown: liblowdown.la main.lo
++      $(LIBTOOL) --mode=link $(CC) -o $@ main.lo -llowdown $(LDFLAGS) $(LDADD_MD5) -lm $(LDADD)
+ 
+-lowdown-diff: lowdown
+-      ln -f lowdown lowdown-diff
++# For regress, we build this (just like lowdown) so that its libtool wrapper works.
++# At install, we'll still just make a hard link to lowdown like upstream.
++lowdown-diff: liblowdown.la main.lo
++      $(LIBTOOL) --mode=link $(CC) -o $@ main.lo -llowdown $(LDFLAGS) $(LDADD_MD5) -lm $(LDADD)
+ 
+ liblowdown.a: $(OBJS) $(COMPAT_OBJS)
+       $(AR) rs $@ $(OBJS) $(COMPAT_OBJS)
+@@ -186,14 +193,17 @@ liblowdown.so: $(OBJS) $(COMPAT_OBJS)
+       $(CC) -shared -o $@.$(LIBVER) $(OBJS) $(COMPAT_OBJS) $(LDFLAGS) $(LDADD_MD5) -lm -Wl,${LINKER_SONAME},$@.$(LIBVER) $(LDLIBS)
+       ln -sf $@.$(LIBVER) $@
+ 
++liblowdown.la: $(LT_OBJS) $(LT_COMPAT_OBJS)
++      $(LIBTOOL) --mode=link $(CC) -o $@ $(LT_OBJS) $(LT_COMPAT_OBJS) $(LDFLAGS) $(LDADD_MD5) -lm $(LDLIBS) -version-number $(LIBVER) -rpath $(LIBDIR)
++
+ install: bins
+       mkdir -p $(DESTDIR)$(BINDIR)
+       mkdir -p $(DESTDIR)$(MANDIR)/man1
+       mkdir -p $(DESTDIR)$(MANDIR)/man5
+       mkdir -p $(DESTDIR)$(SHAREDIR)/lowdown/odt
+       $(INSTALL_DATA) share/odt/styles.xml $(DESTDIR)$(SHAREDIR)/lowdown/odt
+-      $(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
+-      $(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR)
++      $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
++      ln $(DESTDIR)$(BINDIR)/lowdown $(DESTDIR)$(BINDIR)/lowdown-diff
+       for f in $(MAN1S) $(MAN5S) ; do \
+               name=`basename $$f .html` ; \
+               section=$${name##*.} ; \
+@@ -212,6 +222,9 @@ install_lib_common: lowdown.pc
+               $(INSTALL_MAN) man/$$name $(DESTDIR)$(MANDIR)/man$$section ; \
+       done
+ 
++install_pkgsrc: liblowdown.la install_lib_common
++      $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) liblowdown.la $(DESTDIR)$(LIBDIR)
++
+ install_shared: liblowdown.so install_lib_common
+       $(INSTALL_LIB) liblowdown.so.$(LIBVER) $(DESTDIR)$(LIBDIR)
+       ( cd $(DESTDIR)$(LIBDIR) && ln -sf liblowdown.so.$(LIBVER) liblowdown.so )
+@@ -279,6 +292,9 @@ diff.diff.pdf: diff.md diff.old.md lowdo
+ 
+ $(HTMLS): versions.xml lowdown
+ 
++.c.lo:
++      $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
++
+ .md.xml: lowdown
+       ( echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" ; \
+         echo "<article data-sblg-article=\"1\">" ; \
+@@ -313,13 +329,13 @@ lowdown.tar.gz:
+       ( cd .dist/ && tar zcf ../$@ lowdown-$(VERSION) )
+       rm -rf .dist/
+ 
+-$(OBJS) $(COMPAT_OBJS) main.o: config.h
++$(LT_OBJS) $(LT_COMPAT_OBJS) main.lo: config.h
+ 
+-$(OBJS): extern.h lowdown.h
++$(LT_OBJS): extern.h lowdown.h
+ 
+-term.o: term.h
++term.lo: term.h
+ 
+-main.o: lowdown.h
++main.lo: lowdown.h
+ 
+ clean:
+       rm -f $(OBJS) $(COMPAT_OBJS) main.o

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index