From 4edf8e641432b64f22b3f2125b3640b73d53808a Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Wed, 30 Dec 2015 09:59:31 +0000
Subject: [PATCH] Don't sample /var/www/conf/modules.samples/, let webapps do
 that. Optionaly include /var/www/conf/modules/*.conf instead of
 /etc/apache2/modules/*.conf, this allows the usual MESSAGE linking from
 modules.samples/ to modules/ to work out-of-the-box.

ok sthen@
---
 www/apache-httpd/Makefile                              | 3 ++-
 www/apache-httpd/patches/patch-docs_conf_httpd_conf_in | 4 ++--
 www/apache-httpd/pkg/PLIST-main                        | 5 ++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/www/apache-httpd/Makefile b/www/apache-httpd/Makefile
index 98ca773d32a..92248ebe680 100644
--- a/www/apache-httpd/Makefile
+++ b/www/apache-httpd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.71 2015/12/23 14:51:55 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.72 2015/12/30 09:59:31 ajacoutot Exp $
 
 COMMENT-main=		apache HTTP server
 COMMENT-common=		shared files for Apache 1 and 2
@@ -10,6 +10,7 @@ PKGNAME=		apache-httpd-${V}
 PKGNAME-main=		${PKGNAME}
 FULLPKGNAME-common=	apache-httpd-common-${V}
 FULLPKGPATH-common=	www/apache-httpd,-common
+REVISION-main=		0
 
 CATEGORIES=		www net
 
diff --git a/www/apache-httpd/patches/patch-docs_conf_httpd_conf_in b/www/apache-httpd/patches/patch-docs_conf_httpd_conf_in
index 2249c391e2d..fea05feb7e5 100644
--- a/www/apache-httpd/patches/patch-docs_conf_httpd_conf_in
+++ b/www/apache-httpd/patches/patch-docs_conf_httpd_conf_in
@@ -1,4 +1,4 @@
-$OpenBSD: patch-docs_conf_httpd_conf_in,v 1.6 2015/12/23 14:51:55 ajacoutot Exp $
+$OpenBSD: patch-docs_conf_httpd_conf_in,v 1.7 2015/12/30 09:59:31 ajacoutot Exp $
 --- docs/conf/httpd.conf.in.orig	Tue Nov  3 12:58:58 2015
 +++ docs/conf/httpd.conf.in	Mon Dec 21 13:59:16 2015
 @@ -74,8 +74,8 @@ Listen @@Port@@
@@ -17,4 +17,4 @@ $OpenBSD: patch-docs_conf_httpd_conf_in,v 1.6 2015/12/23 14:51:55 ajacoutot Exp
  </IfModule>
  
 +# Include extra module configuration files
-+Include @rel_sysconfdir@/modules/*.conf
++IncludeOptional /var/www/conf/modules/*.conf
diff --git a/www/apache-httpd/pkg/PLIST-main b/www/apache-httpd/pkg/PLIST-main
index ce198d6b842..468b4198279 100644
--- a/www/apache-httpd/pkg/PLIST-main
+++ b/www/apache-httpd/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.9 2015/12/01 16:45:30 sthen Exp $
+@comment $OpenBSD: PLIST-main,v 1.10 2015/12/30 09:59:31 ajacoutot Exp $
 @pkgpath www/apache-httpd${FLAVOR_COMMA}
 @bin bin/ab
 bin/dbmmanage2
@@ -1358,8 +1358,7 @@ share/examples/apache2/conf/magic
 @sample ${CONFDIR}/magic
 share/examples/apache2/conf/mime.types
 @sample ${CONFDIR}/mime.types
-@sample ${CONFDIR}/modules/
-@sample ${CONFDIR}/modules.sample/
+@sample /var/www/conf/modules/
 share/examples/apache2/conf/original/
 share/examples/apache2/conf/original/extra/
 share/examples/apache2/conf/original/extra/httpd-autoindex.conf