Attachment 65077 Details for Bug 96542 – dspam-devel-3.6.5_to_3.6.5_1.diff

[patch] dspam-devel-3.6.5_to_3.6.5_1.diff

dspam-devel-3.6.5_to_3.6.5_1.diff (text/plain), 6.23 KB, created by Ion-Mihai " IOnut " Tetcu on 2006-04-30 12:20:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ion-Mihai " IOnut " Tetcu

Created: 2006-04-30 12:20:23 UTC

Size: 6.23 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/mail/dspam-devel/Makefile,v
>retrieving revision 1.52
>diff -u -r1.52 Makefile
>--- Makefile	25 Apr 2006 16:58:03 -0000	1.52
>+++ Makefile	30 Apr 2006 11:09:23 -0000
>@@ -2,7 +2,7 @@
> # Date created:		24 Jun 2004
> # Whom:			Ion-Mihai "IOnut" Tetcu <itetcu@people.tecnik93.com>
> #
>-# $Tecnik: ports/mail/dspam-devel/Makefile,v 1.44 2006/04/22 12:43:37 itetcu Exp $
>+# $Tecnik: ports/mail/dspam-devel/Makefile,v 1.49 2006/04/30 10:44:28 itetcu Exp $
> # $FreeBSD: ports/mail/dspam-devel/Makefile,v 1.52 2006/04/25 16:58:03 erwin Exp $
> #
> 
>@@ -13,6 +13,7 @@
> 
> PORTNAME=	dspam-devel
> PORTVERSION=	${PORTVER_MAJ}${SNAP_DATE}
>+PORTREVISION=	1
> CATEGORIES=	mail
> MASTER_SITES=	# set later
> 
>@@ -21,9 +22,9 @@
> 
> PORTVER_MAJ=	3.6.5
> #SNAP_DATE=	.20060421.2101
>-_UPD_LINE_NO=	44
>+_UPD_LINE_NO=	8
> 
>-MIN_OPTIONS_VER=	${PORTNAME}-3.6.4..20060421.2101
>+MIN_OPTIONS_VER=	${PORTNAME}-3.6.5
> 
> .ifdef(SNAP_DATE)
> MASTER_SITES=	http://sce-tindy.tecnik93.com/FreeBSD/ports/${PORTNAME}/sources/ \
>@@ -177,8 +178,7 @@
> 
> .ifndef(WITHOUT_DAEMON)
> CONFIGURE_ARGS+=	--enable-daemon
>-RC_SUFX=	.sh
>-USE_RC_SUBR=	${PORTNAME}${RC_SUFX}
>+USE_RC_SUBR=	${PORTNAME}
> _SED_SCRIPT+=	-e 's,%%DAEMON%%,,g'
> SUB_LIST+=	DSPAM_HOME=${DSPAM_HOME}
> .else
>@@ -420,7 +420,7 @@
> RUN_DEPENDS+=	${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd
> .	else
> USE_APACHE=	1.3+
>-.endif
>+.	endif
> LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
> RUN_DEPENDS+=	${SITE_PERL}/mach/GD.pm:${PORTSDIR}/graphics/p5-GD
> RUN_DEPENDS+=	${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph
>@@ -531,7 +531,7 @@
> .endif
> .ifndef(WITHOUT_DAEMON) && !( defined(USE_MYSQL) || \
> 	!defined(WITHOUT_POSTGRESQL) || !defined(WITHOUT_HASH) )
>-	@${ECHO_CMD} "You need MySQL, PostgreSQL ot Hash for Daemon mode, because multithreading support is needed"
>+	@${ECHO_CMD} "You need MySQL, PostgreSQL or Hash for Daemon mode, because multithreading support is needed"
> 	@${FALSE}
> .endif
> .if ( defined(WITH_MYSQL40) && defined(WITH_MYSQL41) && !defined(WITHOUT_MYSQL50) && defined(WITH_MYSQL51))
>@@ -652,7 +652,7 @@
> .ifdef(_OPTIONS_READ)
> 	@(if ${PKG_VERSION} -t ${_OPTIONS_READ} ${MIN_OPTIONS_VER} | ${GREP} -q '<'; \
> 	 then ${ECHO_CMD} "You have unsupported (old) OPTIONS, please do a 'make config; make'\n" \
>-			exit 1; \
>+		exit 1; \
> 	 fi)
> .endif
> 
>Index: pkg-message
>===================================================================
>RCS file: /home/ncvs/ports/mail/dspam-devel/pkg-message,v
>retrieving revision 1.13
>diff -u -r1.13 pkg-message
>--- pkg-message	6 Feb 2006 13:47:48 -0000	1.13
>+++ pkg-message	30 Apr 2006 11:09:23 -0000
>@@ -8,8 +8,8 @@
>  uname -a, dspam --version, %%_VAR_DIR%%/db/ports/%%PORTNAME%%/options, MTA setup.
> 
> Asking about updates or telling me there is one: not only I am active on the
>-mailing lists but I also track dspam CSV so I already know; either there is a
>-problem with the new version or I didn't have enough time to patch the port
>+mailing lists and IRC but I also track dspam CVS so I already know; either there
>+is a problem with the new version or I didn't have enough time to patch the port
> and _test_ the new version; please report your succes/failure if you run the
> new version or the cvs version.
> 
>Index: files/UPDATING
>===================================================================
>RCS file: /home/ncvs/ports/mail/dspam-devel/files/UPDATING,v
>retrieving revision 1.24
>diff -u -r1.24 UPDATING
>--- files/UPDATING	25 Apr 2006 16:58:04 -0000	1.24
>+++ files/UPDATING	30 Apr 2006 11:09:23 -0000
>@@ -11,6 +11,15 @@
> make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
> 
> ###########################################################################
>+# dspam-devel-3.6.5_1
>+#
>+
>+Add dspam_debug rc.d options (default off): starts dspam with debug
>+logging (you need at least WITH_DEBUG).
>+Also fixed a few typos (like MIN_OPTIONS_VER value) in Makefile.
>+
>+
>+###########################################################################
> # dspam-devel-3.6.5
> #
> 
>Index: files/dspam-devel.in
>===================================================================
>RCS file: files/dspam-devel.in
>diff -N files/dspam-devel.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/dspam-devel.in	30 Apr 2006 11:09:23 -0000
>@@ -0,0 +1,46 @@
>+#!/bin/sh
>+# $FreeBSD$
>+#
>+
>+# PROVIDE: dspam
>+# REQUIRE: DAEMON %%MYSQL%% %%PGSQL%% %%CLAMD%%
>+# BEFORE: mail
>+# KEYWORD: shutdown
>+
>+#
>+# Add the following lines to /etc/rc.conf[.local] to enable dspam:
>+# dspam_enable="YES"
>+#
>+# dspam_debug="YES" will start dspam with debug logging (you need ar least WITH_DEBUG)
>+# you can also set the pid file via dspam_pidfile
>+#
>+
>+. %%RC_SUBR%%
>+
>+name="dspam"
>+rcvar=${name}_enable
>+
>+command=%%PREFIX%%/bin/${name}
>+if checkyesno dspam_debug
>+then
>+	command_args="--daemon --debug > /dev/null 2>&1 &"
>+else
>+	command_args="--daemon > /dev/null 2>&1 &"
>+fi
>+required_dirs=%%DSPAM_HOME%%
>+required_files=%%PREFIX%%/etc/${name}.conf
>+
>+extra_commands=reload
>+reload()
>+{
>+ kill -HUP `cat $pidfile`
>+}
>+
>+load_rc_config $name
>+
>+#defaults
>+: ${dspam_enable="NO"}
>+: ${dspam_debug="NO"}
>+: ${dspam_pidfile:-/var/run/dspam.pid}
>+
>+run_rc_command "$1"
>Index: files/dspam-devel.sh.in
>===================================================================
>RCS file: files/dspam-devel.sh.in
>diff -N files/dspam-devel.sh.in
>--- files/dspam-devel.sh.in	25 Apr 2006 16:58:04 -0000	1.11
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,41 +0,0 @@
>-#!/bin/sh
>-# $FreeBSD: ports/mail/dspam-devel/files/dspam-devel.sh.in,v 1.11 2006/04/25 16:58:04 erwin Exp $
>-# formerly $ FreeBSD: ports/mail/dspam-devel/files/dspam.rc,v 1.2 2005/02/25 03:09:26 leeym Exp $
>-
>-# PROVIDE: dspam
>-# REQUIRE: DAEMON %%MYSQL%% %%PGSQL%% %%CLAMD%%
>-# BEFORE: mail
>-# KEYWORD: shutdown
>-
>-#
>-# Add the following lines to /etc/rc.conf[.local] to enable dspam:
>-#
>-# dspam_enable="YES"
>-#
>-
>-. %%RC_SUBR%%
>-
>-name=dspam
>-rcvar=`set_rcvar`
>-
>-command=%%PREFIX%%/bin/${name}
>-command_args="--daemon  > /dev/null 2>&1 &"
>-required_dirs=%%DSPAM_HOME%%
>-required_files=%%PREFIX%%/etc/${name}.conf
>-
>-extra_commands=reload
>-
>-reload()
>-{
>- kill -HUP `cat $pidfile`
>-}
>-
>-# set defaults
>-
>-dspam_enable=${dspam_enable:-"NO"}
>-#dspam_flags=${dspam_flags:-"--daemon &"}
>-
>-load_rc_config $name
>-pidfile=${dspam_pidfile:-/var/run/dspam.pid}
>-
>-run_rc_command "$1"

Actions: View | Diff

Attachments on bug 96542: 65077