[pkgsrc/trunk]: pkgsrc Now that bsd.options.mk has been changed, only add mmx...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c3f975d911bb
branches:  trunk
changeset: 495496:c3f975d911bb
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Jun 11 16:53:18 2005 +0000

description:
Now that bsd.options.mk has been changed, only add mmx to PKG_SUPPORTED_OPTIONS on i386.

diffstat:

 emulators/snes9x/Makefile    |  8 +++++---
 graphics/imlib2/options.mk   |  9 +++++----
 multimedia/avidemux/Makefile |  6 +++++-
 multimedia/xawtv/Makefile    |  9 +++++----
 4 files changed, 20 insertions(+), 12 deletions(-)

diffs (102 lines):

diff -r febbd1706013 -r c3f975d911bb emulators/snes9x/Makefile
--- a/emulators/snes9x/Makefile Sat Jun 11 16:33:48 2005 +0000
+++ b/emulators/snes9x/Makefile Sat Jun 11 16:53:18 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/06/10 18:20:06 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2005/06/11 16:53:18 wiz Exp $
 
 DISTNAME=              s9xs139
 PKGNAME=               snes9x-1.39
@@ -29,13 +29,15 @@
        ${INSTALL_MAN} ${WRKSRC}/README.TXT ${PREFIX}/share/doc/snes9x
        ${INSTALL_MAN} ${WRKSRC}/TODO.TXT ${PREFIX}/share/doc/snes9x
 
+.include "../../mk/bsd.prefs.mk"
+
 PKG_OPTIONS_VAR=       PKG_OPTIONS.snes9x
+.if ${MACHINE_ARCH} == "i386"
 PKG_SUPPORTED_OPTIONS= mmx
+.endif
 
 .include "../../mk/bsd.options.mk"
 
-.include "../../mk/bsd.prefs.mk"
-
 MAKE_ENV+=     THREAD_SOUND=1
 .if ${MACHINE_ARCH} == "i386"
 MAKE_ENV+=     USING_I386=1
diff -r febbd1706013 -r c3f975d911bb graphics/imlib2/options.mk
--- a/graphics/imlib2/options.mk        Sat Jun 11 16:33:48 2005 +0000
+++ b/graphics/imlib2/options.mk        Sat Jun 11 16:53:18 2005 +0000
@@ -1,13 +1,14 @@
-# $NetBSD: options.mk,v 1.3 2005/06/10 18:21:45 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2005/06/11 16:54:31 wiz Exp $
+
+.include "../../mk/bsd.prefs.mk"
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.imlib2
+.if ${MACHINE_ARCH} == "i386"
 PKG_SUPPORTED_OPTIONS= mmx
+.endif
 
 .include "../../mk/bsd.options.mk"
-.include "../../mk/bsd.prefs.mk"
 
 .if !empty(PKG_OPTIONS:Mmmx)
-.if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=       --enable-mmx
 .endif
-.endif
diff -r febbd1706013 -r c3f975d911bb multimedia/avidemux/Makefile
--- a/multimedia/avidemux/Makefile      Sat Jun 11 16:33:48 2005 +0000
+++ b/multimedia/avidemux/Makefile      Sat Jun 11 16:53:18 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/10 18:25:13 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/06/11 16:57:29 wiz Exp $
 #
 
 DISTNAME=      avidemux-2.0.40
@@ -20,8 +20,12 @@
 CONFIGURE_ENV+=                ac_cv_path_ART_CONFIG=no
 CONFIGURE_ARGS+=       --disable-faad # Dolby doesn't allow binary distribution
 
+.include "../../mk/bsd.prefs.mk"
+
 PKG_OPTIONS_VAR=       PKG_OPTIONS.avidemux
+.if ${MACHINE_ARCH} == "i386"
 PKG_SUPPORTED_OPTIONS= mmx
+.endif
 
 .include "../../mk/bsd.options.mk"
 
diff -r febbd1706013 -r c3f975d911bb multimedia/xawtv/Makefile
--- a/multimedia/xawtv/Makefile Sat Jun 11 16:33:48 2005 +0000
+++ b/multimedia/xawtv/Makefile Sat Jun 11 16:53:18 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/10 18:26:36 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/11 16:58:08 wiz Exp $
 #
 
 DISTNAME=      xawtv_3.90
@@ -29,17 +29,18 @@
 SUBST_FILES.devoss+=   man/es/streamer.1 man/es/xawtv.1 man/fr/xawtv.1
 SUBST_SED.devoss=      -e 's|/dev/dsp|${DEVOSSAUDIO}|g'
 
+.include "../../mk/bsd.prefs.mk"
+
 PKG_OPTIONS_VAR=       PKG_OPTIONS.xawtv
+.if ${MACHINE_ARCH} == "i386"
 PKG_SUPPORTED_OPTIONS= mmx
+.endif
 
 .include "../../mk/bsd.options.mk"
-.include "../../mk/bsd.prefs.mk"
 
 .if !empty(PKG_OPTIONS:Mmmx)
-.if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=       --enable-mmx
 .endif
-.endif
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"