summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.gecko.mk4
-rw-r--r--mail/thunderbird/Makefile12
-rw-r--r--www/firefox-esr/Makefile19
-rw-r--r--www/firefox/Makefile19
-rw-r--r--www/libxul/Makefile19
-rw-r--r--www/seamonkey/Makefile12
6 files changed, 7 insertions, 78 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index fcd205500dfb..235094d617c1 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -152,6 +152,7 @@ _ALL_DEPENDS+= vorbis
.endif
.if ! ${PORT_OPTIONS:MBUNDLED_CAIRO}
+cairo_BUILD_DEPENDS=cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo
cairo_LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo
cairo_MOZ_OPTIONS= --enable-system-cairo
.endif
@@ -293,6 +294,7 @@ USE_GNOME+= pango
USE_QT5+= qmake_build buildtools_build gui network quick printsupport
MOZ_EXPORT+= HOST_QMAKE="${QMAKE}" HOST_MOC="${MOC}" HOST_RCC="${RCC}"
.elif ${MOZ_TOOLKIT:Mcairo-gtk3}
+BUILD_DEPENDS+= gtk3>=3.14.6:${PORTSDIR}/x11-toolkits/gtk30
USE_GNOME+= gtk30
. if ${MOZILLA_VER:R:R} >= 32
USE_GNOME+= gtk20 # bug 624422
@@ -330,6 +332,7 @@ MOZ_OPTIONS+= --disable-ffmpeg
.endif
.if ${PORT_OPTIONS:MGSTREAMER}
+RUN_DEPENDS+= gstreamer1-libav>=1.2.4_1:${PORTSDIR}/multimedia/gstreamer1-libav
USE_GSTREAMER1?=good libav
MOZ_OPTIONS+= --enable-gstreamer=1.0
.else
@@ -376,6 +379,7 @@ MOZ_EXPORT+=MOZ_OPTIMIZE_FLAGS="-Os" MOZ_PGO_OPTIMIZE_FLAGS="${CFLAGS:M-O*}"
.if ${PORT_OPTIONS:MALSA}
LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib
RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
+RUN_DEPENDS+= alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
MOZ_OPTIONS+= --enable-alsa
.endif
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 3f071ccdfb46..f2bf392e9003 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -74,18 +74,6 @@ CONFIGURE_TARGET:=${CONFIGURE_TARGET:S/portbld/unknown/}
MOZ_OPTIONS:= ${MOZ_OPTIONS:S/${CONFIGURE_TARGET}//}
.endif
-.if ${PORT_OPTIONS:MALSA}
-RUN_DEPENDS+= alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
-.endif
-
-.if ! ${PORT_OPTIONS:MBUNDLED_CAIRO}
-BUILD_DEPENDS+= cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo
-.endif
-
-.if ${PORT_OPTIONS:MGSTREAMER}
-RUN_DEPENDS+= gstreamer1-libav>=1.2.4_1:${PORTSDIR}/multimedia/gstreamer1-libav
-.endif
-
.if ${PORT_OPTIONS:MENIGMAIL}
MASTER_SITES+= https://www.enigmail.net/download/source/:enigmail
DISTFILES+= ${EM_DISTFILE}:enigmail
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 6b68f810e970..c42d2ea9b508 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -55,26 +55,9 @@ OPTIONS_SINGLE+= TOOLKIT
OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3
.include "${.CURDIR}/../../www/firefox/Makefile.options"
-.include <bsd.port.pre.mk>
WRKSRC:= ${WRKDIR}/mozilla-esr38
-.if ${PORT_OPTIONS:MALSA}
-RUN_DEPENDS+= alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
-.endif
-
-.if ! ${PORT_OPTIONS:MBUNDLED_CAIRO}
-BUILD_DEPENDS+= cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo
-.endif
-
-.if ${PORT_OPTIONS:MGSTREAMER}
-RUN_DEPENDS+= gstreamer1-libav>=1.2.4_1:${PORTSDIR}/multimedia/gstreamer1-libav
-.endif
-
-.if ${PORT_OPTIONS:MGTK3}
-BUILD_DEPENDS+= gtk3>=3.14.6:${PORTSDIR}/x11-toolkits/gtk30
-.endif
-
post-extract:
@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
@@ -95,4 +78,4 @@ post-install:
${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${STAGEDIR}${PREFIX}/share/applications/
${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 16885262d81e..67c731478189 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -55,26 +55,9 @@ OPTIONS_SINGLE+= TOOLKIT
OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3
.include "${.CURDIR}/../../www/firefox/Makefile.options"
-.include <bsd.port.pre.mk>
WRKSRC:= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
-.if ${PORT_OPTIONS:MALSA}
-RUN_DEPENDS+= alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
-.endif
-
-.if ! ${PORT_OPTIONS:MBUNDLED_CAIRO}
-BUILD_DEPENDS+= cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo
-.endif
-
-.if ${PORT_OPTIONS:MGSTREAMER}
-RUN_DEPENDS+= gstreamer1-libav>=1.2.4_1:${PORTSDIR}/multimedia/gstreamer1-libav
-.endif
-
-.if ${PORT_OPTIONS:MGTK3}
-BUILD_DEPENDS+= gtk3>=3.14.6:${PORTSDIR}/x11-toolkits/gtk30
-.endif
-
post-extract:
@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
@@ -95,4 +78,4 @@ post-install:
${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${STAGEDIR}${PREFIX}/share/applications/
${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/libxul/Makefile b/www/libxul/Makefile
index 03f2bdcb4f51..fbaabd0c94df 100644
--- a/www/libxul/Makefile
+++ b/www/libxul/Makefile
@@ -55,28 +55,11 @@ OPTIONS_SINGLE+= TOOLKIT
OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3
.include "${.CURDIR}/../../www/firefox/Makefile.options"
-.include <bsd.port.pre.mk>
.if ${USE_MOZILLA:M-nss}
MOZ_PKGCONFIG_FILES+= mozilla-nss
.endif
-.if ${PORT_OPTIONS:MALSA}
-RUN_DEPENDS+= alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
-.endif
-
-.if ! ${PORT_OPTIONS:MBUNDLED_CAIRO}
-BUILD_DEPENDS+= cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo
-.endif
-
-.if ${PORT_OPTIONS:MGSTREAMER}
-RUN_DEPENDS+= gstreamer1-libav>=1.2.4_1:${PORTSDIR}/multimedia/gstreamer1-libav
-.endif
-
-.if ${PORT_OPTIONS:MGTK3}
-BUILD_DEPENDS+= gtk3>=3.14.6:${PORTSDIR}/x11-toolkits/gtk30
-.endif
-
post-patch:
@${REINPLACE_CMD} -e '/MOZPNG/s/=[0-9]*/=10511/' \
${WRKSRC}/configure.in
@@ -93,4 +76,4 @@ post-build:
s|%%MOZ_LIBDIR%%|${PREFIX}/lib/${MOZILLA}|g" \
${WRKSRC}/xulrunner/installer/*.pc.in || ${TRUE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 1bf44dc2bcab..7cb1ec953c08 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -76,18 +76,6 @@ MOZSRC:= ${WRKSRC}/mozilla
XPI_LIBDIR= ${PREFIX}/lib/xpi
-.if ${PORT_OPTIONS:MALSA}
-RUN_DEPENDS+= alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
-.endif
-
-.if ! ${PORT_OPTIONS:MBUNDLED_CAIRO}
-BUILD_DEPENDS+= cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo
-.endif
-
-.if ${PORT_OPTIONS:MGSTREAMER}
-RUN_DEPENDS+= gstreamer1-libav>=1.2.4_1:${PORTSDIR}/multimedia/gstreamer1-libav
-.endif
-
.if ! ${PORT_OPTIONS:MMAILNEWS}
MOZ_OPTIONS+= --disable-ldap --disable-mailnews
.else