One PLIST for all options

4 files changed, 124 insertions, 126 deletions

diff --git a/multimedia/mkvtoolnix/PLIST b/multimedia/mkvtoolnix/PLIST
index b9c52777fe3..8875759e2cb 100644
--- a/multimedia/mkvtoolnix/PLIST
+++ b/multimedia/mkvtoolnix/PLIST
@@ -1,12 +1,125 @@
-@comment $NetBSD: PLIST,v 1.14 2022/09/29 08:13:17 mrg Exp $
+@comment $NetBSD: PLIST,v 1.15 2022/10/07 04:29:07 adam Exp $
 bin/mkvextract
 bin/mkvinfo
 bin/mkvmerge
 bin/mkvpropedit
+${PLIST.gui}bin/mkvtoolnix-gui
+${PLIST.doc}man/bg/man1/mkvextract.1
+${PLIST.doc}man/bg/man1/mkvinfo.1
+${PLIST.doc}man/bg/man1/mkvmerge.1
+${PLIST.doc}man/bg/man1/mkvpropedit.1
+${PLIST.gui}${PLIST.doc}man/bg/man1/mkvtoolnix-gui.1
+${PLIST.doc}man/ca/man1/mkvextract.1
+${PLIST.doc}man/ca/man1/mkvinfo.1
+${PLIST.doc}man/ca/man1/mkvmerge.1
+${PLIST.doc}man/ca/man1/mkvpropedit.1
+${PLIST.gui}${PLIST.doc}man/ca/man1/mkvtoolnix-gui.1
+${PLIST.doc}man/de/man1/mkvextract.1
+${PLIST.doc}man/de/man1/mkvinfo.1
+${PLIST.doc}man/de/man1/mkvmerge.1
+${PLIST.doc}man/de/man1/mkvpropedit.1
+${PLIST.gui}${PLIST.doc}man/de/man1/mkvtoolnix-gui.1
+${PLIST.doc}man/es/man1/mkvextract.1
+${PLIST.doc}man/es/man1/mkvinfo.1
+${PLIST.doc}man/es/man1/mkvmerge.1
+${PLIST.doc}man/es/man1/mkvpropedit.1
+${PLIST.gui}${PLIST.doc}man/es/man1/mkvtoolnix-gui.1
+${PLIST.doc}man/fr/man1/mkvextract.1
+${PLIST.doc}man/fr/man1/mkvinfo.1
+${PLIST.doc}man/fr/man1/mkvmerge.1
+${PLIST.doc}man/fr/man1/mkvpropedit.1
+${PLIST.gui}${PLIST.doc}man/fr/man1/mkvtoolnix-gui.1
+${PLIST.doc}man/it/man1/mkvextract.1
+${PLIST.doc}man/it/man1/mkvinfo.1
+${PLIST.doc}man/it/man1/mkvmerge.1
+${PLIST.doc}man/it/man1/mkvpropedit.1
+${PLIST.gui}${PLIST.doc}man/it/man1/mkvtoolnix-gui.1
+${PLIST.doc}man/ja/man1/mkvextract.1
+${PLIST.doc}man/ja/man1/mkvinfo.1
+${PLIST.doc}man/ja/man1/mkvmerge.1
+${PLIST.doc}man/ja/man1/mkvpropedit.1
+${PLIST.gui}${PLIST.doc}man/ja/man1/mkvtoolnix-gui.1
+${PLIST.doc}man/ko/man1/mkvextract.1
+${PLIST.doc}man/ko/man1/mkvinfo.1
+${PLIST.doc}man/ko/man1/mkvmerge.1
+${PLIST.doc}man/ko/man1/mkvpropedit.1
+${PLIST.gui}${PLIST.doc}man/ko/man1/mkvtoolnix-gui.1
 man/man1/mkvextract.1
 man/man1/mkvinfo.1
 man/man1/mkvmerge.1
 man/man1/mkvpropedit.1
+${PLIST.gui}man/man1/mkvtoolnix-gui.1
+${PLIST.doc}man/nl/man1/mkvextract.1
+${PLIST.doc}man/nl/man1/mkvinfo.1
+${PLIST.doc}man/nl/man1/mkvmerge.1
+${PLIST.doc}man/nl/man1/mkvpropedit.1
+${PLIST.gui}${PLIST.doc}man/nl/man1/mkvtoolnix-gui.1
+${PLIST.doc}man/pl/man1/mkvextract.1
+${PLIST.doc}man/pl/man1/mkvinfo.1
+${PLIST.doc}man/pl/man1/mkvmerge.1
+${PLIST.doc}man/pl/man1/mkvpropedit.1
+${PLIST.gui}${PLIST.doc}man/pl/man1/mkvtoolnix-gui.1
+${PLIST.doc}man/ru/man1/mkvextract.1
+${PLIST.doc}man/ru/man1/mkvinfo.1
+${PLIST.doc}man/ru/man1/mkvmerge.1
+${PLIST.doc}man/ru/man1/mkvpropedit.1
+${PLIST.gui}${PLIST.doc}man/ru/man1/mkvtoolnix-gui.1
+${PLIST.doc}man/uk/man1/mkvextract.1
+${PLIST.doc}man/uk/man1/mkvinfo.1
+${PLIST.doc}man/uk/man1/mkvmerge.1
+${PLIST.doc}man/uk/man1/mkvpropedit.1
+${PLIST.gui}${PLIST.doc}man/uk/man1/mkvtoolnix-gui.1
+${PLIST.doc}man/zh_CN/man1/mkvextract.1
+${PLIST.doc}man/zh_CN/man1/mkvinfo.1
+${PLIST.doc}man/zh_CN/man1/mkvmerge.1
+${PLIST.doc}man/zh_CN/man1/mkvpropedit.1
+${PLIST.gui}${PLIST.doc}man/zh_CN/man1/mkvtoolnix-gui.1
+${PLIST.doc}man/zh_TW/man1/mkvextract.1
+${PLIST.doc}man/zh_TW/man1/mkvinfo.1
+${PLIST.doc}man/zh_TW/man1/mkvmerge.1
+${PLIST.doc}man/zh_TW/man1/mkvpropedit.1
+${PLIST.gui}${PLIST.doc}man/zh_TW/man1/mkvtoolnix-gui.1
+${PLIST.gui}share/applications/org.bunkus.mkvtoolnix-gui.desktop
+${PLIST.gui}share/icons/hicolor/128x128/apps/mkvextract.png
+${PLIST.gui}share/icons/hicolor/128x128/apps/mkvinfo.png
+${PLIST.gui}share/icons/hicolor/128x128/apps/mkvmerge.png
+${PLIST.gui}share/icons/hicolor/128x128/apps/mkvpropedit.png
+${PLIST.gui}share/icons/hicolor/128x128/apps/mkvtoolnix-gui.png
+${PLIST.gui}share/icons/hicolor/16x16/apps/mkvextract.png
+${PLIST.gui}share/icons/hicolor/16x16/apps/mkvinfo.png
+${PLIST.gui}share/icons/hicolor/16x16/apps/mkvmerge.png
+${PLIST.gui}share/icons/hicolor/16x16/apps/mkvpropedit.png
+${PLIST.gui}share/icons/hicolor/16x16/apps/mkvtoolnix-gui.png
+${PLIST.gui}share/icons/hicolor/24x24/apps/mkvextract.png
+${PLIST.gui}share/icons/hicolor/24x24/apps/mkvinfo.png
+${PLIST.gui}share/icons/hicolor/24x24/apps/mkvmerge.png
+${PLIST.gui}share/icons/hicolor/24x24/apps/mkvpropedit.png
+${PLIST.gui}share/icons/hicolor/24x24/apps/mkvtoolnix-gui.png
+${PLIST.gui}share/icons/hicolor/256x256/apps/mkvextract.png
+${PLIST.gui}share/icons/hicolor/256x256/apps/mkvinfo.png
+${PLIST.gui}share/icons/hicolor/256x256/apps/mkvmerge.png
+${PLIST.gui}share/icons/hicolor/256x256/apps/mkvpropedit.png
+${PLIST.gui}share/icons/hicolor/256x256/apps/mkvtoolnix-gui.png
+${PLIST.gui}share/icons/hicolor/32x32/apps/mkvextract.png
+${PLIST.gui}share/icons/hicolor/32x32/apps/mkvinfo.png
+${PLIST.gui}share/icons/hicolor/32x32/apps/mkvmerge.png
+${PLIST.gui}share/icons/hicolor/32x32/apps/mkvpropedit.png
+${PLIST.gui}share/icons/hicolor/32x32/apps/mkvtoolnix-gui.png
+${PLIST.gui}share/icons/hicolor/48x48/apps/mkvextract.png
+${PLIST.gui}share/icons/hicolor/48x48/apps/mkvinfo.png
+${PLIST.gui}share/icons/hicolor/48x48/apps/mkvmerge.png
+${PLIST.gui}share/icons/hicolor/48x48/apps/mkvpropedit.png
+${PLIST.gui}share/icons/hicolor/48x48/apps/mkvtoolnix-gui.png
+${PLIST.gui}share/icons/hicolor/64x64/apps/mkvextract.png
+${PLIST.gui}share/icons/hicolor/64x64/apps/mkvinfo.png
+${PLIST.gui}share/icons/hicolor/64x64/apps/mkvmerge.png
+${PLIST.gui}share/icons/hicolor/64x64/apps/mkvpropedit.png
+${PLIST.gui}share/icons/hicolor/64x64/apps/mkvtoolnix-gui.png
+${PLIST.gui}share/icons/hicolor/96x96/apps/mkvextract.png
+${PLIST.gui}share/icons/hicolor/96x96/apps/mkvinfo.png
+${PLIST.gui}share/icons/hicolor/96x96/apps/mkvmerge.png
+${PLIST.gui}share/icons/hicolor/96x96/apps/mkvpropedit.png
+${PLIST.gui}share/icons/hicolor/96x96/apps/mkvtoolnix-gui.png
 share/locale/bg/LC_MESSAGES/mkvtoolnix.mo
 share/locale/ca/LC_MESSAGES/mkvtoolnix.mo
 share/locale/cs/LC_MESSAGES/mkvtoolnix.mo
@@ -32,3 +145,8 @@ share/locale/uk/LC_MESSAGES/mkvtoolnix.mo
 share/locale/zh_CN/LC_MESSAGES/mkvtoolnix.mo
 share/locale/zh_SG/LC_MESSAGES/mkvtoolnix.mo
 share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo
+${PLIST.gui}share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml
+${PLIST.gui}share/mime/packages/org.bunkus.mkvtoolnix-gui.xml
+${PLIST.gui}share/mkvtoolnix/sounds/finished-1.webm
+${PLIST.gui}share/mkvtoolnix/sounds/finished-2.webm
+${PLIST.gui}share/mkvtoolnix/sounds/finished-3.webm
diff --git a/multimedia/mkvtoolnix/PLIST.gui b/multimedia/mkvtoolnix/PLIST.gui
deleted file mode 100644
index 65c8cd12921..00000000000
--- a/multimedia/mkvtoolnix/PLIST.gui
+++ /dev/null
@@ -1,63 +0,0 @@
-@comment $NetBSD: PLIST.gui,v 1.7 2022/04/11 11:19:55 adam Exp $
-bin/mkvtoolnix-gui
-man/bg/man1/mkvtoolnix-gui.1
-man/ca/man1/mkvtoolnix-gui.1
-man/de/man1/mkvtoolnix-gui.1
-man/es/man1/mkvtoolnix-gui.1
-man/fr/man1/mkvtoolnix-gui.1
-man/it/man1/mkvtoolnix-gui.1
-man/ja/man1/mkvtoolnix-gui.1
-man/ko/man1/mkvtoolnix-gui.1
-man/man1/mkvtoolnix-gui.1
-man/nl/man1/mkvtoolnix-gui.1
-man/pl/man1/mkvtoolnix-gui.1
-man/ru/man1/mkvtoolnix-gui.1
-man/uk/man1/mkvtoolnix-gui.1
-man/zh_CN/man1/mkvtoolnix-gui.1
-man/zh_TW/man1/mkvtoolnix-gui.1
-share/applications/org.bunkus.mkvtoolnix-gui.desktop
-share/icons/hicolor/128x128/apps/mkvextract.png
-share/icons/hicolor/128x128/apps/mkvinfo.png
-share/icons/hicolor/128x128/apps/mkvmerge.png
-share/icons/hicolor/128x128/apps/mkvpropedit.png
-share/icons/hicolor/128x128/apps/mkvtoolnix-gui.png
-share/icons/hicolor/16x16/apps/mkvextract.png
-share/icons/hicolor/16x16/apps/mkvinfo.png
-share/icons/hicolor/16x16/apps/mkvmerge.png
-share/icons/hicolor/16x16/apps/mkvpropedit.png
-share/icons/hicolor/16x16/apps/mkvtoolnix-gui.png
-share/icons/hicolor/24x24/apps/mkvextract.png
-share/icons/hicolor/24x24/apps/mkvinfo.png
-share/icons/hicolor/24x24/apps/mkvmerge.png
-share/icons/hicolor/24x24/apps/mkvpropedit.png
-share/icons/hicolor/24x24/apps/mkvtoolnix-gui.png
-share/icons/hicolor/256x256/apps/mkvextract.png
-share/icons/hicolor/256x256/apps/mkvinfo.png
-share/icons/hicolor/256x256/apps/mkvmerge.png
-share/icons/hicolor/256x256/apps/mkvpropedit.png
-share/icons/hicolor/256x256/apps/mkvtoolnix-gui.png
-share/icons/hicolor/32x32/apps/mkvextract.png
-share/icons/hicolor/32x32/apps/mkvinfo.png
-share/icons/hicolor/32x32/apps/mkvmerge.png
-share/icons/hicolor/32x32/apps/mkvpropedit.png
-share/icons/hicolor/32x32/apps/mkvtoolnix-gui.png
-share/icons/hicolor/48x48/apps/mkvextract.png
-share/icons/hicolor/48x48/apps/mkvinfo.png
-share/icons/hicolor/48x48/apps/mkvmerge.png
-share/icons/hicolor/48x48/apps/mkvpropedit.png
-share/icons/hicolor/48x48/apps/mkvtoolnix-gui.png
-share/icons/hicolor/64x64/apps/mkvextract.png
-share/icons/hicolor/64x64/apps/mkvinfo.png
-share/icons/hicolor/64x64/apps/mkvmerge.png
-share/icons/hicolor/64x64/apps/mkvpropedit.png
-share/icons/hicolor/64x64/apps/mkvtoolnix-gui.png
-share/icons/hicolor/96x96/apps/mkvextract.png
-share/icons/hicolor/96x96/apps/mkvinfo.png
-share/icons/hicolor/96x96/apps/mkvmerge.png
-share/icons/hicolor/96x96/apps/mkvpropedit.png
-share/icons/hicolor/96x96/apps/mkvtoolnix-gui.png
-share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml
-share/mime/packages/org.bunkus.mkvtoolnix-gui.xml
-share/mkvtoolnix/sounds/finished-1.webm
-share/mkvtoolnix/sounds/finished-2.webm
-share/mkvtoolnix/sounds/finished-3.webm
diff --git a/multimedia/mkvtoolnix/PLIST.po4a b/multimedia/mkvtoolnix/PLIST.po4a
deleted file mode 100644
index 99b72fd6351..00000000000
--- a/multimedia/mkvtoolnix/PLIST.po4a
+++ /dev/null
@@ -1,57 +0,0 @@
-@comment $NetBSD: PLIST.po4a,v 1.1 2022/09/30 03:33:46 mrg Exp $
-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/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
diff --git a/multimedia/mkvtoolnix/options.mk b/multimedia/mkvtoolnix/options.mk
index e8fbe71fa1e..f7c113ee483 100644
--- a/multimedia/mkvtoolnix/options.mk
+++ b/multimedia/mkvtoolnix/options.mk
@@ -1,15 +1,15 @@
-# $NetBSD: options.mk,v 1.7 2022/10/02 18:39:42 adam Exp $
+# $NetBSD: options.mk,v 1.8 2022/10/07 04:29:07 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mkvtoolnix
-PKG_SUPPORTED_OPTIONS=	gui doc
+PKG_SUPPORTED_OPTIONS=	doc gui
 PKG_SUGGESTED_OPTIONS=	doc
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_SRC=		${PLIST_SRC_DFLT}
+PLIST_VARS+=	doc gui
 
 .if !empty(PKG_OPTIONS:Mgui)
-PLIST_SRC+=		PLIST.gui
+PLIST.gui=		yes
 CONFIGURE_ARGS+=	--enable-gui
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/qt5-qtsvg/buildlink3.mk"
@@ -18,7 +18,7 @@ CONFIGURE_ARGS+=	--disable-gui
 .endif
 
 .if !empty(PKG_OPTIONS:Mdoc)
-PLIST_SRC+=		PLIST.po4a
+PLIST.doc=		yes
 CONFIGURE_ARGS+=	--with-po4a
 BUILD_DEPENDS+=		po4a-[0-9]*:../../textproc/po4a
 .else