diff options
author | Norikatsu Shigemura <nork@FreeBSD.org> | 2004-12-25 12:41:20 +0000 |
---|---|---|
committer | Norikatsu Shigemura <nork@FreeBSD.org> | 2004-12-25 12:41:20 +0000 |
commit | add78df5ce637c85d5928cac520d4ff8a1930a1c (patch) | |
tree | c5161af237fc952fc0f93274edd9b32e69f9688e /mail/dspam | |
parent | Properly 'determine' gtkrell2 (diff) |
Update to 20041218.2100.
o Fix deinstall to delete dspam.conf if it hasn't been
cutomized. [1]
o Change of name: SQLITE --> SQLITE2, as the -devel port
already have sqlite3 support.
o Correct long-standing copy/paste bug DSPAM_{GROUPD,MODE}
where set to DSPAM_HOME_{GROUP,MODE}.
o Fix COMMENT
PR: ports/75491
Submitted by: on-Mihai "IOnut" Tetcu <itetcu@people.tecnik93.com> (maintainer)
Pointed out by: kris [1]
Notes
Notes:
svn path=/head/; revision=125128
Diffstat (limited to 'mail/dspam')
-rw-r--r-- | mail/dspam/Makefile | 37 | ||||
-rw-r--r-- | mail/dspam/distinfo | 4 | ||||
-rw-r--r-- | mail/dspam/files/UPDATING | 20 | ||||
-rw-r--r-- | mail/dspam/pkg-plist | 1 |
4 files changed, 41 insertions, 21 deletions
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile index 0e80aeb41ef6..b8939d3e3fcc 100644 --- a/mail/dspam/Makefile +++ b/mail/dspam/Makefile @@ -7,17 +7,17 @@ PORTNAME= dspam PORTVERSION= 3.2.3${SNAP_DATE} -PORTREVISION= 1 +PORTREVISION= 0 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 - development version +COMMENT= Bayesian spam filter - stable maintenance version WRKSRC= ${WRKDIR}/dspam-cvs-stable${SNAP_DATE} -SNAP_DATE= .20041203.1245 +SNAP_DATE= .20041218.2100 ## debug / log / admin options OPTIONS= DEBUG "Enable debugging logging" on @@ -60,7 +60,7 @@ OPTIONS+= POSTGRESQL74 "Use PostgreSQL v.7.4 as back-end" off #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+= SQLITE "Use SQLite as back-end" on +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 @@ -94,7 +94,7 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} PKGMESSAGE= ${WRKSRC}/README.FreeBSD -CONFLICTS= dspam-2* dspam-3.0* +CONFLICTS= dspam-2* dspam-devel-[0-9]* SIGNATURE_LIFE?= 15 _VAR_DIR= /var @@ -102,6 +102,9 @@ LOG_DIR?= ${_VAR_DIR}/log/dspam 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} @@ -120,14 +123,10 @@ CONFIGURE_ARGS+= --with-dspam-home-group=${DSPAM_HOME_GROUP} CONFIGURE_ARGS+= --with-dspam-home-mode=${DSPAM_HOME_MODE} .endif -.if defined(DSPAM_OWNER) CONFIGURE_ARGS+= --with-dspam-owner=${DSPAM_OWNER} -.endif -.if defined(DSPAM_GROUP) -CONFIGURE_ARGS+= --with-dspam-group=${DSPAM_HOME_GROUP} -.endif +CONFIGURE_ARGS+= --with-dspam-group=${DSPAM_GROUP} .if defined(DSPAM_MODE) -CONFIGURE_ARGS+= --with-dspam-mode=${DSPAM_HOME_MODE} +CONFIGURE_ARGS+= --with-dspam-mode=${DSPAM_MODE} .endif SED_SCRIPT= -e 's,%%DOCSDIR%%,${DOCSDIR},g' \ @@ -341,8 +340,7 @@ SED_SCRIPT+= -e '/%%SQLITE%%/D' DBDRV_COUNT:= ${DBDRV_COUNT:S/o//} .endif -.if ${DBDRV_TOTAL_COUNT}==${DBDRV_COUNT} || defined(WITH_SQLITE) -WITH_SQLITE= on +.if ${DBDRV_TOTAL_COUNT}==${DBDRV_COUNT} || defined(WITH_SQLITE2) LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2 CONFIGURE_ARGS+= --with-storage-driver=sqlite_drv \ --with-sqlite-includes=${LOCALBASE}/include \ @@ -605,12 +603,15 @@ pre-configure: @${FALSE} .endif -post-install: +#pre-install: ### to patch dspam.conf - ${REINPLACE_CMD} -e 's|/usr/bin/|${PREFIX}/bin/|g' ${WRKSRC}/dspam.conf - @${CP} ${WRKSRC}/dspam.conf ${WRKSRC}/dspam.conf.sample +# ${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_DATA} dspam.conf.sample ${PREFIX}/etc + ${INSTALL} -o ${DSPAM_OWNER} -g ${DSPAM_GROUP} -m 0640 \ + dspam.conf.sample ${PREFIX}/etc # @${MKDIR} ${LOG_DIR} # @${MKDIR} ${DSPAM_HOME} @@ -630,7 +631,7 @@ post-install: ${INSTALL_DATA} README *.sql ${EXAMPLESDIR}/pgsql # ${INSTALL_DATA} ${FILESDIR}/pgsql.data ${EXAMPLESDIR}/pgsql .endif -.if defined(WITH_SQLITE) +.if defined(WITH_SQLITE2) @${MKDIR} ${EXAMPLESDIR}/sqlite cd ${WRKSRC}/tools.sqlite_drv && \ ${INSTALL_DATA} README *.sql ${EXAMPLESDIR}/sqlite diff --git a/mail/dspam/distinfo b/mail/dspam/distinfo index b030cf98dd69..efc69eca9faa 100644 --- a/mail/dspam/distinfo +++ b/mail/dspam/distinfo @@ -1,2 +1,2 @@ -MD5 (dspam.3.2.3.cvs.stable.20041203.1245.tar.gz) = 8d6c409328ebc3eaf5468ac2bee092e6 -SIZE (dspam.3.2.3.cvs.stable.20041203.1245.tar.gz) = 620629 +MD5 (dspam.3.2.3.cvs.stable.20041218.2100.tar.gz) = 272859a935c7c6582f54c4d6d749ce1b +SIZE (dspam.3.2.3.cvs.stable.20041218.2100.tar.gz) = 620733 diff --git a/mail/dspam/files/UPDATING b/mail/dspam/files/UPDATING index 58a5aafecdda..878afd479e20 100644 --- a/mail/dspam/files/UPDATING +++ b/mail/dspam/files/UPDATING @@ -1,5 +1,5 @@ This file documents some of the problems you may encounter when -upgrading dspam port. I will try our best to minimize these disruptions, +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 @@ -11,6 +11,24 @@ 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 # diff --git a/mail/dspam/pkg-plist b/mail/dspam/pkg-plist index aa2b5e9bce62..96f7c4fbec42 100644 --- a/mail/dspam/pkg-plist +++ b/mail/dspam/pkg-plist @@ -8,6 +8,7 @@ bin/dspam_dump bin/dspam_genaliases bin/dspam_merge bin/dspam_stats +@unexec if cmp -s %D/etc/dspam.conf %D/etc/dspam.conf.sample; then rm -f %D/etc/dspam.conf; fi etc/dspam.conf.sample include/dspam/buffer.h include/dspam/config.h |