- Use APACHEMODDIR and APACHEETCDIR consistently in pkg-plists

- DO NOT bump PORTREVISION

12 files changed, 37 insertions, 37 deletions

diff --git a/www/apache-contrib/pkg-plist b/www/apache-contrib/pkg-plist
index 8fb765f93c1a..c3b2c6178c0f 100644
--- a/www/apache-contrib/pkg-plist
+++ b/www/apache-contrib/pkg-plist
@@ -1,26 +1,26 @@
 @comment $FreeBSD$
-libexec/apache/mod_allowdev.so
-libexec/apache/mod_auth_cookie.so
-libexec/apache/mod_auth_cookie_file.so
-%%PORTS%%libexec/apache/mod_auth_external.so
-libexec/apache/mod_auth_inst.so
-libexec/apache/mod_auth_system.so
-libexec/apache/mod_eaccess.so
-%%PORTS%%libexec/apache/mod_bandwidth.so
-libexec/apache/mod_cgisock.so
-libexec/apache/libcache.so
-libexec/apache/mod_urlcount.so
-libexec/apache/mod_disallow_id.so
-%%PORTS%%libexec/apache/mod_layout.so
-libexec/apache/mod_lock.so
-libexec/apache/mod_peephole.so
-%%PORTS%%libexec/apache/mod_put.so
-libexec/apache/mod_qs2ssi.so
-libexec/apache/mod_session.so
-%%PORTS%%libexec/apache/mod_ticket.so
-%%PORTS%%libexec/apache/mod_fastcgi.so
-%%PORTS%%libexec/apache/mod_cvs.so
-libexec/apache/mod_random.so
-%%PORTS%%libexec/apache/mod_roaming.so
-libexec/apache/mod_ip_forwarding.so
-libexec/apache/mod_macro.so
+%%APACHEMODDIR%%/mod_allowdev.so
+%%APACHEMODDIR%%/mod_auth_cookie.so
+%%APACHEMODDIR%%/mod_auth_cookie_file.so
+%%PORTS%%%%APACHEMODDIR%%/mod_auth_external.so
+%%APACHEMODDIR%%/mod_auth_inst.so
+%%APACHEMODDIR%%/mod_auth_system.so
+%%APACHEMODDIR%%/mod_eaccess.so
+%%PORTS%%%%APACHEMODDIR%%/mod_bandwidth.so
+%%APACHEMODDIR%%/mod_cgisock.so
+%%APACHEMODDIR%%/libcache.so
+%%APACHEMODDIR%%/mod_urlcount.so
+%%APACHEMODDIR%%/mod_disallow_id.so
+%%PORTS%%%%APACHEMODDIR%%/mod_layout.so
+%%APACHEMODDIR%%/mod_lock.so
+%%APACHEMODDIR%%/mod_peephole.so
+%%PORTS%%%%APACHEMODDIR%%/mod_put.so
+%%APACHEMODDIR%%/mod_qs2ssi.so
+%%APACHEMODDIR%%/mod_session.so
+%%PORTS%%%%APACHEMODDIR%%/mod_ticket.so
+%%PORTS%%%%APACHEMODDIR%%/mod_fastcgi.so
+%%PORTS%%%%APACHEMODDIR%%/mod_cvs.so
+%%APACHEMODDIR%%/mod_random.so
+%%PORTS%%%%APACHEMODDIR%%/mod_roaming.so
+%%APACHEMODDIR%%/mod_ip_forwarding.so
+%%APACHEMODDIR%%/mod_macro.so
diff --git a/www/auth_ldap/pkg-plist b/www/auth_ldap/pkg-plist
index 661fc6eebc15..dc7780462fcb 100644
--- a/www/auth_ldap/pkg-plist
+++ b/www/auth_ldap/pkg-plist
@@ -1,3 +1,3 @@
-libexec/apache/mod_auth_ldap.so
+%%APACHEMODDIR%%/mod_auth_ldap.so
 @exec %D/sbin/apxs -e -a -n auth_ldap %D/%F
 @unexec %D/sbin/apxs -e -A -n auth_ldap %D/%F
diff --git a/www/mod_accounting/pkg-plist b/www/mod_accounting/pkg-plist
index 23fc82a39c42..518cf42bb075 100644
--- a/www/mod_accounting/pkg-plist
+++ b/www/mod_accounting/pkg-plist
@@ -1,4 +1,4 @@
-libexec/apache/mod_accounting.so
+%%APACHEMODDIR%%/mod_accounting.so
 @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."
diff --git a/www/mod_auth_cookie_mysql/pkg-plist b/www/mod_auth_cookie_mysql/pkg-plist
index 1c1ee724f4ed..a9e57869fab9 100644
--- a/www/mod_auth_cookie_mysql/pkg-plist
+++ b/www/mod_auth_cookie_mysql/pkg-plist
@@ -1,4 +1,4 @@
-libexec/apache/mod_auth_cookie_mysql.so
+%%APACHEMODDIR%%/mod_auth_cookie_mysql.so
 @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
diff --git a/www/mod_auth_remote/pkg-plist b/www/mod_auth_remote/pkg-plist
index d10699c0d592..61da5e3bb310 100644
--- a/www/mod_auth_remote/pkg-plist
+++ b/www/mod_auth_remote/pkg-plist
@@ -1,4 +1,4 @@
-libexec/apache2/mod_auth_remote.so
+%%APACHEMODDIR%%/mod_auth_remote.so
 @exec %D/sbin/apxs -e -A -n auth_remote %D/%f
 @unexec %D/sbin/apxs -e -A -n auth_remote %D/%f
 @unexec echo "===>  If you do not plan on reinstalling mod_auth_remote, you must manually remove"; echo "===>  references to it in httpd.conf."
diff --git a/www/mod_backhand/pkg-plist b/www/mod_backhand/pkg-plist
index de4273343bd1..21fe35b3f851 100644
--- a/www/mod_backhand/pkg-plist
+++ b/www/mod_backhand/pkg-plist
@@ -1,3 +1,3 @@
-libexec/apache/mod_backhand.so
+%%APACHEMODDIR%%/mod_backhand.so
 @exec %D/sbin/apxs -e -A -n backhand %D/%F
 @unexec %D/sbin/apxs -e -A -n backhand %D/%F
diff --git a/www/mod_bandwidth/pkg-plist b/www/mod_bandwidth/pkg-plist
index 11e47b9839d6..9688967358e4 100644
--- a/www/mod_bandwidth/pkg-plist
+++ b/www/mod_bandwidth/pkg-plist
@@ -1,4 +1,4 @@
-libexec/apache/mod_bandwidth.so
+%%APACHEMODDIR%%/mod_bandwidth.so
 @exec %D/sbin/apxs -e -A -n bandwidth %D/%f
 sbin/cleanlink.pl
 @unexec echo "===>  If you do not plan on reinstalling mod_bandwidth, you must manually remove"; echo "===>  references to it in httpd.conf."
diff --git a/www/mod_layout/pkg-plist b/www/mod_layout/pkg-plist
index 9b2e2d1582df..142f43e2483d 100644
--- a/www/mod_layout/pkg-plist
+++ b/www/mod_layout/pkg-plist
@@ -1,5 +1,5 @@
 @comment $FreeBSD$
-libexec/apache/mod_layout.so
+%%APACHEMODDIR%%/mod_layout.so
 @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."
diff --git a/www/mod_layout2/pkg-plist b/www/mod_layout2/pkg-plist
index efd625515636..a53ad8b7a249 100644
--- a/www/mod_layout2/pkg-plist
+++ b/www/mod_layout2/pkg-plist
@@ -1,4 +1,4 @@
-libexec/apache2/mod_layout.so
+%%APACHEMODDIR%%/mod_layout.so
 @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."
diff --git a/www/mod_perl/pkg-plist b/www/mod_perl/pkg-plist
index 3d08941c0dfa..703b2cb90313 100644
--- a/www/mod_perl/pkg-plist
+++ b/www/mod_perl/pkg-plist
@@ -77,4 +77,4 @@
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/Constants
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache
-@dirrmtry etc/apache
+@dirrmtry %%APACHEETCDIR%%
diff --git a/www/mod_put/pkg-plist b/www/mod_put/pkg-plist
index 1f94b8812768..5bf19f1704c5 100644
--- a/www/mod_put/pkg-plist
+++ b/www/mod_put/pkg-plist
@@ -1,4 +1,4 @@
-libexec/apache/mod_put.so
+%%APACHEMODDIR%%/mod_put.so
 %%PORTDOCS%%share/doc/mod_put/mod_put.html
 %%PORTDOCS%%@dirrm share/doc/mod_put
 @exec ${PKG_PREFIX}/sbin/apxs -e -A -n put mod_put.so; echo "	enable the mod_put in Apache's config manually"
diff --git a/www/mod_roaming2/pkg-plist b/www/mod_roaming2/pkg-plist
index c7fd6b1dc460..569be30d0277 100644
--- a/www/mod_roaming2/pkg-plist
+++ b/www/mod_roaming2/pkg-plist
@@ -1,5 +1,5 @@
-etc/apache2/httpd.conf.mod_roaming
-libexec/apache2/mod_roaming.so
+%%APACHEETCDIR%%/httpd.conf.mod_roaming
+%%APACHEMODDIR%%/mod_roaming.so
 %%PORTDOCS%%share/doc/mod_roaming/CHANGES
 %%PORTDOCS%%share/doc/mod_roaming/INSTALL
 %%PORTDOCS%%share/doc/mod_roaming/LICENSE