[SVN-Commit] r1530 - in trunk: Mk mail/thunderbird www/firefox www/firefox-esr www/firefox-nightly www/libxul www/seamonkey

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Tue Mar  4 00:18:30 2014
New Revision: 1530

Log:
- drop zip from USE_MOZILLA as it's always required
- adjust USE_MOZILLA comment as it often gets out of date

Modified:
   trunk/Mk/bsd.gecko.mk
   trunk/mail/thunderbird/Makefile
   trunk/www/firefox-esr/Makefile
   trunk/www/firefox-nightly/Makefile
   trunk/www/firefox/Makefile
   trunk/www/libxul/Makefile
   trunk/www/seamonkey/Makefile

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Sat Mar  1 02:30:32 2014	(r1529)
+++ trunk/Mk/bsd.gecko.mk	Tue Mar  4 00:18:30 2014	(r1530)
@@ -436,12 +436,11 @@
 #
 # Ports can use the following:
 #
-# USE_MOZILLA			By default, it enables the denendencies: cairo,
-# 						event, ffi, hunspell, jpeg, nspr, nss, png, sqlite,
-# 						vpx and zip. Search for '_ALL_DEPENDS' below to see
-# 						the list. If your port doesn't need one of list then
-# 						you can use '-' like 'USE_MOZILLA= -png -zip' to
-# 						subtract the dependencies.
+# USE_MOZILLA			By default, it enables every system dependency
+# 						listed in '_ALL_DEPENDS'. If your port doesn't
+# 						need one of those then you can use '-' like
+# 						'USE_MOZILLA= -png -vpx' to subtract the
+# 						dependencies.
 #
 # GECKO_PLIST_PRE_FILES	Manual add files in the plist if it needs.
 #
@@ -549,7 +548,7 @@
 .endif
 
 # Standard depends
-_ALL_DEPENDS=	cairo event ffi harfbuzz hunspell icu jpeg nspr nss opus png sqlite vorbis vpx zip
+_ALL_DEPENDS=	cairo event ffi harfbuzz hunspell icu jpeg nspr nss opus png sqlite vorbis vpx
 
 cairo_LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo
 cairo_MOZ_OPTIONS=	--enable-system-cairo --enable-system-pixman
@@ -612,9 +611,6 @@
 vpx_MOZ_OPTIONS=	--with-system-libvpx
 vpx_EXTRACT_AFTER_ARGS=	--exclude mozilla*/media/libvpx
 
-zip_BUILD_DEPENDS=		zip:${PORTSDIR}/archivers/zip
-zip_RUN_DEPENDS=		${zip_BUILD_DEPENDS}
-
 .for use in ${USE_MOZILLA}
 ${use:S/-/_WITHOUT_/}=	${TRUE}
 .endfor

Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile	Sat Mar  1 02:30:32 2014	(r1529)
+++ trunk/mail/thunderbird/Makefile	Tue Mar  4 00:18:30 2014	(r1530)
@@ -21,6 +21,7 @@
 		libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \
 		opus>=1.1:${PORTSDIR}/audio/opus \
 		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
+		zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
 

Modified: trunk/www/firefox-esr/Makefile
==============================================================================
--- trunk/www/firefox-esr/Makefile	Sat Mar  1 02:30:32 2014	(r1529)
+++ trunk/www/firefox-esr/Makefile	Tue Mar  4 00:18:30 2014	(r1530)
@@ -21,6 +21,7 @@
 		libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \
 		opus>=1.1:${PORTSDIR}/audio/opus \
 		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
+		zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
 

Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile	Sat Mar  1 02:30:32 2014	(r1529)
+++ trunk/www/firefox-nightly/Makefile	Tue Mar  4 00:18:30 2014	(r1530)
@@ -23,6 +23,7 @@
 		opus>=1.1:${PORTSDIR}/audio/opus \
 		libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
 		nspr>=4.10.3:${PORTSDIR}/devel/nspr \
+		zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip
 #		cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \
 #		nss>=3.15.5:${PORTSDIR}/security/nss \

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Sat Mar  1 02:30:32 2014	(r1529)
+++ trunk/www/firefox/Makefile	Tue Mar  4 00:18:30 2014	(r1530)
@@ -21,6 +21,7 @@
 		sqlite3>=3.8.1:${PORTSDIR}/databases/sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
+		zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip
 #		cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \
 

Modified: trunk/www/libxul/Makefile
==============================================================================
--- trunk/www/libxul/Makefile	Sat Mar  1 02:30:32 2014	(r1529)
+++ trunk/www/libxul/Makefile	Tue Mar  4 00:18:30 2014	(r1530)
@@ -20,6 +20,7 @@
 		libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \
 		opus>=1.1:${PORTSDIR}/audio/opus \
 		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
+		zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
 

Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile	Sat Mar  1 02:30:32 2014	(r1529)
+++ trunk/www/seamonkey/Makefile	Tue Mar  4 00:18:30 2014	(r1530)
@@ -21,6 +21,7 @@
 		sqlite3>=3.8.1:${PORTSDIR}/databases/sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
+		zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip
 #		cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \