16 files changed, 56 insertions, 56 deletions

diff --git a/www/zope210/files/instance_message.in b/www/zope210/files/instance_message.in
index a6e9d214a56f..ba8f1f29c9cb 100644
--- a/www/zope210/files/instance_message.in
+++ b/www/zope210/files/instance_message.in
@@ -5,10 +5,10 @@ Zope instance successfully installed
 If Zope should get started automatically when the system starts, 
 please add the following lines to /etc/rc.conf
 
-zope_enable="YES"
-zope_instances="%%ZOPEINSTANCEDIR%%" 
+zope29_enable="YES"
+zope29_instances="%%ZOPEINSTANCEDIR%%" 
 
-If there is already a zope_instances entry please add 
+If there is already a zope29_instances entry please add 
 %%ZOPEINSTANCEDIR%% separated by a space. 
 
 Don`t forget to create %%ZOPEINSTANCEDIR%%/etc/zope.conf before 
diff --git a/www/zope210/files/package-pkg-message.in b/www/zope210/files/package-pkg-message.in
index 83e710fc3205..ccb3466addce 100644
--- a/www/zope210/files/package-pkg-message.in
+++ b/www/zope210/files/package-pkg-message.in
@@ -17,10 +17,10 @@ when the package is deinstalled. You`ll have to delete them yourself.
 If Zope should get started automatically when the system starts, 
 please add the following lines to /etc/rc.conf
 
-zope_enable="YES"
-zope_instances="<INSTANCEDIR>" 
+zope29_enable="YES"
+zope29_instances="<INSTANCEDIR>" 
 
-Additional zope Instances have to be added to zope_instances 
+Additional zope Instances have to be added to zope29_instances 
 seperated by a space. 
 
 ** ZEO Instances ** (Optional) 
@@ -32,10 +32,10 @@ calling %%ZOPEBASEDIR%%/bin/mkzopeinstance.py <ZEODIR>
 To start the ZEO Server at System startup add the following lines to 
 /etc/rc.conf
 
-zeo_enable="YES"
-zeo_instances="<ZEODIR>"
+zeo29_enable="YES"
+zeo29_instances="<ZEODIR>"
 
-Additional zeo Instances have to be added to zeo_instances seperated 
+Additional zeo Instances have to be added to zeo29_instances seperated 
 by a space. 
 
 **********************************************************************
diff --git a/www/zope210/files/zeo_message.in b/www/zope210/files/zeo_message.in
index 3d3fd82a201b..157b2d2dbaa5 100644
--- a/www/zope210/files/zeo_message.in
+++ b/www/zope210/files/zeo_message.in
@@ -5,10 +5,10 @@ ZEO instance successfully installed
 If Zope should get started automatically when the system starts, 
 please add the following lines to /etc/rc.conf
 
-zeo_enable="YES"
-zeo_instances="%%ZOPEINSTANCEDIR%%" 
+zeo29_enable="YES"
+zeo29_instances="%%ZOPEINSTANCEDIR%%" 
 
-If there is already a zeo_instances entry please add 
+If there is already a zeo29_instances entry please add 
 %%ZOPEINSTANCEDIR%% separated by a space. 
 
 Don`t forget to edit %%ZOPEINSTANCEDIR%%/etc/zeo.conf before starting 
diff --git a/www/zope210/pkg-plist b/www/zope210/pkg-plist
index dd8f517e8d2b..ad0eb9086a98 100644
--- a/www/zope210/pkg-plist
+++ b/www/zope210/pkg-plist
@@ -9497,5 +9497,5 @@
 @dirrm %%ZOPEBASEDIR%%/lib
 @dirrm %%ZOPEBASEDIR%%/doc
 @dirrm %%ZOPEBASEDIR%%/bin
-@dirrm %%ZOPEBASEDIR%%/Products
-@dirrm %%ZOPEBASEDIR%%
+@dirrmtry %%ZOPEBASEDIR%%/Products
+@dirrmtry %%ZOPEBASEDIR%%
diff --git a/www/zope211/files/instance_message.in b/www/zope211/files/instance_message.in
index a6e9d214a56f..ba8f1f29c9cb 100644
--- a/www/zope211/files/instance_message.in
+++ b/www/zope211/files/instance_message.in
@@ -5,10 +5,10 @@ Zope instance successfully installed
 If Zope should get started automatically when the system starts, 
 please add the following lines to /etc/rc.conf
 
-zope_enable="YES"
-zope_instances="%%ZOPEINSTANCEDIR%%" 
+zope29_enable="YES"
+zope29_instances="%%ZOPEINSTANCEDIR%%" 
 
-If there is already a zope_instances entry please add 
+If there is already a zope29_instances entry please add 
 %%ZOPEINSTANCEDIR%% separated by a space. 
 
 Don`t forget to create %%ZOPEINSTANCEDIR%%/etc/zope.conf before 
diff --git a/www/zope211/files/package-pkg-message.in b/www/zope211/files/package-pkg-message.in
index 83e710fc3205..ccb3466addce 100644
--- a/www/zope211/files/package-pkg-message.in
+++ b/www/zope211/files/package-pkg-message.in
@@ -17,10 +17,10 @@ when the package is deinstalled. You`ll have to delete them yourself.
 If Zope should get started automatically when the system starts, 
 please add the following lines to /etc/rc.conf
 
-zope_enable="YES"
-zope_instances="<INSTANCEDIR>" 
+zope29_enable="YES"
+zope29_instances="<INSTANCEDIR>" 
 
-Additional zope Instances have to be added to zope_instances 
+Additional zope Instances have to be added to zope29_instances 
 seperated by a space. 
 
 ** ZEO Instances ** (Optional) 
@@ -32,10 +32,10 @@ calling %%ZOPEBASEDIR%%/bin/mkzopeinstance.py <ZEODIR>
 To start the ZEO Server at System startup add the following lines to 
 /etc/rc.conf
 
-zeo_enable="YES"
-zeo_instances="<ZEODIR>"
+zeo29_enable="YES"
+zeo29_instances="<ZEODIR>"
 
-Additional zeo Instances have to be added to zeo_instances seperated 
+Additional zeo Instances have to be added to zeo29_instances seperated 
 by a space. 
 
 **********************************************************************
diff --git a/www/zope211/files/zeo_message.in b/www/zope211/files/zeo_message.in
index 3d3fd82a201b..157b2d2dbaa5 100644
--- a/www/zope211/files/zeo_message.in
+++ b/www/zope211/files/zeo_message.in
@@ -5,10 +5,10 @@ ZEO instance successfully installed
 If Zope should get started automatically when the system starts, 
 please add the following lines to /etc/rc.conf
 
-zeo_enable="YES"
-zeo_instances="%%ZOPEINSTANCEDIR%%" 
+zeo29_enable="YES"
+zeo29_instances="%%ZOPEINSTANCEDIR%%" 
 
-If there is already a zeo_instances entry please add 
+If there is already a zeo29_instances entry please add 
 %%ZOPEINSTANCEDIR%% separated by a space. 
 
 Don`t forget to edit %%ZOPEINSTANCEDIR%%/etc/zeo.conf before starting 
diff --git a/www/zope211/pkg-plist b/www/zope211/pkg-plist
index dd8f517e8d2b..ad0eb9086a98 100644
--- a/www/zope211/pkg-plist
+++ b/www/zope211/pkg-plist
@@ -9497,5 +9497,5 @@
 @dirrm %%ZOPEBASEDIR%%/lib
 @dirrm %%ZOPEBASEDIR%%/doc
 @dirrm %%ZOPEBASEDIR%%/bin
-@dirrm %%ZOPEBASEDIR%%/Products
-@dirrm %%ZOPEBASEDIR%%
+@dirrmtry %%ZOPEBASEDIR%%/Products
+@dirrmtry %%ZOPEBASEDIR%%
diff --git a/www/zope213/files/instance_message.in b/www/zope213/files/instance_message.in
index a6e9d214a56f..ba8f1f29c9cb 100644
--- a/www/zope213/files/instance_message.in
+++ b/www/zope213/files/instance_message.in
@@ -5,10 +5,10 @@ Zope instance successfully installed
 If Zope should get started automatically when the system starts, 
 please add the following lines to /etc/rc.conf
 
-zope_enable="YES"
-zope_instances="%%ZOPEINSTANCEDIR%%" 
+zope29_enable="YES"
+zope29_instances="%%ZOPEINSTANCEDIR%%" 
 
-If there is already a zope_instances entry please add 
+If there is already a zope29_instances entry please add 
 %%ZOPEINSTANCEDIR%% separated by a space. 
 
 Don`t forget to create %%ZOPEINSTANCEDIR%%/etc/zope.conf before 
diff --git a/www/zope213/files/package-pkg-message.in b/www/zope213/files/package-pkg-message.in
index 83e710fc3205..ccb3466addce 100644
--- a/www/zope213/files/package-pkg-message.in
+++ b/www/zope213/files/package-pkg-message.in
@@ -17,10 +17,10 @@ when the package is deinstalled. You`ll have to delete them yourself.
 If Zope should get started automatically when the system starts, 
 please add the following lines to /etc/rc.conf
 
-zope_enable="YES"
-zope_instances="<INSTANCEDIR>" 
+zope29_enable="YES"
+zope29_instances="<INSTANCEDIR>" 
 
-Additional zope Instances have to be added to zope_instances 
+Additional zope Instances have to be added to zope29_instances 
 seperated by a space. 
 
 ** ZEO Instances ** (Optional) 
@@ -32,10 +32,10 @@ calling %%ZOPEBASEDIR%%/bin/mkzopeinstance.py <ZEODIR>
 To start the ZEO Server at System startup add the following lines to 
 /etc/rc.conf
 
-zeo_enable="YES"
-zeo_instances="<ZEODIR>"
+zeo29_enable="YES"
+zeo29_instances="<ZEODIR>"
 
-Additional zeo Instances have to be added to zeo_instances seperated 
+Additional zeo Instances have to be added to zeo29_instances seperated 
 by a space. 
 
 **********************************************************************
diff --git a/www/zope213/files/zeo_message.in b/www/zope213/files/zeo_message.in
index 3d3fd82a201b..157b2d2dbaa5 100644
--- a/www/zope213/files/zeo_message.in
+++ b/www/zope213/files/zeo_message.in
@@ -5,10 +5,10 @@ ZEO instance successfully installed
 If Zope should get started automatically when the system starts, 
 please add the following lines to /etc/rc.conf
 
-zeo_enable="YES"
-zeo_instances="%%ZOPEINSTANCEDIR%%" 
+zeo29_enable="YES"
+zeo29_instances="%%ZOPEINSTANCEDIR%%" 
 
-If there is already a zeo_instances entry please add 
+If there is already a zeo29_instances entry please add 
 %%ZOPEINSTANCEDIR%% separated by a space. 
 
 Don`t forget to edit %%ZOPEINSTANCEDIR%%/etc/zeo.conf before starting 
diff --git a/www/zope213/pkg-plist b/www/zope213/pkg-plist
index dd8f517e8d2b..ad0eb9086a98 100644
--- a/www/zope213/pkg-plist
+++ b/www/zope213/pkg-plist
@@ -9497,5 +9497,5 @@
 @dirrm %%ZOPEBASEDIR%%/lib
 @dirrm %%ZOPEBASEDIR%%/doc
 @dirrm %%ZOPEBASEDIR%%/bin
-@dirrm %%ZOPEBASEDIR%%/Products
-@dirrm %%ZOPEBASEDIR%%
+@dirrmtry %%ZOPEBASEDIR%%/Products
+@dirrmtry %%ZOPEBASEDIR%%
diff --git a/www/zope29/files/instance_message.in b/www/zope29/files/instance_message.in
index a6e9d214a56f..ba8f1f29c9cb 100644
--- a/www/zope29/files/instance_message.in
+++ b/www/zope29/files/instance_message.in
@@ -5,10 +5,10 @@ Zope instance successfully installed
 If Zope should get started automatically when the system starts, 
 please add the following lines to /etc/rc.conf
 
-zope_enable="YES"
-zope_instances="%%ZOPEINSTANCEDIR%%" 
+zope29_enable="YES"
+zope29_instances="%%ZOPEINSTANCEDIR%%" 
 
-If there is already a zope_instances entry please add 
+If there is already a zope29_instances entry please add 
 %%ZOPEINSTANCEDIR%% separated by a space. 
 
 Don`t forget to create %%ZOPEINSTANCEDIR%%/etc/zope.conf before 
diff --git a/www/zope29/files/package-pkg-message.in b/www/zope29/files/package-pkg-message.in
index 83e710fc3205..ccb3466addce 100644
--- a/www/zope29/files/package-pkg-message.in
+++ b/www/zope29/files/package-pkg-message.in
@@ -17,10 +17,10 @@ when the package is deinstalled. You`ll have to delete them yourself.
 If Zope should get started automatically when the system starts, 
 please add the following lines to /etc/rc.conf
 
-zope_enable="YES"
-zope_instances="<INSTANCEDIR>" 
+zope29_enable="YES"
+zope29_instances="<INSTANCEDIR>" 
 
-Additional zope Instances have to be added to zope_instances 
+Additional zope Instances have to be added to zope29_instances 
 seperated by a space. 
 
 ** ZEO Instances ** (Optional) 
@@ -32,10 +32,10 @@ calling %%ZOPEBASEDIR%%/bin/mkzopeinstance.py <ZEODIR>
 To start the ZEO Server at System startup add the following lines to 
 /etc/rc.conf
 
-zeo_enable="YES"
-zeo_instances="<ZEODIR>"
+zeo29_enable="YES"
+zeo29_instances="<ZEODIR>"
 
-Additional zeo Instances have to be added to zeo_instances seperated 
+Additional zeo Instances have to be added to zeo29_instances seperated 
 by a space. 
 
 **********************************************************************
diff --git a/www/zope29/files/zeo_message.in b/www/zope29/files/zeo_message.in
index 3d3fd82a201b..157b2d2dbaa5 100644
--- a/www/zope29/files/zeo_message.in
+++ b/www/zope29/files/zeo_message.in
@@ -5,10 +5,10 @@ ZEO instance successfully installed
 If Zope should get started automatically when the system starts, 
 please add the following lines to /etc/rc.conf
 
-zeo_enable="YES"
-zeo_instances="%%ZOPEINSTANCEDIR%%" 
+zeo29_enable="YES"
+zeo29_instances="%%ZOPEINSTANCEDIR%%" 
 
-If there is already a zeo_instances entry please add 
+If there is already a zeo29_instances entry please add 
 %%ZOPEINSTANCEDIR%% separated by a space. 
 
 Don`t forget to edit %%ZOPEINSTANCEDIR%%/etc/zeo.conf before starting 
diff --git a/www/zope29/pkg-plist b/www/zope29/pkg-plist
index dd8f517e8d2b..ad0eb9086a98 100644
--- a/www/zope29/pkg-plist
+++ b/www/zope29/pkg-plist
@@ -9497,5 +9497,5 @@
 @dirrm %%ZOPEBASEDIR%%/lib
 @dirrm %%ZOPEBASEDIR%%/doc
 @dirrm %%ZOPEBASEDIR%%/bin
-@dirrm %%ZOPEBASEDIR%%/Products
-@dirrm %%ZOPEBASEDIR%%
+@dirrmtry %%ZOPEBASEDIR%%/Products
+@dirrmtry %%ZOPEBASEDIR%%