Attachment 65732 Details for Bug 97327 – exilog-0.5_4.patch

[patch] exilog-0.5_4.patch

exilog-0.5_4.patch (text/plain), 3.13 KB, created by Larry Rosenman on 2006-05-16 00:50:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Larry Rosenman

Created: 2006-05-16 00:50:16 UTC

Size: 3.13 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/mail/exilog/Makefile /usr/home/ler/ports/mail/exilog/Makefile
>--- /usr/ports/mail/exilog/Makefile	Mon May 15 13:28:08 2006
>+++ /usr/home/ler/ports/mail/exilog/Makefile	Mon May 15 18:32:13 2006
>@@ -2,12 +2,12 @@
> # Date created:				03 Jun 2005
> # Whom:					Vsevolod Stakhov <vsevolod@highsecure.ru>
> #
>-# $FreeBSD: ports/mail/exilog/Makefile,v 1.11 2006/05/15 13:27:29 sem Exp $
>+# $FreeBSD: ports/mail/exilog/Makefile,v 1.10 2006/05/10 22:36:50 edwin Exp $
> #
> 
> PORTNAME=	exilog
> PORTVERSION=	0.5
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	mail
> MASTER_SITES=	http://duncanthrax.net/exilog/
> 
>@@ -27,24 +27,32 @@
> .if (${WITH_SQL_BACKEND} == "mysql")
> WITH_MYSQL=	yes
> RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
>+SERVER=mysql
> .elif (${WITH_SQL_BACKEND} == "postgresql")
> WITH_POSTGRESQL=	yes
> RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
>+SERVER=postgresql
> .else
> BROKEN=	You should specify sql backend using WITH_SQL_BACKEND
> .endif
>-
>+SUB_LIST+=	SERVER=${SERVER}
> .ifndef WITHOUT_WWWDIR
> EXILOGDIR?=	${PREFIX}/www/exilog
> .else
> EXILOGDIR?=	${PREFIX}/exilog
> .endif
>-
>+.include <bsd.port.pre.mk>
> .if defined(NO_AGENT)
> PLIST_SUB+=	AGENT="@comment "
> .else
> USE_RC_SUBR=	exilog.sh
> PLIST_SUB+=	AGENT=""
>+.if (${OSVERSION} >= 700007 || (${OSVERSION} < 700000 && ${OSVERSION} >= 600101))
>+  RCSCRIPT=exilog
>+.else
>+  RCSCRIPT=exilog.sh
>+.endif
>+PLIST_SUB+=	RCSCRIPT=${RCSCRIPT}
> .endif
> 
> PLIST_SUB+=	EXILOGDIR="${EXILOGDIR:S,^${PREFIX}/,,}"
>@@ -76,9 +84,6 @@
> 	@${CHMOD} 0600 ${PREFIX}/etc/exilog.conf-dist
> 	@${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/etc/exilog.conf-dist
> 	@${CP} ${FILESDIR}/htaccess ${EXILOGDIR}/.htaccess
>-.if !defined(NO_AGENT)
>-	@${INSTALL_SCRIPT} ${WRKDIR}/exilog.sh ${PREFIX}/etc/rc.d
>-.endif
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
> .for docfile in ${PORTDOC_FILES}
>@@ -86,4 +91,4 @@
> .endfor
> .endif
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -ruN --exclude=CVS /usr/ports/mail/exilog/files/exilog.sh.in /usr/home/ler/ports/mail/exilog/files/exilog.sh.in
>--- /usr/ports/mail/exilog/files/exilog.sh.in	Mon May 15 08:27:30 2006
>+++ /usr/home/ler/ports/mail/exilog/files/exilog.sh.in	Mon May 15 18:36:39 2006
>@@ -1,6 +1,10 @@
> #!/bin/sh
> #
>-# $FreeBSD: ports/mail/exilog/files/exilog.sh.in,v 1.1 2006/05/15 13:27:30 sem Exp $
>+# $FreeBSD: ports/mail/exilog/files/exilog.sh,v 1.2 2005/11/03 13:43:00 vsevolod Exp $
>+#
>+# PROVIDE: exilog
>+# REQUIRE: %%SERVER%%
>+# KEYWORD: shutdown
> #
> # Add the following lines to /etc/rc.conf to enable exilog agent:
> #
>diff -ruN --exclude=CVS /usr/ports/mail/exilog/pkg-plist /usr/home/ler/ports/mail/exilog/pkg-plist
>--- /usr/ports/mail/exilog/pkg-plist	Sat Jan 14 15:01:24 2006
>+++ /usr/home/ler/ports/mail/exilog/pkg-plist	Mon May 15 18:16:42 2006
>@@ -1,6 +1,6 @@
>-%%AGENT%%@unexec [ ! -f /var/run/exilog.pid ] || %D/etc/rc.d/exilog.sh stop
>+%%AGENT%%@unexec [ ! -f /var/run/exilog.pid ] || %D/etc/rc.d/%%RCSCRIPT%% stop
> %%AGENT%%sbin/exilog_agent.pl
>-%%AGENT%%etc/rc.d/exilog.sh
>+%%AGENT%%etc/rc.d/%%RCSCRIPT%%
> sbin/exilog_cleanup.pl
> %%EXILOGDIR%%/exilog_cgi.pl
> %%EXILOGDIR%%/exilog_cgi_html.pm

Actions: View | Diff

Attachments on bug 97327: 65732 | 65733