diff options
| author | tnn <tnn@pkgsrc.org> | 2019-01-29 22:33:57 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2019-01-29 22:33:57 +0000 |
| commit | ff32fbe8e0fffaf0d86bbbf51202d6bfeb45b8ce (patch) | |
| tree | f90aef17fb2e944139ae0d0faba05a2ed9273e85 /mail/thunderbird | |
| parent | 5ad62dfb3c56f1980cc6d1a39071736f73228df1 (diff) | |
| download | pkgsrc-ff32fbe8e0fffaf0d86bbbf51202d6bfeb45b8ce.tar.gz | |
remove obsolete hacks.mk & reduce diffs between mozilla derivative packages
Diffstat (limited to 'mail/thunderbird')
| -rw-r--r-- | mail/thunderbird/Makefile | 19 | ||||
| -rw-r--r-- | mail/thunderbird/hacks.mk | 10 |
2 files changed, 9 insertions, 20 deletions
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index b0cc8b68e0f..d5a0176e0da 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.218 2019/01/05 00:38:22 ryoon Exp $ +# $NetBSD: Makefile,v 1.219 2019/01/29 22:33:57 tnn Exp $ DISTNAME= thunderbird-${TB_VER}.source PKGNAME= thunderbird-${TB_VER} @@ -23,12 +23,11 @@ CONFIGURE_ARGS+= --enable-application=comm/mail # Disable WebRTC support for Thunderbird unconditionally. CONFIGURE_ARGS+= --disable-webrtc -MOZILLA_PKG_NAME= thunderbird +NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/thunderbird +NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/thunderbird-bin -NOT_PAX_MPROTECT_SAFE+= lib/${MOZILLA_PKG_NAME}/${MOZILLA_PKG_NAME} -NOT_PAX_MPROTECT_SAFE+= lib/${MOZILLA_PKG_NAME}/${MOZILLA_PKG_NAME}-bin - -ALL_ENV+= MOZILLA_PKG_NAME=${MOZILLA_PKG_NAME} +ALL_ENV+= MOZILLA_PKG_NAME=${PKGBASE} +LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE} .include "../../mk/bsd.prefs.mk" @@ -40,7 +39,7 @@ ALL_ENV+= MOZILLA_PKG_NAME=${MOZILLA_PKG_NAME} #SUBST_FILES.ext-compat+= calendar/*/*/install.rdf #SUBST_SED.ext-compat= -e 's,\(<em:maxVersion>\).*<,\19.0<,g' -CHECK_WRKREF_SKIP+=lib/${MOZILLA_PKG_NAME}/chrome/toolkit/content/global/buildconfig.html +CHECK_WRKREF_SKIP+=lib/${PKGBASE}/chrome/toolkit/content/global/buildconfig.html post-extract: mv ${WRKSRC}${MOZILLA_DIR}/gfx/ycbcr/yuv_row_arm.s \ @@ -57,8 +56,8 @@ do-build: # XXX for some reason it doesn't work unless -j is explicitly specified cd ${WRKSRC}/${OBJDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -j${MAKE_JOBS:U1} -MOZILLA=${MOZILLA_PKG_NAME} -MOZILLA_NAME=${MOZILLA_PKG_NAME} +MOZILLA= ${PKGBASE} +MOZILLA_NAME= ${PKGBASE} post-build: ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \ -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \ @@ -66,7 +65,7 @@ post-build: < ${FILESDIR}/desktop.in \ > ${WRKDIR}/desktop -INSTALLATION_DIRS+= lib/${MOZILLA}/extensions +INSTALLATION_DIRS+= lib/${PKGBASE}/extensions INSTALLATION_DIRS+= share/applications share/pixmaps post-install: ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/${MOZILLA} diff --git a/mail/thunderbird/hacks.mk b/mail/thunderbird/hacks.mk deleted file mode 100644 index 31af098a39e..00000000000 --- a/mail/thunderbird/hacks.mk +++ /dev/null @@ -1,10 +0,0 @@ -# $NetBSD: hacks.mk,v 1.8 2017/10/27 18:01:43 ryoon Exp $ - -# workround for link of thunderbird-bin etc. -LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${MOZILLA_NAME} - -.if ${OPSYS} == "SunOS" -# workaround for strip problems with libxul.so -# https://www.illumos.org/issues/4383 -INSTALL_UNSTRIPPED=yes -.endif |