--- a/oi-extras/nvidia/driver-graphics-nvidia.p5m	Sun Jun 19 15:58:20 2011 +0100
+++ b/oi-extras/nvidia/driver-graphics-nvidia.p5m	Mon Jun 20 02:14:32 2011 +0100
@@ -23,25 +23,39 @@
 set name=org.opensolaris.consolidation value=nvidia
 set name=variant.arch value=$(MACH)
 set name=variant.opensolaris.zone value=global value=nonglobal
-#depend [email protected] type=require
-#depend fmri=consolidation/nvidia/nvidia-incorporation type=require
-#depend fmri=library/desktop/[email protected] type=require
-#depend fmri=library/desktop/[email protected] type=require
-#depend fmri=library/desktop/[email protected] type=require
-#depend fmri=library/[email protected] type=require
-#depend fmri=service/opengl/[email protected] type=require
-#depend fmri=system/library/[email protected] type=require
-#depend fmri=system/library/[email protected] type=require
-#depend fmri=system/[email protected] type=require
-#depend fmri=x11/compatibility/[email protected] type=require
-#depend fmri=x11/library/[email protected] type=require
-#depend fmri=x11/library/[email protected] type=require
-#depend fmri=x11/library/[email protected] type=require
+
+license driver-graphics-nvidia.license license="NVIDIA license"
 
-dir path=dev
-dir path=kernel variant.opensolaris.zone=global
-dir path=kernel/drv variant.opensolaris.zone=global
-dir path=kernel/drv/$(MACH64) variant.opensolaris.zone=global
+depend [email protected] type=require
+depend fmri=consolidation/nvidia/nvidia-incorporation type=require
+depend fmri=library/desktop/[email protected] type=require
+depend fmri=library/desktop/[email protected] type=require
+depend fmri=library/desktop/[email protected] type=require
+depend fmri=library/[email protected] type=require
+depend fmri=service/opengl/[email protected] type=require
+depend fmri=system/library/[email protected] type=require
+depend fmri=system/library/[email protected] type=require
+depend fmri=system/[email protected] type=require
+depend fmri=x11/compatibility/[email protected] type=require
+depend fmri=x11/library/[email protected] type=require
+depend fmri=x11/library/[email protected] type=require
+depend fmri=x11/library/[email protected] type=require
+
+legacy pkg=NVDAgraphics arch=$(ARCH) category=system,graphics \
+    desc="X and OpenGL Drivers for NVIDIA Quadro graphics" \
+    hotline="Please contact your local service provider" \
+    name="NVIDIA Graphics System Software" vendor="NVIDIA Corporation" \
+    version=$(COMPONENT_VERSION),REV=$(COMPONENT_REV)
+legacy pkg=NVDAgraphicsr arch=$(ARCH) category=system,graphics \
+    desc="Kernel Drivers for NVIDIA Quadro graphics" \
+    hotline="Please contact your local service provider" \
+    name="NVIDIA Graphics System Device Driver" vendor="NVIDIA Corporation" \
+    version=$(COMPONENT_VERSION),REV=$(COMPONENT_REV)
+
+dir path=dev group=sys
+dir path=kernel variant.opensolaris.zone=global group=sys
+dir path=kernel/drv variant.opensolaris.zone=global group=sys
+dir path=kernel/drv/$(MACH64) variant.opensolaris.zone=global group=sys
 dir path=usr
 dir path=usr/X11
 dir path=usr/X11/lib
@@ -497,10 +511,10 @@
     alias=pci10de,f8 \
     alias=pci10de,f9
 file path=kernel/drv/$(MACH64)/nvidia reboot-needed=true \
-    variant.opensolaris.zone=global
-file path=kernel/drv/nvidia reboot-needed=true variant.opensolaris.zone=global
+    variant.opensolaris.zone=global group=sys
+file path=kernel/drv/nvidia reboot-needed=true variant.opensolaris.zone=global group=sys
 file path=kernel/drv/nvidia.conf reboot-needed=false \
-    variant.opensolaris.zone=global
+    variant.opensolaris.zone=global group=sys
 file path=usr/X11/lib/NVIDIA/$(MACH64)/libGL.so.1
 file path=usr/X11/lib/NVIDIA/$(MACH64)/libnvidia-glcore.so.1
 file path=usr/X11/lib/NVIDIA/$(MACH64)/libnvidia-tls.so.1
@@ -582,17 +596,6 @@
     restart_fmri=svc:/application/desktop-cache/icon-cache:default
 file path=usr/share/man/man1/nvidia-settings.1
 file path=usr/share/man/man1/nvidia-xconfig.1
-legacy pkg=NVDAgraphics arch=$(ARCH) category=system,graphics \
-    desc="X and OpenGL Drivers for NVIDIA Quadro graphics" \
-    hotline="Please contact your local service provider" \
-    name="NVIDIA Graphics System Software" vendor="NVIDIA Corporation" \
-    version=$(COMPONENT_VERSION),REV=$(COMPONENT_REV)
-legacy pkg=NVDAgraphicsr arch=$(ARCH) category=system,graphics \
-    desc="Kernel Drivers for NVIDIA Quadro graphics" \
-    hotline="Please contact your local service provider" \
-    name="NVIDIA Graphics System Device Driver" vendor="NVIDIA Corporation" \
-    version=$(COMPONENT_VERSION),REV=$(COMPONENT_REV)
-license driver-graphics-nvidia.license license="NVIDIA license"
 link path=dev/nvidia0 target=fbs/nvidia0 variant.opensolaris.zone=global
 link path=dev/nvidia1 target=fbs/nvidia1 variant.opensolaris.zone=global
 link path=dev/nvidia10 target=fbs/nvidia10 variant.opensolaris.zone=global