pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/multimedia/xawtv Don't pull in bsd.options.mk if we do...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/90a1b86cd724
branches:  trunk
changeset: 543898:90a1b86cd724
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Tue Jun 24 11:56:54 2008 +0000

description:
Don't pull in bsd.options.mk if we don't define PKG_SUPPORTED_OPTIONS,
fixes build on non-i386.

diffstat:

 multimedia/xawtv/Makefile |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (25 lines):

diff -r 563f8cc32a6c -r 90a1b86cd724 multimedia/xawtv/Makefile
--- a/multimedia/xawtv/Makefile Tue Jun 24 11:47:32 2008 +0000
+++ b/multimedia/xawtv/Makefile Tue Jun 24 11:56:54 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2007/08/05 15:04:38 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2008/06/24 11:56:54 jmcneill Exp $
 #
 
 DISTNAME=      xawtv-3.95
@@ -31,13 +31,12 @@
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${MACHINE_ARCH} == "i386"
 PKG_OPTIONS_VAR=       PKG_OPTIONS.xawtv
-.if ${MACHINE_ARCH} == "i386"
 PKG_SUPPORTED_OPTIONS= mmx
+.include "../../mk/bsd.options.mk"
 .endif
 
-.include "../../mk/bsd.options.mk"
-
 .if !empty(PKG_OPTIONS:Mmmx)
 CONFIGURE_ARGS+=       --enable-mmx
 .endif



Home | Main Index | Thread Index | Old Index