- Update to upstream version 0.5.0 [1]

- General port cleanup [1]
- Fix sporadic build failures on SMP systems [2]
- Un-break build on arm [2]

PR:		199247
Submitted by:	tkato432@yahoo.com [1]
Reviewed by:	riggs [2]
MFH:		2015Q2

4 files changed, 47 insertions, 22 deletions

diff --git a/multimedia/mkvalidator/Makefile b/multimedia/mkvalidator/Makefile
index 2d3f3ccacda7..cf74374aa0c3 100644
--- a/multimedia/mkvalidator/Makefile
+++ b/multimedia/mkvalidator/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	mkvalidator
-PORTVERSION=	0.4.2
+PORTVERSION=	0.5.0
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/matroska/${PORTNAME}/
 
@@ -11,23 +11,35 @@ COMMENT=	Command line tool to verify Matroska and WebM files
 LICENSE=	BSD3CLAUSE BSD4CLAUSE GPLv2
 LICENSE_COMB=	multi
 
-HAS_CONFIGURE=	yes
-
-USES=		iconv gmake tar:bzip2
-
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
-
-MAKE_ENV+=	"LFLAGS=${LDFLAGS}"
-MAKEFILE=	GNUmakefile
 BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
 
-PLIST_FILES=	bin/mkvalidator
-
-BROKEN_sparc64=	Does not install on sparc64: gmake: GNUmakefile: No such file or directory
+USES=		gmake iconv tar:bzip2
+HAS_CONFIGURE=	yes
+MAKE_ENV=	V=1
+MAKEFILE=	GNUmakefile
 
-post-extract:
-	@${REINPLACE_CMD} -e 's,/usr/local,$$(DESTDIR)$$(PREFIX),g' ${WRKSRC}/corec/tools/coremake/gcc_mak.inc
-	@${RM} ${WRKSRC}/libmatroska2/test/test.proj
+CFLAGS+=	-I${ICONV_PREFIX}/include
+LIBS+=		-L${ICONV_PREFIX}/lib ${ICONV_LIB}
+
+PLIST_FILES=	bin/mkvalidator bin/mkvtree
+
+BROKEN_sparc64=	Build broken on big endian architectures
+
+MAKE_JOBS_UNSAFE=	yes
+
+post-patch:
+	${REINPLACE_CMD} -e \
+		'/STRIP/s|strip|${STRIP_CMD:T}| ; \
+		 /CCFLAGS/s|-O3 .* -W|-W|' \
+		${WRKSRC}/corec/tools/coremake/gcc_linux*.build
+	${REINPLACE_CMD} -e \
+		's|/usr/local|$$(DESTDIR)$$(PREFIX)|g' \
+		${WRKSRC}/corec/tools/coremake/gcc_mak.inc
+	${REINPLACE_CMD} -e \
+		's|arm-none-linux-gnueabi-gcc|${CC}| ; \
+		 s|arm-none-linux-gnueabi-g++|${CXX}| ; \
+		 s|arm-none-linux-gnueabi-ar|${AR}| ; \
+		 s|arm-none-linux-gnueabi-strip|${STRIP_CMD}|' \
+		${WRKSRC}/corec/tools/coremake/gcc_linux_arm.build
 
 .include <bsd.port.mk>
diff --git a/multimedia/mkvalidator/distinfo b/multimedia/mkvalidator/distinfo
index edd680b5e426..e95d252eb981 100644
--- a/multimedia/mkvalidator/distinfo
+++ b/multimedia/mkvalidator/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mkvalidator-0.4.2.tar.bz2) = 9f626b8ae790642d63533da00639c61ef9b0548f6e75cd17544acb352efab77f
-SIZE (mkvalidator-0.4.2.tar.bz2) = 579080
+SHA256 (mkvalidator-0.5.0.tar.bz2) = c3e72e5b49d32174415b9273ea8d52380e09ac63c8dc7db684104021c711c104
+SIZE (mkvalidator-0.5.0.tar.bz2) = 587942
diff --git a/multimedia/mkvalidator/files/patch-corec-tools-coremake-gcc_linux_arm.build b/multimedia/mkvalidator/files/patch-corec-tools-coremake-gcc_linux_arm.build
new file mode 100644
index 000000000000..9c8b008c6d9a
--- /dev/null
+++ b/multimedia/mkvalidator/files/patch-corec-tools-coremake-gcc_linux_arm.build
@@ -0,0 +1,13 @@
+--- corec/tools/coremake/gcc_linux_arm.build.orig	2012-12-16 11:29:34.000000000 +0100
++++ corec/tools/coremake/gcc_linux_arm.build	2015-04-11 19:30:30.119705652 +0200
+@@ -19,8 +19,8 @@
+ 
+ #define GLIBC
+ 
+-#define CCFLAGS -DARM -Wno-multichar -O3 -mno-apcs-frame -fomit-frame-pointer -fsigned-char -march=armv4t -mtune=xscale -fvisibility=hidden -DRESOURCE_COREC
+-#define SFLAGS -DARM -Wno-multichar -O3 -mno-apcs-frame -fomit-frame-pointer -fsigned-char -mcpu=iwmmxt -mtune=xscale -D_HIDDEN
++#define CCFLAGS -DARM -Wno-multichar -O3 -fomit-frame-pointer -DRESOURCE_COREC
++#define SFLAGS -DARM -Wno-multichar -O3 -fomit-frame-pointer -D_HIDDEN
+ #define SHFLAGS -shared -Wl,--strip-all
+ 
+ #include "gcc.inc"
diff --git a/multimedia/mkvalidator/pkg-descr b/multimedia/mkvalidator/pkg-descr
index 8d6fc92b7ad0..90e9bf48428a 100644
--- a/multimedia/mkvalidator/pkg-descr
+++ b/multimedia/mkvalidator/pkg-descr
@@ -1,6 +1,6 @@
-mkvalidator is a simple command line tool to verify Matroska and WebM files for
-spec conformance. It checks the various bogus or missing key elements against
-the EBML DocType version of the file and reports the errors/warnings in the
-command line.
+mkvalidator is a simple command line tool to verify Matroska and WebM
+files for spec conformance. It checks the various bogus or missing key
+elements against the EBML DocType version of the file and reports the
+errors/warnings in the command line.
 
 WWW: http://www.matroska.org/downloads/mkvalidator.html