Page MenuHomeFreeBSD
Files F144474633

D43454.1774854942.diff
No OneTemporary
Actions

Size
12 KB
Referenced Files
None
Subscribers
None

D43454.1774854942.diff
View Options

Index: multimedia/mkvtoolnix/Makefile
===================================================================
--- multimedia/mkvtoolnix/Makefile
+++ multimedia/mkvtoolnix/Makefile
@@ -1,5 +1,6 @@
PORTNAME= mkvtoolnix
PORTVERSION= 82.0
+PORTREVISION= 1
CATEGORIES= multimedia audio
MASTER_SITES= https://www.bunkus.org/videotools/mkvtoolnix/sources/ \
https://mkvtoolnix.download/sources/
@@ -11,8 +12,11 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+SUBPACKAGES= gui
+
BUILD_DEPENDS= rake:devel/rubygem-rake \
docbook-xsl>=0:textproc/docbook-xsl \
+ po4a:textproc/po4a \
xsltproc:textproc/libxslt
LIB_DEPENDS= libvorbis.so:audio/libvorbis \
libogg.so:audio/libogg \
@@ -22,16 +26,12 @@
libmatroska.so:multimedia/libmatroska \
libcmark.so:textproc/cmark \
libgmp.so:math/gmp
+SELF_DEPENDS.gui= main
-FLAVORS= qt6 nogui
-FLAVOR?= ${FLAVORS:[1]}
-nogui_PKGNAMESUFFIX= -nogui
-nogui_CONFLICTS_INSTALL=mkvtoolnix
-qt6_CONFLICTS_INSTALL= mkvtoolnix-nogui
-
-USES= ${_USES_${FLAVOR}}
-USE_GL= ${_USE_GL_${FLAVOR}}
-USE_QT= ${_USE_QT_${FLAVOR}}
+USES= compiler:c++17-lang desktop-file-utils gl iconv localbase \
+ pkgconfig qmake:no_env qt:6 shared-mime-info tar:xz
+USE_GL= gl opengl
+USE_QT= base declarative multimedia svg tools
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-boost=${LOCALBASE} \
@@ -48,22 +48,7 @@
rcc=${RCC} \
uic=${UIC}
-# Flavor handling
-_USES_qt6= compiler:c++17-lang desktop-file-utils gl iconv localbase \
- pkgconfig qmake:no_env qt:6 shared-mime-info tar:xz
-_USE_GL_qt6= gl opengl
-_USE_QT_qt6= base declarative multimedia svg tools
-_PLIST_SUB_qt6= GUI=
-_CONFIGURE_ARGS_nogui= --disable-gui
-_USES_nogui= compiler:c++17-lang iconv localbase pkgconfig qmake:no_env \
- qt:6 tar:xz
-_USE_QT_nogui= base multimedia svg tools:build
-_PLIST_SUB_nogui= GUI="@comment "
-
-PLIST_SUB+= ${_PLIST_SUB_${FLAVOR}}
-
-# Options handling
-OPTIONS_DEFINE= DVDREAD FLAC NLS MANTRANS GUI
+OPTIONS_DEFINE= DVDREAD FLAC NLS
OPTIONS_DEFAULT= FLAC
OPTIONS_SUB= yes
@@ -77,9 +62,6 @@
NLS_USES= gettext
NLS_CONFIGURE_WITH= gettext
-MANTRANS_DESC= Build and install manpage translations
-MANTRANS_BUILD_DEPENDS= po4a:textproc/po4a
-
.include <bsd.port.pre.mk>
.if ${CHOSEN_COMPILER_TYPE} != clang
Index: multimedia/mkvtoolnix/pkg-plist
===================================================================
--- multimedia/mkvtoolnix/pkg-plist
+++ multimedia/mkvtoolnix/pkg-plist
@@ -2,123 +2,123 @@
bin/mkvinfo
bin/mkvmerge
bin/mkvpropedit
-%%GUI%%bin/mkvtoolnix-gui
-%%MANTRANS%%man/bg/man1/mkvextract.1.gz
-%%MANTRANS%%man/bg/man1/mkvinfo.1.gz
-%%MANTRANS%%man/bg/man1/mkvmerge.1.gz
-%%MANTRANS%%man/bg/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%GUI%%man/bg/man1/mkvtoolnix-gui.1.gz
-%%MANTRANS%%man/ca/man1/mkvextract.1.gz
-%%MANTRANS%%man/ca/man1/mkvinfo.1.gz
-%%MANTRANS%%man/ca/man1/mkvmerge.1.gz
-%%MANTRANS%%man/ca/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%GUI%%man/ca/man1/mkvtoolnix-gui.1.gz
-%%MANTRANS%%man/de/man1/mkvextract.1.gz
-%%MANTRANS%%man/de/man1/mkvinfo.1.gz
-%%MANTRANS%%man/de/man1/mkvmerge.1.gz
-%%MANTRANS%%man/de/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%GUI%%man/de/man1/mkvtoolnix-gui.1.gz
-%%MANTRANS%%man/es/man1/mkvextract.1.gz
-%%MANTRANS%%man/es/man1/mkvinfo.1.gz
-%%MANTRANS%%man/es/man1/mkvmerge.1.gz
-%%MANTRANS%%man/es/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%GUI%%man/es/man1/mkvtoolnix-gui.1.gz
-%%MANTRANS%%man/fr/man1/mkvextract.1.gz
-%%MANTRANS%%man/fr/man1/mkvinfo.1.gz
-%%MANTRANS%%man/fr/man1/mkvmerge.1.gz
-%%MANTRANS%%man/fr/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%GUI%%man/fr/man1/mkvtoolnix-gui.1.gz
-%%MANTRANS%%man/it/man1/mkvextract.1.gz
-%%MANTRANS%%man/it/man1/mkvinfo.1.gz
-%%MANTRANS%%man/it/man1/mkvmerge.1.gz
-%%MANTRANS%%man/it/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%GUI%%man/it/man1/mkvtoolnix-gui.1.gz
-%%MANTRANS%%man/ja/man1/mkvextract.1.gz
-%%MANTRANS%%man/ja/man1/mkvinfo.1.gz
-%%MANTRANS%%man/ja/man1/mkvmerge.1.gz
-%%MANTRANS%%man/ja/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%GUI%%man/ja/man1/mkvtoolnix-gui.1.gz
-%%MANTRANS%%man/ko/man1/mkvextract.1.gz
-%%MANTRANS%%man/ko/man1/mkvinfo.1.gz
-%%MANTRANS%%man/ko/man1/mkvmerge.1.gz
-%%MANTRANS%%man/ko/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%GUI%%man/ko/man1/mkvtoolnix-gui.1.gz
-%%MANTRANS%%man/ru/man1/mkvextract.1.gz
-%%MANTRANS%%man/ru/man1/mkvinfo.1.gz
-%%MANTRANS%%man/ru/man1/mkvmerge.1.gz
-%%MANTRANS%%man/ru/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%GUI%%man/ru/man1/mkvtoolnix-gui.1.gz
-%%MANTRANS%%man/zh_TW/man1/mkvextract.1.gz
-%%MANTRANS%%man/zh_TW/man1/mkvinfo.1.gz
-%%MANTRANS%%man/zh_TW/man1/mkvmerge.1.gz
-%%MANTRANS%%man/zh_TW/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%GUI%%man/zh_TW/man1/mkvtoolnix-gui.1.gz
+@@gui@@bin/mkvtoolnix-gui
+man/bg/man1/mkvextract.1.gz
+man/bg/man1/mkvinfo.1.gz
+man/bg/man1/mkvmerge.1.gz
+man/bg/man1/mkvpropedit.1.gz
+@@gui@@man/bg/man1/mkvtoolnix-gui.1.gz
+man/ca/man1/mkvextract.1.gz
+man/ca/man1/mkvinfo.1.gz
+man/ca/man1/mkvmerge.1.gz
+man/ca/man1/mkvpropedit.1.gz
+@@gui@@man/ca/man1/mkvtoolnix-gui.1.gz
+man/de/man1/mkvextract.1.gz
+man/de/man1/mkvinfo.1.gz
+man/de/man1/mkvmerge.1.gz
+man/de/man1/mkvpropedit.1.gz
+@@gui@@man/de/man1/mkvtoolnix-gui.1.gz
+man/es/man1/mkvextract.1.gz
+man/es/man1/mkvinfo.1.gz
+man/es/man1/mkvmerge.1.gz
+man/es/man1/mkvpropedit.1.gz
+@@gui@@man/es/man1/mkvtoolnix-gui.1.gz
+man/fr/man1/mkvextract.1.gz
+man/fr/man1/mkvinfo.1.gz
+man/fr/man1/mkvmerge.1.gz
+man/fr/man1/mkvpropedit.1.gz
+@@gui@@man/fr/man1/mkvtoolnix-gui.1.gz
+man/it/man1/mkvextract.1.gz
+man/it/man1/mkvinfo.1.gz
+man/it/man1/mkvmerge.1.gz
+man/it/man1/mkvpropedit.1.gz
+@@gui@@man/it/man1/mkvtoolnix-gui.1.gz
+man/ja/man1/mkvextract.1.gz
+man/ja/man1/mkvinfo.1.gz
+man/ja/man1/mkvmerge.1.gz
+man/ja/man1/mkvpropedit.1.gz
+@@gui@@man/ja/man1/mkvtoolnix-gui.1.gz
+man/ko/man1/mkvextract.1.gz
+man/ko/man1/mkvinfo.1.gz
+man/ko/man1/mkvmerge.1.gz
+man/ko/man1/mkvpropedit.1.gz
+@@gui@@man/ko/man1/mkvtoolnix-gui.1.gz
+man/ru/man1/mkvextract.1.gz
+man/ru/man1/mkvinfo.1.gz
+man/ru/man1/mkvmerge.1.gz
+man/ru/man1/mkvpropedit.1.gz
+@@gui@@man/ru/man1/mkvtoolnix-gui.1.gz
+man/zh_TW/man1/mkvextract.1.gz
+man/zh_TW/man1/mkvinfo.1.gz
+man/zh_TW/man1/mkvmerge.1.gz
+man/zh_TW/man1/mkvpropedit.1.gz
+@@gui@@man/zh_TW/man1/mkvtoolnix-gui.1.gz
man/man1/mkvextract.1.gz
man/man1/mkvinfo.1.gz
man/man1/mkvmerge.1.gz
man/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%GUI%%man/man1/mkvtoolnix-gui.1.gz
-%%MANTRANS%%man/nl/man1/mkvextract.1.gz
-%%MANTRANS%%man/nl/man1/mkvinfo.1.gz
-%%MANTRANS%%man/nl/man1/mkvmerge.1.gz
-%%MANTRANS%%man/nl/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%GUI%%man/nl/man1/mkvtoolnix-gui.1.gz
-%%MANTRANS%%man/pl/man1/mkvextract.1.gz
-%%MANTRANS%%man/pl/man1/mkvinfo.1.gz
-%%MANTRANS%%man/pl/man1/mkvmerge.1.gz
-%%MANTRANS%%man/pl/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%GUI%%man/pl/man1/mkvtoolnix-gui.1.gz
-%%MANTRANS%%man/uk/man1/mkvextract.1.gz
-%%MANTRANS%%man/uk/man1/mkvinfo.1.gz
-%%MANTRANS%%man/uk/man1/mkvmerge.1.gz
-%%MANTRANS%%man/uk/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%GUI%%man/uk/man1/mkvtoolnix-gui.1.gz
-%%MANTRANS%%man/zh_CN/man1/mkvextract.1.gz
-%%MANTRANS%%man/zh_CN/man1/mkvinfo.1.gz
-%%MANTRANS%%man/zh_CN/man1/mkvmerge.1.gz
-%%MANTRANS%%man/zh_CN/man1/mkvpropedit.1.gz
-%%MANTRANS%%%%GUI%%man/zh_CN/man1/mkvtoolnix-gui.1.gz
-%%GUI%%share/applications/org.bunkus.mkvtoolnix-gui.desktop
-%%GUI%%share/icons/hicolor/128x128/apps/mkvextract.png
-%%GUI%%share/icons/hicolor/128x128/apps/mkvinfo.png
-%%GUI%%share/icons/hicolor/128x128/apps/mkvmerge.png
-%%GUI%%share/icons/hicolor/128x128/apps/mkvpropedit.png
-%%GUI%%share/icons/hicolor/128x128/apps/mkvtoolnix-gui.png
-%%GUI%%share/icons/hicolor/16x16/apps/mkvextract.png
-%%GUI%%share/icons/hicolor/16x16/apps/mkvinfo.png
-%%GUI%%share/icons/hicolor/16x16/apps/mkvmerge.png
-%%GUI%%share/icons/hicolor/16x16/apps/mkvpropedit.png
-%%GUI%%share/icons/hicolor/16x16/apps/mkvtoolnix-gui.png
-%%GUI%%share/icons/hicolor/24x24/apps/mkvextract.png
-%%GUI%%share/icons/hicolor/24x24/apps/mkvinfo.png
-%%GUI%%share/icons/hicolor/24x24/apps/mkvmerge.png
-%%GUI%%share/icons/hicolor/24x24/apps/mkvpropedit.png
-%%GUI%%share/icons/hicolor/24x24/apps/mkvtoolnix-gui.png
-%%GUI%%share/icons/hicolor/256x256/apps/mkvextract.png
-%%GUI%%share/icons/hicolor/256x256/apps/mkvinfo.png
-%%GUI%%share/icons/hicolor/256x256/apps/mkvmerge.png
-%%GUI%%share/icons/hicolor/256x256/apps/mkvpropedit.png
-%%GUI%%share/icons/hicolor/256x256/apps/mkvtoolnix-gui.png
-%%GUI%%share/icons/hicolor/32x32/apps/mkvextract.png
-%%GUI%%share/icons/hicolor/32x32/apps/mkvinfo.png
-%%GUI%%share/icons/hicolor/32x32/apps/mkvmerge.png
-%%GUI%%share/icons/hicolor/32x32/apps/mkvpropedit.png
-%%GUI%%share/icons/hicolor/32x32/apps/mkvtoolnix-gui.png
-%%GUI%%share/icons/hicolor/48x48/apps/mkvextract.png
-%%GUI%%share/icons/hicolor/48x48/apps/mkvinfo.png
-%%GUI%%share/icons/hicolor/48x48/apps/mkvmerge.png
-%%GUI%%share/icons/hicolor/48x48/apps/mkvpropedit.png
-%%GUI%%share/icons/hicolor/48x48/apps/mkvtoolnix-gui.png
-%%GUI%%share/icons/hicolor/64x64/apps/mkvextract.png
-%%GUI%%share/icons/hicolor/64x64/apps/mkvinfo.png
-%%GUI%%share/icons/hicolor/64x64/apps/mkvmerge.png
-%%GUI%%share/icons/hicolor/64x64/apps/mkvpropedit.png
-%%GUI%%share/icons/hicolor/64x64/apps/mkvtoolnix-gui.png
-%%GUI%%share/icons/hicolor/96x96/apps/mkvextract.png
-%%GUI%%share/icons/hicolor/96x96/apps/mkvinfo.png
-%%GUI%%share/icons/hicolor/96x96/apps/mkvmerge.png
-%%GUI%%share/icons/hicolor/96x96/apps/mkvpropedit.png
-%%GUI%%share/icons/hicolor/96x96/apps/mkvtoolnix-gui.png
+@@gui@@man/man1/mkvtoolnix-gui.1.gz
+man/nl/man1/mkvextract.1.gz
+man/nl/man1/mkvinfo.1.gz
+man/nl/man1/mkvmerge.1.gz
+man/nl/man1/mkvpropedit.1.gz
+@@gui@@man/nl/man1/mkvtoolnix-gui.1.gz
+man/pl/man1/mkvextract.1.gz
+man/pl/man1/mkvinfo.1.gz
+man/pl/man1/mkvmerge.1.gz
+man/pl/man1/mkvpropedit.1.gz
+@@gui@@man/pl/man1/mkvtoolnix-gui.1.gz
+man/uk/man1/mkvextract.1.gz
+man/uk/man1/mkvinfo.1.gz
+man/uk/man1/mkvmerge.1.gz
+man/uk/man1/mkvpropedit.1.gz
+@@gui@@man/uk/man1/mkvtoolnix-gui.1.gz
+man/zh_CN/man1/mkvextract.1.gz
+man/zh_CN/man1/mkvinfo.1.gz
+man/zh_CN/man1/mkvmerge.1.gz
+man/zh_CN/man1/mkvpropedit.1.gz
+@@gui@@man/zh_CN/man1/mkvtoolnix-gui.1.gz
+@@gui@@share/applications/org.bunkus.mkvtoolnix-gui.desktop
+@@gui@@share/icons/hicolor/128x128/apps/mkvextract.png
+@@gui@@share/icons/hicolor/128x128/apps/mkvinfo.png
+@@gui@@share/icons/hicolor/128x128/apps/mkvmerge.png
+@@gui@@share/icons/hicolor/128x128/apps/mkvpropedit.png
+@@gui@@share/icons/hicolor/128x128/apps/mkvtoolnix-gui.png
+@@gui@@share/icons/hicolor/16x16/apps/mkvextract.png
+@@gui@@share/icons/hicolor/16x16/apps/mkvinfo.png
+@@gui@@share/icons/hicolor/16x16/apps/mkvmerge.png
+@@gui@@share/icons/hicolor/16x16/apps/mkvpropedit.png
+@@gui@@share/icons/hicolor/16x16/apps/mkvtoolnix-gui.png
+@@gui@@share/icons/hicolor/24x24/apps/mkvextract.png
+@@gui@@share/icons/hicolor/24x24/apps/mkvinfo.png
+@@gui@@share/icons/hicolor/24x24/apps/mkvmerge.png
+@@gui@@share/icons/hicolor/24x24/apps/mkvpropedit.png
+@@gui@@share/icons/hicolor/24x24/apps/mkvtoolnix-gui.png
+@@gui@@share/icons/hicolor/256x256/apps/mkvextract.png
+@@gui@@share/icons/hicolor/256x256/apps/mkvinfo.png
+@@gui@@share/icons/hicolor/256x256/apps/mkvmerge.png
+@@gui@@share/icons/hicolor/256x256/apps/mkvpropedit.png
+@@gui@@share/icons/hicolor/256x256/apps/mkvtoolnix-gui.png
+@@gui@@share/icons/hicolor/32x32/apps/mkvextract.png
+@@gui@@share/icons/hicolor/32x32/apps/mkvinfo.png
+@@gui@@share/icons/hicolor/32x32/apps/mkvmerge.png
+@@gui@@share/icons/hicolor/32x32/apps/mkvpropedit.png
+@@gui@@share/icons/hicolor/32x32/apps/mkvtoolnix-gui.png
+@@gui@@share/icons/hicolor/48x48/apps/mkvextract.png
+@@gui@@share/icons/hicolor/48x48/apps/mkvinfo.png
+@@gui@@share/icons/hicolor/48x48/apps/mkvmerge.png
+@@gui@@share/icons/hicolor/48x48/apps/mkvpropedit.png
+@@gui@@share/icons/hicolor/48x48/apps/mkvtoolnix-gui.png
+@@gui@@share/icons/hicolor/64x64/apps/mkvextract.png
+@@gui@@share/icons/hicolor/64x64/apps/mkvinfo.png
+@@gui@@share/icons/hicolor/64x64/apps/mkvmerge.png
+@@gui@@share/icons/hicolor/64x64/apps/mkvpropedit.png
+@@gui@@share/icons/hicolor/64x64/apps/mkvtoolnix-gui.png
+@@gui@@share/icons/hicolor/96x96/apps/mkvextract.png
+@@gui@@share/icons/hicolor/96x96/apps/mkvinfo.png
+@@gui@@share/icons/hicolor/96x96/apps/mkvmerge.png
+@@gui@@share/icons/hicolor/96x96/apps/mkvpropedit.png
+@@gui@@share/icons/hicolor/96x96/apps/mkvtoolnix-gui.png
%%NLS%%share/locale/bg/LC_MESSAGES/mkvtoolnix.mo
%%NLS%%share/locale/ca/LC_MESSAGES/mkvtoolnix.mo
%%NLS%%share/locale/cs/LC_MESSAGES/mkvtoolnix.mo
@@ -144,9 +144,9 @@
%%NLS%%share/locale/zh_CN/LC_MESSAGES/mkvtoolnix.mo
%%NLS%%share/locale/zh_SG/LC_MESSAGES/mkvtoolnix.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo
-%%GUI%%share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml
-%%GUI%%share/mime/packages/org.bunkus.mkvtoolnix-gui.xml
-%%GUI%%%%DATADIR%%/qt_resources.rcc
-%%GUI%%%%DATADIR%%/sounds/finished-1.webm
-%%GUI%%%%DATADIR%%/sounds/finished-2.webm
-%%GUI%%%%DATADIR%%/sounds/finished-3.webm
+@@gui@@share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml
+@@gui@@share/mime/packages/org.bunkus.mkvtoolnix-gui.xml
+@@gui@@%%DATADIR%%/qt_resources.rcc
+@@gui@@%%DATADIR%%/sounds/finished-1.webm
+@@gui@@%%DATADIR%%/sounds/finished-2.webm
+@@gui@@%%DATADIR%%/sounds/finished-3.webm

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 30, 7:15 AM (20 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28228793
Default Alt Text
D43454.1774854942.diff (12 KB)

Event Timeline