From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Feb 13 12:50:08 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 1286216A420 for ; Mon, 13 Feb 2006 12:50:08 +0000 (GMT) (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 8DC6843D46 for ; Mon, 13 Feb 2006 12:50:07 +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 k1DCo5iN078712 for ; Mon, 13 Feb 2006 12:50:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k1DCo5Fl078711; Mon, 13 Feb 2006 12:50:05 GMT (envelope-from gnats) Resent-Date: Mon, 13 Feb 2006 12:50:05 GMT Resent-Message-Id: <200602131250.k1DCo5Fl078711@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, Marcus Alves Grando Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CAC9D16A420 for ; Mon, 13 Feb 2006 12:47:52 +0000 (GMT) (envelope-from root@marcus.grupos.com.br) Received: from mail.grupos.com.br (mail.grupos.com.br [200.203.183.72]) by mx1.FreeBSD.org (Postfix) with ESMTP id 500A643D73 for ; Mon, 13 Feb 2006 12:47:51 +0000 (GMT) (envelope-from root@marcus.grupos.com.br) Received: from corp.grupos.com.br (unknown [200.193.29.43]) by mail.grupos.com.br (Postfix) with ESMTP id 1A75C11E3F0; Mon, 13 Feb 2006 10:47:50 -0200 (BRST) Received: from marcus.grupos.com.br (marcus.grupos.com.br [192.168.10.10]) by corp.grupos.com.br (Postfix) with ESMTP id CF74C54E9; Mon, 13 Feb 2006 10:47:49 -0200 (BRST) Received: by marcus.grupos.com.br (Postfix, from userid 0) id 9D3EB31; Mon, 13 Feb 2006 10:47:49 -0200 (BRST) Message-Id: <20060213124749.9D3EB31@marcus.grupos.com.br> Date: Mon, 13 Feb 2006 10:47:49 -0200 (BRST) From: Marcus Alves Grando To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: laszlof@vonostingroup.com Subject: ports/93285: Update port: irc/ngircd add rc.d script and use OPTIONS X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Marcus Alves Grando List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 12:50:08 -0000 >Number: 93285 >Category: ports >Synopsis: Update port: irc/ngircd add rc.d script and use OPTIONS >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Feb 13 12:50:04 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Marcus Alves Grando >Release: FreeBSD 6.1-PRERELEASE i386 >Organization: Grupos Internet S/A >Environment: System: FreeBSD marcus.grupos.com.br 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #10: Sun Feb 12 15:20:55 BRST 2006 root@marcus.grupos.com.br:/usr/obj/usr/src/sys/MARCUS i386 >Description: - Use OPTIONS and add more options - Add rc.d script - Bump PORTREVISION Tinderbox test: http://marcus.grupos.com.br:8080/logs/4-STABLE-FreeBSD/ngircd-0.9.2_1.log http://marcus.grupos.com.br:8080/logs/6-STABLE-FreeBSD/ngircd-0.9.2_1.log >How-To-Repeat: >Fix: --- ngircd.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/irc/ngircd/Makefile,v retrieving revision 1.22 diff -u -r1.22 Makefile --- Makefile 20 Oct 2005 00:00:32 -0000 1.22 +++ Makefile 13 Feb 2006 12:43:42 -0000 @@ -7,6 +7,7 @@ PORTNAME= ngircd PORTVERSION= 0.9.2 +PORTREVISION= 1 CATEGORIES= irc MASTER_SITES= http://download.berlios.de/ngircd/ \ ftp://ftp.berlios.de/pub/ngircd/ @@ -14,22 +15,27 @@ MAINTAINER= laszlof@vonostingroup.com COMMENT= Free open source daemon for Internet Relay Chat (IRC) +USE_RC_SUBR= ngircd GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" MAN5= ngircd.conf.5 MAN8= ngircd.8 -.if exists(/usr/include/tcpd.h) -WITH_TCP_WRAPPERS= yes -CONFIGURE_ARGS+= --with-tcp-wrappers -.endif +OPTIONS= TCP_WRAPPERS "Enable TCP wrappers support" on \ + SYSLOG "Enable SYSLOG support" on \ + ZLIB "Enable ZLIB compression" on \ + IRCPLUS "Enable IRC+ protocol" on \ + IDENT "Enable IDENT (AUTH) protocol support" off \ + SNIFFER "Enable IRC traffic sniffer" off \ + DEBUG "Show additional debug output" off -.if defined(WITH_IDENT) -LIB_DEPENDS+= ident.0:${PORTSDIR}/security/libident -CONFIGURE_ARGS+= --with-ident +.include + +.if exists(/usr/include/tcpd.h) && !defined(WITHOUT_TCP_WRAPPERS) +CONFIGURE_ARGS+= --with-tcp-wrappers .endif .if defined(WITHOUT_SYSLOG) @@ -40,31 +46,27 @@ CONFIGURE_ARGS+= --without-zlib .endif -pre-configure: - @${ECHO_MSG} "" -.if defined(WITH_TCP_WRAPPERS) - @${ECHO_MSG} "Enable TCP wrappers support" - @${ECHO_MSG} "" +.if defined(WITHOUT_IRCPLUS) +CONFIGURE_ARGS+= --disable-ircplus .endif + .if defined(WITH_IDENT) - @${ECHO_MSG} "Enable ident support" - @${ECHO_MSG} "" +LIB_DEPENDS+= ident.0:${PORTSDIR}/security/libident +CONFIGURE_ARGS+= --with-ident .endif -.if defined(WITHOUT_SYSLOG) - @${ECHO_MSG} "Disable syslog support" - @${ECHO_MSG} "" + +.if defined(WITH_SNIFFER) +CONFIGURE_ARGS+= --enable-sniffer .endif -.if defined(WITHOUT_ZLIB) - @${ECHO_MSG} "Disable zlib suppot" - @${ECHO_MSG} "" + +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --enable-debug .endif post-install: .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for i in README - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} -.endfor + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif -.include +.include Index: files/ngircd.in =================================================================== RCS file: files/ngircd.in diff -N files/ngircd.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/ngircd.in 13 Feb 2006 12:43:42 -0000 @@ -0,0 +1,33 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# PROVIDE: ngircd +# REQUIRE: DAEMON +# +# Add the following lines to /etc/rc.conf to run ngircd: +# +# ngircd_enable (bool): Set it to "YES" to enable ngircd. +# Default is "NO". +# ngircd_conf (file): Set local of config file. +# Default is "%%PREFIX%%/etc/ngircd.conf". +# ngircd_flags (flags): Set extra flags here. More options in ngircd(1) +# Default is empty "". +# + +. %%RC_SUBR%% + +name="ngircd" +rcvar=`set_rcvar` + +load_rc_config $name + +: ${ngircd_enable="NO"} +: ${ngircd_conf="%%PREFIX%%/etc/ngircd.conf"} +: ${ngircd_flags=""} + +required_files="${ngircd_conf}" +command=%%PREFIX%%/sbin/ngircd +command_args="-f ${ngircd_conf} ${ngircd_flags}" + +run_rc_command "$1" --- ngircd.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: