pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/firefox firefox: fix some pkglint warnings
details: https://anonhg.NetBSD.org/pkgsrc/rev/835bad19592a
branches: trunk
changeset: 455290:835bad19592a
user: tnn <tnn%pkgsrc.org@localhost>
date: Fri Jul 02 10:51:16 2021 +0000
description:
firefox: fix some pkglint warnings
diffstat:
www/firefox/Makefile | 18 +++++++++---------
www/firefox/mozilla-common.mk | 3 ++-
2 files changed, 11 insertions(+), 10 deletions(-)
diffs (70 lines):
diff -r 1d4c1b14c85b -r 835bad19592a www/firefox/Makefile
--- a/www/firefox/Makefile Fri Jul 02 10:45:07 2021 +0000
+++ b/www/firefox/Makefile Fri Jul 02 10:51:16 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.483 2021/06/30 15:09:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.484 2021/07/02 10:51:16 tnn Exp $
FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
MOZ_BRANCH= 89.0
@@ -118,7 +118,7 @@
#CKSUMS+= 0e52f6bde42d7bb05c297ce1c25b9879d61b28caba98f6226a152bff538db6c2
#CKSUMS+= 394425b4ba03c21c494e64d993678f7014575b1e3d590b9ee452b5c2d83ec4ac
-#SUBST_CLASSES+= cksum
+#SUBST_CLASSES+= cksum
#SUBST_STAGE.cksum= pre-configure
#.for crate in ${CKSUM_CRATES}
#SUBST_FILES.cksum+= ${crate}/.cargo-checksum.json
@@ -132,7 +132,7 @@
cd ${WRKSRC}/js/src && autoconf
cd ${WRKSRC} && mkdir ${OBJDIR}
cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars
- # Do not fetch Rust Cargo file via network during build
+# Do not fetch Rust Cargo file via network during build
.if !defined(FIREFOX_MAINTAINER)
mv ${WRKDIR}/dist ${WRKSRC}/${OBJDIR}
.endif
@@ -146,9 +146,9 @@
cd ${WRKSRC}/${OBJDIR}/dist/bin/browser/chrome && \
find . -type f | sort > ${OUT:Q}
-NODE_LIST="${WRKDIR}/node.list"
-NO_NODE_LIST="${WRKDIR}/no-node.list"
-NODE_FILES="${WRKDIR}/node.flist"
+NODE_LIST= "${WRKDIR}/node.list"
+NO_NODE_LIST= "${WRKDIR}/no-node.list"
+NODE_FILES= "${WRKDIR}/node.flist"
.PHONY: maintainer-files
maintainer-files:
@@ -158,9 +158,9 @@
> ${FILESDIR}/node-wrapper.sh && \
chmod 0755 ${FILESDIR}/node-wrapper.sh
rm -f ${WRKDIR}/.build_done ${WRKDIR}/.configure_done
- $(MAKE) MAINTAINER_INTERNAL=yes build
- $(MAKE) MAINTAINER_INTERNAL=yes OUT="${NO_NODE_LIST}" build-list
- $(MAKE) OUT="${NODE_LIST}" build-list
+ ${MAKE} MAINTAINER_INTERNAL=yes build
+ ${MAKE} MAINTAINER_INTERNAL=yes OUT="${NO_NODE_LIST}" build-list
+ ${MAKE} OUT="${NODE_LIST}" build-list
${DIFF} -u "${NO_NODE_LIST}" "${NODE_LIST}" | \
${AWK} \
'/^\+\.\//{ printf("dist/bin/browser/chrome/%s\n", gensub(/^\+\.\//, "", "")) }' \
diff -r 1d4c1b14c85b -r 835bad19592a www/firefox/mozilla-common.mk
--- a/www/firefox/mozilla-common.mk Fri Jul 02 10:45:07 2021 +0000
+++ b/www/firefox/mozilla-common.mk Fri Jul 02 10:51:16 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.202 2021/05/03 16:31:37 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.203 2021/07/02 10:51:16 tnn Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
#
@@ -24,6 +24,7 @@
.if defined(FIREFOX_MAINTAINER) && !defined(MAINTAINER_INTERNAL)
TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs
+USE_TOOLS+= diff
.else
CONFIGURE_ENV+= NODEJS="${FILESDIR}/node-wrapper.sh"
.endif
Home |
Main Index |
Thread Index |
Old Index