Bump Apache dependency to Apache 2

          --- old/usr/src/pkg/manifests/print-lp-ipp-ipp-listener.mf
          +++ new/usr/src/pkg/manifests/print-lp-ipp-ipp-listener.mf

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  
  22   22  #
  23   23  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.

  24   24  #
  25   25  
  26   26  set name=pkg.fmri value=pkg:/print/lp/ipp/ipp-listener@$(PKGVERS)
  27   27  set name=pkg.description \
  28   28      value="Internet Printing Protocol(IPP) Apache module for listening service"
  29   29  set name=pkg.summary value="Internet Printing Protocol(IPP) listener module"
  30   30  set name=info.classification \
  31   31      value=org.opensolaris.category.2008:System/Printing
  32   32  set name=variant.arch value=$(ARCH)
  33   33  dir path=etc group=sys
  34      -dir path=etc/apache
       34 +dir path=etc/apache2
       35 +dir path=etc/apache2/2.2
  35   36  dir path=lib
  36   37  dir path=lib/svc
  37   38  dir path=lib/svc/manifest group=sys
  38   39  dir path=lib/svc/manifest/application group=sys
  39   40  dir path=lib/svc/manifest/application/print group=sys
  40   41  dir path=usr group=sys
  41      -dir path=usr/apache
  42      -dir path=usr/apache/libexec
       42 +dir path=usr/apache2
       43 +dir path=usr/apache2/2.2
       44 +dir path=usr/apache2/2.2/libexec
  43   45  dir path=var group=sys
  44   46  dir path=var/lp group=lp mode=0775 owner=lp
  45   47  dir path=var/lp/ipp-listener
  46      -file path=etc/apache/httpd-standalone-ipp.conf \
       48 +file path=etc/apache2/2.2/httpd-standalone-ipp.conf \
  47   49      original_name=SUNWippl:etc/apache/httpd-standalone-ipp.conf preserve=true
  48   50  file path=lib/svc/manifest/application/print/ipp-listener.xml group=sys \
  49   51      mode=0444
  50      -file path=usr/apache/libexec/mod_ipp.so mode=0555
       52 +file path=usr/apache2/2.2/libexec/mod_ipp.so mode=0555
  51   53  file path=var/lp/ipp-listener/index.html mode=0444
  52   54  legacy pkg=SUNWipplr \
  53   55      desc="Internet Printing Protocol(IPP) Apache configuration for service module" \
  54   56      name="Internet Printing Protocol(IPP) listener, (root)" \
  55   57      version=13.1,REV=2009.11.11
  56   58  legacy pkg=SUNWipplu \
  57   59      desc="Internet Printing Protocol(IPP) Apache module for listening service" \
  58   60      name="Internet Printing Protocol(IPP) listener module (/usr)" \
  59   61      version=13.1,REV=2009.11.11
  60   62  license cr_Sun license=cr_Sun
  61   63  license lic_CDDL license=lic_CDDL
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX