Date: Wed, 2 Mar 2016 22:49:48 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409979 - in head: Mk mail/thunderbird www/firefox www/firefox-esr www/libxul www/seamonkey Message-ID: <201603022249.u22Mnm4C083879@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Mar 2 22:49:48 2016 New Revision: 409979 URL: https://svnweb.freebsd.org/changeset/ports/409979 Log: gecko: unify unchanging options into bsd.gecko.mk PR: 205741 (alternative) Modified: head/Mk/bsd.gecko.mk (contents, props changed) head/mail/thunderbird/Makefile (contents, props changed) head/www/firefox-esr/Makefile (contents, props changed) head/www/firefox/Makefile (contents, props changed) head/www/libxul/Makefile (contents, props changed) head/www/seamonkey/Makefile (contents, props changed) Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Wed Mar 2 22:49:20 2016 (r409978) +++ head/Mk/bsd.gecko.mk Wed Mar 2 22:49:48 2016 (r409979) @@ -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 .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 Modified: head/mail/thunderbird/Makefile ============================================================================== --- head/mail/thunderbird/Makefile Wed Mar 2 22:49:20 2016 (r409978) +++ head/mail/thunderbird/Makefile Wed Mar 2 22:49:48 2016 (r409979) @@ -74,18 +74,6 @@ CONFIGURE_TARGET:=${CONFIGURE_TARGET:S/p 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 Modified: head/www/firefox-esr/Makefile ============================================================================== --- head/www/firefox-esr/Makefile Wed Mar 2 22:49:20 2016 (r409978) +++ head/www/firefox-esr/Makefile Wed Mar 2 22:49:48 2016 (r409979) @@ -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> Modified: head/www/firefox/Makefile ============================================================================== --- head/www/firefox/Makefile Wed Mar 2 22:49:20 2016 (r409978) +++ head/www/firefox/Makefile Wed Mar 2 22:49:48 2016 (r409979) @@ -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> Modified: head/www/libxul/Makefile ============================================================================== --- head/www/libxul/Makefile Wed Mar 2 22:49:20 2016 (r409978) +++ head/www/libxul/Makefile Wed Mar 2 22:49:48 2016 (r409979) @@ -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> Modified: head/www/seamonkey/Makefile ============================================================================== --- head/www/seamonkey/Makefile Wed Mar 2 22:49:20 2016 (r409978) +++ head/www/seamonkey/Makefile Wed Mar 2 22:49:48 2016 (r409979) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603022249.u22Mnm4C083879>