Date: Mon, 9 Jul 2012 17:46:24 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r864 - branches/experimental/Mk Message-ID: <201207091746.q69HkOYH055955@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Mon Jul 9 17:46:24 2012
New Revision: 864
Log:
stop USE_MOZILLA from clashing with bsd.gstreamer.mk
Reported by: flo
Modified:
branches/experimental/Mk/bsd.gecko.mk
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Mon Jul 9 17:46:16 2012 (r863)
+++ branches/experimental/Mk/bsd.gecko.mk Mon Jul 9 17:46:24 2012 (r864)
@@ -614,7 +614,8 @@
vpx_MOZ_OPTIONS= --with-system-libvpx
#vpx_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libvpx
-zip_DEPENDS= zip:${PORTSDIR}/archivers/zip
+zip_BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
+zip_RUN_DEPENDS= ${zip_BUILD_DEPENDS}
.for use in ${USE_MOZILLA}
${use:S/-/_WITHOUT_/}= ${TRUE}
@@ -622,9 +623,9 @@
.for dep in ${_ALL_DEPENDS}
.if !defined(_WITHOUT_${dep})
-BUILD_DEPENDS+= ${${dep}_DEPENDS}
+BUILD_DEPENDS+= ${${dep}_BUILD_DEPENDS}
LIB_DEPENDS+= ${${dep}_LIB_DEPENDS}
-RUN_DEPENDS+= ${${dep}_DEPENDS}
+RUN_DEPENDS+= ${${dep}_RUN_DEPENDS}
MOZ_OPTIONS+= ${${dep}_MOZ_OPTIONS}
EXTRACT_AFTER_ARGS+= ${${dep}_EXTRACT_AFTER_ARGS}
CPPFLAGS+= ${${dep}_CPPFLAGS}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207091746.q69HkOYH055955>