--- a/usr/src/cmd/apache/Makefile.sfw Mon Feb 08 12:51:29 2010 +0200
+++ b/usr/src/cmd/apache/Makefile.sfw Mon Feb 08 15:41:40 2010 +0200
@@ -19,10 +19,10 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "@(#)Makefile.sfw 1.35 09/11/23 SMI"
+#ident "@(#)Makefile.sfw 1.36 10/01/14 SMI"
# Note to maintainers. I'm sorry...please forgive me for all
# that follows.
@@ -58,16 +58,6 @@
SSL_MODULE=mod_ssl-2.8.31-1.3.41
AUTH_GSS_MODULE=mod_auth_gss
-# the following is needed for jserv support
-# jserv is obsolete, but we need to keep it around until
-# we can officially EOF it
-#
-JSERV_MODULE=ApacheJServ-1.1.2
-JSDK=jsdk.jar # we don't build this ourself
-ROOTJSDKDIR=$(ROOT)/usr/apache/libexec
-ROOTJSDK=$(JSDK:%=$(ROOTJSDKDIR)/%)
-JSERV_MAKEFILES=jserv-makefiles
-
LDOPTS=-M $(SRC)/cmd/mapfile_noexstk -zcombreloc
# hack - webapp always uses gcc if it finds it, so we null out
@@ -87,7 +77,6 @@
MODULES= \
$(SSL_MODULE) \
$(PERL_MODULE) \
- $(JSERV_MODULE) \
$(TOMCATCON_MODULE)
# stuff to whack when we do 'make clean'
@@ -274,22 +263,6 @@
PERL=$(PERL) \
$(CCSMAKE) install)
-# currently, mod_jserv only likes to build with gnu make. So to
-# get around this, I have a bunch of makefiles that work with
-# regular make, and we drop these into the tree as "Makefile.sfw"
-# and build with them instead. Someday, maybe gmake will be in the
-# CBE and we can use it.
-
-$(JSERV_MODULE): $(ROOTJSDK)
- gzip -dc $(JSERV_MODULE).tar.gz | tar xopf -
- gpatch -p0 < ./Solaris/mod_jserv.patch
- (cd $(JSERV_MODULE); \
- gzip -dc ../$(JSERV_MAKEFILES).tar.gz| tar xopf - ; \
- sed s/apache_1.3.34/$(SERVER)/ src/c/Makefile.sfw > src/c/Makefile.sfw.new; \
- mv src/c/Makefile.sfw.new src/c/Makefile.sfw; \
- env MAKE=$(CCSMAKE) \
- $(CCSMAKE) -f Makefile.sfw)
-
$(TOMCATCON_MODULE): $(TOMCATCON_SOURCE)/native/config.status
(cd $(TOMCATCON_SOURCE)/native; env - \
PATH=$(SFW_PATH) \