Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/www/w3c-httpd/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/www/w3c-httpd/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- pkgsrc/www/w3c-httpd/Makefile	2006/01/08 20:45:45	1.16
+++ pkgsrc/www/w3c-httpd/Makefile	2006/01/12 17:37:17	1.17
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2006/01/08 20:45:45 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/01/12 17:37:17 rillig Exp $
 
 DISTNAME=	w3c-httpd-3.0A
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.w3.org/pub/httpd/ \
 		ftp://ftp-eu.w3.org/pub/httpd/
@@ -19,7 +20,12 @@ SUBST_FILES.strcasestr=	Daemon/Implement
 	Library/Implementation/HTString.h
 SUBST_SED.strcasestr=	-e "s,\([[:blank:]]\)\(strcasestr\),\1x\2,g"
 
-INSTALLATION_DIRS=	bin sbin
+EGDIR=			${PREFIX}/share/examples/w3c-httpd
+INSTALLATION_DIRS=	bin sbin share/examples/w3c-httpd
+
+.for f in all.conf caching.conf httpd.conf prot.conf proxy.conf
+CONF_FILES+=	${EGDIR:Q}/${f:Q}	${PKG_SYSCONFDIR}/${f:Q}
+.endfor
 
 pre-configure:
 .if !defined(MD5_PW)
@@ -34,7 +40,7 @@ pre-configure:
 do-install:
 	${INSTALL_DATA_DIR} ${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
+	${CP} ${WRKSRC}/server_root/config/*.conf ${EGDIR:Q}
 	${INSTALL_PROGRAM} ${WRKSRC}/Daemon/${OSNAME}/httpd ${PREFIX}/sbin/w3c-httpd
 	${INSTALL_PROGRAM} ${WRKSRC}/Daemon/${OSNAME}/htadm ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/Daemon/${OSNAME}/htimage ${PREFIX}/sbin