Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1639771722101800"
MIME-Version: 1.0
Date: Fri, 17 Dec 2021 20:08:42 +0000
From: "Maya Rashish" <maya@netbsd.org>
Subject: CVS commit: pkgsrc/www/firefox
To: pkgsrc-changes@NetBSD.org
Reply-To: maya@netbsd.org
Message-Id: <20211217200842.71F01FAEC@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1639771722101800
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	maya
Date:		Fri Dec 17 20:08:42 UTC 2021

Modified Files:
	pkgsrc/www/firefox: Makefile mozilla-common.mk

Log Message:
firefox: detect libpci on netbsd, where we call it libpciutil.

webgl works again.

bump pkgrevision


To generate a diff of this commit:
cvs rdiff -u -r1.503 -r1.504 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.212 -r1.213 pkgsrc/www/firefox/mozilla-common.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1639771722101800
Content-Disposition: inline
Content-Length: 2237
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/www/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.503 pkgsrc/www/firefox/Makefile:1.504
--- pkgsrc/www/firefox/Makefile:1.503	Sat Dec 11 14:10:01 2021
+++ pkgsrc/www/firefox/Makefile	Fri Dec 17 20:08:42 2021
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.503 2021/12/11 14:10:01 ryoon Exp $
+# $NetBSD: Makefile,v 1.504 2021/12/17 20:08:42 maya Exp $
 
 FIREFOX_VER=		${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=		95.0
 MOZ_BRANCH_MINOR=	
+PKGREVISION=		1
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
 PKGNAME=	${DISTNAME:S/.source//:S/b/beta/:S/esr//}

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.212 pkgsrc/www/firefox/mozilla-common.mk:1.213
--- pkgsrc/www/firefox/mozilla-common.mk:1.212	Sat Dec 11 14:10:01 2021
+++ pkgsrc/www/firefox/mozilla-common.mk	Fri Dec 17 20:08:42 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.212 2021/12/11 14:10:01 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.213 2021/12/17 20:08:42 maya Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -112,6 +112,13 @@ SUBST_MESSAGE.fix-paths=	Fixing absolute
 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'
 
+.include "../../sysutils/pciutils/libname.mk"
+SUBST_CLASSES+=				fix-libpci-soname
+SUBST_STAGE.fix-libpci-soname=		pre-configure
+SUBST_MESSAGE.fix-libpci-soname=	Fixing libpci soname
+SUBST_FILES.fix-libpci-soname+=		${MOZILLA_DIR}toolkit/xre/glxtest.cpp
+SUBST_SED.fix-libpci-soname+=		-e 's,libpci.so,lib${PCIUTILS_LIBNAME}.so,'
+
 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
@@ -174,6 +181,7 @@ CONFIGURE_ENV.NetBSD+=	ac_cv_thread_keyw
 # In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails.
 CONFIGURE_ENV.NetBSD+=	ac_cv_clock_monotonic=
 
+.include "../../sysutils/pciutils/buildlink3.mk"
 .include "../../mk/atomic64.mk"
 BUILDLINK_API_DEPENDS.libevent+=	libevent>=1.1
 .include "../../devel/libevent/buildlink3.mk"


--_----------=_1639771722101800--