Bump Apache dependency to Apache 2

          --- old/usr/src/lib/print/mod_ipp/Makefile
          +++ new/usr/src/lib/print/mod_ipp/Makefile

   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 +# Copyright 2012 Nexenta Systems, Inc.  All rights reserved.
  22   23  # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  23   24  # Use is subject to license terms.
  24   25  #
  25   26  
  26      -LIBRARY =               mod_ipp.a
       27 +LIBRARY =       mod_ipp.a
  27   28  VERS =
  28      -OBJECTS = mod_ipp.o
       29 +OBJECTS =       mod_ipp.o
  29   30  
  30   31  include ../../Makefile.lib
  31   32  include ../../Makefile.rootfs
  32   33  
  33      -APACHEMODDIR =  $(ROOT)/usr/apache/libexec
  34      -APACHECONFDIR = $(ROOT)/etc/apache
       34 +APACHEMODDIR =  $(ROOT)/usr/apache2/2.2/libexec
       35 +APACHECONFDIR = $(ROOT)/etc/apache2/2.2
  35   36  LISTENERDIR =   $(ROOT)/var/lp/ipp-listener
  36   37  
  37      -ROOTDIRS =      $(ROOT)/usr/apache $(APACHEMODDIR) $(APACHECONFDIR) \
       38 +ROOTDIRS =      $(ROOT)/usr/apache2/2.2 $(APACHEMODDIR) $(APACHECONFDIR) \
  38   39                  $(ROOT)/var/lp $(LISTENERDIR)
  39   40  
  40   41  $(ROOT)/var/lp:=        DIRMODE = 775
  41   42  $(ROOT)/var/lp:=        FILEMODE = 775
  42   43  
  43   44  LIBS =                  $(DYNLIB)
  44   45  
  45   46  SRCS = $(OBJECTS:%.o = %.c)
  46   47  
  47      -
  48      -CFLAGS +=       $(CCVERBOSE)
       48 +APR_INC.cmd =   apr-1-config --includes
       49 +APU_INC.cmd =   apu-1-config --includes
       50 +CFLAGS +=       $(CCVERBOSE) -erroff=E_IMPLICIT_DECL_FUNC_RETURN_INT
  49   51  CPPFLAGS +=     -I../libipp-listener/common
  50   52  CPPFLAGS +=     -I../libipp-core/common
  51      -CPPFLAGS +=     -I/usr/apache/include
       53 +CPPFLAGS +=     -I/usr/apache2/2.2/include
       54 +CPPFLAGS +=     $(APR_INC.cmd:sh)
       55 +CPPFLAGS +=     $(APU_INC.cmd:sh)
  52   56  CPPFLAGS +=     -DEAPI
  53   57  ZDEFS =         $(ZNODEFS)
  54   58  
  55   59  MAPFILES =      mapfile
  56   60  
  57   61  LDLIBS +=       -lipp-listener -lipp-core -lpapi -lc
  58   62  
  59   63  #       SMF manifest
  60   64  MANIFEST=       ipp-listener.xml
  61   65  ROOTMANIFESTDIR=        $(ROOT)/lib/svc/manifest/application/print

  62   66  ROOTMANIFEST=           $(MANIFEST:%=$(ROOTMANIFESTDIR)/%)
  63   67  $(ROOTMANIFEST)         := FILEMODE= 444
  64   68  
  65   69  #       Apache module
  66   70  $(APACHEMODDIR)/$(LIBLINKS):    $(ROOTDIRS)
  67   71  
  68   72  #       Apache config
  69   73  APACHECONFFILE= $(APACHECONFDIR)/httpd-standalone-ipp.conf
  70   74  $(APACHECONFFILE)         := FILEMODE= 644
  71   75  LISTENERFILE=   $(LISTENERDIR)/index.html
  72   76  $(LISTENERFILE)         := FILEMODE= 444
  73   77  
  74   78  $(ROOT)/var/lp:=        FILEMODE = 0775
  75   79  
  76   80  $(APACHEMODDIR)/$(LIBLINKS):=   FILEMODE = 0555
  77   81  
  78   82  $(ROOTMANIFESTDIR)/% $(APACHEMODDIR)/% $(APACHECONFDIR)/% $(LISTENERDIR)/%:     %
  79   83          $(INS.file)
  80   84  
  81   85  $(ROOTDIRS):
  82   86          $(INS.dir)
  83   87  
  84   88  .KEEP_STATE:
  85   89  
  86   90  all:    $(LIBS)
  87   91  
  88   92  install:        all $(APACHEMODDIR)/$(LIBLINKS) $(APACHECONFFILE) \
  89   93                  $(LISTENERFILE) $(ROOTMANIFEST)
  90   94  
  91   95  install_h:
  92   96  
  93   97  lint:
  94   98  
  95   99  include ../../Makefile.targ

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX