diff options
| author | rillig <rillig@pkgsrc.org> | 2019-11-04 22:09:50 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2019-11-04 22:09:50 +0000 |
| commit | 883d1358fc4f72bf3e19f23e9da615cfc5efb351 (patch) | |
| tree | 66f88e4f2f2b97027ca16882d7778bc4ac981b5c /www/firefox68 | |
| parent | d889e73ea365ea2b6518dcb7ee1a4cf5cacfbbbb (diff) | |
| download | pkgsrc-883d1358fc4f72bf3e19f23e9da615cfc5efb351.tar.gz | |
www: align variable assignments
pkglint -Wall -F --only aligned --only indent -r
Manually excluded phraseanet since pkglint got the indentation wrong.
Diffstat (limited to 'www/firefox68')
| -rw-r--r-- | www/firefox68/Makefile | 12 | ||||
| -rw-r--r-- | www/firefox68/mozilla-common.mk | 24 | ||||
| -rw-r--r-- | www/firefox68/options.mk | 12 |
3 files changed, 24 insertions, 24 deletions
diff --git a/www/firefox68/Makefile b/www/firefox68/Makefile index 77847823e2e..ecda048d43a 100644 --- a/www/firefox68/Makefile +++ b/www/firefox68/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/09/21 07:31:43 ryoon Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/04 22:09:55 rillig Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} MOZ_BRANCH= 68.1 @@ -54,12 +54,12 @@ SUBST_FILES.dfly_malloc_h+= media/ffvpx/libavutil/mem.c .include "mozilla-common.mk" .include "options.mk" -CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/header.py -CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/typelib.py -CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py -CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py +CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/header.py +CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/typelib.py +CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpidl.py +CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpt.py -CHECK_WRKREF_SKIP+=lib/${MOZILLA}/chrome/toolkit/content/global/buildconfig.html +CHECK_WRKREF_SKIP+= lib/${MOZILLA}/chrome/toolkit/content/global/buildconfig.html MOZILLA= ${PKGBASE} MOZILLA_ICON= ${WRKSRC}/${OBJDIR}/dist/${MOZILLA}/browser/chrome/icons/default/default48.png diff --git a/www/firefox68/mozilla-common.mk b/www/firefox68/mozilla-common.mk index 49f9c629a06..4fd5697e4e6 100644 --- a/www/firefox68/mozilla-common.mk +++ b/www/firefox68/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.1 2019/09/21 07:31:43 ryoon Exp $ +# $NetBSD: mozilla-common.mk,v 1.2 2019/11/04 22:09:55 rillig Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -10,11 +10,11 @@ PYTHON_VERSIONS_ACCEPTED= 27 PYTHON_FOR_BUILD_ONLY= tool .if !empty(PYTHON_VERSION_DEFAULT:M37) || !empty(PYTHON_VERSION_DEFAULT:M36) -TOOL_DEPENDS+= python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT} -ALL_ENV+= PYTHON3=${LOCALBASE}/bin/python${PYTHON_VERSION_DEFAULT:S/3/3./} +TOOL_DEPENDS+= python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT} +ALL_ENV+= PYTHON3=${LOCALBASE}/bin/python${PYTHON_VERSION_DEFAULT:S/3/3./} .else -TOOL_DEPENDS+= python37-[0-9]*:../../lang/python37 -ALL_ENV+= PYTHON3=${LOCALBASE}/bin/python3.7 +TOOL_DEPENDS+= python37-[0-9]*:../../lang/python37 +ALL_ENV+= PYTHON3=${LOCALBASE}/bin/python3.7 .endif HAS_CONFIGURE= yes @@ -65,13 +65,13 @@ CXXFLAGS+= -mstackrealign CXXFLAGS+= -D__HAVE_INLINE___ISINF -CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh -CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh -CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh -CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}intl/icu/source/configure -CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh -CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh -#CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}modules/pdfium/update.sh +CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh +CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh +CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/tests/update-test262.sh +CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}intl/icu/source/configure +CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh +CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh +#CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}modules/pdfium/update.sh CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3 CONFIGURE_ARGS+= --enable-release diff --git a/www/firefox68/options.mk b/www/firefox68/options.mk index 44fc26388ce..e03d7aa1b45 100644 --- a/www/firefox68/options.mk +++ b/www/firefox68/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2019/09/21 07:31:43 ryoon Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/04 22:09:55 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.firefox @@ -39,12 +39,12 @@ CONFIGURE_ARGS+= --disable-jemalloc .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mgcc) -.if ${CC_VERSION:S/gcc-//:S/.//g} >= 480 +. if ${CC_VERSION:S/gcc-//:S/.//g} >= 480 # Modern gcc does not run any "tracking" passes when compiling with -O0, # which makes the generated debug info mostly useless. So explicitly # request them. O0TRACKING=-fvar-tracking-assignments -fvar-tracking -.endif +. endif .endif .if !empty(PKG_OPTIONS:Mdebug) @@ -54,15 +54,15 @@ CONFIGURE_ARGS+= --enable-debug-js-modules CONFIGURE_ARGS+= --disable-install-strip PLIST.debug= yes .else -.if !empty(PKG_OPTIONS:Mdebug-info) +. if !empty(PKG_OPTIONS:Mdebug-info) CONFIGURE_ARGS+= --enable-debug-symbols CONFIGURE_ARGS+= --enable-optimize=-O0 CONFIGURE_ARGS+= --disable-install-strip -.else +. else CONFIGURE_ARGS+= --disable-debug-symbols CONFIGURE_ARGS+= --enable-optimize=-O2 CONFIGURE_ARGS+= --enable-install-strip -.endif +. endif CONFIGURE_ARGS+= --disable-debug .endif |