Index: head/multimedia/m2vrequantiser/Makefile
===================================================================
--- head/multimedia/m2vrequantiser/Makefile	(revision 538438)
+++ head/multimedia/m2vrequantiser/Makefile	(revision 538439)
@@ -1,21 +1,20 @@
 # Created by: Juergen Lock <nox@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	m2vrequantiser
 PORTVERSION=	1.1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://launchpadlibrarian.net/52366061/
 DISTNAME=	M2VRequantiser-v${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Requantize MPEG-2 streams without recompressing
 
-PATCH_STRIP=	-p1
-CFLAGS+=	-Duint=unsigned
-MAKE_ARGS+=	CC="${CC}" CXX="${CXX}"
-PLIST_FILES+=	bin/M2VRequantiser
+CFLAGS=		-Duint=unsigned
+MAKE_ARGS=	CC="${CC}" CXX="${CXX}"
+PLIST_FILES=	bin/M2VRequantiser
 
 post-patch:
 	${REINPLACE_CMD} 's|$$(PREFIX)|$${DESTDIR}$$(PREFIX)|' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
Index: head/multimedia/m2vrequantiser/files/patch-main.c
===================================================================
--- head/multimedia/m2vrequantiser/files/patch-main.c	(revision 538438)
+++ head/multimedia/m2vrequantiser/files/patch-main.c	(revision 538439)
@@ -1,11 +1,20 @@
---- a/main.c
-+++ b/main.c
+--- main.c
++++ main.c
+@@ -30,7 +30,7 @@ Thanks to Sven Goethel for error resilience patches
+ #define NDEBUG // turns off asserts
+ #define REMOVE_BYTE_STUFFING	// removes series of 0x00
+ 
+-#if defined(__ppc__) || defined(__ppc64__)
++#if (defined(__ppc__) || defined(__ppc64__)) && !defined(__clang__)
+ 	#define USE_GLOBAL_REGISTER // assign registers to bit buffers
+ #elif defined(__i386__) || defined (__x86_64__)
+ 	// #define USE_GLOBAL_REGISTER // assign registers to bit buffers
 @@ -2315,7 +2315,7 @@ int main (int argc, const char * argv[])
  	if (argc < 5) { USAGE }
  	delta_bright = atoi(argv[4]);
  #else
 -	if (argc < 2) { USAGE }
 +	if (argc < 3) { USAGE }
  #endif
  	fact_x = atof(argv[1]);
  	sscanf(argv[2], "%lld", &orim2vsize);