pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc remove obsolete hacks.mk & reduce diffs between mozill...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ae2a80757ebc
branches: trunk
changeset: 318799:ae2a80757ebc
user: tnn <tnn%pkgsrc.org@localhost>
date: Tue Jan 29 22:33:57 2019 +0000
description:
remove obsolete hacks.mk & reduce diffs between mozilla derivative packages
diffstat:
devel/xulrunner192/Makefile | 4 ++--
devel/xulrunner45/Makefile | 18 +++++++++---------
mail/thunderbird/Makefile | 19 +++++++++----------
mail/thunderbird/hacks.mk | 10 ----------
mail/thunderbird45/Makefile | 17 +++++++++--------
mail/thunderbird45/hacks.mk | 10 ----------
mail/thunderbird52/Makefile | 22 +++++++++++-----------
mail/thunderbird52/hacks.mk | 10 ----------
www/firefox/Makefile | 24 ++++++++++--------------
www/firefox/hacks.mk | 13 -------------
www/firefox36/Makefile | 6 +++---
www/firefox45/Makefile | 25 +++++++++++--------------
www/firefox45/hacks.mk | 13 -------------
www/firefox52/Makefile | 27 +++++++++++++--------------
www/firefox52/hacks.mk | 13 -------------
www/firefox60/Makefile | 25 ++++++++++++-------------
www/firefox60/hacks.mk | 13 -------------
www/seamonkey/Makefile | 10 ++++++----
www/seamonkey/hacks.mk | 6 ------
19 files changed, 95 insertions(+), 190 deletions(-)
diffs (truncated from 654 to 300 lines):
diff -r b9c33804ce6f -r ae2a80757ebc devel/xulrunner192/Makefile
--- a/devel/xulrunner192/Makefile Tue Jan 29 19:56:41 2019 +0000
+++ b/devel/xulrunner192/Makefile Tue Jan 29 22:33:57 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2018/12/09 18:52:26 adam Exp $
+# $NetBSD: Makefile,v 1.68 2019/01/29 22:33:58 tnn Exp $
.include "dist.mk"
PKGNAME= xulrunner192-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
@@ -25,7 +25,7 @@
CONFIGURE_ARGS+= --enable-libxul
CONFIGURE_ARGS+= --disable-ipc
-ALL_ENV+= MOZILLA_PKG_NAME=xulrunner192
+ALL_ENV+= MOZILLA_PKG_NAME=${PKGBASE}
MAKE_ENV+= FREEBL_NO_DEPEND=0
diff -r b9c33804ce6f -r ae2a80757ebc devel/xulrunner45/Makefile
--- a/devel/xulrunner45/Makefile Tue Jan 29 19:56:41 2019 +0000
+++ b/devel/xulrunner45/Makefile Tue Jan 29 22:33:57 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2018/11/29 11:21:46 prlw1 Exp $
+# $NetBSD: Makefile,v 1.21 2019/01/29 22:33:58 tnn Exp $
MOZ_BRANCH= 45.9
MOZ_BRANCH_MINOR= .0esr
@@ -8,7 +8,7 @@
#MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${MOZ_VER}/source/}
EXTRACT_SUFX= .tar.xz
-PKGNAME= xulrunner45-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/esr//:S/b/beta/}
+PKGNAME= xulrunner${MOZ_BRANCH:C/\..*$//}-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/esr//:S/b/beta/}
PKGREVISION= 7
CATEGORIES= devel www
@@ -38,18 +38,18 @@
CONFIGURE_ARGS+= --enable-application=xulrunner
CONFIGURE_ARGS+= --enable-libxul
-ALL_ENV+= MOZILLA_PKG_NAME=xulrunner45
+ALL_ENV+= MOZILLA_PKG_NAME=${PKGBASE}
MAKE_ENV+= FREEBL_NO_DEPEND=0
-# workround for link of xulrunner-bin etc.
-LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/xulrunner45 ${COMPILER_RPATH_FLAG}${PREFIX}/lib
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE}
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib
LDFLAGS.SunOS+= -lm
-CHECK_INTERPRETER_SKIP+=lib/xulrunner45/sdk/bin/header.py
-CHECK_INTERPRETER_SKIP+=lib/xulrunner45/sdk/bin/typelib.py
-CHECK_INTERPRETER_SKIP+=lib/xulrunner45/sdk/bin/xpidl.py
-CHECK_INTERPRETER_SKIP+=lib/xulrunner45/sdk/bin/xpt.py
+CHECK_INTERPRETER_SKIP+=lib/${PKGBASE}/sdk/bin/header.py
+CHECK_INTERPRETER_SKIP+=lib/${PKGBASE}/sdk/bin/typelib.py
+CHECK_INTERPRETER_SKIP+=lib/${PKGBASE}/sdk/bin/xpidl.py
+CHECK_INTERPRETER_SKIP+=lib/${PKGBASE}/sdk/bin/xpt.py
.include "../../www/firefox45/mozilla-common.mk"
.include "../../www/firefox45/options.mk"
diff -r b9c33804ce6f -r ae2a80757ebc mail/thunderbird/Makefile
--- a/mail/thunderbird/Makefile Tue Jan 29 19:56:41 2019 +0000
+++ b/mail/thunderbird/Makefile Tue Jan 29 22:33:57 2019 +0000
@@ -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 @@
# 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 @@
#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 @@
# 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 @@
< ${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 -r b9c33804ce6f -r ae2a80757ebc mail/thunderbird/hacks.mk
--- a/mail/thunderbird/hacks.mk Tue Jan 29 19:56:41 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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
diff -r b9c33804ce6f -r ae2a80757ebc mail/thunderbird45/Makefile
--- a/mail/thunderbird45/Makefile Tue Jan 29 19:56:41 2019 +0000
+++ b/mail/thunderbird45/Makefile Tue Jan 29 22:33:57 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2018/11/29 11:21:53 prlw1 Exp $
+# $NetBSD: Makefile,v 1.12 2019/01/29 22:33:57 tnn Exp $
DISTNAME= thunderbird-${TB_VER}.source
-PKGNAME= thunderbird45-${TB_VER}
+PKGNAME= thunderbird${TB_VER:C/\..*$//}-${TB_VER}
PKGREVISION= 9
TB_VER= 45.8.0
CATEGORIES= mail
@@ -24,10 +24,11 @@
# Disable WebRTC support for Thunderbird unconditionally.
CONFIGURE_ARGS+= --disable-webrtc
-NOT_PAX_MPROTECT_SAFE+= lib/thunderbird45/thunderbird
-NOT_PAX_MPROTECT_SAFE+= lib/thunderbird45/thunderbird-bin
+NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/thunderbird
+NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/thunderbird-bin
-ALL_ENV+= MOZILLA_PKG_NAME=thunderbird45
+ALL_ENV+= MOZILLA_PKG_NAME=${PKGBASE}
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE}
.include "../../mk/bsd.prefs.mk"
@@ -61,8 +62,8 @@
# 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=thunderbird45
-MOZILLA_NAME=thunderbird45
+MOZILLA= ${PKGBASE}
+MOZILLA_NAME= ${PKGBASE}
post-build:
${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \
-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \
@@ -70,7 +71,7 @@
< ${FILESDIR}/desktop.in \
> ${WRKDIR}/desktop
-INSTALLATION_DIRS+= lib/${MOZILLA}/extensions
+INSTALLATION_DIRS+= lib/${PKGBASE}/extensions
INSTALLATION_DIRS+= share/applications share/pixmaps
post-install:
${INSTALL_DATA} ${WRKDIR}/desktop \
diff -r b9c33804ce6f -r ae2a80757ebc mail/thunderbird45/hacks.mk
--- a/mail/thunderbird45/hacks.mk Tue Jan 29 19:56:41 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# $NetBSD: hacks.mk,v 1.2 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
diff -r b9c33804ce6f -r ae2a80757ebc mail/thunderbird52/Makefile
--- a/mail/thunderbird52/Makefile Tue Jan 29 19:56:41 2019 +0000
+++ b/mail/thunderbird52/Makefile Tue Jan 29 22:33:57 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2018/12/16 08:29:48 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2019/01/29 22:33:57 tnn Exp $
DISTNAME= thunderbird-${TB_VER}.source
-PKGNAME= thunderbird52-${TB_VER}
+PKGNAME= thunderbird${TB_VER:C/\..*$//}-${TB_VER}
PKGREVISION= 3
TB_VER= 52.9.1
CATEGORIES= mail
@@ -17,8 +17,6 @@
MOZILLA_DIR= mozilla/
PLIST_SRC+= ${PLIST_SRC_DFLT}
-MOZILLA_PKG_NAME= thunderbird52
-
CONFIG_GUESS_OVERRIDE+= ldap/sdks/c-sdk/config/autoconf/config.guess
CONFIG_SUB_OVERRIDE+= ldap/sdks/c-sdk/config/autoconf/config.sub
@@ -26,10 +24,12 @@
# Disable WebRTC support for Thunderbird unconditionally.
CONFIGURE_ARGS+= --disable-webrtc
-NOT_PAX_MPROTECT_SAFE+= lib/${MOZILLA_PKG_NAME}/thunderbird
-NOT_PAX_MPROTECT_SAFE+= lib/${MOZILLA_PKG_NAME}/thunderbird-bin
+NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/thunderbird
+NOT_PAX_MPROTECT_SAFE+= lib/${PKGBASE}/thunderbird-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"
@@ -47,7 +47,7 @@
SUBST_FILES.sys-dic= mozilla/extensions/spellcheck/hunspell/glue/mozHunspell.cpp
SUBST_VARS.sys-dic= LOCALBASE
-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/gfx/ycbcr/yuv_row_arm.s \
@@ -64,8 +64,8 @@
# 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' \
@@ -73,7 +73,7 @@
< ${FILESDIR}/desktop.in \
> ${WRKDIR}/desktop
-INSTALLATION_DIRS+= lib/${MOZILLA}/extensions
+INSTALLATION_DIRS+= lib/${PKGBASE}/extensions
INSTALLATION_DIRS+= share/applications share/pixmaps
post-install:
${INSTALL_DATA} ${WRKDIR}/desktop \
diff -r b9c33804ce6f -r ae2a80757ebc mail/thunderbird52/hacks.mk
--- a/mail/thunderbird52/hacks.mk Tue Jan 29 19:56:41 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2018/12/16 08:29:48 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
diff -r b9c33804ce6f -r ae2a80757ebc www/firefox/Makefile
--- a/www/firefox/Makefile Tue Jan 29 19:56:41 2019 +0000
+++ b/www/firefox/Makefile Tue Jan 29 22:33:57 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.356 2019/01/29 16:28:22 ryoon Exp $
+# $NetBSD: Makefile,v 1.357 2019/01/29 22:33:58 tnn Exp $
FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
MOZ_BRANCH= 65.0
@@ -26,18 +26,18 @@
CFLAGS+= -I${PREFIX}/include/nspr
# for lang/gcc6
CFLAGS+= -D_GLIBCXX_INCLUDE_NEXT_C_HEADERS
-
CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS
-# workround for link of libxul.so etc.
-LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/firefox ${COMPILER_RPATH_FLAG}${PREFIX}/lib
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE}
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib
+LDFLAGS.DragonFly+= -lplc4 -lnspr4
+LDFLAGS.FreeBSD+= -lplc4 -lnspr4
+LDFLAGS.Linux+= -lnspr4
LDFLAGS.SunOS+= -lm
-NOT_PAX_MPROTECT_SAFE+= lib/firefox/firefox
Home |
Main Index |
Thread Index |
Old Index