CVS commit: pkgsrc/multimedia/mkvtoolnix

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Thu Sep 29 08:13:17 UTC 2022

Modified Files:
        pkgsrc/multimedia/mkvtoolnix: Makefile PLIST options.mk

Log Message:
add a "doc" pkg option (default present, retaining current usage.)

this allows the textproc/po4a build dependency to be removed, which
pulls in latex among other things.  since the defaults are not
changed, i have not bumped the pkgrevision.


To generate a diff of this commit:
cvs rdiff -u -r1.200 -r1.201 pkgsrc/multimedia/mkvtoolnix/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/multimedia/mkvtoolnix/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/multimedia/mkvtoolnix/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/multimedia/mkvtoolnix/Makefile
diff -u pkgsrc/multimedia/mkvtoolnix/Makefile:1.200 pkgsrc/multimedia/mkvtoolnix/Makefile:1.201
--- pkgsrc/multimedia/mkvtoolnix/Makefile:1.200 Sun Sep 11 12:52:02 2022
+++ pkgsrc/multimedia/mkvtoolnix/Makefile       Thu Sep 29 08:13:17 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.200 2022/09/11 12:52:02 wiz Exp $
+# $NetBSD: Makefile,v 1.201 2022/09/29 08:13:17 mrg Exp $
 
 DISTNAME=      mkvtoolnix-70.0.0
 PKGREVISION=   1
@@ -12,7 +12,6 @@ COMMENT=      Set of tools to create, alter a
 LICENSE=       gnu-gpl-v2
 
 BUILD_DEPENDS+=        docbook-xsl>=1.79.1nb5:../../textproc/docbook-xsl
-BUILD_DEPENDS+=        po4a-[0-9]*:../../textproc/po4a
 BUILD_DEPENDS+=        ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
 
 # 'The following features of the C++17 standards are not supported by c++:

Index: pkgsrc/multimedia/mkvtoolnix/PLIST
diff -u pkgsrc/multimedia/mkvtoolnix/PLIST:1.13 pkgsrc/multimedia/mkvtoolnix/PLIST:1.14
--- pkgsrc/multimedia/mkvtoolnix/PLIST:1.13     Mon Apr 11 11:19:55 2022
+++ pkgsrc/multimedia/mkvtoolnix/PLIST  Thu Sep 29 08:13:17 2022
@@ -1,68 +1,12 @@
-@comment $NetBSD: PLIST,v 1.13 2022/04/11 11:19:55 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2022/09/29 08:13:17 mrg Exp $
 bin/mkvextract
 bin/mkvinfo
 bin/mkvmerge
 bin/mkvpropedit
-man/bg/man1/mkvextract.1
-man/bg/man1/mkvinfo.1
-man/bg/man1/mkvmerge.1
-man/bg/man1/mkvpropedit.1
-man/ca/man1/mkvextract.1
-man/ca/man1/mkvinfo.1
-man/ca/man1/mkvmerge.1
-man/ca/man1/mkvpropedit.1
-man/de/man1/mkvextract.1
-man/de/man1/mkvinfo.1
-man/de/man1/mkvmerge.1
-man/de/man1/mkvpropedit.1
-man/es/man1/mkvextract.1
-man/es/man1/mkvinfo.1
-man/es/man1/mkvmerge.1
-man/es/man1/mkvpropedit.1
-man/fr/man1/mkvextract.1
-man/fr/man1/mkvinfo.1
-man/fr/man1/mkvmerge.1
-man/fr/man1/mkvpropedit.1
-man/it/man1/mkvextract.1
-man/it/man1/mkvinfo.1
-man/it/man1/mkvmerge.1
-man/it/man1/mkvpropedit.1
-man/ja/man1/mkvextract.1
-man/ja/man1/mkvinfo.1
-man/ja/man1/mkvmerge.1
-man/ja/man1/mkvpropedit.1
-man/ko/man1/mkvextract.1
-man/ko/man1/mkvinfo.1
-man/ko/man1/mkvmerge.1
-man/ko/man1/mkvpropedit.1
 man/man1/mkvextract.1
 man/man1/mkvinfo.1
 man/man1/mkvmerge.1
 man/man1/mkvpropedit.1
-man/nl/man1/mkvextract.1
-man/nl/man1/mkvinfo.1
-man/nl/man1/mkvmerge.1
-man/nl/man1/mkvpropedit.1
-man/pl/man1/mkvextract.1
-man/pl/man1/mkvinfo.1
-man/pl/man1/mkvmerge.1
-man/pl/man1/mkvpropedit.1
-man/ru/man1/mkvextract.1
-man/ru/man1/mkvinfo.1
-man/ru/man1/mkvmerge.1
-man/ru/man1/mkvpropedit.1
-man/uk/man1/mkvextract.1
-man/uk/man1/mkvinfo.1
-man/uk/man1/mkvmerge.1
-man/uk/man1/mkvpropedit.1
-man/zh_CN/man1/mkvextract.1
-man/zh_CN/man1/mkvinfo.1
-man/zh_CN/man1/mkvmerge.1
-man/zh_CN/man1/mkvpropedit.1
-man/zh_TW/man1/mkvextract.1
-man/zh_TW/man1/mkvinfo.1
-man/zh_TW/man1/mkvmerge.1
-man/zh_TW/man1/mkvpropedit.1
 share/locale/bg/LC_MESSAGES/mkvtoolnix.mo
 share/locale/ca/LC_MESSAGES/mkvtoolnix.mo
 share/locale/cs/LC_MESSAGES/mkvtoolnix.mo

Index: pkgsrc/multimedia/mkvtoolnix/options.mk
diff -u pkgsrc/multimedia/mkvtoolnix/options.mk:1.5 pkgsrc/multimedia/mkvtoolnix/options.mk:1.6
--- pkgsrc/multimedia/mkvtoolnix/options.mk:1.5 Mon May 23 11:55:17 2022
+++ pkgsrc/multimedia/mkvtoolnix/options.mk     Thu Sep 29 08:13:17 2022
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.5 2022/05/23 11:55:17 adam Exp $
+# $NetBSD: options.mk,v 1.6 2022/09/29 08:13:17 mrg Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mkvtoolnix
-PKG_SUPPORTED_OPTIONS= gui
+PKG_SUPPORTED_OPTIONS= gui doc
+PKG_DEFAULT_OPTIONS=   doc
 
 .include "../../mk/bsd.options.mk"
 
@@ -15,3 +16,11 @@ CONFIGURE_ARGS+=     --enable-gui
 .else
 CONFIGURE_ARGS+=       --disable-gui
 .endif
+
+.if !empty(PKG_OPTIONS:Mdoc)
+PLIST_SRC+=            PLIST.po4a
+CONFIGURE_ARGS+=       --with-po4a
+BUILD_DEPENDS+=        po4a-[0-9]*:../../textproc/po4a
+.else
+CONFIGURE_ARGS+=       --without-po4a
+.endif