[pkgsrc/trunk]: pkgsrc/mail/thunderbird68 thunderbird68: unbreak pkgsrc tree ...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dd25232074e4
branches:  trunk
changeset: 382787:dd25232074e4
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri Aug 05 08:44:30 2022 +0000

description:
thunderbird68: unbreak pkgsrc tree (my bad!)

diffstat:

 mail/thunderbird68/Makefile          |    4 +-
 mail/thunderbird68/mozilla-common.mk |  211 +++++++++++++++++++++++++++++++++++
 2 files changed, 213 insertions(+), 2 deletions(-)

diffs (233 lines):

diff -r b7ba82b85269 -r dd25232074e4 mail/thunderbird68/Makefile
--- a/mail/thunderbird68/Makefile       Fri Aug 05 08:42:04 2022 +0000
+++ b/mail/thunderbird68/Makefile       Fri Aug 05 08:44:30 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2022/07/02 16:53:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.10 2022/08/05 08:44:30 nia Exp $
 
 DISTNAME=      thunderbird-${TB_VER}.source
 PKGNAME=       thunderbird68-${TB_VER}
@@ -73,7 +73,7 @@
        ${INSTALL_DATA} ${WRKSRC}/${OBJDIR}/dist/${MOZILLA_NAME}/chrome/icons/default/default48.png     \
          ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA_NAME}.png
 
-.include "../../www/firefox68/mozilla-common.mk"
+.include "mozilla-common.mk"
 .include "options.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r b7ba82b85269 -r dd25232074e4 mail/thunderbird68/mozilla-common.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/thunderbird68/mozilla-common.mk      Fri Aug 05 08:44:30 2022 +0000
@@ -0,0 +1,211 @@
+# $NetBSD: mozilla-common.mk,v 1.1 2022/08/05 08:44:30 nia Exp $
+#
+# common Makefile fragment for mozilla packages based on gecko 2.0.
+#
+# used by www/firefox/Makefile
+
+GCC_REQD+=             6.1
+
+.include "../../mk/bsd.prefs.mk"
+
+# Python 2.7 and Python 3.6 or later are required simultaneously.
+PYTHON_VERSIONS_ACCEPTED=      27
+PYTHON_FOR_BUILD_ONLY=         tool
+.if !empty(PYTHON_VERSION_DEFAULT:M3[6789])
+TOOL_DEPENDS+=                 python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT}
+ALL_ENV+=                      PYTHON3=${PREFIX}/bin/python${PYTHON_VERSION_DEFAULT:S/3/3./}
+.else
+TOOL_DEPENDS+=                 python37-[0-9]*:../../lang/python37
+ALL_ENV+=                      PYTHON3=${PREFIX}/bin/python3.7
+.endif
+
+HAS_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --prefix=${PREFIX}
+USE_TOOLS+=            pkg-config perl gmake autoconf213 unzip zip
+USE_LANGUAGES+=                c99 gnu++14
+UNLIMIT_RESOURCES+=    datasize virtualsize
+
+TOOL_DEPENDS+=         cbindgen>=0.8.7:../../devel/cbindgen
+.if ${MACHINE_ARCH} == "sparc64"
+CONFIGURE_ARGS+=       --disable-nodejs
+.else
+TOOL_DEPENDS+=         nodejs-[0-9]*:../../lang/nodejs
+.endif
+
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+BUILD_DEPENDS+=                nasm>=1.1:../../devel/nasm
+BUILD_DEPENDS+=                yasm>=1.1:../../devel/yasm
+.endif
+
+# This is to work around build failures where an upstream configuration script
+# is confused by having more than one approximate match to MACHINE_GNU_PLATFORM
+# "i486" when attempting to select the Rust compiler target.
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
+CONFIGURE_ARGS+=       --target=i586-unknown-netbsd
+CONFIGURE_ARGS+=       --host=i586-unknown-netbsd
+.else
+CONFIGURE_ARGS+=       --target=${MACHINE_GNU_PLATFORM}
+CONFIGURE_ARGS+=       --host=${MACHINE_GNU_PLATFORM}
+.endif
+
+CONFIGURE_ENV+=                BINDGEN_CFLAGS="-isystem${PREFIX}/include/nspr \
+                       -isystem${X11BASE}/include/pixman-1"
+
+test:
+       cd ${WRKSRC}/${OBJDIR}/dist/bin &&      \
+            ./run-mozilla.sh ${WRKSRC}/mach check-spidermonkey
+
+# tar(1) of OpenBSD 5.5 has no --exclude command line option.
+.if ${OPSYS} == "OpenBSD"
+TOOLS_PLATFORM.tar=    ${TOOLS_PATH.bsdtar}
+USE_TOOLS+=            bsdtar
+.endif
+.if !empty(MACHINE_PLATFORM:MNetBSD-[7-8].*-*)
+USE_PKGSRC_GCC_RUNTIME=        yes
+.endif
+.if ${MACHINE_ARCH} == "i386"
+# This is required for SSE2 code under i386.
+CXXFLAGS+=             -mstackrealign
+.endif
+
+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
+# Disable Rust SIMD option to fix build with lang/rust-1.33.0
+# This should be enabled later again.
+#CONFIGURE_ARGS+=      --enable-rust-simd
+CONFIGURE_ARGS+=       --enable-webrender=build
+CONFIGURE_ARGS+=       --disable-tests
+# Mozilla Bug 1432751
+#CONFIGURE_ARGS+=      --enable-system-cairo
+CONFIGURE_ARGS+=       --enable-system-pixman
+# webrtc option requires internal libvpx
+#CONFIGURE_ARGS+=      --with-system-libvpx
+CONFIGURE_ARGS+=       --enable-system-ffi
+CONFIGURE_ARGS+=       --with-system-icu
+CONFIGURE_ARGS+=       --with-system-nss
+CONFIGURE_ARGS+=       --with-system-nspr
+#CONFIGURE_ARGS+=      --with-system-jpeg
+CONFIGURE_ARGS+=       --with-system-zlib
+CONFIGURE_ARGS+=       --with-system-bz2
+CONFIGURE_ARGS+=       --with-system-libevent=${BUILDLINK_PREFIX.libevent}
+CONFIGURE_ARGS+=       --disable-crashreporter
+CONFIGURE_ARGS+=       --disable-necko-wifi
+CONFIGURE_ARGS+=       --enable-chrome-format=flat
+CONFIGURE_ARGS+=       --disable-libjpeg-turbo
+CONFIGURE_ARGS+=       --with-system-webp
+
+CONFIGURE_ARGS+=       --disable-gconf
+#CONFIGURE_ARGS+=      --enable-readline
+CONFIGURE_ARGS+=       --disable-icf
+CONFIGURE_ARGS+=       --disable-updater
+
+SUBST_CLASSES+=                        fix-paths
+SUBST_STAGE.fix-paths=         pre-configure
+SUBST_MESSAGE.fix-paths=       Fixing absolute paths.
+SUBST_FILES.fix-paths+=                ${MOZILLA_DIR}xpcom/io/nsAppFileLocationProvider.cpp
+SUBST_SED.fix-paths+=          -e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g'
+
+CONFIG_GUESS_OVERRIDE+=                ${MOZILLA_DIR}build/autoconf/config.guess
+CONFIG_GUESS_OVERRIDE+=                ${MOZILLA_DIR}js/src/build/autoconf/config.guess
+CONFIG_GUESS_OVERRIDE+=                ${MOZILLA_DIR}nsprpub/build/autoconf/config.guess
+CONFIG_GUESS_OVERRIDE+=                ${MOZILLA_DIR}/js/ctypes/libffi/config.guess
+CONFIG_SUB_OVERRIDE+=          ${MOZILLA_DIR}build/autoconf/config.sub
+CONFIG_SUB_OVERRIDE+=          ${MOZILLA_DIR}js/src/build/autoconf/config.sub
+CONFIG_SUB_OVERRIDE+=          ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub
+CONFIG_SUB_OVERRIDE+=          ${MOZILLA_DIR}/js/ctypes/libffi/config.sub
+
+CONFIGURE_ENV+=                CPP=${CPP:Q}
+ALL_ENV+=              SHELL=${CONFIG_SHELL:Q}
+
+# Build outside ${WRKSRC}
+# Try to avoid conflict with config/makefiles/xpidl/Makefile.in
+OBJDIR=                        ../build
+CONFIGURE_DIRS=                ${OBJDIR}
+CONFIGURE_SCRIPT=      ${WRKSRC}/configure
+
+PLIST_VARS+=   ffvpx
+
+.if ${MACHINE_ARCH} == "aarch64" || \
+    !empty(MACHINE_ARCH:M*arm*) || \
+    ${MACHINE_ARCH} == "i386" || \
+    ${MACHINE_ARCH} == "x86_64"
+PLIST.ffvpx=   yes     # see media/ffvpx/ffvpxcommon.mozbuild
+.endif
+
+# See ${WRKSRC}/security/sandbox/mac/Sandbox.mm: On Darwin, sandboxing
+# support is only available when the toolkit is cairo-cocoa.
+CONFIGURE_ARGS.Darwin+=        --disable-sandbox
+
+# See ${WRKSRC}/configure.in: It tries to use MacOS X 10.6 SDK by
+# default, which is not always possible.
+.if !empty(MACHINE_PLATFORM:MDarwin-8.*-*)
+CONFIGURE_ARGS+=       --enable-macos-target=10.4
+.elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*)
+CONFIGURE_ARGS+=       --enable-macos-target=10.5
+.endif
+
+# Makefiles sometimes call "rm -f" without more arguments. Kludge around ...
+.PHONY: create-rm-wrapper
+pre-configure: create-rm-wrapper
+create-rm-wrapper:
+       printf '#!/bin/sh\n[ "$$*" = "-f" ] && exit 0\nexec /bin/rm $$@\n' > \
+         ${WRAPPER_DIR}/bin/rm
+       chmod +x ${WRAPPER_DIR}/bin/rm
+
+# The configure test for __thread succeeds, but later we end up with:
+# dist/bin/libxul.so: undefined reference to `__tls_get_addr'
+CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no
+# In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails.
+CONFIGURE_ENV.NetBSD+= ac_cv_clock_monotonic=
+
+.if ${OPSYS} == "SunOS"
+# native libbz2.so hides BZ2_crc32Table
+PREFER.bzip2?= pkgsrc
+.endif
+
+.include "../../mk/atomic64.mk"
+.include "../../archivers/bzip2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libevent+=       libevent>=1.1
+.include "../../devel/libevent/buildlink3.mk"
+.include "../../devel/libffi/buildlink3.mk"
+BUILDLINK_API_DEPENDS.nspr+=   nspr>=4.21
+.include "../../devel/nspr/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
+BUILDLINK_API_DEPENDS.nss+=    nss>=3.44.1
+.include "../../devel/nss/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+#.include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4
+#.include "../../graphics/cairo/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libwebp+=        libwebp>=1.0.2
+.include "../../graphics/libwebp/buildlink3.mk"
+BUILDLINK_DEPMETHOD.clang=     build
+.include "../../lang/clang/buildlink3.mk"
+RUST_REQ=      1.34.0
+.include "../../lang/rust/rust.mk"
+# webrtc option requires internal libvpx
+#BUILDLINK_API_DEPENDS.libvpx+=        libvpx>=1.3.0
+#.include "../../multimedia/libvpx/buildlink3.mk"
+.include "../../net/libIDL/buildlink3.mk"
+# textproc/hunspell 1.3 is too old
+#.include "../../textproc/hunspell/buildlink3.mk"
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2
+.include "../../x11/pixman/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+PLIST_VARS+=           wayland
+.if ${PKG_BUILD_OPTIONS.gtk3:Mwayland}
+PLIST.wayland=         yes
+.endif
+.include "../../lang/python/pyversion.mk"