- Fix up MySQL 2.x -> 3.x migration instructions

Submitted by:	Ion-Mihai Tetcu <itetcu@apropo.ro>
Approved by:	maintainer

12 files changed, 16 insertions, 46 deletions

diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index 0d56b97db843..7648ffbc83ea 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -355,6 +355,7 @@ post-install:
 	cd ${WRKSRC}/tools.mysql_drv && \
 		${INSTALL_DATA} README *.sql* ${EXAMPLESDIR}/mysql
 	${INSTALL_DATA} ${FILESDIR}/mysql.data ${EXAMPLESDIR}/mysql
+	${INSTALL_DATA} ${FILESDIR}/2x_to_3x_db.sql ${EXAMPLESDIR}/mysql
 .endif
 .if defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74)
 	${MKDIR} ${EXAMPLESDIR}/pgsql
diff --git a/mail/dspam-devel/files/convert2db.sql b/mail/dspam-devel/files/2x_to_3x_db.sql
index 489965907a7c..489965907a7c 100644
--- a/mail/dspam-devel/files/convert2db.sql
+++ b/mail/dspam-devel/files/2x_to_3x_db.sql
diff --git a/mail/dspam-devel/files/modify2db.sql b/mail/dspam-devel/files/modify2db.sql
deleted file mode 100644
index d387b5c7ddf6..000000000000
--- a/mail/dspam-devel/files/modify2db.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-alter table dspam_stats add spam_learned int;
-alter table dspam_stats add innocent_learned int;
-alter table dspam_stats add spam_classified int;
-alter table dspam_stats add innocent_classified int;
-update dspam_stats set spam_learned = total_spam;
-update dspam_stats set innocent_learned = total_innocent;
-update dspam_stats set spam_classified = 0, innocent_classified = 0;
-alter table dspam_stats add spam_misclassified int;
-alter table dspam_stats add innocent_misclassified int;
-update dspam_stats set spam_misclassified = spam_misses;
-update dspam_stats set innocent_misclassified = false_positives;
-
diff --git a/mail/dspam-devel/files/sync_db.sql b/mail/dspam-devel/files/sync_db.sql
deleted file mode 100644
index 5c82303510e4..000000000000
--- a/mail/dspam-devel/files/sync_db.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-
-update dspam_stats set spam_misclassified = spam_misses;
-update dspam_stats set innocent_misclassified = false_positives;
diff --git a/mail/dspam-devel/pkg-message b/mail/dspam-devel/pkg-message
index f7e266347c5a..97706c8c6b14 100644
--- a/mail/dspam-devel/pkg-message
+++ b/mail/dspam-devel/pkg-message
@@ -4,6 +4,9 @@
  See the file %%DOCSDIR%%/README for advice about
  how to configure DSPAM with your MTA. Examples are provided for
  sendmail, postfix, exim and courier MTAs.
+
+ Note that man entries have been added for all dspam binaries.
+
 %%MYSQL%%
 %%MYSQL%% See %%EXAMPLESDIR%%/README
 %%MYSQL%% for instructions on how to configure MySQL
@@ -13,13 +16,8 @@
 %%MYSQL%% contains an example configuration for use with MySQL.
 %%MYSQL%% Edit and install as
 %%MYSQL%% %%LOCALBASE%%/etc/dspam/mysql.data
-%%MYSQL%% To modify an existing database use and use it with dspam 3.x:
-%%MYSQL%% [ TO BE WRITTEN ]
-%%MYSQL%% dspam versions use
-%%MYSQL%% %%EXAMPLESDIR%%/convert2db.sql
-%%MYSQL%% To modify the existing db and use it with both versions use
-%%MYSQL%% 
-%%MYSQL%%
+%%MYSQL%% To modify an 2.x database use and use it with dspam 3.x use:
+%%MYSQL%% %%EXAMPLESDIR%%/mysql/2x_to_3x_db.sql
 %%MYSQL%%
 %%PGSQL%%
 %%PGSQL%% See %%EXAMPLESDIR%%/README
@@ -31,6 +29,6 @@
 %%PGSQL%% contains an example configuration for use with PostgreSQL.
 %%PGSQL%% Edit and install as
 %%PGSQL%% %%LOCALBASE%%/etc/dspam/pgsql.data
-%%PGSQL%% 
+%%PGSQL%%
 
 --------------------------------------------------------------------
diff --git a/mail/dspam-devel/pkg-plist b/mail/dspam-devel/pkg-plist
index 4c4b2f007d5f..b8fd20d82aa4 100644
--- a/mail/dspam-devel/pkg-plist
+++ b/mail/dspam-devel/pkg-plist
@@ -25,6 +25,7 @@ libdata/pkgconfig/dspam.pc
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%MYSQL%%%%EXAMPLESDIR%%/mysql/README
+%%MYSQL%%%%EXAMPLESDIR%%/mysql/2x_to_3x_db.sql
 %%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql.data
 %%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects.sql.space.optimized
 %%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects.sql.speed.optimized
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 0d56b97db843..7648ffbc83ea 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -355,6 +355,7 @@ post-install:
 	cd ${WRKSRC}/tools.mysql_drv && \
 		${INSTALL_DATA} README *.sql* ${EXAMPLESDIR}/mysql
 	${INSTALL_DATA} ${FILESDIR}/mysql.data ${EXAMPLESDIR}/mysql
+	${INSTALL_DATA} ${FILESDIR}/2x_to_3x_db.sql ${EXAMPLESDIR}/mysql
 .endif
 .if defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74)
 	${MKDIR} ${EXAMPLESDIR}/pgsql
diff --git a/mail/dspam/files/convert2db.sql b/mail/dspam/files/2x_to_3x_db.sql
index 489965907a7c..489965907a7c 100644
--- a/mail/dspam/files/convert2db.sql
+++ b/mail/dspam/files/2x_to_3x_db.sql
diff --git a/mail/dspam/files/modify2db.sql b/mail/dspam/files/modify2db.sql
deleted file mode 100644
index d387b5c7ddf6..000000000000
--- a/mail/dspam/files/modify2db.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-alter table dspam_stats add spam_learned int;
-alter table dspam_stats add innocent_learned int;
-alter table dspam_stats add spam_classified int;
-alter table dspam_stats add innocent_classified int;
-update dspam_stats set spam_learned = total_spam;
-update dspam_stats set innocent_learned = total_innocent;
-update dspam_stats set spam_classified = 0, innocent_classified = 0;
-alter table dspam_stats add spam_misclassified int;
-alter table dspam_stats add innocent_misclassified int;
-update dspam_stats set spam_misclassified = spam_misses;
-update dspam_stats set innocent_misclassified = false_positives;
-
diff --git a/mail/dspam/files/sync_db.sql b/mail/dspam/files/sync_db.sql
deleted file mode 100644
index 5c82303510e4..000000000000
--- a/mail/dspam/files/sync_db.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-
-update dspam_stats set spam_misclassified = spam_misses;
-update dspam_stats set innocent_misclassified = false_positives;
diff --git a/mail/dspam/pkg-message b/mail/dspam/pkg-message
index f7e266347c5a..97706c8c6b14 100644
--- a/mail/dspam/pkg-message
+++ b/mail/dspam/pkg-message
@@ -4,6 +4,9 @@
  See the file %%DOCSDIR%%/README for advice about
  how to configure DSPAM with your MTA. Examples are provided for
  sendmail, postfix, exim and courier MTAs.
+
+ Note that man entries have been added for all dspam binaries.
+
 %%MYSQL%%
 %%MYSQL%% See %%EXAMPLESDIR%%/README
 %%MYSQL%% for instructions on how to configure MySQL
@@ -13,13 +16,8 @@
 %%MYSQL%% contains an example configuration for use with MySQL.
 %%MYSQL%% Edit and install as
 %%MYSQL%% %%LOCALBASE%%/etc/dspam/mysql.data
-%%MYSQL%% To modify an existing database use and use it with dspam 3.x:
-%%MYSQL%% [ TO BE WRITTEN ]
-%%MYSQL%% dspam versions use
-%%MYSQL%% %%EXAMPLESDIR%%/convert2db.sql
-%%MYSQL%% To modify the existing db and use it with both versions use
-%%MYSQL%% 
-%%MYSQL%%
+%%MYSQL%% To modify an 2.x database use and use it with dspam 3.x use:
+%%MYSQL%% %%EXAMPLESDIR%%/mysql/2x_to_3x_db.sql
 %%MYSQL%%
 %%PGSQL%%
 %%PGSQL%% See %%EXAMPLESDIR%%/README
@@ -31,6 +29,6 @@
 %%PGSQL%% contains an example configuration for use with PostgreSQL.
 %%PGSQL%% Edit and install as
 %%PGSQL%% %%LOCALBASE%%/etc/dspam/pgsql.data
-%%PGSQL%% 
+%%PGSQL%%
 
 --------------------------------------------------------------------
diff --git a/mail/dspam/pkg-plist b/mail/dspam/pkg-plist
index 4c4b2f007d5f..b8fd20d82aa4 100644
--- a/mail/dspam/pkg-plist
+++ b/mail/dspam/pkg-plist
@@ -25,6 +25,7 @@ libdata/pkgconfig/dspam.pc
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%MYSQL%%%%EXAMPLESDIR%%/mysql/README
+%%MYSQL%%%%EXAMPLESDIR%%/mysql/2x_to_3x_db.sql
 %%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql.data
 %%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects.sql.space.optimized
 %%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects.sql.speed.optimized