CVS commit: pkgsrc/multimedia/mkvtoolnix

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Nov 23 20:34:30 UTC 2022

Modified Files:
        pkgsrc/multimedia/mkvtoolnix: Makefile distinfo
Added Files:
        pkgsrc/multimedia/mkvtoolnix/patches: patch-configure

Log Message:
mkvtoolnix: fix buildling without po4a


To generate a diff of this commit:
cvs rdiff -u -r1.204 -r1.205 pkgsrc/multimedia/mkvtoolnix/Makefile
cvs rdiff -u -r1.107 -r1.108 pkgsrc/multimedia/mkvtoolnix/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/multimedia/mkvtoolnix/patches/patch-configure

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.204 pkgsrc/multimedia/mkvtoolnix/Makefile:1.205
--- pkgsrc/multimedia/mkvtoolnix/Makefile:1.204 Wed Nov 23 16:20:46 2022
+++ pkgsrc/multimedia/mkvtoolnix/Makefile       Wed Nov 23 20:34:30 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.204 2022/11/23 16:20:46 adam Exp $
+# $NetBSD: Makefile,v 1.205 2022/11/23 20:34:30 adam Exp $
 
 DISTNAME=      mkvtoolnix-72.0.0
 PKGREVISION=   1
@@ -41,9 +41,9 @@ INSTALL_ENV+= SHELL=${SH:Q}
 .include "../../mk/bsd.prefs.mk"
 
 pre-build:
-       cd ${WRKSRC} && ${RM} src/common/*/windows.cpp
+       cd ${WRKSRC} && ${RM} -f src/common/*/windows.cpp
 .if ${OPSYS} != "Darwin"
-       cd ${WRKSRC} && ${RM} src/common/*/macos.cpp
+       cd ${WRKSRC} && ${RM} -f src/common/*/macos.cpp
 .endif
 
 do-build:

Index: pkgsrc/multimedia/mkvtoolnix/distinfo
diff -u pkgsrc/multimedia/mkvtoolnix/distinfo:1.107 pkgsrc/multimedia/mkvtoolnix/distinfo:1.108
--- pkgsrc/multimedia/mkvtoolnix/distinfo:1.107 Tue Nov 15 08:55:30 2022
+++ pkgsrc/multimedia/mkvtoolnix/distinfo       Wed Nov 23 20:34:30 2022
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.107 2022/11/15 08:55:30 adam Exp $
+$NetBSD: distinfo,v 1.108 2022/11/23 20:34:30 adam Exp $
 
 BLAKE2s (mkvtoolnix-72.0.0.tar.xz) = 14948d0d9fe0eeff91c1744914764727847e92b99f58540bba82ba5d17fd20fe
 SHA512 (mkvtoolnix-72.0.0.tar.xz) = dc18c6e63e724181e38753921ec3374752dbb7c4d20650cf0787e9049aaec4f6bb6c744e49b3783921804f192de742fba92826615a1edc8516d2a41621be658c
 Size (mkvtoolnix-72.0.0.tar.xz) = 10994204 bytes
 SHA1 (patch-Rakefile) = 08dbf4a4968008ff258a66e71aa2bddc61c04af6
+SHA1 (patch-configure) = 22769c823b9558c86173b26e2c7d621b59d5a357
 SHA1 (patch-src_common_locale.cpp) = 2f3113c8c9171b87a421df447f6c421b1e4dc7e0

Added files:

Index: pkgsrc/multimedia/mkvtoolnix/patches/patch-configure
diff -u /dev/null pkgsrc/multimedia/mkvtoolnix/patches/patch-configure:1.3
--- /dev/null   Wed Nov 23 20:34:30 2022
+++ pkgsrc/multimedia/mkvtoolnix/patches/patch-configure        Wed Nov 23 20:34:30 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.3 2022/11/23 20:34:30 adam Exp $
+
+Fix configuring without po4a.
+
+--- configure.orig     2022-11-23 20:15:43.899410199 +0000
++++ configure
+@@ -11842,7 +11842,7 @@ PO4A_FLAGS="-k $TRANSLATE_PERCENT"
+ 
+ 
+ # Check whether --with-po4a was given.
+-if test ${with_po4a+y}
++if test "x$with_po4a" != "xno"
+ then :
+   withval=$with_po4a;  PO4A="$with_po4a"
+ fi