Attachment #232051 for bug #262041




PORTNAME=	mkclean
PORTVERSION=	0.9.0
PORTREVISION=	2
CATEGORIES=	multimedia
MASTER_SITES=	SF/matroska/${PORTNAME}/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Clean and optimize Matroska and WebM files

LICENSE=	BSD3CLAUSE

# These may work better now with cmake.
BROKEN_aarch64=	does not install: arm-none-linux-gnueabi-gcc: Command not found
BROKEN_armv6=	does not install: arm-none-linux-gnueabi-gcc: Command not found
BROKEN_armv7=	does not install: arm-none-linux-gnueabi-gcc: Command not found
BROKEN_mips64=	does not install: mipsel-linux-gcc: Command not found
BROKEN_riscv64=	does not compile: cc: invalid arch name 'i486', string must begin with rv32{i,e,g} or rv64{i,g}
BROKEN_sparc64=	does not install: gmake: GNUmakefile: No such file or directory

USES=		cmake compiler:c++11-lang cpe iconv localbase:ldflags

USES=		compiler:c++11-lang cpe iconv localbase:ldflags gmake tar:bzip2
CPE_VENDOR=	matroska

USE_GITHUB=	yes
GH_ACCOUNT=	Matroska-Org
GH_PROJECT=	foundation-source
GH_TAGNAME=	${PORTNAME}-${PORTVERSION}

NO_INSTALL=	yes

post-extract:
	@${REINPLACE_CMD} -e 's/vfs.h/mount.h/' ${WRKSRC}/corec/corec/helpers/file/file_libc.c

LDFLAGS+=	${ICONV_LIB}
MAKEFILE=	GNUmakefile
BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}

PLIST_FILES=	bin/mkclean \
		bin/mkWDclean

post-stage:
	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME}/mkclean ${STAGEDIR}${LOCALBASE}/bin
	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME}/mkWDclean ${STAGEDIR}${LOCALBASE}/bin

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)b/multimedia/mkclean/distinfo (-2 / +3 lines)
1	SHA256 (mkclean-0.8.7.tar.bz2) = 88713065a172d1ab7fd34c8854a42f6bf8d0e794957265340328a2f692ad46d9	1	TIMESTAMP = 1645167021
2	SIZE (mkclean-0.8.7.tar.bz2) = 737877	2	SHA256 (Matroska-Org-foundation-source-0.9.0-mkclean-0.9.0_GH0.tar.gz) = d42123ceb22be6f682105fd4fc28b6657ca86ab2bb9450f753054bf17b65ad1e
		3	SIZE (Matroska-Org-foundation-source-0.9.0-mkclean-0.9.0_GH0.tar.gz) = 718527

Removed Link Here

(-)a/multimedia/mkclean/files/patch-corec__corec__helpers__file__file_libc.c (-11 lines)
1	--- corec/corec/helpers/file/file_libc.c.orig 2012-08-26 13:26:55 UTC
2	+++ corec/corec/helpers/file/file_libc.c
3	@@ -40,7 +40,7 @@
4	#include <unistd.h>
5	#include <dirent.h>
6	#include <errno.h>
7	-#if defined(TARGET_OSX)
8	+#if defined(TARGET_OSX) \|\| defined(TARGET_FREEBSD)
9	#include <sys/mount.h>
10	#else
11	#include <sys/vfs.h>




--- corec/corec/portab.h.orig	2012-08-26 13:26:56 UTC
+++ corec/corec/portab.h
@@ -159,6 +159,9 @@
 
 #elif defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 
+#if defined(__FreeBSD__)
+#define TARGET_FREEBSD
+#endif
 #define TARGET_LINUX
 
 #ifndef TARGET_QTOPIA // qtopia defines desktop manually

Removed Link Here

(-)a/multimedia/mkclean/files/patch-root.proj (-10 lines)
1	--- root.proj.orig 2012-08-26 13:26:56 UTC
2	+++ root.proj
3	@@ -12,6 +12,7 @@ WORKSPACE(CONFIG_MATROSKA2) matroska
4	USE matroska2
5	USE mkvtests
6	USE mkclean
7	+ USE mkWDclean
8	USE mkvalidator
9	}
10

Return to bug 262041

Lines 1-37 Link Here

(-)b/multimedia/mkclean/Makefile (-18 / +22 lines)
1	PORTNAME= mkclean	1	PORTNAME= mkclean
2	PORTVERSION= 0.8.7	2	PORTVERSION= 0.9.0
3	PORTREVISION= 2
4	CATEGORIES= multimedia	3	CATEGORIES= multimedia
5	MASTER_SITES= SF/matroska/${PORTNAME}/
6		4
7	MAINTAINER= ports@FreeBSD.org	5	MAINTAINER= ports@FreeBSD.org
8	COMMENT= Clean and optimize Matroska and WebM files	6	COMMENT= Clean and optimize Matroska and WebM files
9		7
10	LICENSE= BSD3CLAUSE	8	LICENSE= BSD3CLAUSE
11		9
12	BROKEN_aarch64= Does not install: arm-none-linux-gnueabi-gcc: Command not found	10	# These may work better now with cmake.
13	BROKEN_armv6= Does not install: arm-none-linux-gnueabi-gcc: Command not found	11	BROKEN_aarch64= does not install: arm-none-linux-gnueabi-gcc: Command not found
14	BROKEN_armv7= Does not install: arm-none-linux-gnueabi-gcc: Command not found	12	BROKEN_armv6= does not install: arm-none-linux-gnueabi-gcc: Command not found
15	BROKEN_mips64= Does not install: mipsel-linux-gcc: Command not found	13	BROKEN_armv7= does not install: arm-none-linux-gnueabi-gcc: Command not found
16	BROKEN_riscv64= Does not compile: cc: invalid arch name 'i486', string must begin with rv32{i,e,g} or rv64{i,g}	14	BROKEN_mips64= does not install: mipsel-linux-gcc: Command not found
17	BROKEN_sparc64= Does not install: gmake: GNUmakefile: No such file or directory	15	BROKEN_riscv64= does not compile: cc: invalid arch name 'i486', string must begin with rv32{i,e,g} or rv64{i,g}
		16	BROKEN_sparc64= does not install: gmake: GNUmakefile: No such file or directory
18		17
19	HAS_CONFIGURE= yes	18	USES= cmake compiler:c++11-lang cpe iconv localbase:ldflags
20		19
21	USES= compiler:c++11-lang cpe iconv localbase:ldflags gmake tar:bzip2
22	CPE_VENDOR= matroska	20	CPE_VENDOR= matroska
23		21
24	LDFLAGS+= ${ICONV_LIB}	22	USE_GITHUB= yes
		23	GH_ACCOUNT= Matroska-Org
		24	GH_PROJECT= foundation-source
		25	GH_TAGNAME= ${PORTNAME}-${PORTVERSION}
		26
		27	NO_INSTALL= yes
		28
		29	post-extract:
		30	@${REINPLACE_CMD} -e 's/vfs.h/mount.h/' ${WRKSRC}/corec/corec/helpers/file/file_libc.c
25		31
26	MAKE_ENV= "LFLAGS=${LDFLAGS}"	32	LDFLAGS+= ${ICONV_LIB}
27	MAKEFILE= GNUmakefile
28	BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}
29		33
30	PLIST_FILES= bin/mkclean \	34	PLIST_FILES= bin/mkclean \
31	bin/mkWDclean	35	bin/mkWDclean
32		36
33	post-extract:	37	post-stage:
34	@${REINPLACE_CMD} -e 's,/usr/local,$$(DESTDIR)$$(PREFIX),g' ${WRKSRC}/corec/tools/coremake/gcc_mak.inc	38	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME}/mkclean ${STAGEDIR}${LOCALBASE}/bin
35	@${RM} ${WRKSRC}/libmatroska2/test/test.proj	39	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME}/mkWDclean ${STAGEDIR}${LOCALBASE}/bin
36		40
37	.include <bsd.port.mk>	41	.include <bsd.port.mk>

Removed Link Here

(-)a/multimedia/mkclean/files/patch-corec__corec__portab.h (-12 lines)
1	--- corec/corec/portab.h.orig 2012-08-26 13:26:56 UTC
2	+++ corec/corec/portab.h
3	@@ -159,6 +159,9 @@
4
5	#elif defined(__linux__) \|\| defined(__CYGWIN__) \|\| defined(__FreeBSD__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__)
6
7	+#if defined(__FreeBSD__)
8	+#define TARGET_FREEBSD
9	+#endif
10	#define TARGET_LINUX
11
12	#ifndef TARGET_QTOPIA // qtopia defines desktop manually