--- a/usr/src/pkg/manifests/network-ipfilter.mf	Sun Jun 13 09:24:10 2010 +0800
+++ b/usr/src/pkg/manifests/network-ipfilter.mf	Sat Jun 12 23:20:18 2010 -0700
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri value=pkg:/network/ipfilter@$(PKGVERS)
@@ -30,11 +29,12 @@
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Administration and Configuration"
 set name=variant.arch value=$(ARCH)
-set name=variant.opensolaris.zone value=global value=nonglobal
 dir path=etc group=sys
 dir path=etc/ipf group=sys
 dir path=lib
 dir path=lib/svc
+dir path=lib/svc/manifest group=sys
+dir path=lib/svc/manifest/network group=sys
 dir path=lib/svc/method
 dir path=usr group=sys
 dir path=usr/kernel group=sys
@@ -53,12 +53,11 @@
 dir path=var group=sys
 dir path=var/db group=sys
 dir path=var/db/ipf group=sys
-dir path=lib/svc/manifest group=sys
-dir path=lib/svc/manifest/network group=sys
 driver name=ipf perms="* 0666 root sys" \
     policy="read_priv_set=sys_ip_config write_priv_set=sys_ip_config"
 file path=etc/ipf/ipf.conf group=sys original_name=SUNWipf:etc/ipf/ipf.conf \
     preserve=true
+file path=lib/svc/manifest/network/ipfilter.xml group=sys mode=0444
 file path=lib/svc/method/ipfilter mode=0555
 file path=usr/kernel/drv/$(ARCH64)/ipf group=sys
 $(i386_ONLY)file path=usr/kernel/drv/ipf group=sys
@@ -106,7 +105,6 @@
 file path=usr/share/ipfilter/examples/pool.conf
 file path=usr/share/ipfilter/examples/server
 file path=usr/share/ipfilter/examples/tcpstate
-file path=lib/svc/manifest/network/ipfilter.xml group=sys mode=0444
 hardlink path=usr/lib/ipf/ipftest target=../../../usr/lib/isaexec
 hardlink path=usr/sbin/ipf target=../../usr/lib/isaexec
 hardlink path=usr/sbin/ipfs target=../../usr/lib/isaexec