Attachment #197697 for bug #231867




MOZILLA_BIN?=	${PORTNAME}-bin
MOZILLA_EXEC_NAME?=${MOZILLA}
MOZ_RPATH?=	${MOZILLA}
USES+=		cpe gl gmake iconv localbase perl5 pkgconfig \
			python:2.7,build desktop-file-utils
CPE_VENDOR?=mozilla
USE_GL=		gl
USE_PERL5=	build
USE_XORG=	x11 xcomposite xdamage xext xfixes xrender xt
HAS_CONFIGURE=	yes

MOZ_TOOLKIT=	cairo-gtk2
.endif

USES+=		gnome
.if ${MOZ_TOOLKIT:Mcairo-gtk3}
BUILD_DEPENDS+=	gtk3>=3.14.6:x11-toolkits/gtk30
USE_GNOME+=	gdkpixbuf2 gtk20 gtk30

Lines 33-39 SSP_UNSAFE= yes Link Here

(-)b/mail/thunderbird/Makefile (-1 lines)
33	USE_GECKO= gecko	33	USE_GECKO= gecko
34	USE_MOZILLA= -cairo -soundtouch	34	USE_MOZILLA= -cairo -soundtouch
35		35
36	USE_GL= gl
37	USES= tar:xz	36	USES= tar:xz
38		37
39	WRKSRC= ${WRKDIR}/${PORTNAME}-60.0.1	38	WRKSRC= ${WRKDIR}/${PORTNAME}-60.0.1

Lines 37-43 CONFLICTS_INSTALL= firefox Link Here

(-)b/www/firefox-esr/Makefile (-1 lines)
37	MOZ_PKGCONFIG_FILES= # empty	37	MOZ_PKGCONFIG_FILES= # empty
38	USE_MOZILLA= -cairo -soundtouch	38	USE_MOZILLA= -cairo -soundtouch
39		39
40	USE_GL= gl
41	USES= tar:xz	40	USES= tar:xz
42		41
43	FIREFOX_ICON= ${MOZILLA}.png	42	FIREFOX_ICON= ${MOZILLA}.png

Lines 35-41 CONFLICTS_INSTALL= firefox-esr Link Here

(-)b/www/firefox/Makefile (-1 lines)
35	MOZ_PKGCONFIG_FILES= # empty	35	MOZ_PKGCONFIG_FILES= # empty
36	USE_MOZILLA= -cairo -hunspell -soundtouch	36	USE_MOZILLA= -cairo -hunspell -soundtouch
37		37
38	USE_GL= gl
39	USES= tar:xz	38	USES= tar:xz
40		39
41	FIREFOX_ICON= ${MOZILLA}.png	40	FIREFOX_ICON= ${MOZILLA}.png

Return to bug 231867

Lines 81-89 MOZILLA_VER?= ${PORTVERSION} Link Here

(-)b/Mk/bsd.gecko.mk (-1 / +3 lines)
81	MOZILLA_BIN?= ${PORTNAME}-bin	81	MOZILLA_BIN?= ${PORTNAME}-bin
82	MOZILLA_EXEC_NAME?=${MOZILLA}	82	MOZILLA_EXEC_NAME?=${MOZILLA}
83	MOZ_RPATH?= ${MOZILLA}	83	MOZ_RPATH?= ${MOZILLA}
84	USES+= cpe gmake iconv localbase perl5 pkgconfig \	84	USES+= cpe gl gmake iconv localbase perl5 pkgconfig \
85	python:2.7,build desktop-file-utils	85	python:2.7,build desktop-file-utils
86	CPE_VENDOR?=mozilla	86	CPE_VENDOR?=mozilla
		87	USE_GL= gl
87	USE_PERL5= build	88	USE_PERL5= build
88	USE_XORG= x11 xcomposite xdamage xext xfixes xrender xt	89	USE_XORG= x11 xcomposite xdamage xext xfixes xrender xt
89	HAS_CONFIGURE= yes	90	HAS_CONFIGURE= yes
Lines 278-283 MOZ_EXPORT+= MOZ_GOOGLE_API_KEY=AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8 Link Here
278	MOZ_TOOLKIT= cairo-gtk2	279	MOZ_TOOLKIT= cairo-gtk2
279	.endif	280	.endif
280		281
		282	USES+= gnome
281	.if ${MOZ_TOOLKIT:Mcairo-gtk3}	283	.if ${MOZ_TOOLKIT:Mcairo-gtk3}
282	BUILD_DEPENDS+= gtk3>=3.14.6:x11-toolkits/gtk30	284	BUILD_DEPENDS+= gtk3>=3.14.6:x11-toolkits/gtk30
283	USE_GNOME+= gdkpixbuf2 gtk20 gtk30	285	USE_GNOME+= gdkpixbuf2 gtk20 gtk30