- Update to 3.5.0.20050428.1100

PR:		ports/80443
Submitted by:	Ion-Mihai "IOnut" Tetcu <itetcu@people.tecnik93.com> (maintainer)

6 files changed, 112 insertions, 133 deletions

diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index 7b232f212177..070bb5e351b9 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -7,7 +7,7 @@
 
 # Note to commiters: If don't commit a maintainer patch and as a result PKGNAME
 # or user variables (WITH*) changes please add an entry in ${FILESDIR}/UPDATING and
-# modify UPD_LINE_NO=(no_of_added_lines-1) in this Makefile
+# modify _UPD_LINE_NO=(no_of_added_lines-1) in this Makefile
 # else the port will be broken. Thanks.
 
 PORTNAME=	dspam-devel
@@ -19,8 +19,8 @@ MASTER_SITES=	http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sourc
 MAINTAINER=	itetcu@people.tecnik93.com
 COMMENT=	Bayesian spam filter - development version
 
-PORTVER_MAJ=	3.4.r2
-SNAP_DATE=	.20050305.0930
+PORTVER_MAJ=	3.5.0
+SNAP_DATE=	.20050428.1100
 
 .ifdef(SNAP_DATE)
 WRKSRC=		${WRKDIR}/dspam-cvs-devel${SNAP_DATE}
@@ -58,8 +58,8 @@ OPTIONS+=	USER_HOMEDIR "Store user data in ~/.dspam" off
 OPTIONS+=	TRUSTED_USERS "Disable trusted user security" off
 
 ## back-end
-OPTIONS+=	MYSQL40 "Use MySQL 4.0.x as back-end" on
-OPTIONS+=	MYSQL41 "Use MySQL 4.1.x as back-end" off
+OPTIONS+=	MYSQL40 "Use MySQL 4.0.x as back-end" off
+OPTIONS+=	MYSQL41 "Use MySQL 4.1.x as back-end" on
 OPTIONS+=	MYSQL50 "Use MySQL 5.0.x as back-end" off
 OPTIONS+=	MYSQL_COMPRESS "Compress dspam <--> MySQL" off
 OPTIONS+=	POSTGRESQL "Use PostgreSQL as back-end" off
@@ -100,7 +100,7 @@ CFLAGS+=	-g -DDEBUG
 
 PKGMESSAGE=	 ${WRKSRC}/src/README.FreeBSD
 
-UPD_LINE_NO=	24
+_UPD_LINE_NO=	16
 
 CONFLICTS=	dspam-2* dspam-3*
 
@@ -140,12 +140,12 @@ CONFIGURE_ARGS+=	--with-dspam-owner=${DSPAM_OWNER}
 CONFIGURE_ARGS+=	--with-dspam-group=${DSPAM_GROUP}
 # we set DSPAM_MODE at the end as some LDA whant specific mode
 
-SED_SCRIPT=	-e 's,%%DOCSDIR%%,${DOCSDIR},g' \
+_SED_SCRIPT=	-e 's,%%DOCSDIR%%,${DOCSDIR},g' \
 		-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \
-		-e 's,%%LOCALBASE%%,${LOCALBASE},g' \
-		-e 's,%%PREFIX%%,${PREFIX},g' \
-		-e 's,%%PKGNAME%%,${PKGNAME},g' \
 		-e 's,%%DSPAM_HOME%%,${DSPAM_HOME},g'
+#		-e 's,%%LOCALBASE%%,${LOCALBASE},g' \
+#		-e 's,%%PREFIX%%,${PREFIX},g' \
+#		-e 's,%%PKGNAME%%,${PKGNAME},g' \
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
@@ -175,11 +175,11 @@ RC_DIR=		${PREFIX}/etc/rc.d
 RC_SUFX=	.sh
 USE_RC_SUBR=	yes
 PLIST_FILES+=	etc/rc.d/dspam${RC_SUFX}
-SED_SCRIPT+=	-e 's,%%DAEMON%%,,g'
-SED_RC_SCRIPT=	-e 's,%%PREFIX%%,${PREFIX},g' \
+_SED_SCRIPT+=	-e 's,%%DAEMON%%,,g'
+_SED_RC_SCRIPT=	-e 's,%%PREFIX%%,${PREFIX},g' \
 		-e 's,%%DSPAM_HOME%%,${DSPAM_HOME},g'
 .else
-SED_SCRIPT+=	-e ',%%DAEMON%%,D'
+_SED_SCRIPT+=	-e ',%%DAEMON%%,D'
 .endif
 
 .if !defined(WITH_GRAHAM_BAYES)
@@ -234,9 +234,9 @@ PLIST_SUB+=	DB4="@comment "
 PLIST_SUB+=	MYSQL="@comment "
 PLIST_SUB+=	PGSQL=""
 PLIST_SUB+=	SQLITE="@comment "
-SED_SCRIPT+=	-e '/%%MYSQL%%/D'
-SED_SCRIPT+=	-e 's,%%PGSQL%%,,g'
-SED_SCRIPT+=	-e '/%%SQLITE%%/D'
+#_SED_SCRIPT+=	-e '/%%MYSQL%%/D'
+#_SED_SCRIPT+=	-e 's,%%PGSQL%%,,g'
+#_SED_SCRIPT+=	-e '/%%SQLITE%%/D'
 #PKGNAMESUFFIX=	-pgsql
 DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
 .endif
@@ -258,9 +258,9 @@ PLIST_SUB+=	DB4=""
 PLIST_SUB+=	MYSQL="@comment "
 PLIST_SUB+=	PGSQL="@comment "
 PLIST_SUB+=	SQLITE="@comment "
-SED_SCRIPT+=	-e '/%%MYSQL%%/D'
-SED_SCRIPT+=	-e '/%%PGSQL%%/D'
-SED_SCRIPT+=	-e '/%%SQLITE%%/D'
+#_SED_SCRIPT+=	-e '/%%MYSQL%%/D'
+#_SED_SCRIPT+=	-e '/%%PGSQL%%/D'
+#_SED_SCRIPT+=	-e '/%%SQLITE%%/D'
 #PKGNAMESUFFIX=	-bdb
 DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
 .endif
@@ -283,9 +283,9 @@ PLIST_SUB+=	DB4="@comment "
 PLIST_SUB+=	MYSQL="@comment "
 PLIST_SUB+=	PGSQL="@comment "
 PLIST_SUB+=	SQLITE=""
-SED_SCRIPT+=	-e '/%%MYSQL%%/D'
-SED_SCRIPT+=	-e '/%%PGSQL%%/D'
-SED_SCRIPT+=	-e 's,%%SQLITE%%,,g'
+#_SED_SCRIPT+=	-e '/%%MYSQL%%/D'
+#_SED_SCRIPT+=	-e '/%%PGSQL%%/D'
+#_SED_SCRIPT+=	-e 's,%%SQLITE%%,,g'
 #PKGNAMESUFFIX=	-sqlite2
 DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
 .endif
@@ -310,16 +310,16 @@ PLIST_SUB+=	DB4="@comment "
 PLIST_SUB+=	MYSQL=""
 PLIST_SUB+=	PGSQL="@comment "
 PLIST_SUB+=	SQLITE="@comment "
-SED_SCRIPT+=	-e 's,%%MYSQL%%,,g'
-SED_SCRIPT+=	-e '/%%PGSQL%%/D'
-SED_SCRIPT+=	-e '/%%SQLITE%%/D'
+#_SED_SCRIPT+=	-e 's,%%MYSQL%%,,g'
+#_SED_SCRIPT+=	-e '/%%PGSQL%%/D'
+#_SED_SCRIPT+=	-e '/%%SQLITE%%/D'
 DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
 .	if defined(WITH_MYSQL_COMPRESS)
 CONFIGURE_ARGS+=	--enable-client-compression
 .	endif
-SED_RC_SCRIPT+=		-e 's,%%MYSQL%%,mysql,g'
+_SED_RC_SCRIPT+=		-e 's,%%MYSQL%%,mysql,g'
 .else
-SED_RC_SCRIPT+=		-e 's,%%MYSQL%%,,'
+_SED_RC_SCRIPT+=		-e 's,%%MYSQL%%,,'
 .endif
 
 .if defined(WITH_VIRT_USERS)
@@ -355,7 +355,7 @@ LDA_COUNT:=	${LDA_COUNT:S/o//}
 .if defined(WITH_EXIM_LDA)
 .	if defined(WITH_MYSQL40) || (WITH_MYSQL41)
 _EXIM_EXT=	-mysql
-.	elseif defined(WITH_POSTGRESQL)
+.	elif defined(WITH_POSTGRESQL)
 _EXIM_EXT=	-postgresql
 .	endif
 RUN_DEPENDS+=	exim:${PORTSDIR}/mail/exim${_EXIM_EXT}
@@ -391,9 +391,9 @@ DSPAM_MODE=	4511
 
 .if defined(WITH_POSTFIX_MBC)
 DSPAM_MODE=	4511
-SED_SCRIPT+=	-e 's,%%POSTFIX_MBC%%,,g'
+#_SED_SCRIPT+=	-e 's,%%POSTFIX_MBC%%,,g'
 .else
-SED_SCRIPT+=	-e '/%%POSTFIX_MBC%%/D'
+#_SED_SCRIPT+=	-e '/%%POSTFIX_MBC%%/D'
 .endif
 
 .if defined(WITH_QMAIL)
@@ -416,13 +416,13 @@ CONFIGURE_ARGS+=--enable-user-logging
 USE_PERL5_RUN=	yes
 PLIST_SUB+=	CGI=""
 CGI_PATH?=	${PREFIX}/www/vhosts/dspam
-SED_SCRIPT+=	-e 's,%%CGI%%,,g'
-SED_SCRIPT+=	-e 's,%%CGI_PATH%%,${CGI_PATH},g'
+_SED_SCRIPT+=	-e 's,%%CGI%%,,g'
+_SED_SCRIPT+=	-e 's,%%CGI_PATH%%,${CGI_PATH},g'
 #SED_FILES=	${LS}  ${WRKSRC}/cgi/*.pl
 #SED_FILES+=	${LS} $PWRKSRC}/cgi/*.cgi
 .else
 PLIST_SUB+=	CGI="@comment "
-SED_SCRIPT+=	-e '/%%CGI%%/D'
+_SED_SCRIPT+=	-e '/%%CGI%%/D'
 .endif
 
 MAN1=	dspam.1 dspam_clean.1 dspam_corpus.1 dspam_dump.1 dspam_merge.1 \
@@ -437,16 +437,18 @@ MLINKS+=	libdspam.3 dspam_getsource.3
 MLINKS+=	libdspam.3 dspam_destroy.3
 MLINKS+=	libdspam.3 dspam_detach.3
 
-DOCS=	CHANGELOG LICENSE README README.FreeBSD README.courier README.exim \
-	README.pop3filter README.postfix README.qmail README.sendmail \
-	RELEASE.NOTES
+_DOCS=	CHANGELOG LICENSE README README.FreeBSD RELEASE.NOTES UPGRADING
+_DOCSL=	appliance.txt exim.txt ora_drv.txt pgsql_drv.txt postfix.txt \
+	sendmail.txt courier.txt mysql_drv.txt pop3filter.txt qmail.txt \
+	sqlite_drv.txt
 
 .ifndef(MAINT)
 pre-everything::
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "Last ${FILESDIR}/UPDATING entry:"
-	@${GREP} -B 1 -A ${UPD_LINE_NO} ${PKGNAME} ${FILESDIR}/UPDATING
+	@${GREP} -B 1 -A ${_UPD_LINE_NO} ${PKGNAME} ${FILESDIR}/UPDATING
 	@${ECHO_CMD} ""
+	@sleep 5
 .else # maintainer only
 post-fetch:
 .	ifndef(STOP)
@@ -517,7 +519,7 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|where date('now')-date(created_on) > 14;|where date('now')-date(created_on) > ${SIGNATURE_LIFE};|"  ${WRKSRC}/src/tools.sqlite_drv/purge.sql
 .if defined(WITH_DAEMON)
 	@${CP} ${FILESDIR}/dspam.rc ${WRKSRC}
-	@${REINPLACE_CMD} ${SED_RC_SCRIPT} ${WRKSRC}/dspam.rc
+	@${REINPLACE_CMD} ${_SED_RC_SCRIPT} ${WRKSRC}/dspam.rc
 .endif
 
 pre-configure:
@@ -575,7 +577,7 @@ post-install:
 .if defined(USE_MYSQL)
 	@${MKDIR} ${EXAMPLESDIR}/mysql
 	cd  ${WRKSRC}/src/tools.mysql_drv && \
-		${INSTALL_DATA} README mysql_objects-space.sql \
+		${INSTALL_DATA} mysql_objects-space.sql \
 			mysql_objects-speed.sql purge.sql \
 			virtual_users.sql mysql_objects-4.1.sql \
 			purge-4.1.sql neural.sql  ${EXAMPLESDIR}/mysql
@@ -585,17 +587,17 @@ post-install:
 .if defined(WITH_POSTGRESQL)
 	@${MKDIR} ${EXAMPLESDIR}/pgsql
 	@cd  ${WRKSRC}/src/tools.pgsql_drv && \
-		${INSTALL_DATA} README *.sql ${EXAMPLESDIR}/pgsql
+		${INSTALL_DATA} *.sql ${EXAMPLESDIR}/pgsql
 .endif
 .if defined(HAVE_SQLITE)
 	@${MKDIR} ${EXAMPLESDIR}/sqlite
 	cd ${WRKSRC}/src/tools.sqlite_drv && \
-		${INSTALL_DATA} README *.sql ${EXAMPLESDIR}/sqlite
+		${INSTALL_DATA} *.sql ${EXAMPLESDIR}/sqlite
 .endif
 .if defined(WITH_ORACLE)
 	@${MKDIR} ${EXAMPLESDIR}/oracle
 	cd ${WRKSRC}/src/tools.ora_drv && \
-		${INSTALL_DATA} README *.sql ${EXAMPLESDIR}/oracle
+		${INSTALL_DATA} *.sql ${EXAMPLESDIR}/oracle
 .endif
 
 .if defined(WITH_CGI)
@@ -616,11 +618,12 @@ post-install:
 		${INSTALL_DATA} *.html ${CGI_PATH}/templates/
 .endif
 
-	@${SED} ${SED_SCRIPT} ${.CURDIR}/pkg-message > ${WRKSRC}/README.FreeBSD
+	@${SED} ${_SED_SCRIPT} ${.CURDIR}/pkg-message > ${WRKSRC}/README.FreeBSD
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
-	cd ${FILESDIR} && ${INSTALL_DATA} UPDATING ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${_DOCS} ${DOCSDIR}
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${_DOCSL} ${DOCSDIR}
+	cd ${FILESDIR} && ${INSTALL_DATA} UPDATING ${DOCSDIR}/UPDATING
 .endif
 
 	@${MKDIR} -m ${DSPAM_HOME_MODE} ${DSPAM_HOME}
diff --git a/mail/dspam-devel/distinfo b/mail/dspam-devel/distinfo
index b3e2501741ec..b165929575fc 100644
--- a/mail/dspam-devel/distinfo
+++ b/mail/dspam-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (dspam-devel-3.4.r2.20050305.0930.tar.gz) = 265524d5d3fd015423a0818f46bff464
-SIZE (dspam-devel-3.4.r2.20050305.0930.tar.gz) = 683835
+MD5 (dspam-devel-3.5.0.20050428.1100.tar.gz) = 5cb763e8d07aa05ba4ac984ba2e1099b
+SIZE (dspam-devel-3.5.0.20050428.1100.tar.gz) = 700915
diff --git a/mail/dspam-devel/files/UPDATING b/mail/dspam-devel/files/UPDATING
index 44a9324f8817..de6b37a172aa 100644
--- a/mail/dspam-devel/files/UPDATING
+++ b/mail/dspam-devel/files/UPDATING
@@ -13,6 +13,23 @@ in the port directory:
 make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
 
 ###########################################################################
+# dspam-devel-3.5.0.20050428.1100
+#
+
+This is the post-3.4 devel branch. A lot of things have changed and your
+existing dspam.conf won't probably work anymore. Please compare it with the
+dspam.conf.sample located in the same etc/ directory.
+
+Most notable addition is the SMTP delivery which together with "standard"
+inbound LMTP make a very nice content and light (e.g. it's the fastest setup
+I've had so far) filter.
+
+Database structure is roughly the same but you may wish to check your
+existing database structure with the *.sql corresponding to you database
+driver from EXAMPLESDIR (Mysql 4.1.x is now default as it's _much_ faster).
+Please read carefully distributed docs like README, UPGRADING and CHANGES.
+
+###########################################################################
 # dspam-devel-3.4.r2.20050305.0930 (this is post RC2A)
 #
 
diff --git a/mail/dspam-devel/files/patch-dspam.c b/mail/dspam-devel/files/patch-dspam.c
index 678305f2d9d0..866006310930 100644
--- a/mail/dspam-devel/files/patch-dspam.c
+++ b/mail/dspam-devel/files/patch-dspam.c
@@ -1,23 +1,23 @@
---- src/dspam.c.dist	Sun Feb 20 22:42:47 2005
-+++ src/dspam.c	Sun Feb 20 22:46:22 2005
-@@ -2543,8 +2543,9 @@
-           LOG (LOG_CRIT, ERROR_MEM_ALLOC);
-       }
- 
--      if (CTX->result == DSR_ISSPAM)
--      {
-+// FreeBSD patch: put the user in all emails, extremely usefull for scripts
-+//      if (CTX->result == DSR_ISSPAM)
-+//      {
-         snprintf(data, sizeof(data), "X-DSPAM-User: %s", CTX->username);
-         head = _ds_create_header_field(data);
-         if (head != NULL)
-@@ -2556,7 +2557,7 @@
+--- src/dspam.c.dist	Wed Apr 27 14:45:51 2005
++++ src/dspam.c	Wed Apr 27 14:47:50 2005
+@@ -2966,8 +2966,9 @@
+             LOG (LOG_CRIT, ERR_MEM_ALLOC);
          }
-         else
-           LOG (LOG_CRIT, ERROR_MEM_ALLOC);
--      }
-+//      }  // end of FreeBSD patch
  
-       if (!strcmp(_ds_pref_val(PTX, "showFactors"), "on")) {
-
+-        if (CTX->result == DSR_ISSPAM)
+-        {
++// FreeBSD port patch: put the user in all emails, extremely usefull for scripts
++//        if (CTX->result == DSR_ISSPAM)
++//        {
+           snprintf(data, sizeof(data), "X-DSPAM-User: %s", CTX->username);
+           head = _ds_create_header_field(data);
+           if (head != NULL)
+@@ -2979,7 +2980,7 @@
+           }
+           else
+             LOG (LOG_CRIT, ERR_MEM_ALLOC);
+-        }
++//        } // // end of FreeBSD port patch
+ 
+         if (!strcmp(_ds_pref_val(ATX->PTX, "showFactors"), "on")) {
+ 
diff --git a/mail/dspam-devel/pkg-message b/mail/dspam-devel/pkg-message
index 27dc4aa84a60..857c7c46bf05 100644
--- a/mail/dspam-devel/pkg-message
+++ b/mail/dspam-devel/pkg-message
@@ -1,34 +1,13 @@
 
 -------------------------------------------------------------------------------
+ Reporting problems, asking questions:
+ - FreeBSD specific port-related problems/questions/paches: maintainer
+(and ports@ if you fell the need); send-pr only if you get no timely reply
+ - dspam specific questions: dspam/dspam-dev mailling list (maintainer cc'ed)
+ - dspam specific patches: dspam/dspam-dev mailling list (maintainer cc'ed if)
+ Please be sure to include in your email/pr relevant information such as:
+ uname -a, dspam --version, /var/db/ports/dspam-devel/options, MTA setup.
 
- See the file %%DOCSDIR%%/README for advice about 
- how to configure DSPAM and
- %%DOCSDIR%%/README.your_mta_name 
- for MTA or pop3 integration; examples for:
- courier, exim, pop3filter, postfix, qmail and sendmail.
- Keep in mind that while this port obeys our hier(7) this thing is not
- reflected in distributed files because I lack the time for patching them.
-
-%%MYSQL%%
-%%MYSQL%% See %%EXAMPLESDIR%%/mysql/README
-%%MYSQL%% for instructions on how to configure DSPAM - MySQL interaction.
-%%MYSQL%%
-%%PGSQL%%
-%%PGSQL%% See %%EXAMPLESDIR%%/pgsql/README
-%%PGSQL%% for instructions on how to configure PostrgreSQL
-%%PGSQL%% for use with DSPAM.
-%%PGSQL%% 
-%%SQLITE%%
-%%SQLITE%% See %%EXAMPLESDIR%%/sqlite/README
-%%SQLITE%% for suggestion on SQLite back-end. It should work out-of-the-box.
-%%SQLITE%%
-%%SQLITE%% You'll always want to run dspam_clean -p0 and 
-%%SQLITE%% sqlite %%DSPAM_HOME%%/data/user/user.sdb < vacuum 
-%%SQLITE%% after a corpusfeed.
-%%SQLITE%% There are  most likely 70%+ junk tokens that need to be removed.
-%%SQLITE%% This will have a HUGE impact on the disk space your db uses.
-%%SQLITE%%
-%%CGI%%
 %%CGI%% The CGI files had been installed in
 %%CGI%% %%CGI_PATH%%
 %%CGI%% Copy
@@ -48,37 +27,13 @@
 %%CGI%% to
 %%CGI%% %%CGI_PATH%%/admins 
 %%CGI%% and edit the file to your needs. 
-%%CGI%% See %%DOCSDIR%%/README 
-%%CGI%% especially the CGI and Trusted Users sections for more info.
 %%CGI%% If you have problems (after upgrading) check permissions.
 %%DAEMON%%
 %%DAEMON%% To enable the dspam deamon put dspam_enable="YES" in your
 %%DAEMON%% /etc/rc.conf
 
-
-  See %%DOCSDIR%%/RELEASE.NOTES 
-  for new things in this %%PKGNAME%% and 
-  %%DOCSDIR%%/CHANGELOG
-  for the full list of changes.
-
- ---- %%PKGNAME%% is considered to be a DEVELOPMENT release.  ---
- Reporting problems, asking questions:
- - FreeBSD specific port-related problems/questions/paches: maintainer 
-(and ports@ if you fell the need); send-pr only if you get no timely reply
- - dspam specific questions: dspam/dspam-dev mailling list (maintainer cc'ed 
- if you like)
- - dspam specific patches: dspam/dspam-dev mailling list (maintainer cc'ed if 
- you like)
- Please be sure to include in your email/pr relevant information such as:
- uname -a, dspam --version, /var/db/ports/dspam-devel/options, MTA setup.
- If needed rebuild WITH_DEBUG and to turn on debugging see DebugOpt in dsapm.conf
-
- Please send unified diff's (diff -u).
- 
- If you don't want to see in your maillog : 
- "query error: verbose debug INFO ONLY: see sql.errors for more details"
- please recompile withOUT verbose debug; those who will report this "error" will
- be sent to spen their night in a room with a cardassian, a klingonian and a romulan.
-
-				-- Thanks for making both our lives easier.
+ You'll find additionl setup instructions under
+ %%DOCSDIR%%
+and
+ %%EXAMPLESDIR%%
 ------------------------------------------------------------------------------
diff --git a/mail/dspam-devel/pkg-plist b/mail/dspam-devel/pkg-plist
index 2a1832e23dd5..e29b3ff9c236 100644
--- a/mail/dspam-devel/pkg-plist
+++ b/mail/dspam-devel/pkg-plist
@@ -15,6 +15,7 @@ bin/dspam_stats
 etc/dspam.conf.sample
 include/dspam/buffer.h
 include/dspam/config.h
+include/dspam/config_shared.h
 include/dspam/decode.h
 include/dspam/diction.h
 include/dspam/error.h
@@ -33,17 +34,22 @@ libdata/pkgconfig/dspam.pc
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES
 %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
-%%PORTDOCS%%%%DOCSDIR%%/README.courier
-%%PORTDOCS%%%%DOCSDIR%%/README.exim
-%%PORTDOCS%%%%DOCSDIR%%/README.pop3filter
-%%PORTDOCS%%%%DOCSDIR%%/README.postfix
-%%PORTDOCS%%%%DOCSDIR%%/README.qmail
-%%PORTDOCS%%%%DOCSDIR%%/README.sendmail
+%%PORTDOCS%%%%DOCSDIR%%/appliance.txt
+%%PORTDOCS%%%%DOCSDIR%%/courier.txt
+%%PORTDOCS%%%%DOCSDIR%%/exim.txt
+%%PORTDOCS%%%%DOCSDIR%%/mysql_drv.txt
+%%PORTDOCS%%%%DOCSDIR%%/ora_drv.txt
+%%PORTDOCS%%%%DOCSDIR%%/pgsql_drv.txt
+%%PORTDOCS%%%%DOCSDIR%%/pop3filter.txt
+%%PORTDOCS%%%%DOCSDIR%%/postfix.txt
+%%PORTDOCS%%%%DOCSDIR%%/qmail.txt
+%%PORTDOCS%%%%DOCSDIR%%/sendmail.txt
+%%PORTDOCS%%%%DOCSDIR%%/sqlite_drv.txt
 %%PORTDOCS%%%%DOCSDIR%%/UPDATING
+%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%MYSQL%%%%EXAMPLESDIR%%/mysql/2x_to_3x_db.sql
 %%MYSQL%%%%EXAMPLESDIR%%/mysql/310_to_320.my.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/README
 %%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-4.1.sql
 %%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-space.sql
 %%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-speed.sql
@@ -53,13 +59,11 @@ libdata/pkgconfig/dspam.pc
 %%MYSQL%%%%EXAMPLESDIR%%/mysql/virtual_users.sql
 %%MYSQL%%@dirrm %%EXAMPLESDIR%%/mysql
 %%MYSQL%%@dirrm %%EXAMPLESDIR%%
-%%PGSQL%%%%EXAMPLESDIR%%/pgsql/README
 %%PGSQL%%%%EXAMPLESDIR%%/pgsql/pgsql_objects.sql
 %%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge.sql
 %%PGSQL%%%%EXAMPLESDIR%%/pgsql/virtual_users.sql
 %%PGSQL%%@dirrm %%EXAMPLESDIR%%/pgsql
 %%PGSQL%%@dirrm %%EXAMPLESDIR%%
-%%SQLITE%%%%EXAMPLESDIR%%/sqlite/README
 %%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge.sql
 %%SQLITE%%@dirrm %%EXAMPLESDIR%%/sqlite
 %%SQLITE%%@dirrm %%EXAMPLESDIR%%