Author: jbeich Date: Mon Mar 17 07:32:08 2014 New Revision: 1556 Log: allow partial merge until new system deps land in ports repo
www/firefox, www/firefox-esr and mail/thunderbird could be merged without waiting for (often lagging) www/seamonkey release. Reported by: AN <[email protected]> Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Sun Mar 16 16:53:21 2014 (r1555) +++ trunk/Mk/bsd.gecko.mk Mon Mar 17 07:32:08 2014 (r1556) @@ -561,10 +561,12 @@ ffi_MOZ_OPTIONS= --enable-system-ffi ffi_EXTRACT_AFTER_ARGS= --exclude mozilla*/js/src/ctypes/libffi +.if exists(${FILESDIR}/patch-bug847568) || exists(${FILESDIR}/patch-z-bug847568) harfbuzz_LIB_DEPENDS= libharfbuzz.so:${PORTSDIR}/print/harfbuzz harfbuzz_MOZ_OPTIONS= --with-system-harfbuzz --with-system-graphite2 harfbuzz_EXTRACT_AFTER_ARGS= --exclude mozilla*/gfx/harfbuzz \ --exclude mozilla*/gfx/graphite2 +.endif hunspell_LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell hunspell_MOZ_OPTIONS= --enable-system-hunspell @@ -588,9 +590,11 @@ --exclude mozilla*/security/coreconf \ --exclude mozilla*/security/nss +.if exists(${FILESDIR}/patch-z-bug517422) || exists(${FILESDIR}/patch-zz-bug517422) opus_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus opus_MOZ_OPTIONS= --with-system-opus opus_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libopus +.endif pixman_LIB_DEPENDS= libpixman-1.so:${PORTSDIR}/x11/pixman pixman_MOZ_OPTIONS= --enable-system-pixman @@ -604,10 +608,12 @@ sqlite_MOZ_OPTIONS= --enable-system-sqlite sqlite_EXTRACT_AFTER_ARGS= --exclude mozilla*/db/sqlite3 +.if exists(${FILESDIR}/patch-z-bug517422) || exists(${FILESDIR}/patch-zz-bug517422) vorbis_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis vorbis_MOZ_OPTIONS= --with-system-vorbis --with-system-ogg vorbis_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libvorbis \ --exclude mozilla*/media/libogg +.endif -vpx_BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm vpx_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-gecko To unsubscribe, send any mail to "[email protected]"
