Sun Nov 10 15:08:31 2013 UTC ()
Move CHECK_PORTABILITY_SKIP to mozilla-common.mk


(ryoon)
diff -r1.2 -r1.3 pkgsrc/www/firefox24/Makefile
diff -r1.1 -r1.2 pkgsrc/www/firefox24/mozilla-common.mk
cvs diff -r1.2 -r1.3 pkgsrc/www/firefox24/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox24/Attic/Makefile 2013/11/08 12:51:25 1.2
+++ pkgsrc/www/firefox24/Attic/Makefile 2013/11/10 15:08:31 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.2 2013/11/08 12:51:25 ryoon Exp $ 1# $NetBSD: Makefile,v 1.3 2013/11/10 15:08:31 ryoon Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 24.1.0 4MOZ_BRANCH= 24.1.0
5MOZ_BRANCH_MINOR= esr 5MOZ_BRANCH_MINOR= esr
6 6
7DISTNAME= firefox-${FIREFOX_VER}.source 7DISTNAME= firefox-${FIREFOX_VER}.source
8PKGNAME= firefox24-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//} 8PKGNAME= firefox24-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
9PKGREVISION= 1 9PKGREVISION= 1
10CATEGORIES= www 10CATEGORIES= www
11#MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 11#MASTER_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=firefox24 @@ -39,28 +39,26 @@ ALL_ENV+= MOZILLA_PKG_NAME=firefox24
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/firefox24-sdk/sdk/bin/header.py 52CHECK_INTERPRETER_SKIP+=lib/firefox24-sdk/sdk/bin/header.py
55CHECK_INTERPRETER_SKIP+=lib/firefox24-sdk/sdk/bin/typelib.py 53CHECK_INTERPRETER_SKIP+=lib/firefox24-sdk/sdk/bin/typelib.py
56CHECK_INTERPRETER_SKIP+=lib/firefox24-sdk/sdk/bin/xpidl.py 54CHECK_INTERPRETER_SKIP+=lib/firefox24-sdk/sdk/bin/xpidl.py
57CHECK_INTERPRETER_SKIP+=lib/firefox24-sdk/sdk/bin/xpt.py 55CHECK_INTERPRETER_SKIP+=lib/firefox24-sdk/sdk/bin/xpt.py
58 56
59MOZILLA=firefox24 57MOZILLA=firefox24
60MOZILLA_ICON= ${WRKSRC}/dist/firefox/browser/chrome/icons/default/default48.png 58MOZILLA_ICON= ${WRKSRC}/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.1 -r1.2 pkgsrc/www/firefox24/Attic/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox24/Attic/mozilla-common.mk 2013/11/03 04:51:59 1.1
+++ pkgsrc/www/firefox24/Attic/mozilla-common.mk 2013/11/10 15:08:31 1.2
@@ -1,40 +1,41 @@ @@ -1,40 +1,41 @@
1# $NetBSD: mozilla-common.mk,v 1.1 2013/11/03 04:51:59 ryoon Exp $ 1# $NetBSD: mozilla-common.mk,v 1.2 2013/11/10 15:08:31 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/firefox24/Makefile 6# used by www/firefox24/Makefile
7 7
8GNU_CONFIGURE= yes 8GNU_CONFIGURE= yes
9USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip 9USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip
10USE_LANGUAGES+= c99 c++ 10USE_LANGUAGES+= c99 c++
11UNLIMIT_RESOURCES+= datasize 11UNLIMIT_RESOURCES+= datasize
12 12
13.include "../../mk/bsd.prefs.mk" 13.include "../../mk/bsd.prefs.mk"
14# gcc45-4.5.3 of lang/gcc45 does not generate proper binary, 14# gcc45-4.5.3 of lang/gcc45 does not generate proper binary,
15# but gcc 4.5.4 of NetBSD 7 generates working binary. 15# but gcc 4.5.4 of NetBSD 7 generates working binary.
16.if !empty(MACHINE_PLATFORM:MNetBSD-5.*) 16.if !empty(MACHINE_PLATFORM:MNetBSD-5.*)
17GCC_REQD+= 4.6 17GCC_REQD+= 4.6
18. if ${MACHINE_ARCH} == "i386" 18. if ${MACHINE_ARCH} == "i386"
19# Fix for PR pkg/48152. 19# Fix for PR pkg/48152.
20CPPFLAGS+= -march=i486 20CPPFLAGS+= -march=i486
21. endif 21. endif
22.else 22.else
23GCC_REQD+= 4.5 23GCC_REQD+= 4.5
24.endif 24.endif
25 25
26CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh 26CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
27CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh 27CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
 28CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh
28 29
29CONFIGURE_ARGS+= --disable-tests 30CONFIGURE_ARGS+= --disable-tests
30CONFIGURE_ARGS+= --disable-pedantic 31CONFIGURE_ARGS+= --disable-pedantic
31CONFIGURE_ARGS+= --enable-crypto 32CONFIGURE_ARGS+= --enable-crypto
32CONFIGURE_ARGS+= --with-pthreads 33CONFIGURE_ARGS+= --with-pthreads
33CONFIGURE_ARGS+= --disable-javaxpcom 34CONFIGURE_ARGS+= --disable-javaxpcom
34CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2 35CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2
35CONFIGURE_ARGS+= --enable-svg 36CONFIGURE_ARGS+= --enable-svg
36CONFIGURE_ARGS+= --enable-mathml 37CONFIGURE_ARGS+= --enable-mathml
37CONFIGURE_ARGS+= --enable-pango 38CONFIGURE_ARGS+= --enable-pango
38CONFIGURE_ARGS+= --enable-system-cairo 39CONFIGURE_ARGS+= --enable-system-cairo
39CONFIGURE_ARGS+= --enable-system-pixman 40CONFIGURE_ARGS+= --enable-system-pixman
40CONFIGURE_ARGS+= --with-system-libvpx 41CONFIGURE_ARGS+= --with-system-libvpx