From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Apr 27 11:00:31 2005 Return-Path: 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 18E2316A4CE for ; Wed, 27 Apr 2005 11:00:31 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 989BD43D5D for ; Wed, 27 Apr 2005 11:00:30 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j3RB0UYR081391 for ; Wed, 27 Apr 2005 11:00:30 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j3RB0U0W081387; Wed, 27 Apr 2005 11:00:30 GMT (envelope-from gnats) Resent-Date: Wed, 27 Apr 2005 11:00:30 GMT Resent-Message-Id: <200504271100.j3RB0U0W081387@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, "Andrey V. Elsukov" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3447416A4CE for ; Wed, 27 Apr 2005 10:54:15 +0000 (GMT) Received: from mail.rdu.kirov.ru (ns.rdu.kirov.ru [217.9.151.217]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB6C043D73 for ; Wed, 27 Apr 2005 10:54:13 +0000 (GMT) (envelope-from elsukov@rdu.kirov.ru) Received: from rdu.kirov.ru (localhost [127.0.0.1]) by mail.rdu.kirov.ru (Postfix) with ESMTP id DDB45FDB4 for ; Wed, 27 Apr 2005 14:54:11 +0400 (MSD) Received: (from elsukov@localhost) by rdu.kirov.ru (8.12.10/8.12.9/Submit) id j3RAsBC0087601; Wed, 27 Apr 2005 14:54:11 +0400 (MSD) Message-Id: <200504271054.j3RAsBC0087601@rdu.kirov.ru> Date: Wed, 27 Apr 2005 14:54:11 +0400 (MSD) From: "Andrey V. Elsukov" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/80402: [update port] irc/ircservices X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: "Andrey V. Elsukov" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Apr 2005 11:00:31 -0000 >Number: 80402 >Category: ports >Synopsis: [update port] irc/ircservices >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: Wed Apr 27 11:00:30 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Andrey V. Elsukov >Release: FreeBSD >Organization: >Environment: System: FreeBSD 5.4-STABLE i386 >Description: * version update to 5.0.51 * startup script with rc.subr * new mirrors >How-To-Repeat: >Fix: --- ircservices.diff begins here --- diff -rubN ircservices.old/Makefile ircservices/Makefile --- ircservices.old/Makefile Mon Apr 11 23:53:50 2005 +++ ircservices/Makefile Wed Apr 27 14:36:32 2005 @@ -8,11 +8,17 @@ PORTNAME= ircservices PORTVERSION= 5.0.${PATCHLEVEL} CATEGORIES= irc -MASTER_SITES= ftp://ftp.esper.net/ircservices/ +MASTER_SITES= ftp://ftp.esper.net/ircservices/ \ + http://www.ircservices.esper.net/download/ \ + ftp://ftp.freenet.de/pub/ftp.ircservices.za.net/pub/ircservices/ \ + ftp://ftp.ircd.com.br/ircservices/ \ + http://www.irc.gr/ircservices/ \ + http://ircservices.swissirc.ch/ + DISTNAME= ${PORTNAME}-5.0.0 PATCH_SITES= ${MASTER_SITES} -PATCHLEVEL= 50 +PATCHLEVEL= 51 PATCHFILES!= /usr/bin/jot -s " " -w ${DISTNAME:C/[0-9]*$//}%d.diff.gz \ ${PATCHLEVEL} 1 ${PATCHLEVEL} PATCH_DIST_STRIP= -p1 @@ -23,6 +29,8 @@ USE_PERL5_BUILD=yes HAS_CONFIGURE= yes USE_GMAKE= yes +USE_RC_SUBR= yes +USE_GCC= 3.2+ DIST_SUBDIR= ${PORTNAME} CONFIGURE_ARGS= -prefix ${PREFIX} -cflags "${CFLAGS}" -cc "${CC}" @@ -33,14 +41,13 @@ BROKEN= "Does not build on !i386" .endif -.if ${OSVERSION} < 500039 -USE_GCC= 3.2+ -.endif - +post-patch: + @${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%RC_SUBR%%|${RC_SUBR}|g" \ + < ${FILESDIR}/ircservices.sh > ${WRKDIR}/ircservices.sh post-install: - @${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/ircservices.sh.sample startup file." - @${INSTALL_SCRIPT} ${FILESDIR}/ircservices.sh \ - ${PREFIX}/etc/rc.d/ircservices.sh.sample + @${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/ircservices.sh startup file." + @${INSTALL_SCRIPT} ${WRKDIR}/ircservices.sh \ + ${PREFIX}/etc/rc.d/ircservices.sh .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR} diff -rubN ircservices.old/distinfo ircservices/distinfo --- ircservices.old/distinfo Mon Apr 11 23:53:50 2005 +++ ircservices/distinfo Wed Apr 27 13:48:09 2005 @@ -100,3 +100,5 @@ SIZE (ircservices/ircservices-5.0.49.diff.gz) = 48004 MD5 (ircservices/ircservices-5.0.50.diff.gz) = b3137b27b89fa0db99bcc4bab5fd376f SIZE (ircservices/ircservices-5.0.50.diff.gz) = 18847 +MD5 (ircservices/ircservices-5.0.51.diff.gz) = 118701b5c92c3fe13447c40ffbec52e0 +SIZE (ircservices/ircservices-5.0.51.diff.gz) = 8368 diff -rubN ircservices.old/files/ircservices.sh ircservices/files/ircservices.sh --- ircservices.old/files/ircservices.sh Thu Nov 7 19:36:03 2002 +++ ircservices/files/ircservices.sh Wed Apr 27 14:22:01 2005 @@ -1,20 +1,24 @@ #!/bin/sh +# +# PROVIDE: ircservices +# REQUIRE: NETWORKING +# KEYWORD: FreeBSD +# +# Add the following line to /etc/rc.conf to enable ircservices: +# +# ircservices_enable="YES" +# -if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then - echo "$0: Cannot determine the PREFIX" >&2 - exit 1 -fi +ircservices_enable="NO" -case "$1" in -start) - [ -x ${PREFIX}/sbin/ircservices ] && ${PREFIX}/sbin/ircservices > /dev/null && echo -n ' ircservices' - ;; -stop) - killall ircservices && echo -n ' ircservices' - ;; -*) - echo "Usage: `basename $0` {start|stop}" >&2 - ;; -esac +. %%RC_SUBR%% -exit 0 +name=ircservices +rcvar=`set_rcvar` + +prefix=%%PREFIX%% +command="${prefix}/sbin/ircservices" +ircservices_pidfile="${prefix}/lib/services/ircservices.pid" + +load_rc_config ${name} +run_rc_command "$1" diff -rubN ircservices.old/pkg-plist ircservices/pkg-plist --- ircservices.old/pkg-plist Thu Mar 10 11:50:16 2005 +++ ircservices/pkg-plist Wed Apr 27 14:25:46 2005 @@ -1,4 +1,4 @@ -etc/rc.d/ircservices.sh.sample +etc/rc.d/ircservices.sh lib/services/convert-db lib/services/example-ircservices.conf lib/services/example-modules.conf --- ircservices.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: