aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip M. Gollucci <pgollucci@FreeBSD.org>2010-05-27 21:27:03 +0000
committerPhilip M. Gollucci <pgollucci@FreeBSD.org>2010-05-27 21:27:03 +0000
commit6d5b320dddc44db8e41b3e5290051eab2d7f2e05 (patch)
tree6ee7e79c87d49b92e39b6b11c3fc1a7cd39fc85e
parentcac2d8276b1b29fd1a476a43025b2b68b58b29c5 (diff)
downloadports-6d5b320dddc44db8e41b3e5290051eab2d7f2e05.tar.gz
ports-6d5b320dddc44db8e41b3e5290051eab2d7f2e05.zip
- 2/3:
- consistently use APACHE PLIST_SUB var %%AP_NAME%% in pkg-plists PR: ports/147142 Reviewed by: portmgr (pav) With Hat: apache@
Notes
Notes: svn path=/head/; revision=255195
-rw-r--r--www/mod_accounting/pkg-plist4
-rw-r--r--www/mod_auth_cookie_mysql/pkg-plist4
-rw-r--r--www/mod_auth_form/pkg-plist4
-rw-r--r--www/mod_auth_kerb/pkg-plist4
-rw-r--r--www/mod_auth_kerb2/pkg-plist4
-rw-r--r--www/mod_auth_pam/pkg-plist4
-rw-r--r--www/mod_auth_pam2/pkg-plist2
-rw-r--r--www/mod_auth_pgsql/pkg-plist4
-rw-r--r--www/mod_auth_pubtkt/pkg-plist4
-rw-r--r--www/mod_auth_remote/pkg-plist4
-rw-r--r--www/mod_backhand/pkg-plist4
-rw-r--r--www/mod_bandwidth/pkg-plist2
-rw-r--r--www/mod_clamav/pkg-plist2
-rw-r--r--www/mod_cvs2/pkg-plist4
-rw-r--r--www/mod_dnssd/pkg-plist2
-rw-r--r--www/mod_dtcl/pkg-plist4
-rw-r--r--www/mod_fileiri/pkg-plist4
-rw-r--r--www/mod_gzip/pkg-plist4
-rw-r--r--www/mod_jk/pkg-plist4
-rw-r--r--www/mod_layout/pkg-plist4
-rw-r--r--www/mod_layout2/pkg-plist4
-rw-r--r--www/mod_limitipconn2/pkg-plist4
-rw-r--r--www/mod_line_edit/pkg-plist4
-rw-r--r--www/mod_log_firstbyte/pkg-plist4
-rw-r--r--www/mod_log_sql/pkg-plist4
-rw-r--r--www/mod_mp3/pkg-plist4
-rw-r--r--www/mod_musicindex/pkg-plist4
-rw-r--r--www/mod_ntlm/pkg-plist4
-rw-r--r--www/mod_proxy_xml/pkg-plist4
-rw-r--r--www/mod_put/pkg-plist4
-rw-r--r--www/mod_python3/pkg-plist4
-rw-r--r--www/mod_realip/pkg-plist4
-rw-r--r--www/mod_sed/pkg-plist4
-rw-r--r--www/mod_traf_thief/pkg-plist4
-rw-r--r--www/mod_tsunami/pkg-plist4
-rw-r--r--www/mod_xmlns/pkg-plist4
36 files changed, 68 insertions, 68 deletions
diff --git a/www/mod_accounting/pkg-plist b/www/mod_accounting/pkg-plist
index 85beb39cbd4d..d05d7b0beb28 100644
--- a/www/mod_accounting/pkg-plist
+++ b/www/mod_accounting/pkg-plist
@@ -1,6 +1,6 @@
%%APACHEMODDIR%%/mod_accounting.so
-@exec %D/sbin/apxs -e -a -n accounting %D/%f
-@unexec %D/sbin/apxs -e -A -n accounting %D/%f
+@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."
%%DATADIR%%/schema.sql
%%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/www/mod_auth_cookie_mysql/pkg-plist b/www/mod_auth_cookie_mysql/pkg-plist
index 0058de2b3b3b..d8c0ee8fc92f 100644
--- a/www/mod_auth_cookie_mysql/pkg-plist
+++ b/www/mod_auth_cookie_mysql/pkg-plist
@@ -1,6 +1,6 @@
%%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
+@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%f
+@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%f
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%EXAMPLESDIR%%/authform.tmpl
%%PORTDOCS%%%%EXAMPLESDIR%%/putcookie.cgi
diff --git a/www/mod_auth_form/pkg-plist b/www/mod_auth_form/pkg-plist
index df9b0141d24b..2d1edb0d7b67 100644
--- a/www/mod_auth_form/pkg-plist
+++ b/www/mod_auth_form/pkg-plist
@@ -3,5 +3,5 @@ lib/mod_auth_form.la
lib/mod_auth_form.so
lib/mod_auth_form.so.2
%%APACHEMODDIR%%/mod_auth_form.so
-@exec %D/sbin/apxs -e -a -n auth_form %D/%F
-@unexec %D/sbin/apxs -e -A -n auth_form %D/%F
+@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 570a53e915ea..1627a6be1d97 100644
--- a/www/mod_auth_kerb/pkg-plist
+++ b/www/mod_auth_kerb/pkg-plist
@@ -1,3 +1,3 @@
%%APACHEMODDIR%%/mod_auth_kerb.so
-@exec %D/sbin/apxs -e -a -n auth_kerb %D/%F
-@unexec %D/sbin/apxs -e -A -n auth_kerb %D/%F
+@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 570a53e915ea..1627a6be1d97 100644
--- a/www/mod_auth_kerb2/pkg-plist
+++ b/www/mod_auth_kerb2/pkg-plist
@@ -1,3 +1,3 @@
%%APACHEMODDIR%%/mod_auth_kerb.so
-@exec %D/sbin/apxs -e -a -n auth_kerb %D/%F
-@unexec %D/sbin/apxs -e -A -n auth_kerb %D/%F
+@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 56e29762c976..5808c091f525 100644
--- a/www/mod_auth_pam/pkg-plist
+++ b/www/mod_auth_pam/pkg-plist
@@ -1,6 +1,6 @@
%%APACHEMODDIR%%/mod_auth_pam.so
-@exec %D/sbin/apxs -e -a -n auth_pam %D/%F
-@unexec %D/sbin/apxs -e -A -n auth_pam %D/%F
+@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
%%PORTDOCS%%%%DOCSDIR%%/faq.txt
%%PORTDOCS%%%%DOCSDIR%%/samples/dot-htaccess
diff --git a/www/mod_auth_pam2/pkg-plist b/www/mod_auth_pam2/pkg-plist
index e4014bb730d4..51652e8b8e4b 100644
--- a/www/mod_auth_pam2/pkg-plist
+++ b/www/mod_auth_pam2/pkg-plist
@@ -3,7 +3,7 @@
%%PORTDOCS%%%%DOCSDIR%%/install.html
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%APACHEMODDIR%%/mod_auth_pam.so
-@exec %D/sbin/apxs -e -a -n auth_pam %D/%f
+@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%f
%%APACHEMODDIR%%/mod_auth_sys_group.so
@exec %D/sbin/apxs -e -a -n auth_sys_group %D/%f
%%EXAMPLESDIR%%/pam-httpd.sample
diff --git a/www/mod_auth_pgsql/pkg-plist b/www/mod_auth_pgsql/pkg-plist
index 202aa5fbb08c..1c2204bcf525 100644
--- a/www/mod_auth_pgsql/pkg-plist
+++ b/www/mod_auth_pgsql/pkg-plist
@@ -1,3 +1,3 @@
%%APACHEMODDIR%%/mod_auth_pgsql.so
-@exec %D/sbin/apxs -e -a -n auth_pgsql %f
-@unexec %D/sbin/apxs -e -A -n auth_pgsql %f
+@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %f
+@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %f
diff --git a/www/mod_auth_pubtkt/pkg-plist b/www/mod_auth_pubtkt/pkg-plist
index 81401c1d5ba2..9cfb27117181 100644
--- a/www/mod_auth_pubtkt/pkg-plist
+++ b/www/mod_auth_pubtkt/pkg-plist
@@ -1,4 +1,4 @@
%%APACHEMODDIR%%/mod_auth_pubtkt.so
-@exec %D/sbin/apxs -e -a -n auth_pubtkt %D/%f
-@unexec %D/sbin/apxs -e -A -n auth_pubtkt %D/%f
+@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 021d20973661..ae39de305b21 100644
--- a/www/mod_auth_remote/pkg-plist
+++ b/www/mod_auth_remote/pkg-plist
@@ -1,4 +1,4 @@
%%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
+@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 ae86e634c3e3..3e9ce38cba44 100644
--- a/www/mod_backhand/pkg-plist
+++ b/www/mod_backhand/pkg-plist
@@ -1,3 +1,3 @@
%%APACHEMODDIR%%/mod_backhand.so
-@exec %D/sbin/apxs -e -a -n backhand %D/%F
-@unexec %D/sbin/apxs -e -A -n backhand %D/%F
+@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 98c81b9ef2bc..72785277599b 100644
--- a/www/mod_bandwidth/pkg-plist
+++ b/www/mod_bandwidth/pkg-plist
@@ -1,4 +1,4 @@
%%APACHEMODDIR%%/mod_bandwidth.so
-@exec %D/sbin/apxs -e -a -n bandwidth %D/%f
+@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 146260182f13..ca98002c7715 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
-@exec %D/sbin/apxs -e -a -n clamav %D/%f
+@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%f
diff --git a/www/mod_cvs2/pkg-plist b/www/mod_cvs2/pkg-plist
index 53a4d57b8af0..2d2144905a14 100644
--- a/www/mod_cvs2/pkg-plist
+++ b/www/mod_cvs2/pkg-plist
@@ -1,4 +1,4 @@
%%APACHEMODDIR%%/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 %%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_dnssd/pkg-plist b/www/mod_dnssd/pkg-plist
index 7ba55de87652..f56157daf0a3 100644
--- a/www/mod_dnssd/pkg-plist
+++ b/www/mod_dnssd/pkg-plist
@@ -1,5 +1,5 @@
@unexec sed -i '' '/LoadModule %%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf
%%APACHEMODDIR%%/mod_dnssd.so
-@exec %D/sbin/apxs -e -a -n dnssd %D/%f || true
+@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%f || true
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/www/mod_dtcl/pkg-plist b/www/mod_dtcl/pkg-plist
index 0d4c0c25b49d..f9e3015d74c9 100644
--- a/www/mod_dtcl/pkg-plist
+++ b/www/mod_dtcl/pkg-plist
@@ -1,6 +1,6 @@
libexec/apache/mod_dtcl.so
-@exec %D/sbin/apxs -e -a -n dtcl %D/%F
-@unexec %D/sbin/apxs -e -A -n dtcl %D/%F
+@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
+@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
%%PORTDOCS%%share/doc/mod_dtcl/commands.html
%%PORTDOCS%%share/doc/mod_dtcl/directives.html
%%PORTDOCS%%share/doc/mod_dtcl/help.html
diff --git a/www/mod_fileiri/pkg-plist b/www/mod_fileiri/pkg-plist
index e06ed0ee93d3..1db2bc904408 100644
--- a/www/mod_fileiri/pkg-plist
+++ b/www/mod_fileiri/pkg-plist
@@ -1,3 +1,3 @@
%%APACHE_DIR%%/mod_fileiri.so
-@exec %D/sbin/apxs -e -a -n fileiri %D/%F
-@unexec %D/sbin/apxs -e -A -n fileiri %D/%F
+@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_gzip/pkg-plist b/www/mod_gzip/pkg-plist
index 9669ee61e567..03a662b0cf00 100644
--- a/www/mod_gzip/pkg-plist
+++ b/www/mod_gzip/pkg-plist
@@ -1,6 +1,6 @@
%%APACHEMODDIR%%/mod_gzip.so
-@exec %D/sbin/apxs -e -a -n gzip %f
-@unexec %D/sbin/apxs -e -A -n gzip %f
+@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %f
+@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %f
%%PORTDOCS%%%%DOCSDIR%%/browser.htm
%%PORTDOCS%%%%DOCSDIR%%/cache.htm
%%PORTDOCS%%%%DOCSDIR%%/config.htm
diff --git a/www/mod_jk/pkg-plist b/www/mod_jk/pkg-plist
index f2b7f6b58455..abde450d7eed 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
-@exec %D/sbin/apxs -e -a -n jk %f || true
-@unexec %D/sbin/apxs -e -A -n jk %f || true
+@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_layout/pkg-plist b/www/mod_layout/pkg-plist
index e0336a82bddb..217421fe29d1 100644
--- a/www/mod_layout/pkg-plist
+++ b/www/mod_layout/pkg-plist
@@ -1,7 +1,7 @@
@comment $FreeBSD$
%%APACHEMODDIR%%/mod_layout.so
-@exec %D/sbin/apxs -e -a -n layout %D/%f
-@unexec %D/sbin/apxs -e -A -n layout %D/%f
+@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."
%%PORTDOCS%%%%DOCSDIR%%/faq.html
%%PORTDOCS%%%%DOCSDIR%%/directives/Layout.html
diff --git a/www/mod_layout2/pkg-plist b/www/mod_layout2/pkg-plist
index bf1c66772308..b77b5805ea58 100644
--- a/www/mod_layout2/pkg-plist
+++ b/www/mod_layout2/pkg-plist
@@ -1,6 +1,6 @@
%%APACHEMODDIR%%/mod_layout.so
-@exec %D/sbin/apxs -e -a -n layout %D/%f
-@unexec %D/sbin/apxs -e -A -n layout %D/%f
+@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."
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/www/mod_limitipconn2/pkg-plist b/www/mod_limitipconn2/pkg-plist
index 893688a3c613..7e5390c6ec44 100644
--- a/www/mod_limitipconn2/pkg-plist
+++ b/www/mod_limitipconn2/pkg-plist
@@ -2,7 +2,7 @@
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/README
-@exec %D/sbin/apxs -e -a -n limitipconn %D/%f
-@unexec %D/sbin/apxs -e -A -n limitipconn %D/%f
+@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_limitipconn, you must manually remove"; echo "===> references to it in httpd.conf."
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/www/mod_line_edit/pkg-plist b/www/mod_line_edit/pkg-plist
index 53865ff2fab2..040fce7aba3e 100644
--- a/www/mod_line_edit/pkg-plist
+++ b/www/mod_line_edit/pkg-plist
@@ -1,3 +1,3 @@
%%APACHEMODDIR%%/mod_line_edit.so
-@exec %D/sbin/apxs -e -a -n line_edit %D/%F
-@unexec %D/sbin/apxs -e -A -n line_edit %D/%F
+@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_log_firstbyte/pkg-plist b/www/mod_log_firstbyte/pkg-plist
index 621dd23bc484..aaa3cf54e563 100644
--- a/www/mod_log_firstbyte/pkg-plist
+++ b/www/mod_log_firstbyte/pkg-plist
@@ -1,3 +1,3 @@
%%APACHEMODDIR%%/mod_log_firstbyte.so
-@exec %D/sbin/apxs -e -a -n log_firstbyte %D/%F
-@unexec %D/sbin/apxs -e -A -n log_firstbyte %D/%F
+@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_log_sql/pkg-plist b/www/mod_log_sql/pkg-plist
index 307c20bf8b41..f1fe4f0ba9fe 100644
--- a/www/mod_log_sql/pkg-plist
+++ b/www/mod_log_sql/pkg-plist
@@ -1,3 +1,3 @@
%%APACHEMODDIR%%/mod_log_sql.so
-@unexec %D/sbin/apxs -e -A -n log_sql %D%%APACHEMODDIR%%/mod_log_sql.so
-@exec %D/sbin/apxs -e -a -n log_sql %D%%APACHEMODDIR%%/mod_log_sql.so
+@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D%%APACHEMODDIR%%/mod_log_sql.so
+@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D%%APACHEMODDIR%%/mod_log_sql.so
diff --git a/www/mod_mp3/pkg-plist b/www/mod_mp3/pkg-plist
index 3af501ff603d..7afe05210e58 100644
--- a/www/mod_mp3/pkg-plist
+++ b/www/mod_mp3/pkg-plist
@@ -1,3 +1,3 @@
%%APACHEMODDIR%%/mod_mp3.so
-@exec %D/sbin/apxs -e -a -n mp3 %D/%F
-@unexec %D/sbin/apxs -e -A -n mp3 %D/%F
+@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 def296d0b9d2..3ac67dd23ba6 100644
--- a/www/mod_musicindex/pkg-plist
+++ b/www/mod_musicindex/pkg-plist
@@ -1,6 +1,6 @@
%%APACHEMODDIR%%/mod_musicindex.so
-@exec %D/sbin/apxs -e -a -n musicindex %D/%F
-@unexec %D/sbin/apxs -e -A -n musicindex %D/%F
+@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
%%DATADIR%%/directory.png
%%DATADIR%%/fetch.png
diff --git a/www/mod_ntlm/pkg-plist b/www/mod_ntlm/pkg-plist
index 66fcbb5dad58..61a6e7b76ab7 100644
--- a/www/mod_ntlm/pkg-plist
+++ b/www/mod_ntlm/pkg-plist
@@ -1,5 +1,5 @@
%%APACHEMODDIR%%/mod_ntlm.so
-@exec %D/sbin/apxs -e -a -n ntlm %D/%f
-@unexec %D/sbin/apxs -e -A -n ntlm %D/%F
+@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
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/www/mod_proxy_xml/pkg-plist b/www/mod_proxy_xml/pkg-plist
index 583fcb587080..afd95d630e52 100644
--- a/www/mod_proxy_xml/pkg-plist
+++ b/www/mod_proxy_xml/pkg-plist
@@ -1,3 +1,3 @@
%%APACHEMODDIR%%/mod_proxy_xml.so
-@exec %D/sbin/apxs -e -a -n proxy_xml %D/%F
-@unexec %D/sbin/apxs -e -A -n proxy_xml %D/%F
+@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 5bf19f1704c5..b9d291fc5eb5 100644
--- a/www/mod_put/pkg-plist
+++ b/www/mod_put/pkg-plist
@@ -1,5 +1,5 @@
%%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"
-@unexec ${PKG_PREFIX}/sbin/apxs -e -A -n put mod_put.so || echo " remove the mod_put from Apache's config manually"
+@exec ${PKG_PREFIX}/sbin/apxs -e -A -n %%AP_NAME%% mod_put.so; echo " enable the mod_put in Apache's config manually"
+@unexec ${PKG_PREFIX}/sbin/apxs -e -A -n %%AP_NAME%% mod_put.so || echo " remove the mod_put from Apache's config manually"
diff --git a/www/mod_python3/pkg-plist b/www/mod_python3/pkg-plist
index a4aacd20af24..3d3853e19f62 100644
--- a/www/mod_python3/pkg-plist
+++ b/www/mod_python3/pkg-plist
@@ -1,6 +1,6 @@
%%APACHEMODDIR%%/mod_python.so
-@exec %D/sbin/apxs -e -a -n python %f
-@unexec %D/sbin/apxs -e -A -n python %f
+@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
%%PYTHON_SITELIBDIR%%/mod_python/Cookie.pyc
%%PYTHON_SITELIBDIR%%/mod_python/Cookie.pyo
diff --git a/www/mod_realip/pkg-plist b/www/mod_realip/pkg-plist
index a8f749ff2da8..8d0146e55ce1 100644
--- a/www/mod_realip/pkg-plist
+++ b/www/mod_realip/pkg-plist
@@ -1,3 +1,3 @@
%%APACHEMODDIR%%/mod_realip.so
-@exec %D/sbin/apxs -e -a -n realip %D/%F
-@unexec %D/sbin/apxs -e -A -n realip %D/%F
+@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_sed/pkg-plist b/www/mod_sed/pkg-plist
index d44e9ff0040a..6fcc3575579f 100644
--- a/www/mod_sed/pkg-plist
+++ b/www/mod_sed/pkg-plist
@@ -1,3 +1,3 @@
%%APACHEMODDIR%%/mod_sed.so
-@exec %D/sbin/apxs -e -a -n sed %D/%F
-@unexec %D/sbin/apxs -e -A -n sed %D/%F
+@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_traf_thief/pkg-plist b/www/mod_traf_thief/pkg-plist
index e2e75d1d017b..44362b826d59 100644
--- a/www/mod_traf_thief/pkg-plist
+++ b/www/mod_traf_thief/pkg-plist
@@ -1,3 +1,3 @@
%%APACHEMODIR%%/%%APMODULE%%
-@exec %D/sbin/apxs -e -a -n traf_thief %D/%F
-@unexec %D/sbin/apxs -e -A -n traf_thief %D/%F
+@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_tsunami/pkg-plist b/www/mod_tsunami/pkg-plist
index 64664b3e7b8c..4169eeedde08 100644
--- a/www/mod_tsunami/pkg-plist
+++ b/www/mod_tsunami/pkg-plist
@@ -1,6 +1,6 @@
%%APACHEMODDIR%%/mod_tsunami.so
-@exec %D/sbin/apxs -e -a -n tsunami %D/%F
-@unexec %D/sbin/apxs -e -A -n tsunami %D/%F
+@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
%%PORTDOCS%%%%DOCSDIR%%/Changelog
%%PORTDOCS%%%%DOCSDIR%%/index.html
diff --git a/www/mod_xmlns/pkg-plist b/www/mod_xmlns/pkg-plist
index 6fb7f2cd1e7d..bc6f3bc01231 100644
--- a/www/mod_xmlns/pkg-plist
+++ b/www/mod_xmlns/pkg-plist
@@ -1,3 +1,3 @@
%%APACHEMODDIR%%/mod_xmlns.so
-@exec %D/sbin/apxs -e -a -n xmlns %D/%F
-@unexec %D/sbin/apxs -e -A -n xmlns %D/%F
+@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
+@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F