- Respect "apache modules convention".

  When you install an apache module via ports or packages, ideally
  module must not alter configuration (not enabled by default)

10 files changed, 19 insertions, 12 deletions

diff --git a/www/mod_accounting/pkg-plist b/www/mod_accounting/pkg-plist
index 281cc503fbbe..5ed9eddda324 100644
--- a/www/mod_accounting/pkg-plist
+++ b/www/mod_accounting/pkg-plist
@@ -1,5 +1,6 @@
 libexec/apache/mod_accounting.so
-@exec %D/sbin/apxs -e -a -n accounting %D/%f
+@exec %D/sbin/apxs -e -A -n accounting %D/%f
+@unexec %D/sbin/apxs -e -A -n accounting %D/%f
 @unexec echo "===>  If you do not plan on reinstalling mod_accounting, you must manually remove"; echo "===>  references to it in httpd.conf."
 share/mod_accounting/schema.sql
 %%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/www/mod_auth_cookie_mysql/pkg-plist b/www/mod_auth_cookie_mysql/pkg-plist
index e635296f7988..1c1ee724f4ed 100644
--- a/www/mod_auth_cookie_mysql/pkg-plist
+++ b/www/mod_auth_cookie_mysql/pkg-plist
@@ -1,5 +1,6 @@
 libexec/apache/mod_auth_cookie_mysql.so
-@exec %D/sbin/apxs -e -a -n auth_cookie_mysql %D/%f
+@exec %D/sbin/apxs -e -A -n auth_cookie_mysql %D/%f
+@unexec %D/sbin/apxs -e -A -n auth_cookie_mysql %D/%f
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/authform.tmpl
 %%PORTDOCS%%%%EXAMPLESDIR%%/putcookie.cgi
diff --git a/www/mod_auth_pgsql2/pkg-plist b/www/mod_auth_pgsql2/pkg-plist
index 2dd545b64b6b..69e62af0c476 100644
--- a/www/mod_auth_pgsql2/pkg-plist
+++ b/www/mod_auth_pgsql2/pkg-plist
@@ -1,5 +1,6 @@
 libexec/apache2/mod_auth_pgsql.so
-@exec %D/sbin/apxs -e -a -n auth_pgsql %D/%f
+@exec %D/sbin/apxs -e -A -n auth_pgsql %D/%f
+@unexec %D/sbin/apxs -e -A -n auth_pgsql %D/%f
 %%PORTDOCS%%%%DOCSDIR%%/mod_auth_pgsql.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec echo "===>  If you do not plan on reinstalling mod_auth_pgsql, you must manually remove"; echo "===>  references to it in httpd.conf."
diff --git a/www/mod_cvs2/pkg-plist b/www/mod_cvs2/pkg-plist
index cb494f3c1163..000d98657b93 100644
--- a/www/mod_cvs2/pkg-plist
+++ b/www/mod_cvs2/pkg-plist
@@ -1,4 +1,4 @@
 libexec/apache2/mod_cvs.so
-@exec %D/sbin/apxs -e -a -n cvs %D/%f
-@unexec %D/sbin/apxs -e -a -n cvs %D/%f
+@exec %D/sbin/apxs -e -A -n cvs %D/%f
+@unexec %D/sbin/apxs -e -A -n cvs %D/%f
 @unexec echo "===>  If you do not plan on reinstalling mod_cvs, you must manually remove"; echo "===>  references to it in httpd.conf."
diff --git a/www/mod_injection/pkg-plist b/www/mod_injection/pkg-plist
index d6ca1bb52016..e9e26250e00b 100644
--- a/www/mod_injection/pkg-plist
+++ b/www/mod_injection/pkg-plist
@@ -1,5 +1,6 @@
 libexec/apache2/mod_injection.so
-@exec %D/sbin/apxs -e -a -n injection %D/%f
+@exec %D/sbin/apxs -e -A -n injection %D/%f
+@unexec %D/sbin/apxs -e -A -n injection %D/%f
 %%PORTDOCS%%%%DOCSDIR%%/manual/Makefile
 %%PORTDOCS%%%%DOCSDIR%%/manual/build.xml
 %%PORTDOCS%%%%DOCSDIR%%/manual/changelog.xml
diff --git a/www/mod_layout/pkg-plist b/www/mod_layout/pkg-plist
index 8bc9c2a7229e..9b2e2d1582df 100644
--- a/www/mod_layout/pkg-plist
+++ b/www/mod_layout/pkg-plist
@@ -1,6 +1,7 @@
 @comment $FreeBSD$
 libexec/apache/mod_layout.so
-@exec %D/sbin/apxs -e -a -n layout %D/%f
+@exec %D/sbin/apxs -e -A -n layout %D/%f
+@unexec %D/sbin/apxs -e -A -n layout %D/%f
 @unexec echo "===>  If you do not plan on reinstalling mod_layout, you must manually remove"; echo "===>  references to it in httpd.conf."
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/directives/Layout.html
diff --git a/www/mod_layout2/pkg-plist b/www/mod_layout2/pkg-plist
index ede244d95c11..efd625515636 100644
--- a/www/mod_layout2/pkg-plist
+++ b/www/mod_layout2/pkg-plist
@@ -1,5 +1,6 @@
 libexec/apache2/mod_layout.so
-@exec %D/sbin/apxs -e -a -n layout %D/%f
+@exec %D/sbin/apxs -e -A -n layout %D/%f
+@unexec %D/sbin/apxs -e -A -n layout %D/%f
 @unexec echo "===>  If you do not plan on reinstalling mod_layout, you must manually remove"; echo "===>  references to it in httpd.conf."
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/www/mod_layout22/pkg-plist b/www/mod_layout22/pkg-plist
index ede244d95c11..efd625515636 100644
--- a/www/mod_layout22/pkg-plist
+++ b/www/mod_layout22/pkg-plist
@@ -1,5 +1,6 @@
 libexec/apache2/mod_layout.so
-@exec %D/sbin/apxs -e -a -n layout %D/%f
+@exec %D/sbin/apxs -e -A -n layout %D/%f
+@unexec %D/sbin/apxs -e -A -n layout %D/%f
 @unexec echo "===>  If you do not plan on reinstalling mod_layout, you must manually remove"; echo "===>  references to it in httpd.conf."
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/www/mod_log_data/pkg-plist b/www/mod_log_data/pkg-plist
index 1222ccc92160..b633906e980b 100644
--- a/www/mod_log_data/pkg-plist
+++ b/www/mod_log_data/pkg-plist
@@ -1,4 +1,4 @@
 libexec/apache2/mod_log_data.so
-@exec %D/sbin/apxs -e -a -n log_data %D/%f
-@unexec %D/sbin/apxs -e -a -n log_data %D/%f
+@exec %D/sbin/apxs -e -A -n log_data %D/%f
+@unexec %D/sbin/apxs -e -A -n log_data %D/%f
 @unexec echo "===>  If you do not plan on reinstalling mod_log_data, you must manually remove"; echo "===>  references to it in httpd.conf."
diff --git a/www/mod_php3/pkg-plist b/www/mod_php3/pkg-plist
index aaf14991fa47..a27e2833d8ba 100644
--- a/www/mod_php3/pkg-plist
+++ b/www/mod_php3/pkg-plist
@@ -1,4 +1,4 @@
 etc/php3.ini-dist
 %%AP_LIBEXEC%%/libphp3.so
-@exec %D/sbin/apxs -e -a -n php3 %f
+@exec %D/sbin/apxs -e -A -n php3 %f
 @unexec %D/sbin/apxs -e -A -n php3 %f