--- old/usr/src/pkg/manifests/BRCMbnx.mf	   :: 
+++ new/usr/src/pkg/manifests/BRCMbnx.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/BRCMbnx@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/bnx@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/bnx@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/BRCMbnxe.mf	   :: 
+++ new/usr/src/pkg/manifests/BRCMbnxe.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/BRCMbnxe@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/bnxe@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/bnxe@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/CPQary3.mf	   :: 
+++ new/usr/src/pkg/manifests/CPQary3.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/CPQary3@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/storage/cpqary3@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/cpqary3@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNW0on.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNW0on.mf	   :: 
@@ -26,5 +26,5 @@
 set name=pkg.fmri value=pkg:/SUNW0on@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/consolidation/osnet/osnet-message-files@0.5.11,5.11-0.133 \
+depend fmri=pkg:/consolidation/osnet/osnet-message-files@$(PKGVERS) \
     type=require
--- old/usr/src/pkg/manifests/SUNW1394.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNW1394.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNW1394@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/firewire@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/firewire@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNW1394h.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNW1394h.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNW1394h@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/header/header-firewire@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/header/header-firewire@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWaac.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWaac.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWaac@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/storage/aac@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/aac@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWacc.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWacc.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWacc@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/accounting/legacy@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/accounting/legacy@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWad810.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWad810.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWad810@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/audio/audio810@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/audio/audio810@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWadixp.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWadixp.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWadixp@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/audio/audioixp@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/audio/audioixp@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWadpu320.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWadpu320.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWadpu320@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/storage/adpu320@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/adpu320@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWafe.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWafe.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWafe@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/afe@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/afe@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWagp.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWagp.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWagp@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/graphics/agpgart@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/graphics/agpgart@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWagph.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWagph.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWagph@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/system/header/header-agp@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/header/header-agp@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWahci.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWahci.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWahci@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/storage/ahci@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/ahci@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWamd8111s.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWamd8111s.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWamd8111s@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/amd8111s@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/amd8111s@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWamr.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWamr.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWamr@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/storage/amr@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/amr@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWamt.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWamt.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWamt@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/system/management/intel-amt@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/management/intel-amt@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWapct.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWapct.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWapct@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/developer/appcert@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/developer/appcert@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWarc.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWarc.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWarc@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/developer/library/lint@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/developer/library/lint@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWarcmsr.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWarcmsr.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWarcmsr@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/storage/arcmsr@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/arcmsr@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWarn.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWarn.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWarn@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/arn@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/arn@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWastdev.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWastdev.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWastdev@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/developer/astdev@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/developer/astdev@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWatfs.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWatfs.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWatfs@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/file-system/autofs@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/file-system/autofs@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWatge.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWatge.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWatge@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/atge@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/atge@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWatheros.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWatheros.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWatheros@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/ath@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/ath@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWatigfx.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWatigfx.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWatigfx@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/graphics/atiatom@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/graphics/atiatom@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWatu.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWatu.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWatu@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/atu@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/atu@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWauda.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWauda.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWauda@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/audio/audio-utilities@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/audio/audio-utilities@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWaudd.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWaudd.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWaudd@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/audio@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/audio@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWaudf.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWaudf.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWaudf@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/library/demo/audio-samples@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/library/demo/audio-samples@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWaudh.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWaudh.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWaudh@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/header/header-audio@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/header/header-audio@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWaudiocmi.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWaudiocmi.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWaudiocmi@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/audio/audiocmi@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/audio/audiocmi@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWaudioemu10k.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWaudioemu10k.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWaudioemu10k@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/audio/audioemu10k@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/audio/audioemu10k@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWaudiohd.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWaudiohd.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWaudiohd@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/audio/audiohd@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/audio/audiohd@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWaudiols.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWaudiols.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWaudiols@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/audio/audiols@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/audio/audiols@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWaudiop16x.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWaudiop16x.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWaudiop16x@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/audio/audiop16x@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/audio/audiop16x@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWaudiosolo.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWaudiosolo.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWaudiosolo@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/audio/audiosolo@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/audio/audiosolo@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWaudiovia97.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWaudiovia97.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWaudiovia97@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/audio/audiovia97@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/audio/audiovia97@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWaudit.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWaudit.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWaudit@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/library/libadt_jni@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/library/libadt_jni@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWav1394.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWav1394.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWav1394@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/graphics/av1394@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/graphics/av1394@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWbart.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWbart.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWbart@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/security/bart@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/security/bart@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWbcmsata.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWbcmsata.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWbcmsata@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/storage/bcm_sata@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/bcm_sata@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWbcp.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWbcp.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWbcp@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=sparc
-depend fmri=pkg:/system/compatibility/sunos4@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/compatibility/sunos4@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWbeadm.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWbeadm.mf	   :: 
@@ -25,4 +25,4 @@
 set name=pkg.fmri value=pkg:/SUNWbeadm@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/install/beadm@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/install/beadm@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWbfe.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWbfe.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWbfe@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/bfe@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/bfe@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWbge.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWbge.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWbge@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/bge@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/bge@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWbip.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWbip.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWbip@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/network/ftp@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/network/ftp@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWbnu.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWbnu.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWbnu@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/network/uucp@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/service/network/uucp@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWbridge.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWbridge.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWbridge@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/network/bridging@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/network/bridging@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWbs.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWbs.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWbs@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/boot/network@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/boot/network@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWbtool.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWbtool.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWbtool@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/developer/object-file@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/developer/object-file@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWcakr.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWcakr.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWcakr@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/kernel/platform@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/kernel/platform@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWcar.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWcar.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWcar@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/library/processor@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/library/processor@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWcdrw.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWcdrw.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWcdrw@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/media/cdrw@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/media/cdrw@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWcfcl.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWcfcl.mf	   :: 
@@ -26,5 +26,5 @@
 set name=pkg.fmri value=pkg:/SUNWcfcl@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/library/storage/fibre-channel/hbaapi@0.5.11,5.11-0.133 \
+depend fmri=pkg:/system/library/storage/fibre-channel/hbaapi@$(PKGVERS) \
     type=require
--- old/usr/src/pkg/manifests/SUNWcfpl.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWcfpl.mf	   :: 
@@ -26,5 +26,5 @@
 set name=pkg.fmri value=pkg:/SUNWcfpl@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/storage/fibre-channel/fc-fabric@0.5.11,5.11-0.133 \
+depend fmri=pkg:/service/storage/fibre-channel/fc-fabric@$(PKGVERS) \
     type=require
--- old/usr/src/pkg/manifests/SUNWchxge.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWchxge.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWchxge@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/chxge@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/chxge@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWckr.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWckr.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWckr@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/kernel@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/kernel@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWcnetr.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWcnetr.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWcnetr@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/network@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/network@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWcns.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWcns.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWcns@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/network/legacy@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/service/network/legacy@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWcpc.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWcpc.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWcpc@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/kernel/cpu-counters@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/kernel/cpu-counters@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWcpcu.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWcpcu.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWcpcu@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/diagnostic/cpu-counters@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/diagnostic/cpu-counters@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWcpr.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWcpr.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWcpr@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/kernel/suspend-resume@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/kernel/suspend-resume@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWcsl.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWcsl.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWcsl@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/library@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/library@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWcstl.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWcstl.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWcstl@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/developer/apptrace@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/developer/apptrace@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWcti2.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWcti2.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWcti2@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=sparc
-depend fmri=pkg:/system/kernel/platform/netra@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/kernel/platform/netra@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWcvc.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWcvc.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWcvc@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=sparc
-depend fmri=pkg:/system/network-console@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/network-console@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWdcaf.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWdcaf.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWdcaf@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/crypto/dca@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/crypto/dca@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWdcopy.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWdcopy.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWdcopy@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/i86pc/ioat@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/i86pc/ioat@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWdmfe.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWdmfe.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWdmfe@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/dmfe@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/dmfe@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWdmgt.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWdmgt.mf	   :: 
@@ -26,5 +26,5 @@
 set name=pkg.fmri value=pkg:/SUNWdmgt@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/management/wbem/data-management@0.5.11,5.11-0.133 \
+depend fmri=pkg:/system/management/wbem/data-management@$(PKGVERS) \
     type=require
--- old/usr/src/pkg/manifests/SUNWdoc.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWdoc.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWdoc@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/text/doctools@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/text/doctools@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWdrmr.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWdrmr.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWdrmr@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/graphics/drm@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/graphics/drm@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWdsd.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWdsd.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWdsd@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/network/dns/mdns@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/service/network/dns/mdns@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWdtrc.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWdtrc.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWdtrc@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/developer/dtrace@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/developer/dtrace@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWdtrp.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWdtrp.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWdtrp@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/kernel/dtrace/providers@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/kernel/dtrace/providers@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWdtrt.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWdtrt.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWdtrt@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/dtrace/tests@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/dtrace/tests@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWefc.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWefc.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWefc@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=sparc
-depend fmri=pkg:/system/embedded-fcode-interpreter@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/system/embedded-fcode-interpreter@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWemlxs.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWemlxs.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWemlxs@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/emlxs@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/emlxs@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWerid.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWerid.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWerid@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=sparc
-depend fmri=pkg:/driver/network/eri@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/eri@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWesu.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWesu.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWesu@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/extended-system-utilities@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/system/extended-system-utilities@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWfcip.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWfcip.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWfcip@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/fcip@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/fcip@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWfcoe.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWfcoe.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWfcoe@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/fcoe@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/fcoe@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWfcoei.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWfcoei.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWfcoei@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/fcoei@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/fcoei@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWfcoet.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWfcoet.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWfcoet@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/fcoet@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/fcoet@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWfcoeu.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWfcoeu.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWfcoeu@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/library/libfcoe@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/library/libfcoe@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWfcp.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWfcp.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWfcp@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/fcp@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/fcp@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWfcprt.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWfcprt.mf	   :: 
@@ -26,5 +26,5 @@
 set name=pkg.fmri value=pkg:/SUNWfcprt@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/storage/fibre-channel/port-utility@0.5.11,5.11-0.133 \
+depend fmri=pkg:/system/storage/fibre-channel/port-utility@$(PKGVERS) \
     type=require
--- old/usr/src/pkg/manifests/SUNWfcsm.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWfcsm.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWfcsm@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/fcsm@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/fcsm@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWfctl.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWfctl.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWfctl@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/fp@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/fp@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWfipe.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWfipe.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWfipe@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/i86pc/fipe@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/i86pc/fipe@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWfmd.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWfmd.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWfmd@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/fault-management@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/service/fault-management@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWfruid.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWfruid.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWfruid@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/fru-id@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/fru-id@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWfruip.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWfruip.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWfruip@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/fru-id/platform@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/fru-id/platform@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWfss.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWfss.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWfss@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/scheduler/fss@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/scheduler/fss@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWftdu.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWftdu.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWftdu@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/developer/driver/ftsafe@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/developer/driver/ftsafe@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWfwdc.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWfwdc.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWfwdc@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/graphics/dcam1394@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/graphics/dcam1394@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWfwdcu.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWfwdcu.mf	   :: 
@@ -26,5 +26,5 @@
 set name=pkg.fmri value=pkg:/SUNWfwdcu@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/graphics/dcam1394/devfsadm-dcam1394@0.5.11,5.11-0.133 \
+depend fmri=pkg:/driver/graphics/dcam1394/devfsadm-dcam1394@$(PKGVERS) \
     type=require
--- old/usr/src/pkg/manifests/SUNWfwflash.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWfwflash.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWfwflash@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/flash/fwflash@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/flash/fwflash@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWgrub.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWgrub.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWgrub@0.97,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/boot/grub@0.97,5.11-0.133 type=require
+depend fmri=pkg:/system/boot/grub@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWgrubS.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWgrubS.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWgrubS@0.97,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/source/system/grub@0.97,5.11-0.133 type=require
+depend fmri=pkg:/source/system/grub@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWgss.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWgss.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWgss@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/library/security/gss@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/library/security/gss@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWgssc.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWgssc.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWgssc@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/security/gss@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/service/security/gss@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWgssdh.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWgssdh.mf	   :: 
@@ -26,5 +26,5 @@
 set name=pkg.fmri value=pkg:/SUNWgssdh@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/library/security/gss/diffie-hellman@0.5.11,5.11-0.133 \
+depend fmri=pkg:/system/library/security/gss/diffie-hellman@$(PKGVERS) \
     type=require
--- old/usr/src/pkg/manifests/SUNWgssk.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWgssk.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWgssk@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/kernel/security/gss@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/kernel/security/gss@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWhal.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWhal.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWhal@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/hal@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/service/hal@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWhea.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWhea.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWhea@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/header@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/header@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWhermon.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWhermon.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWhermon@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/hermon@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/hermon@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWhmd.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWhmd.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWhmd@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/hme@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/hme@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWhmdu.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWhmdu.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWhmdu@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=sparc
-depend fmri=pkg:/driver/storage/fas/header-fas@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/fas/header-fas@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWhwdata.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWhwdata.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWhwdata@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/data/hardware-registry@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/data/hardware-registry@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWhxge.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWhxge.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWhxge@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/hxge@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/hxge@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWib.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWib.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWib@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/ib@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/ib@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWibdma.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWibdma.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWibdma@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/ibdma@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/ibdma@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWibsdp.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWibsdp.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWibsdp@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/sdp@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/sdp@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWibsdpib.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWibsdpib.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWibsdpib@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/sdpib@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/sdpib@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWibsdpu.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWibsdpu.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWibsdpu@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/network/spdadm@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/network/spdadm@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWigb.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWigb.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWigb@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/igb@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/igb@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWii.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWii.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWii@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/storage/avs/point-in-time-copy@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/storage/avs/point-in-time-copy@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWilb.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWilb.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWilb@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/network/load-balancer/ilb@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/service/network/load-balancer/ilb@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWima.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWima.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWima@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/library/storage/ima@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/library/storage/ima@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWimac.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWimac.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWimac@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/library/storage/ima/header-ima@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/system/library/storage/ima/header-ima@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWinstallint.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWinstallint.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWinstallint@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/library/install/libinstzones@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/system/library/install/libinstzones@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWintgige.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWintgige.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWintgige@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/e1000g@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/e1000g@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWio-tools.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWio-tools.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWio-tools@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/management/pcitool@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/management/pcitool@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWiopc.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWiopc.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWiopc@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=sparc
-depend fmri=pkg:/system/kernel/io-performance-counters@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/system/kernel/io-performance-counters@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWiot.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWiot.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWiot@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/io/tests@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/io/tests@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWipc.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWipc.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWipc@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/ipc@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/ipc@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWipf.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWipf.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWipf@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/network/ipfilter@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/network/ipfilter@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWipfh.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWipfh.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWipfh@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/network/ipfilter/header-ipfilter@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/network/ipfilter/header-ipfilter@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWipoib.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWipoib.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWipoib@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/ibd@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/ibp@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWippcore.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWippcore.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWippcore@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/print/lp/ipp/libipp@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/print/lp/ipp/libipp@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWipw.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWipw.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWipw@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/ipw@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/ipw@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWiscsi.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWiscsi.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWiscsi@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/network/iscsi/initiator@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/network/iscsi/initiator@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWiscsidm.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWiscsidm.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWiscsidm@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/network/iscsi/iser@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/network/iscsi/iser@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWiscsit.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWiscsit.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWiscsit@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/network/iscsi/target@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/network/iscsi/target@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWisns.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWisns.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWisns@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/storage/isns@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/service/storage/isns@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWiwh.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWiwh.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWiwh@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/iwh@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/iwh@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWiwi.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWiwi.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWiwi@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/iwi@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/iwi@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWiwk.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWiwk.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWiwk@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/iwk@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/iwk@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWiwp.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWiwp.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWiwp@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/iwp@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/iwp@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWixgb.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWixgb.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWixgb@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/ixgb@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/ixgb@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWixgbe.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWixgbe.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWixgbe@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/ixgbe@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/ixgbe@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWkdc.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWkdc.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWkdc@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/security/kerberos-5@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/security/kerberos-5@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWkey.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWkey.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWkey@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/data/keyboard/keytables@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/data/keyboard/keytables@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWkrb.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWkrb.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWkrb@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/security/kerberos-5@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/service/security/kerberos-5@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWkvm.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWkvm.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWkvm@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/library/platform@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/library/platform@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWlatencytop.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWlatencytop.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWlatencytop@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/diagnostic/latencytop@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/diagnostic/latencytop@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWldom.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWldom.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWldom@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=sparc
-depend fmri=pkg:/system/ldoms@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/ldoms@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWldskint.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWldskint.mf	   :: 
@@ -26,5 +26,5 @@
 set name=pkg.fmri value=pkg:/SUNWldskint@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/library/libdiskmgt/header-libdiskmgt@0.5.11,5.11-0.133 \
+depend fmri=pkg:/system/library/libdiskmgt/header-libdiskmgt@$(PKGVERS) \
     type=require
--- old/usr/src/pkg/manifests/SUNWlibsasl.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWlibsasl.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWlibsasl@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/library/security/libsasl@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/system/library/security/libsasl@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWlldap.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWlldap.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWlldap@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/naming/ldap@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/naming/ldap@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWloc.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWloc.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWloc@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/text/locale@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/text/locale@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWlsimega.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWlsimega.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWlsimega@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/storage/lsimega@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/lsimega@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWluxd.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWluxd.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWluxd@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=sparc
-depend fmri=pkg:/driver/storage/sf@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/sf@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWluxl.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWluxl.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWluxl@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=sparc
-depend fmri=pkg:/driver/network/socal@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/socal@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWluxop.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWluxop.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWluxop@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/storage/luxadm@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/storage/luxadm@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWluxopr.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWluxopr.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWluxopr@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=sparc
-depend fmri=pkg:/storage/library/network-array@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/storage/library/network-array@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWmd.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWmd.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWmd@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/storage/svm@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/storage/svm@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWmda.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWmda.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWmda@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/storage/metassist@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/storage/metassist@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWmdb.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWmdb.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWmdb@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/developer/debug/mdb@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/developer/debug/mdb@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWmdbdm.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWmdbdm.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWmdbdm@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/source/demo/mdb-examples@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/source/demo/mdb-examples@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWmddr.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWmddr.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWmddr@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/library/svm-rcm@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/library/svm-rcm@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWmegasas.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWmegasas.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWmegasas@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/storage/mega_sas@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/mega_sas@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWmpapi.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWmpapi.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWmpapi@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/library/storage/libmpapi@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/system/library/storage/libmpapi@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWmpathadm.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWmpathadm.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWmpathadm@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/storage/mpathadm@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/storage/mpathadm@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWmpsvplr.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWmpsvplr.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWmpsvplr@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/library/storage/libmpscsi_vhci@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/system/library/storage/libmpscsi_vhci@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWmptsas.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWmptsas.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWmptsas@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/storage/mpt_sas@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/mpt_sas@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWmrsas.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWmrsas.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWmrsas@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/storage/mr_sas@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/mr_sas@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWmv88sx.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWmv88sx.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWmv88sx@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/storage/marvell88sx@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/marvell88sx@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWmwl.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWmwl.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWmwl@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/mwl@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/mwl@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWmxfe.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWmxfe.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWmxfe@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/mxfe@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/mxfe@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWmyri10ge.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWmyri10ge.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWmyri10ge@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/myri10ge@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/myri10ge@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWnca.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWnca.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWnca@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/network/http-cache-accelerator@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/system/network/http-cache-accelerator@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWndmp.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWndmp.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWndmp@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/storage/ndmp@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/service/storage/ndmp@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWnetcat.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWnetcat.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWnetcat@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/network/netcat@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/network/netcat@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWnfsc.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWnfsc.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWnfsc@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/file-system/nfs@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/file-system/nfs@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWnfss.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWnfss.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWnfss@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/file-system/nfs@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/service/file-system/nfs@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWnge.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWnge.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWnge@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/nge@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/nge@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWnis.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWnis.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWnis@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/network/nis@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/network/nis@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWniumx.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWniumx.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWniumx@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=sparc
-depend fmri=pkg:/driver/network/niumx@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/niumx@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWntxn.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWntxn.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWntxn@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/ntxn@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/ntxn@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWnvsata.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWnvsata.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWnvsata@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/storage/nv_sata@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/nv_sata@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWnxge.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWnxge.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWnxge@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/nxge@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/nxge@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWonbld.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWonbld.mf	   :: 
@@ -27,4 +27,4 @@
 set name=pkg.renamed value=true
 set name=org.opensolaris.noincorp value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/developer/build/onbld@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/developer/build/onbld@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWonfmes.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWonfmes.mf	   :: 
@@ -26,5 +26,5 @@
 set name=pkg.fmri value=pkg:/SUNWonfmes@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/fault-management/eversholt-utilities@0.5.11,5.11-0.133 \
+depend fmri=pkg:/system/fault-management/eversholt-utilities@$(PKGVERS) \
     type=require
--- old/usr/src/pkg/manifests/SUNWonzfs.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWonzfs.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWonzfs@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/file-system/zfs/tests@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/file-system/zfs/tests@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWos86r.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWos86r.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWos86r@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/platform@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/platform@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWosdem.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWosdem.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWosdem@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/source/demo/system@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/source/demo/system@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWpacket.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWpacket.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWpacket@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/bpf@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/bpf@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWpapi.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWpapi.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWpapi@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/library/print/open-printing@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/library/print/open-printing@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWpc.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWpc.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWpc@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/print/lp/print-client-commands@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/print/lp/print-client-commands@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWpcmci.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWpcmci.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWpcmci@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/pcmcia@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/pcmcia@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWpicl.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWpicl.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWpicl@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/picl@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/service/picl@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWpiclh.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWpiclh.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWpiclh@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/header/header-picl@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/header/header-picl@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWpkgcmds.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWpkgcmds.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWpkgcmds@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/package/svr4@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/package/svr4@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWpm.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWpm.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWpm@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/kernel/power@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/kernel/power@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWpmcs.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWpmcs.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWpmcs@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/storage/pmcs@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/pmcs@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWpolkit.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWpolkit.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWpolkit@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/library/policykit@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/library/policykit@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWpool.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWpool.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWpool@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/resource-pools@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/service/resource-pools@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWpoold.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWpoold.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWpoold@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/resource-pools/poold@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/service/resource-pools/poold@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWpowertop.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWpowertop.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWpowertop@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/diagnostic/powertop@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/diagnostic/powertop@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWppm.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWppm.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWppm@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/print/lp/print-manager/legacy@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/print/lp/print-manager/legacy@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWpppd.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWpppd.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWpppd@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/network/ppp@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/network/ppp@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWpppdt.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWpppdt.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWpppdt@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/network/ppp/tunnel@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/network/ppp/tunnel@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWpppg.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWpppg.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWpppg@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/network/ppp/pppdump@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/network/ppp/pppdump@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWps.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWps.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWps@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/print/lp@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/print/lp@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWpsdcr.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWpsdcr.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWpsdcr@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/i86pc/platform@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/i86pc/platform@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWpsdir.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWpsdir.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWpsdir@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/storage/ata@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/ata@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWpsf.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWpsf.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWpsf@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/print/lp/filter/postscript-lp-filter@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/print/lp/filter/postscript-lp-filter@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWpsh.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWpsh.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWpsh@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/system/header/header-storage@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/header/header-storage@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWpsm-ipp.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWpsm-ipp.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWpsm-ipp@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/library/print/open-printing/ipp@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/library/print/open-printing/ipp@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWpsm-lpd.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWpsm-lpd.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWpsm-lpd@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/library/print/open-printing/lpd@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/library/print/open-printing/lpd@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWpstl.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWpstl.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWpstl@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=sparc
-depend fmri=pkg:/developer/apptrace/platform@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/developer/apptrace/platform@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWqfed.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWqfed.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWqfed@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=sparc
-depend fmri=pkg:/driver/network/qfe@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/qfe@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWqlc.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWqlc.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWqlc@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/qlc@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/qlc@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWqlcu.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWqlcu.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWqlcu@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/qlc/qlc-mdb@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/developer/debug/mdb/module/module-qlc@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWqos.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWqos.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWqos@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/network/ipqos/ipqos-config@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/system/network/ipqos/ipqos-config@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWqosu.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWqosu.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWqosu@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/network/ipqos@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/network/ipqos@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWralink.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWralink.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWralink@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/ral@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/ral@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWrcap.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWrcap.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWrcap@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/resource-cap@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/service/resource-cap@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWrcmdc.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWrcmdc.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWrcmdc@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/network/network-clients@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/service/network/network-clients@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWrcmds.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWrcmds.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWrcmds@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/network/network-servers@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/service/network/network-servers@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWrdc.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWrdc.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWrdc@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/storage/avs/remote-mirror@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/storage/avs/remote-mirror@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWrds.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWrds.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWrds@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/rds@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/rds@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWrge.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWrge.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWrge@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/rge@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/rge@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWrmod.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWrmod.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWrmod@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/boot/real-mode@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/boot/real-mode@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWrmvolmgr.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWrmvolmgr.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWrmvolmgr@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/storage/media-volume-manager@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/service/storage/media-volume-manager@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWroute.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWroute.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWroute@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/network/routing@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/network/routing@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWrpcib.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWrpcib.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWrpcib@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/rpcib@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/rpcib@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWrsg.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWrsg.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWrsg@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/library/security/rpcsec@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/library/security/rpcsec@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWrsgk.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWrsgk.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWrsgk@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/kernel/secure-rpc@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/kernel/secure-rpc@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWrsm.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWrsm.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWrsm@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/remote-shared-memory@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/remote-shared-memory@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWrsmo.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWrsmo.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWrsmo@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/kernel/rsmops@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/kernel/rsmops@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWrtls.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWrtls.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWrtls@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/rtls@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/rtls@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWrtw.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWrtw.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWrtw@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/rtw@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/rtw@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWrum.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWrum.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWrum@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/rum@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/rum@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWrwd.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWrwd.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWrwd@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/rwd@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/rwd@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWrwn.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWrwn.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWrwn@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/rwn@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/rwn@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWs10brand.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWs10brand.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWs10brand@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/zones/brand/s10@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/zones/brand/s10@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWsbp2.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWsbp2.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWsbp2@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/storage/sbp2@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/sbp2@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWsckm.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWsckm.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWsckm@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=sparc
-depend fmri=pkg:/service/key-management/sun-fire-15000@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/service/key-management/sun-fire-15000@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWscm.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWscm.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWscm@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/storage/avs/cache-management@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/service/storage/avs/cache-management@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWscp.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWscp.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWscp@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/compatibility/ucb@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/compatibility/ucb@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWscplp.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWscplp.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWscplp@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/print/lp/compatibility/sunos4@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/print/lp/compatibility/sunos4@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWscsa1394.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWscsa1394.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWscsa1394@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/storage/scsa1394@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/scsa1394@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWscsip.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWscsip.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWscsip@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/library/storage/scsi-plugin@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/system/library/storage/scsi-plugins@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWsdcard.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWsdcard.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWsdcard@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/storage/sdcard@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/sdcard@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWses.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWses.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWses@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/storage/ses@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/ses@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWsfe.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWsfe.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWsfe@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/sfe@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/sfe@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWsi3124.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWsi3124.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWsi3124@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/storage/si3124@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/si3124@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWslp.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWslp.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWslp@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/network/slp@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/service/network/slp@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWsmapi.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWsmapi.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWsmapi@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/library/libdiskmgt@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/library/libdiskmgt@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWsmbfs.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWsmbfs.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWsmbfs@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/file-system/smb@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/file-system/smb@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWsmbs.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWsmbs.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWsmbs@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/file-system/smb@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/service/file-system/smb@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWsmedia.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWsmedia.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWsmedia@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/storage/removable-media@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/service/storage/removable-media@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWsmhba.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWsmhba.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWsmhba@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/storage/sasinfo@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/storage/sasinfo@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWsmpd.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWsmpd.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWsmpd@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/storage/smp@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/smp@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWsn1int.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWsn1int.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWsn1int@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/zones/brand/sn1@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/zones/brand/sn1@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWsndm.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWsndm.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWsndm@8.14.4,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/network/smtp/sendmail@8.14.4,5.11-0.133 type=require
+depend fmri=pkg:/service/network/smtp/sendmail@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWspnego.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWspnego.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWspnego@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/library/security/gss/spnego@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/system/library/security/gss/spnego@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWspsv.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWspsv.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWspsv@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/storage/sv@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/sv@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWsrpt.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWsrpt.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWsrpt@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/srpt@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/srpt@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWssad.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWssad.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWssad@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=sparc
-depend fmri=pkg:/driver/storage/ssd@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/storage/ssd@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWssh.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWssh.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWssh@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/network/ssh@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/network/ssh@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWsshcu.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWsshcu.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWsshcu@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/network/ssh/ssh-key@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/network/ssh/ssh-key@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWsshd.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWsshd.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWsshd@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/network/ssh@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/service/network/ssh@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWstmf.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWstmf.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWstmf@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/network/iscsi@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/storage/stmf@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWtavor.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWtavor.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWtavor@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/tavor@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/tavor@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWtcpd.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWtcpd.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWtcpd@7.6,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/library/security/tcp-wrapper@7.6,5.11-0.133 type=require
+depend fmri=pkg:/library/security/tcp-wrapper@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWtecla.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWtecla.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWtecla@1.6.0,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/library/libtecla@1.6.0,5.11-0.133 type=require
+depend fmri=pkg:/library/libtecla@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWter.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWter.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWter@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/data/terminfo@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/data/terminfo@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWtftp.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWtftp.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWtftp@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/network/tftp@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/service/network/tftp@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWtnetc.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWtnetc.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWtnetc@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/network/telnet@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/network/telnet@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWtnetd.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWtnetd.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWtnetd@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/network/telnet@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/service/network/telnet@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWtnfc.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWtnfc.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWtnfc@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/tnf@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/tnf@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWtnfd.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWtnfd.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWtnfd@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/developer/tnf@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/developer/tnf@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWtoo.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWtoo.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWtoo@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/developer/linker@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/developer/linker@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWtpm.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWtpm.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWtpm@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/crypto/tpm@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/crypto/tpm@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWts.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWts.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWts@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/trusted@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/trusted@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWtsg.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWtsg.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWtsg@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/trusted/global-zone@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/trusted/global-zone@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWuacm.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWuacm.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWuacm@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/serial/usbsacm@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/serial/usbsacm@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWuath.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWuath.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWuath@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/uath@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/uath@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWucbt.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWucbt.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWucbt@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/developer/apptrace/ucblib@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/developer/apptrace/ucblib@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWudapl.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWudapl.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWudapl@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/network/udapl@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/network/udapl@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWudaplt.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWudaplt.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWudaplt@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/network/udapl/udapl-tavor@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/system/network/udapl/udapl-tavor@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWudf.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWudf.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWudf@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/file-system/udfs@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/file-system/udfs@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWuedg.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWuedg.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWuedg@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/serial/usbser_edge@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/serial/usbser_edge@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWuftdi.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWuftdi.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWuftdi@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/serial/usbftdi@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/serial/usbftdi@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWugen.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWugen.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWugen@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/usb/ugen@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/usb/ugen@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWugenu.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWugenu.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWugenu@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/header/header-ugen@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/header/header-ugen@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWuksp.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWuksp.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWuksp@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/serial/usbsksp@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/serial/usbsksp@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWukspfw.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWukspfw.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWukspfw@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/serial/usbsksp/usbs49_fw@0.5.11,5.11-0.133 \
-    type=require
+depend fmri=pkg:/driver/serial/usbsksp/usbs49_fw@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWuprl.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWuprl.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWuprl@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/serial/usbsprl@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/serial/usbsprl@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWural.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWural.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWural@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/ural@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/ural@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWurtw.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWurtw.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWurtw@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/urtw@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/urtw@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWus.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWus.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWus@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=sparc
-depend fmri=pkg:/driver/cpu/us@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/cpu/us@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWusb.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWusb.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWusb@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/usb@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/usb@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWusbs.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWusbs.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWusbs@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/serial/usbser@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/serial/usbser@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWusbu.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWusbu.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWusbu@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/header/header-usb@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/header/header-usb@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWusbvc.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWusbvc.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWusbvc@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/graphics/usbvc@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/graphics/usbvc@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWust.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWust.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWust@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=sparc
-depend fmri=pkg:/system/kernel/cpu/sun4v@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/kernel/cpu/sun4v@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWvia823x.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWvia823x.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWvia823x@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/audio/audiovia823x@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/audio/audiovia823x@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWvr.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWvr.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWvr@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/vr@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/vr@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWvrrp.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWvrrp.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWvrrp@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/network/routing/vrrp@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/network/routing/vrrp@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWvscan.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWvscan.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWvscan@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/storage/virus-scan@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/service/storage/virus-scan@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWwbint.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWwbint.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWwbint@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/boot/wanboot/internal@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/boot/wanboot/internal@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWwbsup.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWwbsup.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWwbsup@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/boot/wanboot@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/boot/wanboot@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWwlan.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWwlan.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWwlan@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/network/wificonfig@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/network/wificonfig@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWwpa.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWwpa.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWwpa@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/network/wpa@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/service/network/wpa@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWwpi.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWwpi.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWwpi@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/wpi@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/wpi@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWxcu4.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWxcu4.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWxcu4@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/xopen/xcu4@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/xopen/xcu4@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWxcu6.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWxcu6.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWxcu6@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/xopen/xcu6@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/xopen/xcu6@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWxdt.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWxdt.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWxdt@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/system/dtrace@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/dtrace@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWxge.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWxge.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWxge@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/xge@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/xge@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWxsvc.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWxsvc.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWxsvc@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/x11/xsvc@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/x11/xsvc@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWxvmipa.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWxvmipa.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWxvmipa@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/system/xvm/ipagent@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/xvm/ipagent@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWxvmpv.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWxvmpv.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWxvmpv@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/xvm/pv@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/xvm/pv@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWxwdv.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWxwdv.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWxwdv@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/x11/winlock@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/x11/winlock@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWyge.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWyge.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWyge@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/yge@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/yge@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWyp.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWyp.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWyp@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/service/network/nis@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/service/network/nis@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWzfs.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWzfs.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWzfs@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/file-system/zfs@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/file-system/zfs@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWzone.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWzone.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWzone@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/zones@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/zones@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWzoneint.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWzoneint.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWzoneint@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/zones/internal@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/system/zones/internal@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/SUNWzyd.mf	   :: 
+++ new/usr/src/pkg/manifests/SUNWzyd.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/SUNWzyd@0.5.11,5.11-0.133
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/driver/network/zyd@0.5.11,5.11-0.133 type=require
+depend fmri=pkg:/driver/network/zyd@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/driver-network-ibd.mf	   :: 
+++ new/usr/src/pkg/manifests/driver-network-ibd.mf	   :: 
@@ -32,4 +32,4 @@
 set name=pkg.fmri value=pkg:/driver/network/ibd@0.5.11,5.11-0.139
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/ibp@0.5.11,5.11-0.139 type=require
+depend fmri=pkg:/driver/network/ibp@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/driver-network-qlc-qlc-mdb.mf	   :: 
+++ new/usr/src/pkg/manifests/driver-network-qlc-qlc-mdb.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/driver/network/qlc/qlc-mdb@0.5.11,5.11-0.134
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/developer/debug/mdb/module/module-qlc@0.5.11,5.11-0.134 \
-    type=require
+depend fmri=pkg:/developer/debug/mdb/module/module-qlc@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/network-iscsi.mf	   :: 
+++ new/usr/src/pkg/manifests/network-iscsi.mf	   :: 
@@ -26,4 +26,4 @@
 set name=pkg.fmri value=pkg:/network/iscsi@0.5.11,5.11-0.134
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/storage/stmf@0.5.11,5.11-0.134 type=require
+depend fmri=pkg:/storage/stmf@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/system-dtrace.mf	   :: 
+++ new/usr/src/pkg/manifests/system-dtrace.mf	   :: 
@@ -26,5 +26,4 @@
 set name=pkg.fmri value=pkg:/system/dtrace@0.5.11,5.11-0.134
 set name=pkg.renamed value=true
 set name=variant.arch value=i386
-depend fmri=pkg:/system/kernel/dtrace/providers/xdt@0.5.11,5.11-0.134 \
-    type=require
+depend fmri=pkg:/system/kernel/dtrace/providers/xdt@$(PKGVERS) type=require
--- old/usr/src/pkg/manifests/system-library-storage-scsi-plugin.mf	   :: 
+++ new/usr/src/pkg/manifests/system-library-storage-scsi-plugin.mf	   :: 
@@ -27,5 +27,4 @@
     value=pkg:/system/library/storage/scsi-plugin@0.5.11,5.11-0.134
 set name=pkg.renamed value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/system/library/storage/scsi-plugins@0.5.11,5.11-0.134 \
-    type=require
+depend fmri=pkg:/system/library/storage/scsi-plugins@$(PKGVERS) type=require
