Upgrade to 1.3b6, now with loadable modules!

1 files changed, 20 insertions, 61 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 2819b5f10293..00c184ead5ea 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -3,77 +3,36 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 ache@nagual.pp.ru
 #
-# $Id: Makefile,v 1.45 1998/02/25 06:23:55 asami Exp $
+# $Id: Makefile,v 1.46 1998/03/12 04:05:01 ache Exp $
 #
 
-DISTNAME=       apache_1.3b5
-PKGNAME=        apache-1.3b5
+DISTNAME=       apache_1.3b6
+PKGNAME=        apache-1.3b6
 CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
-# bsd.port.mk can't handle different base directory per dist patch yet
-#PATCH_SITES=    ftp://www.apache.org/apache/dist/patches/apply_to_1.3b5/
-#PATCHFILES=     PR1847.patch PR1850.patch PR1889.patch
+#PATCH_SITES=    ftp://www.apache.org/apache/dist/patches/apply_to_1.3b6/
 
 MAINTAINER=     ache@freebsd.org
 
 NO_LATEST_LINK=	yes
 
-# Set it for local-supplied patch, f.e.
-# VERS_ID = mods-1.0/me
-
-post-patch:
-	@cd ${WRKSRC}/conf && \
-	for I in access.conf-dist srm.conf-dist; do \
-	    sed -e "s#@@ServerRoot@@#${PREFIX}/www#g" < $${I} > $${I}.new; \
-	    mv $${I}.new $${I}; \
-	done
-	@cd ${WRKSRC}/conf && \
-	sed -e "s#@@ServerRoot@@#${PREFIX}/etc/apache#g" < \
-		httpd.conf-dist > httpd.conf-dist.new && \
-	mv httpd.conf-dist.new httpd.conf-dist
-	@${RM} -rf ${WRKSRC}/icons/CVS
-.if defined(VERS_ID)
-	@cd ${WRKSRC}/src && \
-	mv Configuration Configuration.old && \
-	sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
-	< Configuration.old > Configuration
-.endif
-
-CONF_DIR=   ${PREFIX}/etc/apache
-MAN1=   apachectl.1 htpasswd.1
-MAN8=   httpd.8
-
-do-install:
-	install -d -m 755 -o bin -g bin ${CONF_DIR} ${PREFIX}/www/data \
-		${PREFIX}/www/icons ${PREFIX}/www/cgi-bin
-	${INSTALL_PROGRAM} ${WRKSRC}/src/httpd ${PREFIX}/sbin
-	cd ${WRKSRC}/src/support && \
-		${INSTALL_PROGRAM} htdigest htpasswd logresolve rotatelogs \
-		${PREFIX}/sbin
-	cd ${WRKSRC}/src/support && \
-		${INSTALL_SCRIPT} apachectl dbmmanage log_server_status \
-		${PREFIX}/sbin
-	${INSTALL_DATA} -o nobody ${WRKSRC}/icons/* ${PREFIX}/www/icons
-	${INSTALL_MAN} ${WRKSRC}/src/support/httpd.8 \
-		${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/src/support/htpasswd.1 \
-		       ${WRKSRC}/src/support/apachectl.1 \
-		${PREFIX}/man/man1
-	cd ${WRKSRC} && \
-	for file in httpd.conf srm.conf access.conf ; do \
-	    if [ ! -f ${CONF_DIR}/$$file ] ; then \
-		${INSTALL_DATA} conf/$$file-dist ${CONF_DIR}/$$file ; \
-	    fi ; \
-	    ${INSTALL_DATA} conf/$$file-dist ${CONF_DIR} ; \
-	done
-	cd ${WRKSRC} && \
-	for file in mime.types magic ; do \
-	    if [ ! -f ${CONF_DIR}/$$file ] ; then \
-		${INSTALL_DATA} conf/$$file ${CONF_DIR} ; \
-	    fi ; \
-	    ${INSTALL_DATA} conf/$$file ${CONF_DIR}/$${file}-dist ; \
-	done
+HAS_CONFIGURE=  yes
+CONFIGURE_ARGS+= --prefix=${PREFIX} \
+		 --localstatedir=/var \
+		 --datadir=${PREFIX}/www \
+		 --libexecdir=${PREFIX}/libexec/apache \
+		 --enable-shared=remain \
+		 --enable-module=most \
+		 --enable-module=auth_db \
+		 --disable-module=auth_dbm
+
+CONFIGURE_ENV+= \
+OPTIM='-DDOCUMENT_LOCATION=\\"'${PREFIX}'/www/data/\\" \
+-DDEFAULT_PATH=\\"/bin:/usr/bin:'${PREFIX}'/bin\\"'
+
+MAN1=   ab.1 apachectl.1 dbmmanage.1 htdigest.1 htpasswd.1
+MAN8=   apxs.8 httpd.8 logresolve.8 rotatelogs.8
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \