Always installl *-dist files and list them in PLIST too, it allows

pkg_delete not remove current configuration

8 files changed, 32 insertions, 32 deletions

diff --git a/www/apache13/pkg-plist b/www/apache13/pkg-plist
index f9e1d97aa85a..c60ce6b20139 100644
--- a/www/apache13/pkg-plist
+++ b/www/apache13/pkg-plist
@@ -1,9 +1,9 @@
 etc/rc.d/apache.sh
 @exec mkdir -p %D/www/cgi-bin %D/www/data
-etc/apache/httpd.conf
-etc/apache/srm.conf
-etc/apache/access.conf
-etc/apache/mime.types
+etc/apache/httpd.conf-dist
+etc/apache/srm.conf-dist
+etc/apache/access.conf-dist
+etc/apache/mime.types-dist
 sbin/httpd
 www/icons/README
 www/icons/a.gif
diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist
index f9e1d97aa85a..c60ce6b20139 100644
--- a/www/apache2/pkg-plist
+++ b/www/apache2/pkg-plist
@@ -1,9 +1,9 @@
 etc/rc.d/apache.sh
 @exec mkdir -p %D/www/cgi-bin %D/www/data
-etc/apache/httpd.conf
-etc/apache/srm.conf
-etc/apache/access.conf
-etc/apache/mime.types
+etc/apache/httpd.conf-dist
+etc/apache/srm.conf-dist
+etc/apache/access.conf-dist
+etc/apache/mime.types-dist
 sbin/httpd
 www/icons/README
 www/icons/a.gif
diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist
index f9e1d97aa85a..c60ce6b20139 100644
--- a/www/apache20/pkg-plist
+++ b/www/apache20/pkg-plist
@@ -1,9 +1,9 @@
 etc/rc.d/apache.sh
 @exec mkdir -p %D/www/cgi-bin %D/www/data
-etc/apache/httpd.conf
-etc/apache/srm.conf
-etc/apache/access.conf
-etc/apache/mime.types
+etc/apache/httpd.conf-dist
+etc/apache/srm.conf-dist
+etc/apache/access.conf-dist
+etc/apache/mime.types-dist
 sbin/httpd
 www/icons/README
 www/icons/a.gif
diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist
index f9e1d97aa85a..c60ce6b20139 100644
--- a/www/apache21/pkg-plist
+++ b/www/apache21/pkg-plist
@@ -1,9 +1,9 @@
 etc/rc.d/apache.sh
 @exec mkdir -p %D/www/cgi-bin %D/www/data
-etc/apache/httpd.conf
-etc/apache/srm.conf
-etc/apache/access.conf
-etc/apache/mime.types
+etc/apache/httpd.conf-dist
+etc/apache/srm.conf-dist
+etc/apache/access.conf-dist
+etc/apache/mime.types-dist
 sbin/httpd
 www/icons/README
 www/icons/a.gif
diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
index f9e1d97aa85a..c60ce6b20139 100644
--- a/www/apache22/pkg-plist
+++ b/www/apache22/pkg-plist
@@ -1,9 +1,9 @@
 etc/rc.d/apache.sh
 @exec mkdir -p %D/www/cgi-bin %D/www/data
-etc/apache/httpd.conf
-etc/apache/srm.conf
-etc/apache/access.conf
-etc/apache/mime.types
+etc/apache/httpd.conf-dist
+etc/apache/srm.conf-dist
+etc/apache/access.conf-dist
+etc/apache/mime.types-dist
 sbin/httpd
 www/icons/README
 www/icons/a.gif
diff --git a/www/mod_php3/pkg-plist b/www/mod_php3/pkg-plist
index f9e1d97aa85a..c60ce6b20139 100644
--- a/www/mod_php3/pkg-plist
+++ b/www/mod_php3/pkg-plist
@@ -1,9 +1,9 @@
 etc/rc.d/apache.sh
 @exec mkdir -p %D/www/cgi-bin %D/www/data
-etc/apache/httpd.conf
-etc/apache/srm.conf
-etc/apache/access.conf
-etc/apache/mime.types
+etc/apache/httpd.conf-dist
+etc/apache/srm.conf-dist
+etc/apache/access.conf-dist
+etc/apache/mime.types-dist
 sbin/httpd
 www/icons/README
 www/icons/a.gif
diff --git a/www/mod_php4/pkg-plist b/www/mod_php4/pkg-plist
index f9e1d97aa85a..c60ce6b20139 100644
--- a/www/mod_php4/pkg-plist
+++ b/www/mod_php4/pkg-plist
@@ -1,9 +1,9 @@
 etc/rc.d/apache.sh
 @exec mkdir -p %D/www/cgi-bin %D/www/data
-etc/apache/httpd.conf
-etc/apache/srm.conf
-etc/apache/access.conf
-etc/apache/mime.types
+etc/apache/httpd.conf-dist
+etc/apache/srm.conf-dist
+etc/apache/access.conf-dist
+etc/apache/mime.types-dist
 sbin/httpd
 www/icons/README
 www/icons/a.gif
diff --git a/www/mod_php5/pkg-plist b/www/mod_php5/pkg-plist
index f9e1d97aa85a..c60ce6b20139 100644
--- a/www/mod_php5/pkg-plist
+++ b/www/mod_php5/pkg-plist
@@ -1,9 +1,9 @@
 etc/rc.d/apache.sh
 @exec mkdir -p %D/www/cgi-bin %D/www/data
-etc/apache/httpd.conf
-etc/apache/srm.conf
-etc/apache/access.conf
-etc/apache/mime.types
+etc/apache/httpd.conf-dist
+etc/apache/srm.conf-dist
+etc/apache/access.conf-dist
+etc/apache/mime.types-dist
 sbin/httpd
 www/icons/README
 www/icons/a.gif