CVS commit: pkgsrc/converters/pandoc

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Sun May  5 09:46:00 UTC 2024

Modified Files:
        pkgsrc/converters/pandoc: DESCR Makefile
Removed Files:
        pkgsrc/converters/pandoc: PLIST distinfo options.mk

Log Message:
converters/pandoc: Turn the package into a meta package

Background: The upstream package, pandoc, historically contained the CLI
tool but it was split into two separate packages: pandoc and
pandoc-cli. When that happened I (pho@) renamed the original
converters/pandoc to converters/hs-pandoc-base to install the Pandoc
library, and replaced the contents of converters/pandoc with the upstream
pandoc-cli.

The intention was to make the change less surprising to our users. That is,
I didn't want the CLI tool to suddenly disappear from
converters/pandoc. But it complicated matters because the upstream
pandoc-cli used a distinct versioning scheme from pandoc. As a result I was
forced to use a weird versioning scheme for converters/pandoc, whose
PKGVERSION actually tracked the version of converters/hs-pandoc-base,
despite its contents being that of pandoc-cli. The difference in package
name, upstream "pandoc" vs. pkgsrc "hs-pandoc-base", was also confusing.

So I:

* renamed converters/hs-pandoc-base to converters/hs-pandoc, which tracks
  upstream "pandoc",
* created converters/pandoc-cli, which tracks upsream "pandoc-cli",
* and turned converters/pandoc into a singleton meta-package which depends
  only on converters/pandoc-cli

so that we can eliminate the weird versioning scheme and can still provide
the CLI tool (indirectly) from converters/pandoc.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/converters/pandoc/DESCR
cvs rdiff -u -r1.16 -r1.17 pkgsrc/converters/pandoc/Makefile
cvs rdiff -u -r1.4 -r0 pkgsrc/converters/pandoc/PLIST
cvs rdiff -u -r1.8 -r0 pkgsrc/converters/pandoc/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/converters/pandoc/options.mk

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

Modified files:

Index: pkgsrc/converters/pandoc/DESCR
diff -u pkgsrc/converters/pandoc/DESCR:1.1 pkgsrc/converters/pandoc/DESCR:1.2
--- pkgsrc/converters/pandoc/DESCR:1.1  Sat Jan 18 02:16:39 2020
+++ pkgsrc/converters/pandoc/DESCR      Sun May  5 09:45:59 2024
@@ -1,21 +1,23 @@
-Pandoc is a Haskell library for converting from one markup format to
-another, and a command-line tool that uses this library. It can read
-several dialects of Markdown and (subsets of) HTML, reStructuredText,
-LaTeX, DocBook, JATS, MediaWiki markup, DokuWiki markup, TWiki markup,
-TikiWiki markup, Jira markup, Creole 1.0, Haddock markup, OPML, Emacs
-Org-Mode, Emacs Muse, txt2tags, ipynb (Jupyter notebooks), Vimwiki,
-Word Docx, ODT, EPUB, FictionBook2, roff man, and Textile, and it can
-write Markdown, reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt,
-DocBook, JATS, OPML, TEI, OpenDocument, ODT, Word docx, PowerPoint
-pptx, RTF, MediaWiki, DokuWiki, XWiki, ZimWiki, Textile, Jira, roff
-man, roff ms, plain text, Emacs Org-Mode, AsciiDoc, Haddock markup,
-EPUB (v2 and v3), ipynb, FictionBook2, InDesign ICML, Muse, LaTeX
-beamer slides, and several kinds of HTML/JavaScript slide shows (S5,
-Slidy, Slideous, DZSlides, reveal.js).
+Pandoc is a Haskell library and a CLI tool for converting from one markup
+format to another. The formats it can handle include
 
-In contrast to most existing tools for converting Markdown to HTML,
-pandoc has a modular design: it consists of a set of readers, which
-parse text in a given format and produce a native representation of
-the document, and a set of writers, which convert this native
-representation into a target format. Thus, adding an input or output
-format requires only adding a reader or writer.
+* light markup formats (many variants of Markdown, reStructuredText,
+  AsciiDoc, Org-mode, Muse, Textile, txt2tags, djot)
+* HTML formats (HTML 4 and 5)
+* Ebook formats (EPUB v2 and v3, FB2)
+* Documentation formats (GNU TexInfo, Haddock)
+* Roff formats (man, ms)
+* TeX formats (LaTeX, ConTeXt)
+* Typst
+* XML formats (DocBook 4 and 5, JATS, TEI Simple, OpenDocument)
+* Outline formats (OPML)
+* Bibliography formats (BibTeX, BibLaTeX, CSL JSON, CSL YAML, RIS)
+* Word processor formats (Docx, RTF, ODT)
+* Interactive notebook formats (Jupyter notebook ipynb)
+* Page layout formats (InDesign ICML)
+* Wiki markup formats (MediaWiki, DokuWiki, TikiWiki, TWiki, Vimwiki,
+  XWiki, ZimWiki, Jira wiki, Creole)
+* Slide show formats (LaTeX Beamer, PowerPoint, Slidy, reveal.js, Slideous,
+  S5, DZSlides)
+* Data formats (CSV and TSV tables)
+* PDF (via external programs such as pdflatex or wkhtmltopdf)

Index: pkgsrc/converters/pandoc/Makefile
diff -u pkgsrc/converters/pandoc/Makefile:1.16 pkgsrc/converters/pandoc/Makefile:1.17
--- pkgsrc/converters/pandoc/Makefile:1.16      Thu Nov  2 06:36:13 2023
+++ pkgsrc/converters/pandoc/Makefile   Sun May  5 09:45:59 2024
@@ -1,28 +1,18 @@
-# $NetBSD: Makefile,v 1.16 2023/11/02 06:36:13 pho Exp $
+# $NetBSD: Makefile,v 1.17 2024/05/05 09:45:59 pho Exp $
 
-PKGREVISION= 1
-.include "../../converters/hs-pandoc-base/version.mk"
-# This package does not use the version number of "pandoc-cli" for a
-# historical reason. When the upstream releases a new version of
-# "pandoc-cli" without releasing new "pandoc", bump the revision of this
-# package without changing PANDOC_BASE_VERSION.
-DISTNAME=      pandoc-cli-0.1.1.1
-PKGNAME=       pandoc-${PANDOC_BASE_VERSION}
-CATEGORIES=    converters
+.include "../../converters/hs-pandoc/version.mk"
+
+DISTNAME=      # empty
+PKGNAME=       pandoc-${PANDOC_VERSION}
+CATEGORIES=    converters meta-pkgs
+DISTFILES=     # empty
 
 MAINTAINER=    zecrazytux%zecrazytux.net@localhost
-COMMENT=       Conversion between markup formats
+COMMENT=       Conversion between documentation formats
 LICENSE=       gnu-gpl-v2
 
-# If pandoc is to be linked dynamically, it will depend on more than 180
-# shared objects and the dynamic linker will spend several seconds to
-# resolve symbols on startup. This is unacceptable because pandoc tends to
-# be launched very frequently by build systems and editors. This wastes
-# storage, but time is more expensive than disks.
-HASKELL_ENABLE_DYNAMIC_EXECUTABLE=     no
+META_PACKAGE=  yes
 
-.include "options.mk"
+DEPENDS+=      pandoc-cli>=${PANDOC_VERSION}:../../converters/pandoc-cli
 
-.include "../../converters/hs-pandoc-base/buildlink3.mk"
-.include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"