7946 package Apache panel separately
authorDavid Powell <David.Powell@sun.com>
Fri, 03 Apr 2009 18:31:42 -0700
changeset 255 af9a9c40d84f
parent 254 a4a503f15846
child 256 a570f2e29dbd
7946 package Apache panel separately
usr/src/pkgdefs/OSOLvpin-apache/Makefile
usr/src/pkgdefs/OSOLvpin-apache/copyright
usr/src/pkgdefs/OSOLvpin-apache/pkginfo
usr/src/pkgdefs/OSOLvpin-apache/prototype_com
usr/src/pkgdefs/OSOLvpin-apache/prototype_i386
usr/src/pkgdefs/OSOLvpin-apache/prototype_sparc
usr/src/pkgdefs/OSOLvpin/prototype_com
usr/src/pkgdefs/publish.ksh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/OSOLvpin-apache/Makefile	Fri Apr 03 18:31:42 2009 -0700
@@ -0,0 +1,31 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+include ../Makefile.env
+
+install: all pkg
+
+include ../Makefile.targ
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/OSOLvpin-apache/copyright	Fri Apr 03 18:31:42 2009 -0700
@@ -0,0 +1,25 @@
+
+Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+Use is subject to license terms.
+
+--------------------------------------------------------------------
+
+CDDL HEADER START
+
+The contents of this file are subject to the terms of the
+Common Development and Distribution License (the "License").
+You may not use this file except in compliance with the License.
+
+You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+or http://www.opensolaris.org/os/licensing.
+See the License for the specific language governing permissions
+and limitations under the License.
+
+When distributing Covered Code, include this CDDL HEADER in each
+file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+If applicable, add the following below this CDDL HEADER, with the
+fields enclosed by brackets "[]" replaced with your own identifying
+information: Portions Copyright [yyyy] [name of copyright owner]
+
+CDDL HEADER END
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/OSOLvpin-apache/pkginfo	Fri Apr 03 18:31:42 2009 -0700
@@ -0,0 +1,41 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+PKG="OSOLvpin-apache"
+NAME="Visual Panels Apache UI"
+ARCH="ISA"
+VERSION="1.0.0"
+MAXINST="1000"
+CATEGORY="system"
+DESC="Visual Panels Apache UI"
+VENDOR="http://www.opensolaris.org/os/project/vpanels/"
+HOTLINE="[email protected]"
+EMAIL="[email protected]"
+CLASSES="none"
+BASEDIR="/"
+SUNW_PKGVERS="1.0"
+SUNW_PRODNAME=SunOS
+SUNW_PKGTYPE=root
+SUNW_PRODVERS=5.11/vpanels-gate
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/OSOLvpin-apache/prototype_com	Fri Apr 03 18:31:42 2009 -0700
@@ -0,0 +1,54 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+# packaging files
+i pkginfo
+i copyright
+
+d none etc 755 root sys
+d none etc/vpanels 755 root sys
+f none etc/vpanels/httpd.conf.in 444 root sys
+f none etc/vpanels/httpd_conf.templ 444 root sys
+
+d none lib 755 root bin
+d none lib/svc 755 root bin
+d none lib/svc/method 755 root bin
+f none lib/svc/method/http-vpanels 555 root bin
+
+d none usr/share 755 root sys
+d none usr/share/applications 755 root other
+f none usr/share/applications/vp-apache.desktop 644 root bin
+
+d none usr/share/vpanels 755 root sys
+d none usr/share/vpanels/panel 755 root sys
+f none usr/share/vpanels/panel/vpanels-panels-apache.jar 644 root sys
+d none usr/share/vpanels/panels 755 root sys
+f none usr/share/vpanels/panels/apache.xml 444 root sys
+
+d none var/svc 755 root sys
+d none var/svc/manifest 755 root sys
+d none var/svc/manifest/network 755 root sys
+f manifest var/svc/manifest/network/http-vpanels.xml 444 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/OSOLvpin-apache/prototype_i386	Fri Apr 03 18:31:42 2009 -0700
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+!include prototype_com
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/OSOLvpin-apache/prototype_sparc	Fri Apr 03 18:31:42 2009 -0700
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+!include prototype_com
--- a/usr/src/pkgdefs/OSOLvpin/prototype_com	Fri Apr 03 20:58:03 2009 -0400
+++ b/usr/src/pkgdefs/OSOLvpin/prototype_com	Fri Apr 03 18:31:42 2009 -0700
@@ -42,14 +42,9 @@
 f none etc/cacao/instances/default/modules/org.opensolaris.os.vp.server.module.smf.SMFModule.xml 644 root sys
 f none etc/cacao/instances/default/modules/org.opensolaris.os.vp.server.module.uds.UDSConnectorModule.xml 644 root sys
 
-d none etc/vpanels 755 root sys
-f none etc/vpanels/httpd.conf.in 444 root sys
-f none etc/vpanels/httpd_conf.templ 444 root sys
-
 d none lib 755 root bin
 d none lib/svc 755 root bin
 d none lib/svc/method 755 root bin
-f none lib/svc/method/http-vpanels 555 root bin
 f none lib/svc/method/svc-cacaoinit 555 root bin
 
 d none usr 755 root sys
@@ -65,7 +60,6 @@
 
 d none usr/share 755 root sys
 d none usr/share/applications 755 root other
-f none usr/share/applications/vp-apache.desktop 644 root bin
 f none usr/share/applications/vp-coreadm.desktop 644 root bin
 
 # Technically these jars aren't public, but these locations are referenced by
@@ -82,13 +76,11 @@
 d none usr/share/vpanels 755 root sys
 f none usr/share/vpanels/TimingFramework-1.0.jar 644 root sys
 d none usr/share/vpanels/panel 755 root sys
-f none usr/share/vpanels/panel/vpanels-panels-apache.jar 644 root sys
 f none usr/share/vpanels/panel/vpanels-panels-coreadm.jar 644 root sys
 f none usr/share/vpanels/panel/vpanels-panels-sharemgr.jar 644 root sys
 f none usr/share/vpanels/panel/vpanels-panels-smf.jar 644 root sys
 f none usr/share/vpanels/panel/vpanels-panels-time.jar 644 root sys
 d none usr/share/vpanels/panels 755 root sys
-f none usr/share/vpanels/panels/apache.xml 444 root sys
 f none usr/share/vpanels/panels/coreadm.xml 444 root sys
 f none usr/share/vpanels/panels/sharemgr.xml 444 root sys
 f none usr/share/vpanels/panels/smf.xml 444 root sys
@@ -110,5 +102,3 @@
 d none var/svc/manifest/application 755 root sys
 d none var/svc/manifest/application/management 755 root sys
 f manifest var/svc/manifest/application/management/cacaoinit.xml 444 root sys
-d none var/svc/manifest/network 755 root sys
-f manifest var/svc/manifest/network/http-vpanels.xml 444 root sys
--- a/usr/src/pkgdefs/publish.ksh	Fri Apr 03 20:58:03 2009 -0400
+++ b/usr/src/pkgdefs/publish.ksh	Fri Apr 03 18:31:42 2009 -0700
@@ -41,8 +41,6 @@
 
 eval `pkgsend open pkg:/OSOLvpanels@$VERSION`
 pkgsend add set name=classification value="Applications/Configuration and Preferences"
-pkgsend add depend type=require fmri=pkg:/SUNWapch22
-pkgsend add depend type=require fmri=pkg:/SUNWapch22m-php52
 pkgsend add depend type=require fmri=pkg:/SUNWcacaort
 pkgsend add depend type=require fmri=pkg:/SUNWcacaowsvr
 pkgsend add depend type=require fmri=pkg:/SUNWgnome-base-libs-java
@@ -63,3 +61,11 @@
 pkgsend add depend type=require fmri=pkg:/OSOLvpanels@$VERSION
 pkgsend import OSOLvpin-sysid
 pkgsend close
+
+eval `pkgsend open pkg:/OSOLvpanels-apache@$VERSION`
+pkgsend add set name=classification value="Applications/Configuration and Preferences"
+pkgsend add depend type=require fmri=pkg:/OSOLvpanels@$VERSION
+pkgsend add depend type=require fmri=pkg:/SUNWapch22
+pkgsend add depend type=require fmri=pkg:/SUNWapch22m-php52
+pkgsend import OSOLvpin-apache
+pkgsend close