Date: Thu, 27 May 2010 15:02:19 -0400 (EDT) From: "Philip M. Gollucci" <pgollucci@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: apache@FreeBSD.org Subject: ports/147142: mod_*/pkg-plist fix: [patch] use %%AP_NAME%% Message-ID: <201005271902.o4RJ2JZW061768@frieza.p6m7g8.net> Resent-Message-ID: <201005271910.o4RJA1Ac061138@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 147142
>Category: ports
>Synopsis: mod_*/pkg-plist fix: [patch] use %%AP_NAME%%
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu May 27 19:10:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Philip M. Gollucci
>Release: FreeBSD 9.0-CURRENT amd64
>Organization:
RideCharge Inc.
>Environment:
System: FreeBSD frieza.p6m7g8.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Mon Apr 26 16:20:00 EDT 2010 root@frieza.p6m7g8.net:/usr/obj/usr/src/sys/FRIEZA amd64
>Description:
Use PLIST_SUB %%AP_NAME%%
>How-To-Repeat:
>Fix:
--- ap_name.diff begins here ---
Index: mod_accounting/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_accounting/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- mod_accounting/pkg-plist 17 May 2009 09:28:50 -0000 1.5
+++ mod_accounting/pkg-plist 27 May 2010 18:55:00 -0000
@@ -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
Index: mod_auth_cookie_mysql/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_auth_cookie_mysql/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- mod_auth_cookie_mysql/pkg-plist 17 May 2009 09:28:50 -0000 1.3
+++ mod_auth_cookie_mysql/pkg-plist 27 May 2010 18:55:01 -0000
@@ -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
Index: mod_auth_form/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_auth_form/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- mod_auth_form/pkg-plist 16 Feb 2008 08:54:06 -0000 1.1
+++ mod_auth_form/pkg-plist 27 May 2010 18:55:01 -0000
@@ -3,5 +3,5 @@
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
Index: mod_auth_kerb/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_auth_kerb/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- mod_auth_kerb/pkg-plist 11 May 2009 07:35:41 -0000 1.3
+++ mod_auth_kerb/pkg-plist 27 May 2010 18:55:01 -0000
@@ -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
Index: mod_auth_kerb2/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_auth_kerb2/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- mod_auth_kerb2/pkg-plist 11 May 2009 07:42:53 -0000 1.4
+++ mod_auth_kerb2/pkg-plist 27 May 2010 18:55:02 -0000
@@ -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
Index: mod_auth_pam/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_auth_pam/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- mod_auth_pam/pkg-plist 31 May 2009 18:31:45 -0000 1.3
+++ mod_auth_pam/pkg-plist 27 May 2010 18:55:02 -0000
@@ -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
Index: mod_auth_pam2/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_auth_pam2/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- mod_auth_pam2/pkg-plist 18 Jul 2006 08:27:57 -0000 1.2
+++ mod_auth_pam2/pkg-plist 27 May 2010 18:55:02 -0000
@@ -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
Index: mod_auth_pgsql/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_auth_pgsql/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- mod_auth_pgsql/pkg-plist 13 Apr 2009 02:27:07 -0000 1.4
+++ mod_auth_pgsql/pkg-plist 27 May 2010 18:55:03 -0000
@@ -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
Index: mod_auth_pubtkt/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_auth_pubtkt/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- mod_auth_pubtkt/pkg-plist 18 Jul 2009 16:50:55 -0000 1.1
+++ mod_auth_pubtkt/pkg-plist 27 May 2010 18:55:03 -0000
@@ -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."
Index: mod_auth_remote/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_auth_remote/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- mod_auth_remote/pkg-plist 17 May 2009 09:28:50 -0000 1.3
+++ mod_auth_remote/pkg-plist 27 May 2010 18:55:03 -0000
@@ -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."
Index: mod_backhand/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_backhand/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- mod_backhand/pkg-plist 17 May 2009 09:28:50 -0000 1.2
+++ mod_backhand/pkg-plist 27 May 2010 18:55:03 -0000
@@ -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
Index: mod_bandwidth/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_bandwidth/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- mod_bandwidth/pkg-plist 17 May 2009 09:28:50 -0000 1.3
+++ mod_bandwidth/pkg-plist 27 May 2010 18:55:04 -0000
@@ -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."
Index: mod_cband/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_cband/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- mod_cband/pkg-plist 4 Dec 2005 17:21:21 -0000 1.1
+++ mod_cband/pkg-plist 27 May 2010 18:28:20 -0000
@@ -1,4 +1,4 @@
@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%%APACHEMODDIR%%/%%AP_MODULE%%
%%APACHEMODDIR%%/%%AP_MODULE%%
-@exec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
+@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
@unexec echo "Don't forget to remove all mod_cband-related directives in your httpd.conf"
Index: mod_clamav/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_clamav/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- mod_clamav/pkg-plist 9 Jun 2009 14:41:37 -0000 1.3
+++ mod_clamav/pkg-plist 27 May 2010 18:55:04 -0000
@@ -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
Index: mod_cvs2/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_cvs2/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- mod_cvs2/pkg-plist 12 Apr 2009 00:06:59 -0000 1.3
+++ mod_cvs2/pkg-plist 27 May 2010 18:55:04 -0000
@@ -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."
Index: mod_dnssd/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_dnssd/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- mod_dnssd/pkg-plist 19 Mar 2009 19:40:42 -0000 1.2
+++ mod_dnssd/pkg-plist 27 May 2010 18:55:04 -0000
@@ -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%%
Index: mod_dtcl/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_dtcl/pkg-plist,v
retrieving revision 1.8
diff -u -r1.8 pkg-plist
--- mod_dtcl/pkg-plist 30 Sep 2001 15:34:50 -0000 1.8
+++ mod_dtcl/pkg-plist 27 May 2010 18:55:05 -0000
@@ -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
Index: mod_fileiri/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_fileiri/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- mod_fileiri/pkg-plist 28 May 2008 12:36:05 -0000 1.1
+++ mod_fileiri/pkg-plist 27 May 2010 18:55:05 -0000
@@ -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
Index: mod_gzip/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_gzip/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- mod_gzip/pkg-plist 28 Apr 2009 06:10:54 -0000 1.6
+++ mod_gzip/pkg-plist 27 May 2010 18:55:05 -0000
@@ -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
Index: mod_h264_streaming/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_h264_streaming/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- mod_h264_streaming/pkg-plist 8 May 2010 08:32:16 -0000 1.1
+++ mod_h264_streaming/pkg-plist 27 May 2010 18:28:20 -0000
@@ -1,4 +1,4 @@
@unexec %%SED%% -i '' '/LoadModule %%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf
%%APACHEMODDIR%%/%%AP_MODULE%%
-@exec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
+@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
@unexec echo "Don't forget to remove all mod_h264_streaming-related directives in your httpd.conf"
Index: mod_jk/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_jk/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- mod_jk/pkg-plist 14 Aug 2006 07:49:52 -0000 1.4
+++ mod_jk/pkg-plist 27 May 2010 18:55:06 -0000
@@ -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
Index: mod_layout/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_layout/pkg-plist,v
retrieving revision 1.7
diff -u -r1.7 pkg-plist
--- mod_layout/pkg-plist 17 May 2009 09:28:51 -0000 1.7
+++ mod_layout/pkg-plist 27 May 2010 18:55:06 -0000
@@ -1,7 +1,7 @@
@comment $FreeBSD: ports/www/mod_layout/pkg-plist,v 1.7 2009/05/17 09:28:51 pgollucci Exp $
%%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
Index: mod_layout2/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_layout2/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- mod_layout2/pkg-plist 17 May 2009 09:28:51 -0000 1.4
+++ mod_layout2/pkg-plist 27 May 2010 18:55:06 -0000
@@ -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%%
Index: mod_limitipconn2/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_limitipconn2/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- mod_limitipconn2/pkg-plist 26 Nov 2008 04:53:43 -0000 1.2
+++ mod_limitipconn2/pkg-plist 27 May 2010 18:55:07 -0000
@@ -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%%
Index: mod_line_edit/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_line_edit/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- mod_line_edit/pkg-plist 29 Apr 2009 01:35:47 -0000 1.2
+++ mod_line_edit/pkg-plist 27 May 2010 18:55:07 -0000
@@ -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
Index: mod_log_dbd/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_log_dbd/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- mod_log_dbd/pkg-plist 15 Jul 2007 19:10:58 -0000 1.2
+++ mod_log_dbd/pkg-plist 27 May 2010 18:28:20 -0000
@@ -1,4 +1,4 @@
%%APACHEMODDIR%%/%%AP_MODULE%%
-@exec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%%APACHEMODDIR%%/%%AP_MODULE%%
+@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%%APACHEMODDIR%%/%%AP_MODULE%%
@unexec /usr/bin/sed -i '' '/LoadModule %%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf
@unexec echo "Don't forget to remove all mod_%%AP_NAME%% related directives in your httpd.conf"
Index: mod_log_firstbyte/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_log_firstbyte/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- mod_log_firstbyte/pkg-plist 15 Feb 2008 14:38:41 -0000 1.1
+++ mod_log_firstbyte/pkg-plist 27 May 2010 18:55:07 -0000
@@ -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
Index: mod_log_sql/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_log_sql/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- mod_log_sql/pkg-plist 8 May 2009 15:48:58 -0000 1.4
+++ mod_log_sql/pkg-plist 27 May 2010 18:55:08 -0000
@@ -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
Index: mod_log_sql2-dtc/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_log_sql2-dtc/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- mod_log_sql2-dtc/pkg-plist 27 Dec 2009 01:45:01 -0000 1.3
+++ mod_log_sql2-dtc/pkg-plist 27 May 2010 18:28:20 -0000
@@ -1,5 +1,5 @@
%%APACHEMODDIR%%/%%AP_MODULE%%
-@exec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
+@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
@unexec /usr/bin/sed -i '' '/LoadModule %%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf
%%APACHEMODDIR%%/mod_log_sql_mysql.so
%%APACHEMODDIR%%/mod_log_sql_logio.so
Index: mod_log_sql2/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_log_sql2/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- mod_log_sql2/pkg-plist 20 Mar 2007 10:38:12 -0000 1.3
+++ mod_log_sql2/pkg-plist 27 May 2010 18:28:20 -0000
@@ -1,5 +1,5 @@
%%APACHEMODDIR%%/%%AP_MODULE%%
-@exec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
+@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
%%APACHEMODDIR%%/mod_log_sql_mysql.so
%%APACHE2X%%%%APACHEMODDIR%%/mod_log_sql_logio.so
Index: mod_mp3/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_mp3/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- mod_mp3/pkg-plist 13 Apr 2009 03:20:23 -0000 1.4
+++ mod_mp3/pkg-plist 27 May 2010 18:55:08 -0000
@@ -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
Index: mod_musicindex/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_musicindex/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- mod_musicindex/pkg-plist 26 May 2010 22:00:47 -0000 1.6
+++ mod_musicindex/pkg-plist 27 May 2010 18:55:08 -0000
@@ -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
Index: mod_ntlm/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_ntlm/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- mod_ntlm/pkg-plist 31 May 2009 18:34:18 -0000 1.2
+++ mod_ntlm/pkg-plist 27 May 2010 18:55:09 -0000
@@ -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%%
Index: mod_proxy_xml/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_proxy_xml/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- mod_proxy_xml/pkg-plist 24 Apr 2009 22:21:13 -0000 1.2
+++ mod_proxy_xml/pkg-plist 27 May 2010 18:55:09 -0000
@@ -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
Index: mod_pubcookie/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_pubcookie/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- mod_pubcookie/pkg-plist 8 Feb 2006 03:06:22 -0000 1.1
+++ mod_pubcookie/pkg-plist 27 May 2010 18:28:20 -0000
@@ -4,5 +4,5 @@
@dirrmtry pubcookie
@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%%APACHEMODDIR%%/%%AP_MODULE%%
%%APACHEMODDIR%%/%%AP_MODULE%%
-@exec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
+@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
@unexec echo "Don't forget to remove all ${MODULENAME}-related directives in your httpd.conf"
Index: mod_put/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_put/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- mod_put/pkg-plist 17 May 2009 09:28:51 -0000 1.2
+++ mod_put/pkg-plist 27 May 2010 18:55:10 -0000
@@ -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"
Index: mod_python3/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_python3/pkg-plist,v
retrieving revision 1.9
diff -u -r1.9 pkg-plist
--- mod_python3/pkg-plist 25 Mar 2007 17:00:05 -0000 1.9
+++ mod_python3/pkg-plist 27 May 2010 18:55:10 -0000
@@ -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
Index: mod_realip/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_realip/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- mod_realip/pkg-plist 18 May 2009 10:57:34 -0000 1.2
+++ mod_realip/pkg-plist 27 May 2010 18:55:10 -0000
@@ -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
Index: mod_sed/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_sed/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- mod_sed/pkg-plist 12 Apr 2009 06:24:52 -0000 1.2
+++ mod_sed/pkg-plist 27 May 2010 18:55:11 -0000
@@ -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
Index: mod_traf_thief/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_traf_thief/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- mod_traf_thief/pkg-plist 11 May 2009 07:46:40 -0000 1.2
+++ mod_traf_thief/pkg-plist 27 May 2010 18:55:11 -0000
@@ -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
Index: mod_tsunami/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_tsunami/pkg-plist,v
retrieving revision 1.7
diff -u -r1.7 pkg-plist
--- mod_tsunami/pkg-plist 18 May 2009 10:59:18 -0000 1.7
+++ mod_tsunami/pkg-plist 27 May 2010 18:55:12 -0000
@@ -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
Index: mod_xmlns/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/mod_xmlns/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- mod_xmlns/pkg-plist 24 Apr 2009 22:29:28 -0000 1.2
+++ mod_xmlns/pkg-plist 27 May 2010 18:55:12 -0000
@@ -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
--- ap_name.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005271902.o4RJ2JZW061768>