- use %%AP_MODULE%% PLIST_SUB var in pkg-plist s

PR:             ports/147143
Submitted by:   pgollucci@ (myself)
Reviewed by:    portmgr (pav)

34 files changed, 36 insertions, 36 deletions

diff --git a/www/mod_accounting/pkg-plist b/www/mod_accounting/pkg-plist
index d05d7b0beb28..75012af1d090 100644
--- a/www/mod_accounting/pkg-plist
+++ b/www/mod_accounting/pkg-plist
@@ -1,4 +1,4 @@
-%%APACHEMODDIR%%/mod_accounting.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%f
 @unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %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_form/pkg-plist b/www/mod_auth_form/pkg-plist
index 2d1edb0d7b67..7c946eb99af8 100644
--- a/www/mod_auth_form/pkg-plist
+++ b/www/mod_auth_form/pkg-plist
@@ -1,7 +1,7 @@
 lib/mod_auth_form.a
 lib/mod_auth_form.la
-lib/mod_auth_form.so
-lib/mod_auth_form.so.2
-%%APACHEMODDIR%%/mod_auth_form.so
+lib/%%AP_MODULE%%
+lib/%%AP_MODULE%%.2
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
 @unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
diff --git a/www/mod_auth_kerb/pkg-plist b/www/mod_auth_kerb/pkg-plist
index 1627a6be1d97..fb691e0a0509 100644
--- a/www/mod_auth_kerb/pkg-plist
+++ b/www/mod_auth_kerb/pkg-plist
@@ -1,3 +1,3 @@
-%%APACHEMODDIR%%/mod_auth_kerb.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
 @unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
diff --git a/www/mod_auth_kerb2/pkg-plist b/www/mod_auth_kerb2/pkg-plist
index 1627a6be1d97..fb691e0a0509 100644
--- a/www/mod_auth_kerb2/pkg-plist
+++ b/www/mod_auth_kerb2/pkg-plist
@@ -1,3 +1,3 @@
-%%APACHEMODDIR%%/mod_auth_kerb.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
 @unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
diff --git a/www/mod_auth_pam/pkg-plist b/www/mod_auth_pam/pkg-plist
index 5808c091f525..513e37fab1c5 100644
--- a/www/mod_auth_pam/pkg-plist
+++ b/www/mod_auth_pam/pkg-plist
@@ -1,4 +1,4 @@
-%%APACHEMODDIR%%/mod_auth_pam.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
 @unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
 %%PORTDOCS%%%%DOCSDIR%%/configure.txt
diff --git a/www/mod_auth_pubtkt/pkg-plist b/www/mod_auth_pubtkt/pkg-plist
index 9cfb27117181..8ba91ff77180 100644
--- a/www/mod_auth_pubtkt/pkg-plist
+++ b/www/mod_auth_pubtkt/pkg-plist
@@ -1,4 +1,4 @@
-%%APACHEMODDIR%%/mod_auth_pubtkt.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%f
 @unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%f
 @unexec echo "===>  If you do not plan on reinstalling mod_auth_pubtkt, you must manually remove"; echo "===>  references to it in httpd.conf."
diff --git a/www/mod_auth_remote/pkg-plist b/www/mod_auth_remote/pkg-plist
index ae39de305b21..abe8a11adfc5 100644
--- a/www/mod_auth_remote/pkg-plist
+++ b/www/mod_auth_remote/pkg-plist
@@ -1,4 +1,4 @@
-%%APACHEMODDIR%%/mod_auth_remote.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%f
 @unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %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 3e9ce38cba44..fb691e0a0509 100644
--- a/www/mod_backhand/pkg-plist
+++ b/www/mod_backhand/pkg-plist
@@ -1,3 +1,3 @@
-%%APACHEMODDIR%%/mod_backhand.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
 @unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
diff --git a/www/mod_bandwidth/pkg-plist b/www/mod_bandwidth/pkg-plist
index 72785277599b..151e108a4755 100644
--- a/www/mod_bandwidth/pkg-plist
+++ b/www/mod_bandwidth/pkg-plist
@@ -1,4 +1,4 @@
-%%APACHEMODDIR%%/mod_bandwidth.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %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_clamav/pkg-plist b/www/mod_clamav/pkg-plist
index ca98002c7715..c135a9884b7b 100644
--- a/www/mod_clamav/pkg-plist
+++ b/www/mod_clamav/pkg-plist
@@ -1,3 +1,3 @@
 @unexec /usr/bin/sed -i '' '/LoadModule %%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf
-%%APACHEMODDIR%%/mod_clamav.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%f
diff --git a/www/mod_cplusplus/pkg-plist b/www/mod_cplusplus/pkg-plist
index 91af842dd896..728a7f24eb5c 100644
--- a/www/mod_cplusplus/pkg-plist
+++ b/www/mod_cplusplus/pkg-plist
@@ -8,4 +8,4 @@
 %%APACHEINCLUDEDIR%%/env_value.h
 %%APACHEINCLUDEDIR%%/mod_cplusplus.h
 %%APACHEINCLUDEDIR%%/request_env.h
-%%APACHEMODDIR%%/mod_cplusplus.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
diff --git a/www/mod_cvs2/pkg-plist b/www/mod_cvs2/pkg-plist
index 2d2144905a14..43953b6b52b2 100644
--- a/www/mod_cvs2/pkg-plist
+++ b/www/mod_cvs2/pkg-plist
@@ -1,4 +1,4 @@
-%%APACHEMODDIR%%/mod_cvs.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%f
 @unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %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_fcgid/pkg-plist b/www/mod_fcgid/pkg-plist
index 8cee86c0e0df..9c4950496c69 100644
--- a/www/mod_fcgid/pkg-plist
+++ b/www/mod_fcgid/pkg-plist
@@ -1,4 +1,4 @@
-%%APACHEMODDIR%%/mod_fcgid.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 %%PORTDOCS%%%%DOCSDIR%%/mod_fcgid.html
 %%PORTDOCS%%%%DOCSDIR%%/mod_fcgid.html.en
 %%PORTDOCS%%@unexec /bin/rmdir %D/%%DOCSDIR%% 2>/dev/null || true
diff --git a/www/mod_gzip/pkg-plist b/www/mod_gzip/pkg-plist
index 03a662b0cf00..bb64629849b9 100644
--- a/www/mod_gzip/pkg-plist
+++ b/www/mod_gzip/pkg-plist
@@ -1,4 +1,4 @@
-%%APACHEMODDIR%%/mod_gzip.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %f
 @unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %f
 %%PORTDOCS%%%%DOCSDIR%%/browser.htm
diff --git a/www/mod_jk/pkg-plist b/www/mod_jk/pkg-plist
index abde450d7eed..50b4a9c5b509 100644
--- a/www/mod_jk/pkg-plist
+++ b/www/mod_jk/pkg-plist
@@ -1,5 +1,5 @@
 %%APACHEETCDIR%%/mod_jk.conf.sample
 %%APACHEETCDIR%%/workers.properties.sample
-%%APACHEMODDIR%%/mod_jk.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %f || true
 @unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %f || true
diff --git a/www/mod_layout2/pkg-plist b/www/mod_layout2/pkg-plist
index b77b5805ea58..c6a63e8a0982 100644
--- a/www/mod_layout2/pkg-plist
+++ b/www/mod_layout2/pkg-plist
@@ -1,4 +1,4 @@
-%%APACHEMODDIR%%/mod_layout.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%f
 @unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %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_limitipconn2/pkg-plist b/www/mod_limitipconn2/pkg-plist
index 7e5390c6ec44..c04317aac6ca 100644
--- a/www/mod_limitipconn2/pkg-plist
+++ b/www/mod_limitipconn2/pkg-plist
@@ -1,4 +1,4 @@
-%%APACHEMODDIR%%/mod_limitipconn.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/www/mod_log_firstbyte/pkg-plist b/www/mod_log_firstbyte/pkg-plist
index aaa3cf54e563..fb691e0a0509 100644
--- a/www/mod_log_firstbyte/pkg-plist
+++ b/www/mod_log_firstbyte/pkg-plist
@@ -1,3 +1,3 @@
-%%APACHEMODDIR%%/mod_log_firstbyte.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
 @unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
diff --git a/www/mod_memcache/pkg-plist b/www/mod_memcache/pkg-plist
index f1d748024a8a..9d37840b1310 100644
--- a/www/mod_memcache/pkg-plist
+++ b/www/mod_memcache/pkg-plist
@@ -1,4 +1,4 @@
 @comment $FreeBSD$
-%%APACHEMODDIR%%/mod_memcache.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 %%APACHEMODDIR%%/mod_memcache_example.so
 @dirrmtry %%APACHEMODDIR%%
diff --git a/www/mod_mono/pkg-plist b/www/mod_mono/pkg-plist
index dd256790f88f..f235b5187ed7 100644
--- a/www/mod_mono/pkg-plist
+++ b/www/mod_mono/pkg-plist
@@ -1,3 +1,3 @@
 @comment $FreeBSD$
 %%MOD_MONOCONFDIR%%/mod_mono.conf
-%%APACHEMODDIR%%/mod_mono.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
diff --git a/www/mod_mp3/pkg-plist b/www/mod_mp3/pkg-plist
index 7afe05210e58..fb691e0a0509 100644
--- a/www/mod_mp3/pkg-plist
+++ b/www/mod_mp3/pkg-plist
@@ -1,3 +1,3 @@
-%%APACHEMODDIR%%/mod_mp3.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
 @unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
diff --git a/www/mod_musicindex/pkg-plist b/www/mod_musicindex/pkg-plist
index 3ac67dd23ba6..26d0a588f01a 100644
--- a/www/mod_musicindex/pkg-plist
+++ b/www/mod_musicindex/pkg-plist
@@ -1,4 +1,4 @@
-%%APACHEMODDIR%%/mod_musicindex.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
 @unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
 %%DATADIR%%/musicindex.css
diff --git a/www/mod_ntlm/pkg-plist b/www/mod_ntlm/pkg-plist
index 61a6e7b76ab7..57cd569e9f01 100644
--- a/www/mod_ntlm/pkg-plist
+++ b/www/mod_ntlm/pkg-plist
@@ -1,4 +1,4 @@
-%%APACHEMODDIR%%/mod_ntlm.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%f
 @unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
 %%PORTDOCS%%%%DOCSDIR%%/mod_ntlm.html
diff --git a/www/mod_ntlm2/pkg-plist b/www/mod_ntlm2/pkg-plist
index dce22239e0ce..427c54cdb712 100644
--- a/www/mod_ntlm2/pkg-plist
+++ b/www/mod_ntlm2/pkg-plist
@@ -1,3 +1,3 @@
-%%APACHEMODDIR%%/mod_ntlm.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n ntlm %D/%f
 @unexec %D/sbin/apxs -e -A -n ntlm %D/%F
diff --git a/www/mod_proxy_xml/pkg-plist b/www/mod_proxy_xml/pkg-plist
index afd95d630e52..fb691e0a0509 100644
--- a/www/mod_proxy_xml/pkg-plist
+++ b/www/mod_proxy_xml/pkg-plist
@@ -1,3 +1,3 @@
-%%APACHEMODDIR%%/mod_proxy_xml.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
 @unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
diff --git a/www/mod_put/pkg-plist b/www/mod_put/pkg-plist
index b9d291fc5eb5..e01db39484c4 100644
--- a/www/mod_put/pkg-plist
+++ b/www/mod_put/pkg-plist
@@ -1,4 +1,4 @@
-%%APACHEMODDIR%%/mod_put.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 %%PORTDOCS%%share/doc/mod_put/mod_put.html
 %%PORTDOCS%%@dirrm share/doc/mod_put
 @exec ${PKG_PREFIX}/sbin/apxs -e -A -n %%AP_NAME%% mod_put.so; echo "	enable the mod_put in Apache's config manually"
diff --git a/www/mod_python/pkg-plist b/www/mod_python/pkg-plist
index 25f612bf46e9..e998365ef5e6 100644
--- a/www/mod_python/pkg-plist
+++ b/www/mod_python/pkg-plist
@@ -1,4 +1,4 @@
-%%APACHEMODDIR%%/mod_python.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 %%PYTHON_SITELIBDIR%%/mod_python/__init__.py
 %%PYTHON_SITELIBDIR%%/mod_python/apache.py
 %%PYTHON_SITELIBDIR%%/mod_python/cgihandler.py
diff --git a/www/mod_python3/pkg-plist b/www/mod_python3/pkg-plist
index 3d3853e19f62..18285f5fcdef 100644
--- a/www/mod_python3/pkg-plist
+++ b/www/mod_python3/pkg-plist
@@ -1,4 +1,4 @@
-%%APACHEMODDIR%%/mod_python.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %f
 @unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %f
 %%PYTHON_SITELIBDIR%%/mod_python/Cookie.py
diff --git a/www/mod_realip/pkg-plist b/www/mod_realip/pkg-plist
index 8d0146e55ce1..fb691e0a0509 100644
--- a/www/mod_realip/pkg-plist
+++ b/www/mod_realip/pkg-plist
@@ -1,3 +1,3 @@
-%%APACHEMODDIR%%/mod_realip.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
 @unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
diff --git a/www/mod_roaming2/pkg-plist b/www/mod_roaming2/pkg-plist
index 569be30d0277..d71cfb140206 100644
--- a/www/mod_roaming2/pkg-plist
+++ b/www/mod_roaming2/pkg-plist
@@ -1,5 +1,5 @@
 %%APACHEETCDIR%%/httpd.conf.mod_roaming
-%%APACHEMODDIR%%/mod_roaming.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 %%PORTDOCS%%share/doc/mod_roaming/CHANGES
 %%PORTDOCS%%share/doc/mod_roaming/INSTALL
 %%PORTDOCS%%share/doc/mod_roaming/LICENSE
diff --git a/www/mod_sed/pkg-plist b/www/mod_sed/pkg-plist
index 6fcc3575579f..fb691e0a0509 100644
--- a/www/mod_sed/pkg-plist
+++ b/www/mod_sed/pkg-plist
@@ -1,3 +1,3 @@
-%%APACHEMODDIR%%/mod_sed.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
 @unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
diff --git a/www/mod_transform/pkg-plist b/www/mod_transform/pkg-plist
index a7a8394f4959..605f77a6fff5 100644
--- a/www/mod_transform/pkg-plist
+++ b/www/mod_transform/pkg-plist
@@ -1,2 +1,2 @@
 %%APACHEINCLUDEDIR%%/mod_transform.h
-%%APACHEMODDIR%%/mod_transform.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
diff --git a/www/mod_tsunami/pkg-plist b/www/mod_tsunami/pkg-plist
index 4169eeedde08..d2f8742c964d 100644
--- a/www/mod_tsunami/pkg-plist
+++ b/www/mod_tsunami/pkg-plist
@@ -1,4 +1,4 @@
-%%APACHEMODDIR%%/mod_tsunami.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
 @unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
diff --git a/www/mod_xmlns/pkg-plist b/www/mod_xmlns/pkg-plist
index bc6f3bc01231..fb691e0a0509 100644
--- a/www/mod_xmlns/pkg-plist
+++ b/www/mod_xmlns/pkg-plist
@@ -1,3 +1,3 @@
-%%APACHEMODDIR%%/mod_xmlns.so
+%%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
 @unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F