pdate to 20050128.1500 snapshot

- disable ORACLE DB back-end; it's unmaintained and hasn't worked on FreeBSD
- drop USE_GNOME as per PH 6.6
- drop merged up-stream files/patch-dspam.c
- kinldy ask non-maintainer-approved commits to be logged in files/UPDATING if they contain user-visible changes
( like the change of POSTGRESQL* to POSTGRESQL because of "Split the postgresql ports into a server and a client part" )

PR:		ports/77449
Submitted by:	Ion-Mihai "IOnut" Tetcu (maintainer)

5 files changed, 31 insertions, 39 deletions

diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 7b8850e19f47..e649b8890b04 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -5,6 +5,11 @@
 # $FreeBSD$
 #
 
+# Note to commiters: If don't commit a maintainer patch and as a result PKGNAME
+# or user variables (WITH*) changes please and an entry in ${FILESDIR}/UPDATING and
+# modify UPD_LINE_NO=(no_of_added_lines-1) in this Makefile
+# else the port will be broken. Thanks.
+
 PORTNAME=	dspam
 PORTVERSION=	${PORTVER_MAJ}${SNAP_DATE}
 PORTREVISION=	0
@@ -15,10 +20,9 @@ MAINTAINER=	itetcu@people.tecnik93.com
 COMMENT=	Bayesian spam filter - stable maintenance version
 
 PORTVER_MAJ=	3.2.6
-#SNAP_DATE=	.20041229.1945
+SNAP_DATE=	.20050128.1500
 
 .ifdef(SNAP_DATE)
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz
 WRKSRC=		${WRKDIR}/dspam-cvs-stable${SNAP_DATE}
 .endif
 
@@ -28,7 +32,7 @@ MASTER_SITES=	http://dspam.nuclearelephant.com/sources/
 NO_CHECKSUM=	yes
 .	ifdef(SNAP_DATE)
 DISTFILES=	snapshot-stable.tar.gz
-FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${PORTNAME}-${PORTVERSION}.tar.gz
+FETCH_BEFORE_ARGS=	-v -o ${DISTDIR}/${PORTNAME}-${PORTVERSION}.tar.gz
 .	endif
 .endif
 
@@ -57,7 +61,7 @@ OPTIONS+=	MYSQL41 "Use MySQL 4.1.x as back-end" off
 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
-OPTIONS+=	ORACLE "Use Oracle as back-end (BROKEN)" off
+#OPTIONS+=	ORACLE "Use Oracle as back-end (BROKEN)" off
 OPTIONS+=	BDB4 "Use BDB4 as back-end (not recomanded)" off
 OPTIONS+=	SQLITE2 "Use SQLite v2.x as back-end" on
 OPTIONS+=	VIRT_USERS "Enable virtual users (needs SQL back-end)" off
@@ -80,7 +84,6 @@ OPTIONS+=	QMAIL "Play nice with Qmail mail server" off
 
 OPTIONS+=	CGI "Install CGI (pulls in apache)" off
 
-USE_GNOME=	pkgconfig
 USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
@@ -94,7 +97,7 @@ CFLAGS+=	-g -DDEBUG
 
 PKGMESSAGE=	${WRKSRC}/README.FreeBSD
 
-UPD_LINE_NO=	13
+UPD_LINE_NO=	9
 
 CONFLICTS=	dspam-2* dspam-devel-[0-9]*
 
@@ -188,7 +191,7 @@ CONFIGURE_ARGS+=	--enable-homedir
 CONFIGURE_ARGS+=	--disable-trusted-user-security
 .endif
 
-DBDRV_TOTAL_COUNT=	oooooooo # 8
+DBDRV_TOTAL_COUNT=	ooooooo # 7
 DBDRV_COUNT=	${DBDRV_TOTAL_COUNT}
 
 .ifdef(WITH_MYSQL40)
@@ -411,6 +414,7 @@ post-fetch:
 .endif
 
 pre-extract:
+	@${ECHO_CMD} ""
 	@${ECHO_CMD} "Define vars below before make-ing if you need:"
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "SIGNATURE_LIFE=${SIGNATURE_LIFE} (default 15)"
@@ -433,7 +437,8 @@ pre-extract:
 .for old_opt in MAILDROP PROCMAIL TRAD_BAYES ALT_BAYES SPAM_SUBJ \
 	USER_LOGGING SYSTEM_LOGGING WEBMAIL OPT_IN SAT PARSE_TO_HEADERS \
 	BROKEN_MTA BROKEN_ERR_CODES SIGNATURE_HEADERS SIGNATURE_ATACH \
-	HOMEDIR_DOT SIGNATURE_LIFE SQLITE QUARANTINE_AGENT WHITELIST
+	HOMEDIR_DOT SIGNATURE_LIFE SQLITE QUARANTINE_AGENT WHITELIST \
+	POSTGRESQL73 POSTGRESQL74 ORACLE
 .	if defined(WITH_${old_opt}) || defined(WITHOUT_${old_opt})
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "******************************************************************"
diff --git a/mail/dspam/distinfo b/mail/dspam/distinfo
index de83fb7f8f0a..85754153e6b0 100644
--- a/mail/dspam/distinfo
+++ b/mail/dspam/distinfo
@@ -1,2 +1,2 @@
-MD5 (dspam-3.2.6.tar.gz) = aad53b4542076840e2a0e1fd43e48ebb
-SIZE (dspam-3.2.6.tar.gz) = 621074
+MD5 (dspam-3.2.6.20050128.1500.tar.gz) = 4dac582a3e38a19a5c6120a43b49f51e
+SIZE (dspam-3.2.6.20050128.1500.tar.gz) = 621415
diff --git a/mail/dspam/files/UPDATING b/mail/dspam/files/UPDATING
index b755a547e0be..c087771faf9c 100644
--- a/mail/dspam/files/UPDATING
+++ b/mail/dspam/files/UPDATING
@@ -1,3 +1,8 @@
+# $FreeBSD$
+#
+# for each PKGNAME or user option change an entry should be added in this file
+# each entry 
+
 This file documents some of the problems you may encounter when
 upgrading dspam port.  I will try my best to minimize these disruptions,
 but sometimes they are unavoidable.
@@ -11,6 +16,16 @@ in the port directory:
 make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
 
 #############################################################################
+# dspam-3.2.6.20050128.1500
+#
+
+- disable ORACLE DB back-end; it's unmaintained and hasn't work on FreeBSD
+- (added post-factum) Fix mysql/neural-combination
+- (added post-factum) change POSTGRESQL* to POSTGRESQL because of "Split the 
+postgresql ports into a server and a client part"
+
+
+#############################################################################
 # dspam-3.2.6
 #
 
diff --git a/mail/dspam/files/patch-dspam.c b/mail/dspam/files/patch-dspam.c
deleted file mode 100644
index 4863a8411661..000000000000
--- a/mail/dspam/files/patch-dspam.c
+++ /dev/null
@@ -1,28 +0,0 @@
-*** dspam.c	Fri Jan 28 14:33:46 2005
---- dspam.c.orig	Fri Jan 28 14:33:40 2005
-***************
-*** 2748,2757 ****
-      free(SIG.data);
-    nt_destroy (inoc_users);
-    nt_destroy (classify_users);
-!   if (CTX)
-      dspam_destroy (CTX);
-    return result;
-- 
-  }
-  
-  int
---- 2748,2760 ----
-      free(SIG.data);
-    nt_destroy (inoc_users);
-    nt_destroy (classify_users);
-!   if (CTX) {
-!     if (CTX->signature == &SIG) {
-!       CTX->signature = NULL;
-!      }
-      dspam_destroy (CTX);
-+   }
-    return result;
-  }
-  
-  int
diff --git a/mail/dspam/pkg-plist b/mail/dspam/pkg-plist
index 96f7c4fbec42..940f2da6c6c9 100644
--- a/mail/dspam/pkg-plist
+++ b/mail/dspam/pkg-plist
@@ -24,6 +24,7 @@ lib/libdspam.a
 lib/libdspam.so
 lib/libdspam.so.6
 libdata/pkgconfig/dspam.pc
+@unexec rmdir %B 2>/dev/null || true
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README
@@ -86,7 +87,6 @@ libdata/pkgconfig/dspam.pc
 %%CGI%%@dirrm www/vhosts
 %%CGI%%@unexec rmdir %D/www 2>/dev/null || true
 @dirrm include/dspam
-@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
 @cwd %%DSPAM_HOME%%
 firstrun.txt.sample
 firstspam.txt.sample