Allow firebird and thunderbird to be pulled from a branch. rs=leaf.

client.mk

@@ -60,6 +60,9 @@ LDAPCSDK_CO_TAG = ldapcsdk_50_client_branch
 ACCESSIBLE_CO_TAG = 
 IMGLIB2_CO_TAG = 
 IPC_CO_TAG = IPC_BRANCH_20030304
+TOOLKIT_CO_TAG =
+BROWSER_CO_TAG =
+MAIL_CO_TAG =
 BUILD_MODULES = all
 
 #######################################################################
@@ -368,7 +371,15 @@ endif
 ####################################
 # CVS defines for Phoenix (pulled and built if MOZ_PHOENIX is set)
 #
-CVSCO_PHOENIX := $(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/browser
+BROWSER_CO_FLAGS := -P
+ifdef MOZ_CO_FLAGS
+  BROWSER_CO_FLAGS := $(MOZ_CO_FLAGS)
+endif
+ifdef BROWSER_CO_TAG
+  BROWSER_CO_FLAGS := $(BROWSER_CO_FLAGS) -r $(BROWSER_CO_TAG)
+endif
+
+CVSCO_PHOENIX := $(CVS) $(CVS_FLAGS) co $(BROWSER_CO_FLAGS) $(CVS_CO_DATE_FLAGS) mozilla/browser
 
 ifdef MOZ_PHOENIX
 FASTUPDATE_PHOENIX := fast_update $(CVSCO_PHOENIX)
@@ -383,7 +394,15 @@ endif
 # CVS defines for Thunderbird (pulled and built if MOZ_THUNDERBIRD is set)
 #
 
-CVSCO_THUNDERBIRD := $(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/mail
+MAIL_CO_FLAGS := -P
+ifdef MOZ_CO_FLAGS
+  MAIL_CO_FLAGS := $(MOZ_CO_FLAGS)
+endif
+ifdef MAIL_CO_TAG
+  MAIL_CO_FLAGS := $(MAIL_CO_FLAGS) -r $(MAIL_CO_TAG)
+endif
+
+CVSCO_THUNDERBIRD := $(CVS) $(CVS_FLAGS) co $(MAIL_CO_FLAGS) $(CVS_CO_DATE_FLAGS) mozilla/mail
 ifdef MOZ_THUNDERBIRD
 FASTUPDATE_THUNDERBIRD := fast_update $(CVSCO_THUNDERBIRD)
 CHECKOUT_THUNDERBIRD := cvs_co $(CVSCO_THUNDERBIRD)
@@ -397,7 +416,15 @@ endif
 # CVS defines for mozilla/toolkit (pulled and built if MOZ_XUL_APP is set)
 #
 
-CVSCO_MOZTOOLKIT := $(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/toolkit
+TOOLKIT_CO_FLAGS := -P
+ifdef MOZ_CO_FLAGS
+  TOOLKIT_CO_FLAGS := $(MOZ_CO_FLAGS)
+endif
+ifdef TOOLKIT_CO_TAG
+  TOOLKIT_CO_FLAGS := $(TOOLKIT_CO_FLAGS) -r $(TOOLKIT_CO_TAG)
+endif
+
+CVSCO_MOZTOOLKIT := $(CVS) $(CVS_FLAGS) co $(TOOLKIT_CO_FLAGS) $(CVS_CO_DATE_FLAGS)  mozilla/toolkit
 ifdef MOZ_XUL_APP
 FASTUPDATE_MOZTOOLKIT := fast_update $(CVSCO_MOZTOOLKIT)
 CHECKOUT_MOZTOOLKIT := cvs_co $(CVSCO_MOZTOOLKIT)