The ${CFLAGS} fix-up in Makefile.cflags must come after everything, even

bsd.pkg.mk, to completely master all CFLAGS settings. This fixes the build
in the MPLAYER_ENABLE_RUNTIME_CPU_DETECTION=NO case (PR pkg/19946).

This isn't the only way this package wantonly disregards buildlink's rule.
In any case, binary packages are still problematic, even with the runtime
detection, as one of the dependencies (audio/faad2) may not be distributed
as a binary.

4 files changed, 12 insertions, 12 deletions

diff --git a/graphics/gmplayer/Makefile b/graphics/gmplayer/Makefile
index 5c73c699c80..789027d4d20 100644
--- a/graphics/gmplayer/Makefile
+++ b/graphics/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/01/20 07:10:42 fredb Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/20 22:42:40 fredb Exp $
 
 .include "../../graphics/mplayer-share/Makefile.common"
 
@@ -61,5 +61,5 @@ do-install:
 .include "../../audio/nas/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 
-.include "../../graphics/mplayer-share/Makefile.cflags"
 .include "../../mk/bsd.pkg.mk"
+.include "../../graphics/mplayer-share/Makefile.cflags"
diff --git a/graphics/mencoder/Makefile b/graphics/mencoder/Makefile
index 27833d01c3f..d6888785e57 100644
--- a/graphics/mencoder/Makefile
+++ b/graphics/mencoder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/01/20 07:10:43 fredb Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/20 22:42:40 fredb Exp $
 
 .include "../../graphics/mplayer-share/Makefile.common"
 
@@ -19,5 +19,5 @@ do-install:
 
 .include "../../audio/lame/buildlink2.mk"
 
-.include "../../graphics/mplayer-share/Makefile.cflags"
 .include "../../mk/bsd.pkg.mk"
+.include "../../graphics/mplayer-share/Makefile.cflags"
diff --git a/graphics/mplayer-share/Makefile.cflags b/graphics/mplayer-share/Makefile.cflags
index 72326bd166a..38e2aac76fa 100644
--- a/graphics/mplayer-share/Makefile.cflags
+++ b/graphics/mplayer-share/Makefile.cflags
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.cflags,v 1.1 2003/01/20 07:10:41 fredb Exp $
+# $NetBSD: Makefile.cflags,v 1.2 2003/01/20 22:42:39 fredb Exp $
 
-# This must all come after the last "buildink2.mk" inclusion, as
-# "buildlink2.mk" munges ${CFLAGS}, and if ${CFLAGS} is non-empty,
-# the configure script refuses to add any optimizations at all.
+# This must be included after everything else to truly clear ${CFLAGS}
+# in the non-runtime-cpu-detection case. If ${CFLAGS} is non-empty, the
+# configure script refuses to add any optimizations at all.
 
 .if ${MPLAYER_ENABLE_RUNTIME_CPU_DETECTION} == YES
 .if ${MACHINE_ARCH} == i386
@@ -10,9 +10,9 @@
 # is nearly optimal for K6-2 as well. Anything slowler will still run
 # (but would probably benefit greatly from turning off the run-time
 # cpu detection).
-CFLAGS+=	-O3 -ffast-math -fomit-frame-pointer -mcpu=pentiumpro
+CFLAGS=		-O3 -ffast-math -fomit-frame-pointer -mcpu=pentiumpro
 .else
-CFLAGS+=	-O3 -ffast-math -fomit-frame-pointer
+CFLAGS=		-O3 -ffast-math -fomit-frame-pointer
 .endif
 .else
 CFLAGS=		# Let "configure" do its thing.
diff --git a/graphics/mplayer/Makefile b/graphics/mplayer/Makefile
index 2eb0ca6a01a..7b0ff5bb7ad 100644
--- a/graphics/mplayer/Makefile
+++ b/graphics/mplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2003/01/20 07:10:42 fredb Exp $
+# $NetBSD: Makefile,v 1.30 2003/01/20 22:42:39 fredb Exp $
 
 .include "../../graphics/mplayer-share/Makefile.common"
 
@@ -15,6 +15,6 @@ do-install:
 .include "../../graphics/mplayer-share/Makefile.depends"
 
 .include "../../audio/nas/buildlink2.mk"
+.include "../../mk/bsd.pkg.mk"
 
 .include "../../graphics/mplayer-share/Makefile.cflags"
-.include "../../mk/bsd.pkg.mk"