svn commit: r377323 - head/multimedia/mplayer

[Thomas Zander]

Author: riggs
Date: Sun Jan 18 11:40:01 2015
New Revision: 377323
URL: https://svnweb.freebsd.org/changeset/ports/377323
QAT: https://qat.redports.org/buildarchive/r377323/

Log:
  Handle arch-dependent CFLAGS in Makefile.options because it
  should be included by mencoder as well.

Modified:
  head/multimedia/mplayer/Makefile
  head/multimedia/mplayer/Makefile.options

Modified: head/multimedia/mplayer/Makefile
==============================================================================
--- head/multimedia/mplayer/Makefile	Sun Jan 18 11:20:54 2015	(r377322)
+++ head/multimedia/mplayer/Makefile	Sun Jan 18 11:40:01 2015	(r377323)
@@ -60,10 +60,6 @@ CONFIGURE_ARGS+=	--disable-arts \
 
 .include "${.CURDIR}/Makefile.options"
 
-.if ${ARCH} == "armv6"
-CFLAGS_armv6+=	-no-integrated-as
-.endif
-
 .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 PLIST_SUB+=	GMPLAYER=""
 DESKTOP_ENTRIES=	"MPlayer" "High performance media player" "mplayer" "gmplayer" "" false

Modified: head/multimedia/mplayer/Makefile.options
==============================================================================
--- head/multimedia/mplayer/Makefile.options	Sun Jan 18 11:20:54 2015	(r377322)
+++ head/multimedia/mplayer/Makefile.options	Sun Jan 18 11:40:01 2015	(r377323)
@@ -141,6 +141,9 @@ MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bi
 .endif # ${PORT_OPTIONS:MOTCHAIN}
 .endif # defined(WITH_BASE_CLANG)
 
+.if ${ARCH} == "armv6"
+CFLAGS_armv6+=	-no-integrated-as
+.endif
 
 # Extra build options for debugging and optimised CFLAGS
 # ======================================================