Attachment #49426 for bug #75491

View | Details | Raw Unified | Return to bug 75491
Collapse All | Expand All





PORTNAME=	dspam
PORTVERSION=	3.2.3${SNAP_DATE}
PORTREVISION=	1
CATEGORIES=	mail
MASTER_SITES=	http://people.tecnik93.com/~itetcu/FreeBSD/ports/dspam/sources/
DISTFILES=	dspam.3.2.3.cvs.stable${SNAP_DATE}.tar.gz

MAINTAINER=	itetcu@people.tecnik93.com
COMMENT=	Bayesian spam filter - stable maintenance version

WRKSRC=		${WRKDIR}/dspam-cvs-stable${SNAP_DATE}

SNAP_DATE=	.20041218.2100

## debug / log / admin options
OPTIONS=	DEBUG "Enable debugging logging" on

#OPTIONS+=	PGSQL_INSTALLED "You have the client installed" on
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
OPTIONS+=	LONG_USERNAMES "Usernames longer that OS supports" off
OPTIONS+=	LARGE_SCALE "File structure for large scale" off


PKGMESSAGE=	${WRKSRC}/README.FreeBSD

CONFLICTS=	dspam-2* dspam-devel-[0-9]*

SIGNATURE_LIFE?=	15
_VAR_DIR=	/var

DSPAM_HOME?=	${_VAR_DIR}/db/dspam
DSPAM_HOME_MODE?=	0660

DSPAM_OWNER?=	root
DSPAM_GROUP?=	mail

.include <bsd.port.pre.mk>

CONFIGURE_ARGS+=	--with-logdir=${LOG_DIR}

CONFIGURE_ARGS+=	--with-dspam-home-mode=${DSPAM_HOME_MODE}
.endif

.if defined(DSPAM_OWNER)
CONFIGURE_ARGS+=	--with-dspam-owner=${DSPAM_OWNER}
CONFIGURE_ARGS+=	--with-dspam-group=${DSPAM_GROUP}
.if defined(DSPAM_GROUP)
CONFIGURE_ARGS+=	--with-dspam-group=${DSPAM_HOME_GROUP}
.endif
.if defined(DSPAM_MODE)
CONFIGURE_ARGS+=	--with-dspam-mode=${DSPAM_MODE}
.endif

SED_SCRIPT=	-e 's,%%DOCSDIR%%,${DOCSDIR},g' \

DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
.endif

.if ${DBDRV_TOTAL_COUNT}==${DBDRV_COUNT} || defined(WITH_SQLITE2)
WITH_SQLITE=	on
LIB_DEPENDS+=	sqlite.2:${PORTSDIR}/databases/sqlite2
CONFIGURE_ARGS+=	--with-storage-driver=sqlite_drv \
	--with-sqlite-includes=${LOCALBASE}/include \

	@${FALSE}
.endif

#pre-install:
### to patch dspam.conf
#	${REINPLACE_CMD} -e 's|/usr/bin/|${LOCALBASE}/bin/|g' ${WRKSRC}/dspam.conf.in

post-install:
	${CP} ${WRKSRC}/dspam.conf ${WRKSRC}/dspam.conf.sample
	cd ${WRKSRC}/ && \
		${INSTALL} -o ${DSPAM_OWNER} -g ${DSPAM_GROUP} -m 0640 \
			 dspam.conf.sample ${PREFIX}/etc
#	@${MKDIR} ${LOG_DIR}
#	@${MKDIR} ${DSPAM_HOME}


		${INSTALL_DATA} README *.sql ${EXAMPLESDIR}/pgsql
#	${INSTALL_DATA} ${FILESDIR}/pgsql.data ${EXAMPLESDIR}/pgsql
.endif
.if defined(WITH_SQLITE2)
	@${MKDIR} ${EXAMPLESDIR}/sqlite
	cd ${WRKSRC}/tools.sqlite_drv && \
		${INSTALL_DATA} README *.sql ${EXAMPLESDIR}/sqlite

Lines 1-2 Link Here

(-)dspam/distinfo (-2 / +2 lines)
1	MD5 (dspam.3.2.3.cvs.stable.20041203.1245.tar.gz) = 8d6c409328ebc3eaf5468ac2bee092e6	1	MD5 (dspam.3.2.3.cvs.stable.20041218.2100.tar.gz) = 272859a935c7c6582f54c4d6d749ce1b
2	SIZE (dspam.3.2.3.cvs.stable.20041203.1245.tar.gz) = 620629	2	SIZE (dspam.3.2.3.cvs.stable.20041218.2100.tar.gz) = 620733




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.

You should get into the habit of checking this file for changes each

also the UPGRADING enclosed in the dspam distribution. You can see it by doing
in the port directory:
make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`

#############################################################################
# dspam-3.2.3.20041218.2100 (this is really 3.2.3 release)
#

- change of name: SQLITE --> SQLITE2, as the -devel port already have sqlite3
support
- fix deinstall to delete dspam.conf if it hasn't been cutomized, as 
requested by kris@ with "Ports Janitor" hat :)
- correct long-standing copy/paste bug DSPAM_{GROUPD,MODE} where set to
DSPAM_HOME_{GROUP,MODE} 

#############################################################################
# dspam-3.2.3.20041203.1245_1 (entry added post-factum, it was an automated 
#                            update approved by me but not under my control )
#

- chase dependecy for sqlite

#############################################################################
# dspam-3.2.3.20041203.1245

Lines 8-13 Link Here

(-)dspam/pkg-plist (+1 lines)
8	bin/dspam_genaliases	8	bin/dspam_genaliases
9	bin/dspam_merge	9	bin/dspam_merge
10	bin/dspam_stats	10	bin/dspam_stats
		11	@unexec if cmp -s %D/etc/dspam.conf %D/etc/dspam.conf.sample; then rm -f %D/etc/dspam.conf; fi
11	etc/dspam.conf.sample	12	etc/dspam.conf.sample
12	include/dspam/buffer.h	13	include/dspam/buffer.h
13	include/dspam/config.h	14	include/dspam/config.h

Return to bug 75491

Lines 7-23 Link Here

(-)dspam/Makefile (-18 / +18 lines)
7		7
8	PORTNAME= dspam	8	PORTNAME= dspam
9	PORTVERSION= 3.2.3${SNAP_DATE}	9	PORTVERSION= 3.2.3${SNAP_DATE}
10	PORTREVISION= 1
11	CATEGORIES= mail	10	CATEGORIES= mail
12	MASTER_SITES= http://people.tecnik93.com/~itetcu/FreeBSD/ports/dspam/sources/	11	MASTER_SITES= http://people.tecnik93.com/~itetcu/FreeBSD/ports/dspam/sources/
13	DISTFILES= dspam.3.2.3.cvs.stable${SNAP_DATE}.tar.gz	12	DISTFILES= dspam.3.2.3.cvs.stable${SNAP_DATE}.tar.gz
14		13
15	MAINTAINER= itetcu@people.tecnik93.com	14	MAINTAINER= itetcu@people.tecnik93.com
16	COMMENT= Bayesian spam filter - development version	15	COMMENT= Bayesian spam filter - stable maintenance version
17		16
18	WRKSRC= ${WRKDIR}/dspam-cvs-stable${SNAP_DATE}	17	WRKSRC= ${WRKDIR}/dspam-cvs-stable${SNAP_DATE}
19		18
20	SNAP_DATE= .20041203.1245	19	SNAP_DATE= .20041218.2100
21		20
22	## debug / log / admin options	21	## debug / log / admin options
23	OPTIONS= DEBUG "Enable debugging logging" on	22	OPTIONS= DEBUG "Enable debugging logging" on
Lines 60-66 Link Here
60	#OPTIONS+= PGSQL_INSTALLED "You have the client installed" on	59	#OPTIONS+= PGSQL_INSTALLED "You have the client installed" on
61	OPTIONS+= ORACLE "Use Oracle as back-end (BROKEN)" off	60	OPTIONS+= ORACLE "Use Oracle as back-end (BROKEN)" off
62	OPTIONS+= BDB4 "Use BDB4 as back-end (not recomanded)" off	61	OPTIONS+= BDB4 "Use BDB4 as back-end (not recomanded)" off
63	OPTIONS+= SQLITE "Use SQLite as back-end" on	62	OPTIONS+= SQLITE2 "Use SQLite v2.x as back-end" on
64	OPTIONS+= VIRT_USERS "Enable virtual users (needs SQL back-end)" off	63	OPTIONS+= VIRT_USERS "Enable virtual users (needs SQL back-end)" off
65	OPTIONS+= LONG_USERNAMES "Usernames longer that OS supports" off	64	OPTIONS+= LONG_USERNAMES "Usernames longer that OS supports" off
66	OPTIONS+= LARGE_SCALE "File structure for large scale" off	65	OPTIONS+= LARGE_SCALE "File structure for large scale" off
Lines 94-100 Link Here
94		93
95	PKGMESSAGE= ${WRKSRC}/README.FreeBSD	94	PKGMESSAGE= ${WRKSRC}/README.FreeBSD
96		95
97	CONFLICTS= dspam-2* dspam-3.0*	96	CONFLICTS= dspam-2* dspam-devel-[0-9]*
98		97
99	SIGNATURE_LIFE?= 15	98	SIGNATURE_LIFE?= 15
100	_VAR_DIR= /var	99	_VAR_DIR= /var
Lines 102-107 Link Here
102	DSPAM_HOME?= ${_VAR_DIR}/db/dspam	101	DSPAM_HOME?= ${_VAR_DIR}/db/dspam
103	DSPAM_HOME_MODE?= 0660	102	DSPAM_HOME_MODE?= 0660
104		103
		104	DSPAM_OWNER?= root
		105	DSPAM_GROUP?= mail
		106
105	.include <bsd.port.pre.mk>	107	.include <bsd.port.pre.mk>
106		108
107	CONFIGURE_ARGS+= --with-logdir=${LOG_DIR}	109	CONFIGURE_ARGS+= --with-logdir=${LOG_DIR}
Lines 120-133 Link Here
120	CONFIGURE_ARGS+= --with-dspam-home-mode=${DSPAM_HOME_MODE}	122	CONFIGURE_ARGS+= --with-dspam-home-mode=${DSPAM_HOME_MODE}
121	.endif	123	.endif
122		124
123	.if defined(DSPAM_OWNER)
124	CONFIGURE_ARGS+= --with-dspam-owner=${DSPAM_OWNER}	125	CONFIGURE_ARGS+= --with-dspam-owner=${DSPAM_OWNER}
125	.endif	126	CONFIGURE_ARGS+= --with-dspam-group=${DSPAM_GROUP}
126	.if defined(DSPAM_GROUP)
127	CONFIGURE_ARGS+= --with-dspam-group=${DSPAM_HOME_GROUP}
128	.endif
129	.if defined(DSPAM_MODE)	127	.if defined(DSPAM_MODE)
130	CONFIGURE_ARGS+= --with-dspam-mode=${DSPAM_HOME_MODE}	128	CONFIGURE_ARGS+= --with-dspam-mode=${DSPAM_MODE}
131	.endif	129	.endif
132		130
133	SED_SCRIPT= -e 's,%%DOCSDIR%%,${DOCSDIR},g' \	131	SED_SCRIPT= -e 's,%%DOCSDIR%%,${DOCSDIR},g' \
Lines 341-348 Link Here
341	DBDRV_COUNT:= ${DBDRV_COUNT:S/o//}	339	DBDRV_COUNT:= ${DBDRV_COUNT:S/o//}
342	.endif	340	.endif
343		341
344	.if ${DBDRV_TOTAL_COUNT}==${DBDRV_COUNT} \|\| defined(WITH_SQLITE)	342	.if ${DBDRV_TOTAL_COUNT}==${DBDRV_COUNT} \|\| defined(WITH_SQLITE2)
345	WITH_SQLITE= on
346	LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2	343	LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2
347	CONFIGURE_ARGS+= --with-storage-driver=sqlite_drv \	344	CONFIGURE_ARGS+= --with-storage-driver=sqlite_drv \
348	--with-sqlite-includes=${LOCALBASE}/include \	345	--with-sqlite-includes=${LOCALBASE}/include \
Lines 605-616 Link Here
605	@${FALSE}	602	@${FALSE}
606	.endif	603	.endif
607		604
608	post-install:	605	#pre-install:
609	### to patch dspam.conf	606	### to patch dspam.conf
610	${REINPLACE_CMD} -e 's\|/usr/bin/\|${PREFIX}/bin/\|g' ${WRKSRC}/dspam.conf	607	# ${REINPLACE_CMD} -e 's\|/usr/bin/\|${LOCALBASE}/bin/\|g' ${WRKSRC}/dspam.conf.in
611	@${CP} ${WRKSRC}/dspam.conf ${WRKSRC}/dspam.conf.sample	608
		609	post-install:
		610	${CP} ${WRKSRC}/dspam.conf ${WRKSRC}/dspam.conf.sample
612	cd ${WRKSRC}/ && \	611	cd ${WRKSRC}/ && \
613	${INSTALL_DATA} dspam.conf.sample ${PREFIX}/etc	612	${INSTALL} -o ${DSPAM_OWNER} -g ${DSPAM_GROUP} -m 0640 \
		613	dspam.conf.sample ${PREFIX}/etc
614	# @${MKDIR} ${LOG_DIR}	614	# @${MKDIR} ${LOG_DIR}
615	# @${MKDIR} ${DSPAM_HOME}	615	# @${MKDIR} ${DSPAM_HOME}
616		616
Lines 630-636 Link Here
630	${INSTALL_DATA} README *.sql ${EXAMPLESDIR}/pgsql	630	${INSTALL_DATA} README *.sql ${EXAMPLESDIR}/pgsql
631	# ${INSTALL_DATA} ${FILESDIR}/pgsql.data ${EXAMPLESDIR}/pgsql	631	# ${INSTALL_DATA} ${FILESDIR}/pgsql.data ${EXAMPLESDIR}/pgsql
632	.endif	632	.endif
633	.if defined(WITH_SQLITE)	633	.if defined(WITH_SQLITE2)
634	@${MKDIR} ${EXAMPLESDIR}/sqlite	634	@${MKDIR} ${EXAMPLESDIR}/sqlite
635	cd ${WRKSRC}/tools.sqlite_drv && \	635	cd ${WRKSRC}/tools.sqlite_drv && \
636	${INSTALL_DATA} README *.sql ${EXAMPLESDIR}/sqlite	636	${INSTALL_DATA} README *.sql ${EXAMPLESDIR}/sqlite

Lines 1-5 Link Here

(-)dspam/files/UPDATING (-1 / +19 lines)
1	This file documents some of the problems you may encounter when	1	This file documents some of the problems you may encounter when
2	upgrading dspam port. I will try our best to minimize these disruptions,	2	upgrading dspam port. I will try my best to minimize these disruptions,
3	but sometimes they are unavoidable.	3	but sometimes they are unavoidable.
4		4
5	You should get into the habit of checking this file for changes each	5	You should get into the habit of checking this file for changes each
Lines 9-14 Link Here
9	also the UPGRADING enclosed in the dspam distribution. You can see it by doing	9	also the UPGRADING enclosed in the dspam distribution. You can see it by doing
10	in the port directory:	10	in the port directory:
11	make extract; more `find . -type f -maxdepth 2 -name UPGRADING`	11	make extract; more `find . -type f -maxdepth 2 -name UPGRADING`
		12
		13	#############################################################################
		14	# dspam-3.2.3.20041218.2100 (this is really 3.2.3 release)
		15	#
		16
		17	- change of name: SQLITE --> SQLITE2, as the -devel port already have sqlite3
		18	support
		19	- fix deinstall to delete dspam.conf if it hasn't been cutomized, as
		20	requested by kris@ with "Ports Janitor" hat :)
		21	- correct long-standing copy/paste bug DSPAM_{GROUPD,MODE} where set to
		22	DSPAM_HOME_{GROUP,MODE}
		23
		24	#############################################################################
		25	# dspam-3.2.3.20041203.1245_1 (entry added post-factum, it was an automated
		26	# update approved by me but not under my control )
		27	#
		28
		29	- chase dependecy for sqlite
12		30
13	#############################################################################	31	#############################################################################
14	# dspam-3.2.3.20041203.1245	32	# dspam-3.2.3.20041203.1245