Bump Apache dependency to Apache 2

*** 17,26 ****
--- 17,27 ----
  # information: Portions Copyright [yyyy] [name of copyright owner]
  #
  # CDDL HEADER END
  #
  #
+ # Copyright 2012 Nexenta Systems, Inc.  All rights reserved.
  # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  
  LIBRARY =       mod_ipp.a
*** 28,56 ****
  OBJECTS = mod_ipp.o
  
  include ../../Makefile.lib
  include ../../Makefile.rootfs
  
! APACHEMODDIR =  $(ROOT)/usr/apache/libexec
! APACHECONFDIR = $(ROOT)/etc/apache
  LISTENERDIR =   $(ROOT)/var/lp/ipp-listener
  
! ROOTDIRS =      $(ROOT)/usr/apache $(APACHEMODDIR) $(APACHECONFDIR) \
                  $(ROOT)/var/lp $(LISTENERDIR)
  
  $(ROOT)/var/lp:=        DIRMODE = 775
  $(ROOT)/var/lp:=        FILEMODE = 775
  
  LIBS =                  $(DYNLIB)
  
  SRCS = $(OBJECTS:%.o = %.c)
  
! 
! CFLAGS +=       $(CCVERBOSE)
  CPPFLAGS +=     -I../libipp-listener/common
  CPPFLAGS +=     -I../libipp-core/common
! CPPFLAGS +=     -I/usr/apache/include
  CPPFLAGS +=     -DEAPI
  ZDEFS =         $(ZNODEFS)
  
  MAPFILES =      mapfile
  
--- 29,60 ----
  OBJECTS =       mod_ipp.o
  
  include ../../Makefile.lib
  include ../../Makefile.rootfs
  
! APACHEMODDIR =  $(ROOT)/usr/apache2/2.2/libexec
! APACHECONFDIR = $(ROOT)/etc/apache2/2.2
  LISTENERDIR =   $(ROOT)/var/lp/ipp-listener
  
! ROOTDIRS =      $(ROOT)/usr/apache2/2.2 $(APACHEMODDIR) $(APACHECONFDIR) \
                  $(ROOT)/var/lp $(LISTENERDIR)
  
  $(ROOT)/var/lp:=        DIRMODE = 775
  $(ROOT)/var/lp:=        FILEMODE = 775
  
  LIBS =                  $(DYNLIB)
  
  SRCS = $(OBJECTS:%.o = %.c)
  
! APR_INC.cmd =   apr-1-config --includes
! APU_INC.cmd =   apu-1-config --includes
! CFLAGS +=       $(CCVERBOSE) -erroff=E_IMPLICIT_DECL_FUNC_RETURN_INT
  CPPFLAGS +=     -I../libipp-listener/common
  CPPFLAGS +=     -I../libipp-core/common
! CPPFLAGS +=     -I/usr/apache2/2.2/include
! CPPFLAGS +=     $(APR_INC.cmd:sh)
! CPPFLAGS +=     $(APU_INC.cmd:sh)
  CPPFLAGS +=     -DEAPI
  ZDEFS =         $(ZNODEFS)
  
  MAPFILES =      mapfile