Thu Nov 12 10:03:24 2020 UTC ()
firefox*: DLL_SUFFIX no longer used in PLIST


(nia)
diff -r1.186 -r1.187 pkgsrc/www/firefox/mozilla-common.mk
diff -r1.9 -r1.10 pkgsrc/www/firefox52/mozilla-common.mk
diff -r1.15 -r1.16 pkgsrc/www/firefox68/mozilla-common.mk
diff -r1.4 -r1.5 pkgsrc/www/firefox78/mozilla-common.mk
cvs diff -r1.186 -r1.187 pkgsrc/www/firefox/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/mozilla-common.mk 2020/11/12 09:58:16 1.186
+++ pkgsrc/www/firefox/mozilla-common.mk 2020/11/12 10:03:24 1.187
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.186 2020/11/12 09:58:16 nia Exp $ 1# $NetBSD: mozilla-common.mk,v 1.187 2020/11/12 10:03:24 nia Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 2.0. 3# common Makefile fragment for mozilla packages based on gecko 2.0.
4# 4#
5# used by www/firefox/Makefile 5# used by www/firefox/Makefile
6 6
7.include "../../mk/bsd.prefs.mk" 7.include "../../mk/bsd.prefs.mk"
8 8
9PYTHON_VERSIONS_INCOMPATIBLE= 27 9PYTHON_VERSIONS_INCOMPATIBLE= 27
10PYTHON_FOR_BUILD_ONLY= tool 10PYTHON_FOR_BUILD_ONLY= tool
11ALL_ENV+= PYTHON3=${PYTHONBIN} 11ALL_ENV+= PYTHON3=${PYTHONBIN}
12 12
13HAS_CONFIGURE= yes 13HAS_CONFIGURE= yes
14CONFIGURE_ARGS+= --prefix=${PREFIX} 14CONFIGURE_ARGS+= --prefix=${PREFIX}
@@ -153,34 +153,26 @@ fix-clang-wrapper: @@ -153,34 +153,26 @@ fix-clang-wrapper:
153# XXX: When using GCC, pkgsrc provides 'clang' wrappers that are actually gcc. 153# XXX: When using GCC, pkgsrc provides 'clang' wrappers that are actually gcc.
154# This breaks the build. 154# This breaks the build.
155 ${LN} -sf ${PREFIX}/bin/clang ${WRKDIR}/.cwrapper/bin/clang 155 ${LN} -sf ${PREFIX}/bin/clang ${WRKDIR}/.cwrapper/bin/clang
156 ${LN} -sf ${PREFIX}/bin/clang++ ${WRKDIR}/.cwrapper/bin/clang++ 156 ${LN} -sf ${PREFIX}/bin/clang++ ${WRKDIR}/.cwrapper/bin/clang++
157 ${LN} -sf ${PREFIX}/bin/clang-cpp ${WRKDIR}/.cwrapper/bin/clang-cpp 157 ${LN} -sf ${PREFIX}/bin/clang-cpp ${WRKDIR}/.cwrapper/bin/clang-cpp
158.endif 158.endif
159 159
160# The configure test for __thread succeeds, but later we end up with: 160# The configure test for __thread succeeds, but later we end up with:
161# dist/bin/libxul.so: undefined reference to `__tls_get_addr' 161# dist/bin/libxul.so: undefined reference to `__tls_get_addr'
162CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no 162CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no
163# In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails. 163# In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails.
164CONFIGURE_ENV.NetBSD+= ac_cv_clock_monotonic= 164CONFIGURE_ENV.NetBSD+= ac_cv_clock_monotonic=
165 165
166.if ${OPSYS} == "OpenBSD" 
167PLIST_SUBST+= DLL_SUFFIX=".so.1.0" 
168.elif ${OPSYS} == "Darwin" 
169PLIST_SUBST+= DLL_SUFFIX=".dylib" 
170.else 
171PLIST_SUBST+= DLL_SUFFIX=".so" 
172.endif 
173 
174# PR pkg/55456 166# PR pkg/55456
175.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386" 167.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
176.include "../../devel/libatomic/buildlink3.mk" 168.include "../../devel/libatomic/buildlink3.mk"
177CONFIGURE_ENV.NetBSD+= ac_cv_needs_atomic=yes 169CONFIGURE_ENV.NetBSD+= ac_cv_needs_atomic=yes
178.endif 170.endif
179BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 171BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1
180.include "../../devel/libevent/buildlink3.mk" 172.include "../../devel/libevent/buildlink3.mk"
181.include "../../devel/libffi/buildlink3.mk" 173.include "../../devel/libffi/buildlink3.mk"
182BUILDLINK_API_DEPENDS.nspr+= nspr>=4.26 174BUILDLINK_API_DEPENDS.nspr+= nspr>=4.26
183.include "../../devel/nspr/buildlink3.mk" 175.include "../../devel/nspr/buildlink3.mk"
184.include "../../textproc/icu/buildlink3.mk" 176.include "../../textproc/icu/buildlink3.mk"
185BUILDLINK_API_DEPENDS.nss+= nss>=3.56 177BUILDLINK_API_DEPENDS.nss+= nss>=3.56
186.include "../../devel/nss/buildlink3.mk" 178.include "../../devel/nss/buildlink3.mk"
cvs diff -r1.9 -r1.10 pkgsrc/www/firefox52/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox52/mozilla-common.mk 2020/11/11 11:11:30 1.9
+++ pkgsrc/www/firefox52/mozilla-common.mk 2020/11/12 10:03:24 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.9 2020/11/11 11:11:30 nia Exp $ 1# $NetBSD: mozilla-common.mk,v 1.10 2020/11/12 10:03:24 nia Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 2.0. 3# common Makefile fragment for mozilla packages based on gecko 2.0.
4# 4#
5# used by www/firefox/Makefile 5# used by www/firefox/Makefile
6# used by www/seamonkey/Makefile 6# used by www/seamonkey/Makefile
7 7
8# GCC 4.6 is required to support nullptr. 8# GCC 4.6 is required to support nullptr.
9GCC_REQD+= 4.8 9GCC_REQD+= 4.8
10 10
11.include "../../mk/bsd.prefs.mk" 11.include "../../mk/bsd.prefs.mk"
12 12
13.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 13.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
14BUILD_DEPENDS+= yasm>=1.1:../../devel/yasm 14BUILD_DEPENDS+= yasm>=1.1:../../devel/yasm
@@ -126,34 +126,26 @@ create-rm-wrapper: @@ -126,34 +126,26 @@ create-rm-wrapper:
126 printf '#!/bin/sh\n[ "$$*" = "-f" ] && exit 0\nexec /bin/rm $$@\n' > \ 126 printf '#!/bin/sh\n[ "$$*" = "-f" ] && exit 0\nexec /bin/rm $$@\n' > \
127 ${WRAPPER_DIR}/bin/rm 127 ${WRAPPER_DIR}/bin/rm
128 chmod +x ${WRAPPER_DIR}/bin/rm 128 chmod +x ${WRAPPER_DIR}/bin/rm
129 129
130# The configure test for __thread succeeds, but later we end up with: 130# The configure test for __thread succeeds, but later we end up with:
131# dist/bin/libxul.so: undefined reference to `__tls_get_addr' 131# dist/bin/libxul.so: undefined reference to `__tls_get_addr'
132CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no 132CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no
133 133
134.if ${OPSYS} == "SunOS" 134.if ${OPSYS} == "SunOS"
135# native libbz2.so hides BZ2_crc32Table 135# native libbz2.so hides BZ2_crc32Table
136PREFER.bzip2?= pkgsrc 136PREFER.bzip2?= pkgsrc
137.endif 137.endif
138 138
139.if ${OPSYS} == "OpenBSD" 
140PLIST_SUBST+= DLL_SUFFIX=".so.1.0" 
141.elif ${OPSYS} == "Darwin" 
142PLIST_SUBST+= DLL_SUFFIX=".dylib" 
143.else 
144PLIST_SUBST+= DLL_SUFFIX=".so" 
145.endif 
146 
147.include "../../archivers/bzip2/buildlink3.mk" 139.include "../../archivers/bzip2/buildlink3.mk"
148BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 140BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1
149.include "../../devel/libevent/buildlink3.mk" 141.include "../../devel/libevent/buildlink3.mk"
150.include "../../devel/libffi/buildlink3.mk" 142.include "../../devel/libffi/buildlink3.mk"
151BUILDLINK_API_DEPENDS.nspr+= nspr>=4.12 143BUILDLINK_API_DEPENDS.nspr+= nspr>=4.12
152.include "../../devel/nspr/buildlink3.mk" 144.include "../../devel/nspr/buildlink3.mk"
153.include "../../textproc/icu/buildlink3.mk" 145.include "../../textproc/icu/buildlink3.mk"
154.include "../../devel/nss/buildlink3.mk" 146.include "../../devel/nss/buildlink3.mk"
155.include "../../devel/zlib/buildlink3.mk" 147.include "../../devel/zlib/buildlink3.mk"
156.include "../../mk/jpeg.buildlink3.mk" 148.include "../../mk/jpeg.buildlink3.mk"
157.include "../../graphics/MesaLib/buildlink3.mk" 149.include "../../graphics/MesaLib/buildlink3.mk"
158BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4 150BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4
159.include "../../graphics/cairo/buildlink3.mk" 151.include "../../graphics/cairo/buildlink3.mk"
cvs diff -r1.15 -r1.16 pkgsrc/www/firefox68/Attic/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox68/Attic/mozilla-common.mk 2020/11/11 10:21:34 1.15
+++ pkgsrc/www/firefox68/Attic/mozilla-common.mk 2020/11/12 10:03:24 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.15 2020/11/11 10:21:34 nia Exp $ 1# $NetBSD: mozilla-common.mk,v 1.16 2020/11/12 10:03:24 nia Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 2.0. 3# common Makefile fragment for mozilla packages based on gecko 2.0.
4# 4#
5# used by www/firefox/Makefile 5# used by www/firefox/Makefile
6 6
7GCC_REQD+= 6.1 7GCC_REQD+= 6.1
8 8
9.include "../../mk/bsd.prefs.mk" 9.include "../../mk/bsd.prefs.mk"
10 10
11# Python 2.7 and Python 3.6 or later are required simultaneously. 11# Python 2.7 and Python 3.6 or later are required simultaneously.
12PYTHON_VERSIONS_ACCEPTED= 27 12PYTHON_VERSIONS_ACCEPTED= 27
13PYTHON_FOR_BUILD_ONLY= tool 13PYTHON_FOR_BUILD_ONLY= tool
14.if !empty(PYTHON_VERSION_DEFAULT:M3[6789]) 14.if !empty(PYTHON_VERSION_DEFAULT:M3[6789])
@@ -157,34 +157,26 @@ create-rm-wrapper: @@ -157,34 +157,26 @@ create-rm-wrapper:
157 chmod +x ${WRAPPER_DIR}/bin/rm 157 chmod +x ${WRAPPER_DIR}/bin/rm
158 158
159# The configure test for __thread succeeds, but later we end up with: 159# The configure test for __thread succeeds, but later we end up with:
160# dist/bin/libxul.so: undefined reference to `__tls_get_addr' 160# dist/bin/libxul.so: undefined reference to `__tls_get_addr'
161CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no 161CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no
162# In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails. 162# In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails.
163CONFIGURE_ENV.NetBSD+= ac_cv_clock_monotonic= 163CONFIGURE_ENV.NetBSD+= ac_cv_clock_monotonic=
164 164
165.if ${OPSYS} == "SunOS" 165.if ${OPSYS} == "SunOS"
166# native libbz2.so hides BZ2_crc32Table 166# native libbz2.so hides BZ2_crc32Table
167PREFER.bzip2?= pkgsrc 167PREFER.bzip2?= pkgsrc
168.endif 168.endif
169 169
170.if ${OPSYS} == "OpenBSD" 
171PLIST_SUBST+= DLL_SUFFIX=".so.1.0" 
172.elif ${OPSYS} == "Darwin" 
173PLIST_SUBST+= DLL_SUFFIX=".dylib" 
174.else 
175PLIST_SUBST+= DLL_SUFFIX=".so" 
176.endif 
177 
178.include "../../archivers/bzip2/buildlink3.mk" 170.include "../../archivers/bzip2/buildlink3.mk"
179BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 171BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1
180.include "../../devel/libevent/buildlink3.mk" 172.include "../../devel/libevent/buildlink3.mk"
181.include "../../devel/libffi/buildlink3.mk" 173.include "../../devel/libffi/buildlink3.mk"
182BUILDLINK_API_DEPENDS.nspr+= nspr>=4.21 174BUILDLINK_API_DEPENDS.nspr+= nspr>=4.21
183.include "../../devel/nspr/buildlink3.mk" 175.include "../../devel/nspr/buildlink3.mk"
184.include "../../textproc/icu/buildlink3.mk" 176.include "../../textproc/icu/buildlink3.mk"
185BUILDLINK_API_DEPENDS.nss+= nss>=3.44.1 177BUILDLINK_API_DEPENDS.nss+= nss>=3.44.1
186.include "../../devel/nss/buildlink3.mk" 178.include "../../devel/nss/buildlink3.mk"
187.include "../../devel/zlib/buildlink3.mk" 179.include "../../devel/zlib/buildlink3.mk"
188#.include "../../mk/jpeg.buildlink3.mk" 180#.include "../../mk/jpeg.buildlink3.mk"
189.include "../../graphics/MesaLib/buildlink3.mk" 181.include "../../graphics/MesaLib/buildlink3.mk"
190#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4 182#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4
cvs diff -r1.4 -r1.5 pkgsrc/www/firefox78/Attic/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox78/Attic/mozilla-common.mk 2020/11/11 19:10:05 1.4
+++ pkgsrc/www/firefox78/Attic/mozilla-common.mk 2020/11/12 10:03:24 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.4 2020/11/11 19:10:05 nia Exp $ 1# $NetBSD: mozilla-common.mk,v 1.5 2020/11/12 10:03:24 nia Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 2.0. 3# common Makefile fragment for mozilla packages based on gecko 2.0.
4# 4#
5# used by www/firefox/Makefile 5# used by www/firefox/Makefile
6 6
7.include "../../mk/bsd.prefs.mk" 7.include "../../mk/bsd.prefs.mk"
8 8
9PYTHON_VERSIONS_INCOMPATIBLE= 27 9PYTHON_VERSIONS_INCOMPATIBLE= 27
10PYTHON_FOR_BUILD_ONLY= tool 10PYTHON_FOR_BUILD_ONLY= tool
11ALL_ENV+= PYTHON3=${PYTHONBIN} 11ALL_ENV+= PYTHON3=${PYTHONBIN}
12 12
13HAS_CONFIGURE= yes 13HAS_CONFIGURE= yes
14CONFIGURE_ARGS+= --prefix=${PREFIX} 14CONFIGURE_ARGS+= --prefix=${PREFIX}
@@ -152,34 +152,26 @@ fix-clang-wrapper: @@ -152,34 +152,26 @@ fix-clang-wrapper:
152# XXX: When using GCC, pkgsrc provides 'clang' wrappers that are actually gcc. 152# XXX: When using GCC, pkgsrc provides 'clang' wrappers that are actually gcc.
153# This breaks the build. 153# This breaks the build.
154 ${LN} -sf ${PREFIX}/bin/clang ${WRKDIR}/.cwrapper/bin/clang 154 ${LN} -sf ${PREFIX}/bin/clang ${WRKDIR}/.cwrapper/bin/clang
155 ${LN} -sf ${PREFIX}/bin/clang++ ${WRKDIR}/.cwrapper/bin/clang++ 155 ${LN} -sf ${PREFIX}/bin/clang++ ${WRKDIR}/.cwrapper/bin/clang++
156 ${LN} -sf ${PREFIX}/bin/clang-cpp ${WRKDIR}/.cwrapper/bin/clang-cpp 156 ${LN} -sf ${PREFIX}/bin/clang-cpp ${WRKDIR}/.cwrapper/bin/clang-cpp
157.endif 157.endif
158 158
159# The configure test for __thread succeeds, but later we end up with: 159# The configure test for __thread succeeds, but later we end up with:
160# dist/bin/libxul.so: undefined reference to `__tls_get_addr' 160# dist/bin/libxul.so: undefined reference to `__tls_get_addr'
161CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no 161CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no
162# In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails. 162# In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails.
163CONFIGURE_ENV.NetBSD+= ac_cv_clock_monotonic= 163CONFIGURE_ENV.NetBSD+= ac_cv_clock_monotonic=
164 164
165.if ${OPSYS} == "OpenBSD" 
166PLIST_SUBST+= DLL_SUFFIX=".so.1.0" 
167.elif ${OPSYS} == "Darwin" 
168PLIST_SUBST+= DLL_SUFFIX=".dylib" 
169.else 
170PLIST_SUBST+= DLL_SUFFIX=".so" 
171.endif 
172 
173# PR pkg/55456 165# PR pkg/55456
174.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386" 166.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
175.include "../../devel/libatomic/buildlink3.mk" 167.include "../../devel/libatomic/buildlink3.mk"
176CONFIGURE_ENV.NetBSD+= ac_cv_needs_atomic=yes 168CONFIGURE_ENV.NetBSD+= ac_cv_needs_atomic=yes
177.endif 169.endif
178BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 170BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1
179.include "../../devel/libevent/buildlink3.mk" 171.include "../../devel/libevent/buildlink3.mk"
180.include "../../devel/libffi/buildlink3.mk" 172.include "../../devel/libffi/buildlink3.mk"
181BUILDLINK_API_DEPENDS.nspr+= nspr>=4.25 173BUILDLINK_API_DEPENDS.nspr+= nspr>=4.25
182.include "../../devel/nspr/buildlink3.mk" 174.include "../../devel/nspr/buildlink3.mk"
183.include "../../textproc/icu/buildlink3.mk" 175.include "../../textproc/icu/buildlink3.mk"
184BUILDLINK_API_DEPENDS.nss+= nss>=3.53 176BUILDLINK_API_DEPENDS.nss+= nss>=3.53
185.include "../../devel/nss/buildlink3.mk" 177.include "../../devel/nss/buildlink3.mk"