From b9567f047eee5eea8478c44df61a46612d1ead2c Mon Sep 17 00:00:00 2001
From: sbd <sbd>
Date: Wed, 8 May 2013 09:11:19 +0000
Subject: Move the sps, vorbis and tremor PLIST_VARS and settings to
 mozilla-common.mk

---
 devel/xulrunner/Makefile          | 15 +--------------
 devel/xulrunner/mozilla-common.mk | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'devel')

diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile
index 043a967b165..29d7f687b88 100644
--- a/devel/xulrunner/Makefile
+++ b/devel/xulrunner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2013/04/05 13:30:17 ryoon Exp $
+# $NetBSD: Makefile,v 1.104 2013/05/08 09:11:19 sbd Exp $
 
 .include "dist.mk"
 PKGNAME=	xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/esr//}
@@ -34,19 +34,6 @@ LDFLAGS.SunOS+=		-lm
 .include "mozilla-common.mk"
 .include "options.mk"
 
-PLIST_VARS+=	sps vorbis tremor
-
-.if !empty(MACHINE_PLATFORM:S/i386/x86/:MLinux-*-x86*)
-PLIST.sps=	yes
-.endif
-
-.if !empty(MACHINE_PLATFORM:MLinux-*-arm*) || ${OPSYS} == "DragonFly" \
-    || ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
-PLIST.tremor=	yes
-.else
-PLIST.vorbis=	yes
-.endif
-
 pre-configure:
 	cd ${WRKSRC} && autoconf
 	cd ${WRKSRC}/js/src && autoconf
diff --git a/devel/xulrunner/mozilla-common.mk b/devel/xulrunner/mozilla-common.mk
index 9fa80cf389a..957e0aa2375 100644
--- a/devel/xulrunner/mozilla-common.mk
+++ b/devel/xulrunner/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.47 2013/04/15 15:21:26 mef Exp $
+# $NetBSD: mozilla-common.mk,v 1.48 2013/05/08 09:11:20 sbd Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -82,6 +82,19 @@ CONFIGURE_ARGS+=	--enable-libjpeg-turbo
 CONFIGURE_ARGS+=	--disable-libjpeg-turbo
 .endif
 
+PLIST_VARS+=	sps vorbis tremor
+
+.if !empty(MACHINE_PLATFORM:S/i386/x86/:MLinux-*-x86*)
+PLIST.sps=	yes
+.endif
+
+.if !empty(MACHINE_PLATFORM:MLinux-*-arm*) || ${OPSYS} == "DragonFly" \
+    || ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
+PLIST.tremor=	yes
+.else
+PLIST.vorbis=	yes
+.endif
+
 #
 # pysqlite2 is used by xulrunner's Python virtualenv.  If pysqlite2 isn't
 # installed at build time it will attempt to download it instead, so the
-- 
cgit v1.2.3