Bugzilla bug 78471: have Mozilla pull the latest version of NSPR (NSPR 4.2

Beta).  The tag we are using now is the static tag NSPRPUB_CLIENT_TAG.
We may change the tag to "HEAD" (the tip of NSPR) or some client-specific
branch tag soon.  This landing has been approved by drivers@mozilla.org
for mozilla0.9.4.
Modified files: mozilla/client.mk mozilla/client.mak
mozilla/build/mac/build_scripts/MozillaCheckoutList.txt

build/mac/build_scripts/MozillaCheckoutList.txt

@@ -3,11 +3,11 @@
 # where tag and date are optional (non-trailing commas are required)
 #
 # Examples:
-#   mozilla/nsprpub, NSPRPUB_CLIENT_BRANCH
+#   mozilla/nsprpub, NSPRPUB_CLIENT_TAG
 #   mozilla/gc, , 10/25/2000 12:00:00
 #
 
-mozilla/nsprpub,        NSPRPUB_CLIENT_BRANCH
+mozilla/nsprpub,        NSPRPUB_CLIENT_TAG
 mozilla/security/nss,   NSS_CLIENT_TAG
 mozilla/security/psm,   
 mozilla/security/manager,

client.mak

@@ -134,7 +134,7 @@ NSPR_CO_FLAGS=$(MOZ_CO_FLAGS)
 !if "$(NSPR_CO_TAG)" != ""
 NSPR_CO_FLAGS=$(NSPR_CO_FLAGS) -r $(NSPR_CO_TAG)
 !else
-NSPR_CO_FLAGS=$(NSPR_CO_FLAGS) -r NSPRPUB_CLIENT_BRANCH
+NSPR_CO_FLAGS=$(NSPR_CO_FLAGS) -r NSPRPUB_CLIENT_TAG
 !endif
 
 CVSCO_NSPR = cvs -q $(CVS_FLAGS) co $(NSPR_CO_FLAGS)

client.mk

@@ -53,7 +53,7 @@
 # For branches, uncomment the MOZ_CO_TAG line with the proper tag,
 # and commit this file on that tag.
 #MOZ_CO_TAG = <tag>
-NSPR_CO_TAG = NSPRPUB_CLIENT_BRANCH
+NSPR_CO_TAG = NSPRPUB_CLIENT_TAG
 PSM_CO_TAG = #We will now build PSM from the tip instead of a branch.
 NSS_CO_TAG = NSS_CLIENT_TAG
 LDAPCSDK_CO_TAG = LDAPCSDK_40_BRANCH