From owner-freebsd-ports-bugs@FreeBSD.ORG Mon May 15 23:50:17 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BA06316A756 for ; Mon, 15 May 2006 23:50:17 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3103F43D48 for ; Mon, 15 May 2006 23:50:17 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k4FNoHJN029998 for ; Mon, 15 May 2006 23:50:17 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k4FNoGiQ029997; Mon, 15 May 2006 23:50:17 GMT (envelope-from gnats) Resent-Date: Mon, 15 May 2006 23:50:17 GMT Resent-Message-Id: <200605152350.k4FNoGiQ029997@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Larry Rosenman Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0029E16A6BF for ; Mon, 15 May 2006 23:41:57 +0000 (UTC) (envelope-from ler@lerctr.org) Received: from thebighonker.lerctr.org (thebighonker.lerctr.org [192.147.25.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id A8F6943D46 for ; Mon, 15 May 2006 23:41:57 +0000 (GMT) (envelope-from ler@lerctr.org) Received: from ler by thebighonker.lerctr.org with local (Exim 4.62 (FreeBSD)) (envelope-from ) id 1FfmhJ-000Oyf-AF for FreeBSD-gnats-submit@freebsd.org; Mon, 15 May 2006 18:41:57 -0500 Message-Id: Date: Mon, 15 May 2006 18:41:57 -0500 From: Larry Rosenman To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/97327: [MAINTAINER] mail/exilog: fix rc.d stuff X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 May 2006 23:50:17 -0000 >Number: 97327 >Category: ports >Synopsis: [MAINTAINER] mail/exilog: fix rc.d stuff >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon May 15 23:50:16 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Larry Rosenman >Release: FreeBSD 6.1-STABLE amd64 >Organization: LERCTR Consulting >Environment: System: FreeBSD thebighonker.lerctr.org 6.1-STABLE FreeBSD 6.1-STABLE #55: Sun May 14 10:51:36 CDT 2006 >Description: Fix rc.d/ script stuff. - stop daemon on uninstall - only install ONE rc.d script - add REQUIRE/PROVIDE keywords committer/other's comments welcome... :) Sorry for the churn. :) Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- exilog-0.5_4.patch begins here --- 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 # -# $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 .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 +.include 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 --- exilog-0.5_4.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: