Use same directory structure as "apache" package.

2 files changed, 45 insertions, 46 deletions

diff --git a/www/w3c-httpd/Makefile b/www/w3c-httpd/Makefile
index 7b0fe6e0651..4b1ac89609f 100644
--- a/www/w3c-httpd/Makefile
+++ b/www/w3c-httpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/05/09 21:12:32 tron Exp $
+# $NetBSD: Makefile,v 1.3 1999/05/10 07:48:01 tron Exp $
 # FreeBSD Id: Makefile,v 1.19 1999/01/08 19:59:26 fenner Exp
 
 DISTNAME=	w3c-httpd-3.0A
@@ -11,8 +11,6 @@ HOMEPAGE=	http://www.w3.org/pub/WWW/Daemon/
 
 NO_WRKSUBDIR=	yes
 
-WWW_ROOT=	${PREFIX}/www
-
 pre-configure:
 .if !defined(MD5_PW)
 	@echo ""
@@ -24,14 +22,14 @@ pre-configure:
 .endif
 
 do-install:
-	${MKDIR} ${WWW_ROOT}/data ${WWW_ROOT}/cgi-bin ${WWW_ROOT}/htbin
-	${CP} -R ${WRKSRC}/server_root/icons $(WWW_ROOT)
-	${CP} ${WRKSRC}/server_root/config/*.conf $(PREFIX)/etc
-	${INSTALL_PROGRAM} ${WRKSRC}/Daemon/${OSNAME}/httpd ${PREFIX}/libexec
+	${MKDIR} ${PREFIX}/etc/w3c-httpd ${PREFIX}/share/w3c-httpd
+	${CP} -R ${WRKSRC}/server_root/icons ${PREFIX}/share/w3c-httpd
+	${CP} ${WRKSRC}/server_root/config/*.conf ${PREFIX}/etc/w3c-httpd
+	${INSTALL_PROGRAM} ${WRKSRC}/Daemon/${OSNAME}/httpd ${PREFIX}/sbin/w3c-httpd
 	${INSTALL_PROGRAM} ${WRKSRC}/Daemon/${OSNAME}/htadm ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/Daemon/${OSNAME}/htimage ${WWW_ROOT}/htbin
-	${INSTALL_PROGRAM} ${WRKSRC}/Daemon/${OSNAME}/cgiparse ${WWW_ROOT}/cgi-bin
-	${INSTALL_PROGRAM} ${WRKSRC}/Daemon/${OSNAME}/cgiutils ${WWW_ROOT}/cgi-bin
+	${INSTALL_PROGRAM} ${WRKSRC}/Daemon/${OSNAME}/htimage ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/Daemon/${OSNAME}/cgiparse ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/Daemon/${OSNAME}/cgiutils ${PREFIX}/sbin
 
 .include <../../mk/bsd.pkg.mk>
 
diff --git a/www/w3c-httpd/pkg/PLIST b/www/w3c-httpd/pkg/PLIST
index 3b764d3e1c3..b7f70e94799 100644
--- a/www/w3c-httpd/pkg/PLIST
+++ b/www/w3c-httpd/pkg/PLIST
@@ -1,37 +1,38 @@
-@comment $NetBSD: PLIST,v 1.2 1999/05/09 21:12:33 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/05/10 07:48:01 tron Exp $
 bin/htadm
-etc/all.conf
-etc/caching.conf
-etc/httpd.conf
-etc/prot.conf
-etc/proxy.conf
-libexec/httpd
-www/cgi-bin/cgiparse
-www/cgi-bin/cgiutils
-www/htbin/htimage
-www/icons/back.xbm
-www/icons/binary.xbm
-www/icons/binhex.xbm
-www/icons/blank.xbm
-www/icons/compressed.xbm
-www/icons/dir.gif
-www/icons/directory.xbm
-www/icons/doc.gif
-www/icons/doc.xbm
-www/icons/dummy.xbm
-www/icons/ftp.xbm
-www/icons/gzip.xbm
-www/icons/image.xbm
-www/icons/index.xbm
-www/icons/index2.xbm
-www/icons/movie.xbm
-www/icons/sound.xbm
-www/icons/tar.xbm
-www/icons/telnet.xbm
-www/icons/text.xbm
-www/icons/unknown.doc.xbm
-www/icons/unknown.old.xbm
-www/icons/unknown.xbm
-www/icons/uu.xbm
-@dirrm www/htbin
-@dirrm www/icons
+etc/w3c-httpd/all.conf
+etc/w3c-httpd/caching.conf
+etc/w3c-httpd/httpd.conf
+etc/w3c-httpd/prot.conf
+etc/w3c-httpd/proxy.conf
+sbin/htimage
+sbin/w3c-httpd
+sbin/cgiparse
+sbin/cgiutils
+share/w3c-httpd/icons/back.xbm
+share/w3c-httpd/icons/binary.xbm
+share/w3c-httpd/icons/binhex.xbm
+share/w3c-httpd/icons/blank.xbm
+share/w3c-httpd/icons/compressed.xbm
+share/w3c-httpd/icons/dir.gif
+share/w3c-httpd/icons/directory.xbm
+share/w3c-httpd/icons/doc.gif
+share/w3c-httpd/icons/doc.xbm
+share/w3c-httpd/icons/dummy.xbm
+share/w3c-httpd/icons/ftp.xbm
+share/w3c-httpd/icons/gzip.xbm
+share/w3c-httpd/icons/image.xbm
+share/w3c-httpd/icons/index.xbm
+share/w3c-httpd/icons/index2.xbm
+share/w3c-httpd/icons/movie.xbm
+share/w3c-httpd/icons/sound.xbm
+share/w3c-httpd/icons/tar.xbm
+share/w3c-httpd/icons/telnet.xbm
+share/w3c-httpd/icons/text.xbm
+share/w3c-httpd/icons/unknown.doc.xbm
+share/w3c-httpd/icons/unknown.old.xbm
+share/w3c-httpd/icons/unknown.xbm
+share/w3c-httpd/icons/uu.xbm
+@dirrm etc/w3c-httpd
+@dirrm share/w3c-httpd/icons
+@dirrm share/w3c-httpd