Wed Mar 12 23:41:33 2014 UTC ()
Move CHECK_PORTABILITY_SKIP


(ryoon)
diff -r1.154 -r1.155 pkgsrc/www/firefox/Makefile
diff -r1.26 -r1.27 pkgsrc/www/firefox/mozilla-common.mk
cvs diff -r1.154 -r1.155 pkgsrc/www/firefox/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox/Makefile 2014/02/21 16:17:47 1.154
+++ pkgsrc/www/firefox/Makefile 2014/03/12 23:41:33 1.155
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.154 2014/02/21 16:17:47 ryoon Exp $ 1# $NetBSD: Makefile,v 1.155 2014/03/12 23:41:33 ryoon Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 27.0 4MOZ_BRANCH= 27.0
5MOZ_BRANCH_MINOR= .1 5MOZ_BRANCH_MINOR= .1
6 6
7DISTNAME= firefox-${FIREFOX_VER}.source 7DISTNAME= firefox-${FIREFOX_VER}.source
8PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//} 8PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
9PKGREVISION= 1 9PKGREVISION= 1
10CATEGORIES= www 10CATEGORIES= www
11MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 11MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
12MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/} 12MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
13EXTRACT_SUFX= .tar.bz2 13EXTRACT_SUFX= .tar.bz2
14 14
@@ -39,28 +39,26 @@ ALL_ENV+= MOZILLA_PKG_NAME=firefox @@ -39,28 +39,26 @@ ALL_ENV+= MOZILLA_PKG_NAME=firefox
39# Avoid ld "invalid section index" errors. 39# Avoid ld "invalid section index" errors.
40.if ${OPSYS} == "SunOS" 40.if ${OPSYS} == "SunOS"
41BUILDLINK_TRANSFORM+= rm:-fdata-sections 41BUILDLINK_TRANSFORM+= rm:-fdata-sections
42BUILDLINK_TRANSFORM+= rm:-ffunction-sections 42BUILDLINK_TRANSFORM+= rm:-ffunction-sections
43.endif 43.endif
44 44
45LDFLAGS.DragonFly= -lplc4 -lnspr4 45LDFLAGS.DragonFly= -lplc4 -lnspr4
46LDFLAGS.FreeBSD= -lplc4 -lnspr4 46LDFLAGS.FreeBSD= -lplc4 -lnspr4
47LDFLAGS.Linux= -lnspr4 47LDFLAGS.Linux= -lnspr4
48 48
49.include "mozilla-common.mk" 49.include "mozilla-common.mk"
50.include "options.mk" 50.include "options.mk"
51 51
52CHECK_PORTABILITY_SKIP+= js/src/tests/update-test262.sh 
53 
54CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/header.py 52CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/header.py
55CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/typelib.py 53CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/typelib.py
56CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py 54CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py
57CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py 55CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py
58 56
59MOZILLA=firefox 57MOZILLA=firefox
60MOZILLA_ICON= ${WRKSRC}/${OBJDIR}/dist/firefox/browser/chrome/icons/default/default48.png 58MOZILLA_ICON= ${WRKSRC}/${OBJDIR}/dist/firefox/browser/chrome/icons/default/default48.png
61.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) 59.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
62MOZILLA_NAME= Firefox 60MOZILLA_NAME= Firefox
63.else 61.else
64MOZILLA_NAME= Browser 62MOZILLA_NAME= Browser
65.endif 63.endif
66 64
cvs diff -r1.26 -r1.27 pkgsrc/www/firefox/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/mozilla-common.mk 2014/03/10 19:52:26 1.26
+++ pkgsrc/www/firefox/mozilla-common.mk 2014/03/12 23:41:33 1.27
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.26 2014/03/10 19:52:26 ryoon Exp $ 1# $NetBSD: mozilla-common.mk,v 1.27 2014/03/12 23:41:33 ryoon Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 2.0. 3# common Makefile fragment for mozilla packages based on gecko 2.0.
4# 4#
5# used by mail/thunderbird/Makefile 5# used by mail/thunderbird/Makefile
6# used by www/firefox/Makefile 6# used by www/firefox/Makefile
7# used by www/seamonkey/Makefile 7# used by www/seamonkey/Makefile
8 8
9GNU_CONFIGURE= yes 9GNU_CONFIGURE= yes
10USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip 10USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip
11USE_LANGUAGES+= c99 c++ 11USE_LANGUAGES+= c99 c++
12UNLIMIT_RESOURCES+= datasize 12UNLIMIT_RESOURCES+= datasize
13 13
14.include "../../mk/bsd.prefs.mk" 14.include "../../mk/bsd.prefs.mk"
@@ -16,26 +16,28 @@ UNLIMIT_RESOURCES+= datasize @@ -16,26 +16,28 @@ UNLIMIT_RESOURCES+= datasize
16# but gcc 4.5.4 of NetBSD 7 generates working binary. 16# but gcc 4.5.4 of NetBSD 7 generates working binary.
17.if !empty(MACHINE_PLATFORM:MNetBSD-5.*) 17.if !empty(MACHINE_PLATFORM:MNetBSD-5.*)
18GCC_REQD+= 4.6 18GCC_REQD+= 4.6
19. if ${MACHINE_ARCH} == "i386" 19. if ${MACHINE_ARCH} == "i386"
20# Fix for PR pkg/48152. 20# Fix for PR pkg/48152.
21CPPFLAGS+= -march=i486 21CPPFLAGS+= -march=i486
22. endif 22. endif
23.else 23.else
24GCC_REQD+= 4.5 24GCC_REQD+= 4.5
25.endif 25.endif
26 26
27CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh 27CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
28CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh 28CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
 29CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh
 30
29 31
30CONFIGURE_ARGS+= --disable-tests 32CONFIGURE_ARGS+= --disable-tests
31CONFIGURE_ARGS+= --disable-pedantic 33CONFIGURE_ARGS+= --disable-pedantic
32CONFIGURE_ARGS+= --enable-crypto 34CONFIGURE_ARGS+= --enable-crypto
33CONFIGURE_ARGS+= --with-pthreads 35CONFIGURE_ARGS+= --with-pthreads
34CONFIGURE_ARGS+= --disable-javaxpcom 36CONFIGURE_ARGS+= --disable-javaxpcom
35CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2 37CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2
36CONFIGURE_ARGS+= --enable-gstreamer 38CONFIGURE_ARGS+= --enable-gstreamer
37CONFIGURE_ARGS+= --enable-svg 39CONFIGURE_ARGS+= --enable-svg
38CONFIGURE_ARGS+= --enable-mathml 40CONFIGURE_ARGS+= --enable-mathml
39CONFIGURE_ARGS+= --enable-pango 41CONFIGURE_ARGS+= --enable-pango
40CONFIGURE_ARGS+= --enable-system-cairo 42CONFIGURE_ARGS+= --enable-system-cairo
41CONFIGURE_ARGS+= --enable-system-pixman 43CONFIGURE_ARGS+= --enable-system-pixman