[pkgsrc/trunk]: pkgsrc/www/apache2 - Backout recent APACHE_DEFAULT_FILES buil...

[adrianp <adrianp%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/77f9054c096a
branches:  trunk
changeset: 478041:77f9054c096a
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Thu Jul 15 04:38:17 2004 +0000

description:
- Backout recent APACHE_DEFAULT_FILES build def as some ppl are having
problems with it and it also looks like it might be breaking some
apache related packages.

diffstat:

 www/apache2/Makefile       |    32 +-
 www/apache2/PLIST          |  1421 +++++++++++++++++++++++++++++++++++++++++++-
 www/apache2/PLIST.deffiles |  1420 -------------------------------------------
 3 files changed, 1422 insertions(+), 1451 deletions(-)

diffs (truncated from 2921 to 300 lines):

diff -r 05bffff0f358 -r 77f9054c096a www/apache2/Makefile
--- a/www/apache2/Makefile      Thu Jul 15 04:08:00 2004 +0000
+++ b/www/apache2/Makefile      Thu Jul 15 04:38:17 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2004/07/14 14:36:48 seb Exp $
+# $NetBSD: Makefile,v 1.41 2004/07/15 04:38:17 adrianp Exp $
 
 PKGNAME=               apache-${APACHE_VERSION}
 CATEGORIES=            www
@@ -9,7 +9,7 @@
 CONFLICTS=             apache-*ssl-[0-9]* apache-[0-9]* apache6-[0-9]*
 CONFLICTS+=            ap-*-[0-9]*     # Apache-1.x DSOs
 
-BUILD_DEFS+=           USE_INET6 APACHE_DEFAULT_FILES
+BUILD_DEFS+=           USE_INET6
 
 USE_BUILDLINK3=                YES
 USE_PKGINSTALL=                YES
@@ -27,32 +27,6 @@
 CONFIGURE_ARGS+=       --with-apr=${LOCALBASE}
 CONFIGURE_ARGS+=       --with-apr-util=${LOCALBASE}
 
-#
-# APACHE_DEFAULT_FILES Notes:
-#
-# If this is defined as YES then you will basically get all the default files
-# that apapche installs.  On a default install this includes: 
-#
-#      ${PREFIX}/share/httpd/htdocs
-#      ${PREFIX}/libexec/cgi-bin
-#      ${PREFIX}/share/httpd/manual
-#      ${PREFIX}/share/httpd/icons
-#
-# The basic idea is that if you have customised your web root and you don't 
-# want the apache install/upgrade to add any files to your default web 
-# directories simply set this to YES.
-#
-# NOTE: Default error pages will always be installed regardless of what
-# APACHE_DEFAULT_FILES is set to.
-#
-.if defined(APACHE_DEFAULT_FILES) && !empty(APACHE_DEFAULT_FILES:M[Nn][Oo])
-INSTALL_TARGET=install install-error install-other install-include \
-       install-suexec install-man install-build
-.else
-APACHE_DEFAULT_FILES?= YES
-PLIST_SRC+=    ${PKGDIR}/PLIST ${PKGDIR}/PLIST.deffiles
-.endif
-
 .include "../../mk/bsd.prefs.mk"
 
 DFLT_APACHE_MODULES=   all
@@ -181,10 +155,8 @@
                ${MV} -f $${file}.new $${file};                         \
        done
 
-.if defined(APACHE_DEFAULT_FILES) && !empty(APACHE_DEFAULT_FILES:M[Yy][Ee][Ss])
        @${INSTALL_DATA_DIR} ${PREFIX}/share/httpd/manual
        @cd ${WRKSRC}/docs/manual && ${PAX} -rw . ${PREFIX}/share/httpd/manual
-.endif
 
        for file in ${FIX_PERMS}; do \
                ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/sbin/$$file && \
diff -r 05bffff0f358 -r 77f9054c096a www/apache2/PLIST
--- a/www/apache2/PLIST Thu Jul 15 04:08:00 2004 +0000
+++ b/www/apache2/PLIST Thu Jul 15 04:38:17 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2004/07/14 08:28:51 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.22 2004/07/15 04:38:17 adrianp Exp $
 include/httpd/ap_compat.h
 include/httpd/util_time.h
 include/httpd/util_script.h
@@ -110,6 +110,1425 @@
 share/httpd/error/HTTP_FORBIDDEN.html.var
 share/httpd/error/HTTP_BAD_REQUEST.html.var
 share/httpd/error/HTTP_BAD_GATEWAY.html.var
+libexec/cgi-bin/printenv
+libexec/cgi-bin/test-cgi
+share/httpd/htdocs/apache_pb.gif
+share/httpd/htdocs/index.html.zh-cn.gb2312
+share/httpd/htdocs/index.html.var
+share/httpd/htdocs/index.html.sv
+share/httpd/htdocs/index.html.ru.utf8
+share/httpd/htdocs/index.html.ru.koi8-r
+share/httpd/htdocs/index.html.ru.iso-ru
+share/httpd/htdocs/index.html.ru.cp866
+share/httpd/htdocs/index.html.ru.cp-1251
+share/httpd/htdocs/index.html.pt-br
+share/httpd/htdocs/index.html.pt
+share/httpd/htdocs/index.html.po.iso8859-2
+share/httpd/htdocs/index.html.no
+share/httpd/htdocs/index.html.nn
+share/httpd/htdocs/index.html.nl
+share/httpd/htdocs/index.html.lb.utf8
+share/httpd/htdocs/index.html.ko.euc-kr
+share/httpd/htdocs/index.html.ja.iso2022-jp
+share/httpd/htdocs/index.html.it
+share/httpd/htdocs/index.html.hr.iso8859-2
+share/httpd/htdocs/index.html.he.iso8859-8
+share/httpd/htdocs/index.html.fr
+share/httpd/htdocs/index.html.et
+share/httpd/htdocs/index.html.es
+share/httpd/htdocs/index.html.en
+share/httpd/htdocs/index.html.el
+share/httpd/htdocs/index.html.ee
+share/httpd/htdocs/index.html.dk
+share/httpd/htdocs/index.html.de
+share/httpd/htdocs/index.html.cz.iso8859-2
+share/httpd/htdocs/index.html.ca
+share/httpd/htdocs/apache_pb2_ani.gif
+share/httpd/htdocs/apache_pb2.png
+share/httpd/htdocs/apache_pb2.gif
+share/httpd/htdocs/apache_pb.png
+share/httpd/htdocs/index.html.zh-tw.big5
+share/httpd/icons/small/uu.png
+share/httpd/icons/small/back.gif
+share/httpd/icons/small/back.png
+share/httpd/icons/small/binary.gif
+share/httpd/icons/small/binary.png
+share/httpd/icons/small/binhex.gif
+share/httpd/icons/small/binhex.png
+share/httpd/icons/small/blank.gif
+share/httpd/icons/small/blank.png
+share/httpd/icons/small/broken.gif
+share/httpd/icons/small/broken.png
+share/httpd/icons/small/burst.gif
+share/httpd/icons/small/burst.png
+share/httpd/icons/small/comp1.gif
+share/httpd/icons/small/comp1.png
+share/httpd/icons/small/comp2.gif
+share/httpd/icons/small/comp2.png
+share/httpd/icons/small/compressed.gif
+share/httpd/icons/small/compressed.png
+share/httpd/icons/small/continued.gif
+share/httpd/icons/small/continued.png
+share/httpd/icons/small/dir.gif
+share/httpd/icons/small/dir.png
+share/httpd/icons/small/dir2.gif
+share/httpd/icons/small/dir2.png
+share/httpd/icons/small/doc.gif
+share/httpd/icons/small/doc.png
+share/httpd/icons/small/forward.gif
+share/httpd/icons/small/forward.png
+share/httpd/icons/small/generic.gif
+share/httpd/icons/small/generic.png
+share/httpd/icons/small/generic2.gif
+share/httpd/icons/small/generic2.png
+share/httpd/icons/small/generic3.gif
+share/httpd/icons/small/generic3.png
+share/httpd/icons/small/image.gif
+share/httpd/icons/small/image.png
+share/httpd/icons/small/image2.gif
+share/httpd/icons/small/image2.png
+share/httpd/icons/small/index.gif
+share/httpd/icons/small/index.png
+share/httpd/icons/small/key.gif
+share/httpd/icons/small/key.png
+share/httpd/icons/small/movie.gif
+share/httpd/icons/small/movie.png
+share/httpd/icons/small/patch.gif
+share/httpd/icons/small/patch.png
+share/httpd/icons/small/ps.gif
+share/httpd/icons/small/ps.png
+share/httpd/icons/small/rainbow.gif
+share/httpd/icons/small/rainbow.png
+share/httpd/icons/small/sound.gif
+share/httpd/icons/small/sound.png
+share/httpd/icons/small/sound2.gif
+share/httpd/icons/small/sound2.png
+share/httpd/icons/small/tar.gif
+share/httpd/icons/small/tar.png
+share/httpd/icons/small/text.gif
+share/httpd/icons/small/text.png
+share/httpd/icons/small/transfer.gif
+share/httpd/icons/small/transfer.png
+share/httpd/icons/small/unknown.gif
+share/httpd/icons/small/unknown.png
+share/httpd/icons/small/uu.gif
+share/httpd/icons/small/README.txt
+share/httpd/icons/world2.gif
+share/httpd/icons/world1.png
+share/httpd/icons/world1.gif
+share/httpd/icons/uuencoded.png
+share/httpd/icons/uuencoded.gif
+share/httpd/icons/uu.png
+share/httpd/icons/uu.gif
+share/httpd/icons/up.png
+share/httpd/icons/up.gif
+share/httpd/icons/unknown.png
+share/httpd/icons/unknown.gif
+share/httpd/icons/transfer.png
+share/httpd/icons/transfer.gif
+share/httpd/icons/text.png
+share/httpd/icons/text.gif
+share/httpd/icons/tex.png
+share/httpd/icons/tex.gif
+share/httpd/icons/tar.png
+share/httpd/icons/tar.gif
+share/httpd/icons/sphere2.png
+share/httpd/icons/sphere2.gif
+share/httpd/icons/sphere1.png
+share/httpd/icons/sphere1.gif
+share/httpd/icons/sound2.png
+share/httpd/icons/sound2.gif
+share/httpd/icons/sound1.png
+share/httpd/icons/sound1.gif
+share/httpd/icons/script.png
+share/httpd/icons/script.gif
+share/httpd/icons/screw2.png
+share/httpd/icons/screw2.gif
+share/httpd/icons/screw1.png
+share/httpd/icons/screw1.gif
+share/httpd/icons/right.png
+share/httpd/icons/right.gif
+share/httpd/icons/quill.png
+share/httpd/icons/quill.gif
+share/httpd/icons/ps.png
+share/httpd/icons/ps.gif
+share/httpd/icons/portal.png
+share/httpd/icons/portal.gif
+share/httpd/icons/pie8.png
+share/httpd/icons/pie8.gif
+share/httpd/icons/pie7.png
+share/httpd/icons/pie7.gif
+share/httpd/icons/pie6.png
+share/httpd/icons/pie6.gif
+share/httpd/icons/pie5.png
+share/httpd/icons/pie5.gif
+share/httpd/icons/pie4.png
+share/httpd/icons/pie4.gif
+share/httpd/icons/pie3.png
+share/httpd/icons/pie3.gif
+share/httpd/icons/pie2.png
+share/httpd/icons/pie2.gif
+share/httpd/icons/pie1.png
+share/httpd/icons/pie1.gif
+share/httpd/icons/pie0.png
+share/httpd/icons/pie0.gif
+share/httpd/icons/pdf.png
+share/httpd/icons/pdf.gif
+share/httpd/icons/patch.png
+share/httpd/icons/patch.gif
+share/httpd/icons/p.png
+share/httpd/icons/p.gif
+share/httpd/icons/movie.png
+share/httpd/icons/movie.gif
+share/httpd/icons/link.png
+share/httpd/icons/link.gif
+share/httpd/icons/left.png
+share/httpd/icons/left.gif
+share/httpd/icons/layout.png
+share/httpd/icons/layout.gif
+share/httpd/icons/index.png
+share/httpd/icons/index.gif
+share/httpd/icons/image3.png
+share/httpd/icons/image3.gif
+share/httpd/icons/image2.png
+share/httpd/icons/image2.gif
+share/httpd/icons/image1.png
+share/httpd/icons/image1.gif
+share/httpd/icons/icon.sheet.png
+share/httpd/icons/icon.sheet.gif
+share/httpd/icons/hand.up.png
+share/httpd/icons/hand.up.gif
+share/httpd/icons/hand.right.png
+share/httpd/icons/hand.right.gif
+share/httpd/icons/generic.sec.png
+share/httpd/icons/generic.sec.gif
+share/httpd/icons/generic.red.png
+share/httpd/icons/generic.red.gif
+share/httpd/icons/generic.png
+share/httpd/icons/generic.gif
+share/httpd/icons/forward.png
+share/httpd/icons/forward.gif
+share/httpd/icons/folder.sec.png
+share/httpd/icons/folder.sec.gif
+share/httpd/icons/folder.png
+share/httpd/icons/folder.open.png
+share/httpd/icons/folder.open.gif
+share/httpd/icons/folder.gif
+share/httpd/icons/f.png
+share/httpd/icons/f.gif
+share/httpd/icons/dvi.png
+share/httpd/icons/dvi.gif
+share/httpd/icons/down.png
+share/httpd/icons/down.gif
+share/httpd/icons/diskimg.png
+share/httpd/icons/diskimg.gif
+share/httpd/icons/dir.png
+share/httpd/icons/dir.gif
+share/httpd/icons/continued.png
+share/httpd/icons/continued.gif
+share/httpd/icons/compressed.png
+share/httpd/icons/compressed.gif
+share/httpd/icons/comp.gray.png
+share/httpd/icons/comp.gray.gif
+share/httpd/icons/comp.blue.png
+share/httpd/icons/comp.blue.gif
+share/httpd/icons/c.png
+share/httpd/icons/c.gif
+share/httpd/icons/burst.png