Date: Sat, 25 Dec 2004 13:55:36 +0200 From: "Ion-Mihai " IOnut " Tetcu" <itetcu@people.tecnik93.com> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/75491: mail/dspam: fix deinstall; fix comment; bug-fixes; update Message-ID: <1103975736.0@it.buh.tecnik93.com> Resent-Message-ID: <200412251200.iBPC0jGO027274@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 75491 >Category: ports >Synopsis: mail/dspam: fix deinstall; fix comment; bug-fixes; update >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Dec 25 12:00:44 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Ion-Mihai "IOnut" Tetcu >Release: FreeBSD 5.3-STABLE i386 >Organization: Tecnik'93 >Environment: System: FreeBSD 5.3-STABLE #12: Sat Dec 4 15:20:02 EET 2004 >Description: - 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 [1] - correct long-standing copy/paste bug DSPAM_{GROUPD,MODE} where set to DSPAM_HOME_{GROUP,MODE} - fix COMMENT [1] requested by kris@ with "Ports Janitor" hat :) >How-To-Repeat: >Fix: --- dspam-3.2.3.20041203.1245_1_to_dspam-3.2.3.20041218.2100.diff begins here --- diff -urN dspam.cvs/Makefile dspam/Makefile --- dspam.cvs/Makefile Thu Dec 23 20:42:25 2004 +++ dspam/Makefile Sat Dec 25 02:00:35 2004 @@ -7,17 +7,16 @@ 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 - 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 +59,7 @@ #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 +93,7 @@ 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 +101,9 @@ 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 +122,10 @@ 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 +339,7 @@ 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 +602,15 @@ @${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 +630,7 @@ ${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 -urN dspam.cvs/distinfo dspam/distinfo --- dspam.cvs/distinfo Thu Dec 9 04:01:15 2004 +++ dspam/distinfo Mon Dec 20 00:30:34 2004 @@ -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 -urN dspam.cvs/files/UPDATING dspam/files/UPDATING --- dspam.cvs/files/UPDATING Thu Dec 9 04:01:15 2004 +++ dspam/files/UPDATING Sat Dec 25 13:52:59 2004 @@ -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 @@ -9,6 +9,24 @@ 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 diff -urN dspam.cvs/pkg-plist dspam/pkg-plist --- dspam.cvs/pkg-plist Mon Nov 29 23:19:51 2004 +++ dspam/pkg-plist Sat Dec 25 00:28:10 2004 @@ -8,6 +8,7 @@ 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 --- dspam-3.2.3.20041203.1245_1_to_dspam-3.2.3.20041218.2100.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1103975736.0>