From owner-svn-ports-head@FreeBSD.ORG  Sat Jul  6 19:30:05 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 01598423;
 Sat,  6 Jul 2013 19:30:05 +0000 (UTC) (envelope-from nox@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E8934117B;
 Sat,  6 Jul 2013 19:30:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r66JU4oL079443;
 Sat, 6 Jul 2013 19:30:04 GMT (envelope-from nox@svn.freebsd.org)
Received: (from nox@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r66JU4sP079442;
 Sat, 6 Jul 2013 19:30:04 GMT (envelope-from nox@svn.freebsd.org)
Message-Id: <201307061930.r66JU4sP079442@svn.freebsd.org>
From: Juergen Lock <nox@FreeBSD.org>
Date: Sat, 6 Jul 2013 19:30:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322409 - head/multimedia/avidemux2
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Jul 2013 19:30:05 -0000

Author: nox
Date: Sat Jul  6 19:30:04 2013
New Revision: 322409
URL: http://svnweb.freebsd.org/changeset/ports/322409

Log:
  Fix build of multimedia/avidemux2 and multimedia/avidemux2-plugins
  in a world WITH_CLANG_IS_CC and WITHOUT_GCC.
  
  PR:		ports/180087
  Submitted by:	r4721@tormail.org

Modified:
  head/multimedia/avidemux2/Makefile.common

Modified: head/multimedia/avidemux2/Makefile.common
==============================================================================
--- head/multimedia/avidemux2/Makefile.common	Sat Jul  6 19:29:38 2013	(r322408)
+++ head/multimedia/avidemux2/Makefile.common	Sat Jul  6 19:30:04 2013	(r322409)
@@ -27,6 +27,7 @@ WANT_SDL=	yes
 USES=		cmake:outsource pkgconfig iconv
 CMAKE_USE_PTHREAD=yes
 CMAKE_ARGS+=	-DTHREADS_HAVE_PTHREAD_ARG:STRING="${PTHREAD_LIBS}"
+CFLAGS+=	-Wno-return-type
 MAKE_JOBS_UNSAFE=	yes
 
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
@@ -223,6 +224,8 @@ post-extract:
 
 post-patch:
 	@${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/*/*/Makefile
+	@${REINPLACE_CMD} '/--enable-shared/s,,& --cc=${CC},' ${WRKSRC}/cmake/admFFmpegBuild.cmake
+	@${REINPLACE_CMD} '/sub $$1/s,sub,subl,' ${WRKSRC}/plugins/ADM_videoFilters/FluxSmooth/ADM_vidFlux.cpp
 	@${CP} ${FILESDIR}/execinfo.cpp ${WRKSRC}/cmake_compile_check/
 	@${CP} ${FILESDIR}/*.patch ${WRKSRC}/cmake/patches/
 	@${MKDIR} ${CONFIGURE_WRKSRC}/config