Sat Apr 25 16:37:24 2020 UTC ()
www/firefox52: remove no-op SUBST block

The file does not contain python (in lowercase), only PYTHON.


(rillig)
diff -r1.5 -r1.6 pkgsrc/www/firefox52/mozilla-common.mk
cvs diff -r1.5 -r1.6 pkgsrc/www/firefox52/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox52/mozilla-common.mk 2019/11/09 20:01:14 1.5
+++ pkgsrc/www/firefox52/mozilla-common.mk 2020/04/25 16:37:24 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.5 2019/11/09 20:01:14 jperkin Exp $ 1# $NetBSD: mozilla-common.mk,v 1.6 2020/04/25 16:37:24 rillig 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
@@ -84,32 +84,26 @@ SUBST_FILES.fix-paths+= ${MOZILLA_DIR}x @@ -84,32 +84,26 @@ SUBST_FILES.fix-paths+= ${MOZILLA_DIR}x
84SUBST_SED.fix-paths+= -e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g' 84SUBST_SED.fix-paths+= -e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g'
85 85
86CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.guess 86CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.guess
87CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.guess 87CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.guess
88CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.guess 88CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.guess
89CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.guess 89CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.guess
90CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.sub 90CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.sub
91CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.sub 91CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.sub
92CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub 92CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub
93CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub 93CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub
94 94
95CONFIGURE_ENV+= CPP=${CPP} 95CONFIGURE_ENV+= CPP=${CPP}
96 96
97SUBST_CLASSES+= python 
98SUBST_STAGE.python= pre-configure 
99SUBST_MESSAGE.python= Fixing path to python. 
100SUBST_FILES.python+= media/webrtc/trunk/build/common.gypi 
101SUBST_SED.python+= -e 's,<!(python,<!(${PYTHONBIN},' 
102 
103# Build outside ${WRKSRC} 97# Build outside ${WRKSRC}
104# Try to avoid conflict with config/makefiles/xpidl/Makefile.in 98# Try to avoid conflict with config/makefiles/xpidl/Makefile.in
105OBJDIR= ../build 99OBJDIR= ../build
106CONFIGURE_DIRS= ${OBJDIR} 100CONFIGURE_DIRS= ${OBJDIR}
107CONFIGURE_SCRIPT= ${WRKSRC}/configure 101CONFIGURE_SCRIPT= ${WRKSRC}/configure
108 102
109PLIST_VARS+= sps vorbis tremor glskia throwwrapper mozglue avx86 103PLIST_VARS+= sps vorbis tremor glskia throwwrapper mozglue avx86
110 104
111.include "../../mk/endian.mk" 105.include "../../mk/endian.mk"
112.if ${MACHINE_ENDIAN} == "little" 106.if ${MACHINE_ENDIAN} == "little"
113PLIST.glskia= yes 107PLIST.glskia= yes
114.endif 108.endif
115 109