From owner-svn-ports-all@FreeBSD.ORG  Fri Jan 16 22:50:43 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9B276851;
 Fri, 16 Jan 2015 22:50:43 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 86931BCC;
 Fri, 16 Jan 2015 22:50:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0GMohWu039921;
 Fri, 16 Jan 2015 22:50:43 GMT (envelope-from sbruno@FreeBSD.org)
Received: (from sbruno@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0GMohOq039919;
 Fri, 16 Jan 2015 22:50:43 GMT (envelope-from sbruno@FreeBSD.org)
Message-Id: <201501162250.t0GMohOq039919@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: sbruno set sender to
 sbruno@FreeBSD.org using -f
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Fri, 16 Jan 2015 22:50:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r377205 - in head/multimedia: ffmpeg gstreamer1-libav
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jan 2015 22:50:43 -0000

Author: sbruno
Date: Fri Jan 16 22:50:42 2015
New Revision: 377205
URL: https://svnweb.freebsd.org/changeset/ports/377205
QAT: https://qat.redports.org/buildarchive/r377205/

Log:
  Remove duplicate armv6 conditional introduced in r377204
  
  Submitted by:	antoine

Modified:
  head/multimedia/ffmpeg/Makefile
  head/multimedia/gstreamer1-libav/Makefile

Modified: head/multimedia/ffmpeg/Makefile
==============================================================================
--- head/multimedia/ffmpeg/Makefile	Fri Jan 16 22:34:22 2015	(r377204)
+++ head/multimedia/ffmpeg/Makefile	Fri Jan 16 22:50:42 2015	(r377205)
@@ -237,10 +237,6 @@ CONFIGURE_ARGS+=	--enable-x11grab
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == armv6
-CONFIGURE_ENV+=	ASFLAGS=-no-integrated-as
-.endif
-
 .if ${ARCH} == "armv6"
 CONFIGURE_ENV+=	ASFLAGS=-no-integrated-as
 .endif

Modified: head/multimedia/gstreamer1-libav/Makefile
==============================================================================
--- head/multimedia/gstreamer1-libav/Makefile	Fri Jan 16 22:34:22 2015	(r377204)
+++ head/multimedia/gstreamer1-libav/Makefile	Fri Jan 16 22:50:42 2015	(r377205)
@@ -43,10 +43,6 @@ MAKE_ENV=	COMPILER_PATH=${LOCALBASE}/bin
 CFLAGS+=	-mstack-alignment=16 -mstackrealign
 .endif
 
-.if ${ARCH} == armv6
-CONFIGURE_ENV+=	ASFLAGS=-no-integrated-as
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} 's/[[:<:]]ARCH[[:>:]]/LIBAV_ARCH/' \
 		${WRKSRC}/gst-libs/ext/libav/Makefile \