[pkgsrc/trunk]: pkgsrc Slightly different solution to previous:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/da842ea76747
branches:  trunk
changeset: 495469:da842ea76747
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Jun 10 18:20:06 2005 +0000

description:
Slightly different solution to previous:
just ignore mmx pkg_option if set on non-i386.

diffstat:

 emulators/snes9x/Makefile  |  12 +++++-------
 graphics/imlib2/options.mk |   7 +++----
 2 files changed, 8 insertions(+), 11 deletions(-)

diffs (54 lines):

diff -r 402fa40d28de -r da842ea76747 emulators/snes9x/Makefile
--- a/emulators/snes9x/Makefile Fri Jun 10 18:14:23 2005 +0000
+++ b/emulators/snes9x/Makefile Fri Jun 10 18:20:06 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/06/10 18:09:45 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2005/06/10 18:20:06 wiz Exp $
 
 DISTNAME=              s9xs139
 PKGNAME=               snes9x-1.39
@@ -29,19 +29,17 @@
        ${INSTALL_MAN} ${WRKSRC}/README.TXT ${PREFIX}/share/doc/snes9x
        ${INSTALL_MAN} ${WRKSRC}/TODO.TXT ${PREFIX}/share/doc/snes9x
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "i386"
 PKG_OPTIONS_VAR=       PKG_OPTIONS.snes9x
 PKG_SUPPORTED_OPTIONS= mmx
 
 .include "../../mk/bsd.options.mk"
-.endif
+
+.include "../../mk/bsd.prefs.mk"
 
 MAKE_ENV+=     THREAD_SOUND=1
-.if ( ${MACHINE_ARCH} == "i386" )
+.if ${MACHINE_ARCH} == "i386"
 MAKE_ENV+=     USING_I386=1
-.if ( ${OBJECT_FMT} == "a.out" )
+.if ${OBJECT_FMT} == "a.out"
 MAKE_ENV+=     FILEFORMAT=aoutb
 MAKE_ENV+=     _ASM_UNDERBARS=1
 .else
diff -r 402fa40d28de -r da842ea76747 graphics/imlib2/options.mk
--- a/graphics/imlib2/options.mk        Fri Jun 10 18:14:23 2005 +0000
+++ b/graphics/imlib2/options.mk        Fri Jun 10 18:20:06 2005 +0000
@@ -1,14 +1,13 @@
-# $NetBSD: options.mk,v 1.2 2005/06/10 18:14:23 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2005/06/10 18:21:45 wiz Exp $
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "i386"
 PKG_OPTIONS_VAR=       PKG_OPTIONS.imlib2
 PKG_SUPPORTED_OPTIONS= mmx
 
 .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