--- a/make_release_packages	Mon Aug 13 17:00:10 2012 -0700
+++ b/make_release_packages	Wed Aug 15 11:28:07 2012 -0700
@@ -1,6 +1,6 @@
 #! /bin/ksh93
 #
-# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -68,9 +68,9 @@
 LOG="$(pwd)/log/make-pkgs"
 CHECK_LOG="$(pwd)/log/check-pkgs"
 
-# Get build version from hg by searching for most recent tag matching s11u*
+# Get build version from hg by searching for most recent tag matching s12*
 BUILD_TAG="$(hg parent --template '{latesttag}\n' | \
-    perl -l -n -e 'if ($_ =~ m/^s11u\d+_\d+/) {print $_}')"
+    perl -l -n -e 'if ($_ =~ m/^s12_(\d+)/) {print $_}')"
 
 if [[ -z "${BUILD_TAG}" ]] ; then
     fatal_error "BUILD_TAG could not be found from hg parent"

--- a/pkg/Makefile	Mon Aug 13 17:00:10 2012 -0700
+++ b/pkg/Makefile	Wed Aug 15 11:28:07 2012 -0700
@@ -151,12 +151,13 @@
 PKGMOGRIFY = pkgmogrify
 
 # RELEASE = uname -r for the target release
-RELEASE = 5.11
+RELEASE = 5.12
 PKGVERS_BUILTON = $(RELEASE)
 
 # The PKGVERS_BRANCH is determined by the values in the Makefile.buildnum
+# PSARC 2012/240 for package version scheme
 include Makefile.buildnum
-PKGVERS_BRANCH_MAIN = 0.$(TRUNKID).$(UPDATENUM).$(SRUNUM).$(PLATNUM)
+PKGVERS_BRANCH_MAIN = 5.12.$(UPDATENUM).$(SRUNUM).$(PLATNUM)
 PKGVERS_BRANCH = $(PKGVERS_BRANCH_MAIN).$(BUILDID).$(NIGHTLYID)
 
 PKGVERS_BUILD = $(PKGVERS_BUILTON)-$(PKGVERS_BRANCH)
@@ -179,7 +180,7 @@
 # bundle together components from multiple upstream packages with individual
 # version numbers
 PKGMOG_DEFINES += X11PKGVERS=7.7
-PKGMOG_DEFINES += OSPKGVERS=0.$(RELEASE)
+PKGMOG_DEFINES += OSPKGVERS=$(RELEASE)
 
 # Base URL for ARC cases used in opensolaris.arc_url metadata
 PKGMOG_DEFINES += ARC_URL='http://arc.opensolaris.org/caselog/'

--- a/pkg/Makefile.buildnum	Mon Aug 13 17:00:10 2012 -0700
+++ b/pkg/Makefile.buildnum	Wed Aug 15 11:28:07 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -47,10 +47,9 @@
 #
 # The package branch version scheme is:
 #
-#       trunk_id.update.SRU.platform.buildid.nightlyid
+#       release_major.release_minor.update.SRU.platform.buildid.nightlyid
 #
 # where
-#       trunk_id : build number for tip development gate, with leading 0
 #       update   : 0 for FCS, 1 for update 1, etc.
 #       SRU      : SRU (support repository update) number for this update
 #       platform : reserved for future use.
@@ -63,33 +62,20 @@
 #
 # Generate various ids of the packages from the tag in the gate.
 # In X the Nevada builds were tagged with nv_XXX where XXX is the
-# build/trunk number.
-#
-# When the next development train is started this pattern will need to be
-# uncommented & changed in order to match the tag used there:
+# build number.
 #
-# TRUNKID :sh = hg parent --template '{latesttag}\n' | \
-#        perl -l -n -e 'if ($_ =~ m/^nv_(\d+)/) {print $1} else {exit 1}'
-
-# If you get mksh: Fatal error from the above, then you have an unexpected
-# tag other than nv_XXX in your hg repo.   You can run make TRUNKID=123 to
-# override with a different build id until you fix your repo or this regexp.
-
-# For Solaris 11 updates, the TRUNKID is always 175, since that's the build
-# we branched the updates at.
-TRUNKID= 175
 
 #
 # The Solaris Update number. This will be set by the gatekeepers.
 # The value must match the update number of the release.
 #
 # Uncomment for development train:
-# UPDATENUM= 0
+UPDATENUM= 0
 
 # For Solaris 11 updates, the update number is part of the tag (s11u1_01 for
 # instance):
-UPDATENUM:sh = hg parent --template '{latesttag}\n' | \
-        perl -l -n -e 'if ($_ =~ m/^s11u(\d+)_/) {print $1} else {exit 1}'
+#UPDATENUM:sh = hg parent --template '{latesttag}\n' | \
+#        perl -l -n -e 'if ($_ =~ m/^s11u(\d+)_/) {print $1} else {exit 1}'
 
 #
 # Support Respository Update number. This is here to reserve space within the
@@ -113,10 +99,10 @@
 # Uncomment for development train:
 # BUILDID= 0
 
-# For Solaris 11 updates, the build number is part of the tag (s11u1_01 for
+# As for Solaris 11 updates, the build number is part of the tag (s11u1_01 for
 # instance):
 BUILDID:sh = hg parent --template '{latesttag}\n' | \
-        perl -l -n -e 'if ($_ =~ m/^s11u\d+_0*(\d+)/) {print $1} else {exit 1}'
+        perl -l -n -e 'if ($_ =~ m/^s12_0*(\d+)/) {print $1} else {exit 1}'
 
 #
 # Each (nightly) build of the code that produces packages needs to