From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jan 20 14:00: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 12BFC16A41F for ; Fri, 20 Jan 2006 14:00:17 +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 29EC343D46 for ; Fri, 20 Jan 2006 14:00:15 +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 k0KE0EKB012066 for ; Fri, 20 Jan 2006 14:00:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k0KE0EqV012065; Fri, 20 Jan 2006 14:00:14 GMT (envelope-from gnats) Resent-Date: Fri, 20 Jan 2006 14:00:14 GMT Resent-Message-Id: <200601201400.k0KE0EqV012065@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, Denis Shaposhnikov Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9CAC816A436 for ; Fri, 20 Jan 2006 13:50:18 +0000 (GMT) (envelope-from dsh@vlink.ru) Received: from deliver.smtp.vlink.ru (vlink-1.avtlg.ru [83.239.142.33]) by mx1.FreeBSD.org (Postfix) with ESMTP id DDDF443D46 for ; Fri, 20 Jan 2006 13:50:17 +0000 (GMT) (envelope-from dsh@vlink.ru) Received: from smtp.smtp.vlink.ru (clamav.smtp.vlink.ru [192.168.4.1]) by deliver.smtp.vlink.ru (Postfix) with ESMTP id 1102DFED91F; Fri, 20 Jan 2006 16:50:16 +0300 (MSK) Received: from neva.vlink.ru (neva.vlink.ru [217.107.252.66]) by smtp.smtp.vlink.ru (Postfix) with ESMTP id C1AA91009A9A; Fri, 20 Jan 2006 16:50:15 +0300 (MSK) Received: from neva.vlink.ru (localhost [127.0.0.1]) by neva.vlink.ru (8.13.4/8.13.4) with ESMTP id k0KDo5su049920; Fri, 20 Jan 2006 16:50:05 +0300 (MSK) (envelope-from dsh@neva.vlink.ru) Received: (from dsh@localhost) by neva.vlink.ru (8.13.4/8.13.4/Submit) id k0KDo4gS049917; Fri, 20 Jan 2006 16:50:04 +0300 (MSK) (envelope-from dsh) Message-Id: <200601201350.k0KDo4gS049917@neva.vlink.ru> Date: Fri, 20 Jan 2006 16:50:04 +0300 (MSK) From: Denis Shaposhnikov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: dsh@vlink.ru, alexander.timoshenko@gmail.com Subject: ports/92060: Update port: net-im/jit (rcNG'fy) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Denis Shaposhnikov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jan 2006 14:00:17 -0000 >Number: 92060 >Category: ports >Synopsis: Update port: net-im/jit (rcNG'fy) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jan 20 14:00:14 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Denis Shaposhnikov >Release: FreeBSD 7.0-CURRENT i386 >Organization: >Environment: System: FreeBSD neva.vlink.ru 7.0-CURRENT FreeBSD 7.0-CURRENT #2: Fri Dec 30 09:41:33 MSK 2005 dsh@neva.vlink.ru:/var/FreeBSD/obj/var/FreeBSD/src/sys/MYNERIC i386 >Description: Bring startup script to rcNG. >How-To-Repeat: >Fix: diff -Nru jit.orig/Makefile jit/Makefile --- jit.orig/Makefile Fri Jan 20 16:47:16 2006 +++ jit/Makefile Fri Jan 20 16:34:24 2006 @@ -7,6 +7,7 @@ PORTNAME= jit PORTVERSION= 1.1.7 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://www.penza-gsm.ru/snake/xmpp/ DIST_SUBDIR= jabber @@ -15,6 +16,7 @@ COMMENT= Jabber ICQ Transport USE_GMAKE= yes +USE_RC_SUBR= jabber_jit.sh USE_REINPLACE= yes HAS_CONFIGURE= yes MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ @@ -28,7 +30,7 @@ post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/jit/jabber-icq.example ${WRKSRC}/jit/jit.sh + ${WRKSRC}/jit/jabber-icq.example do-install: @${MKDIR} ${PREFIX}/lib/jabber/jit @@ -36,7 +38,6 @@ @${INSTALL_DATA} ${WRKSRC}/xdb_file/xdb_file.so ${PREFIX}/lib/jabber/jit @${INSTALL_PROGRAM} ${WRKSRC}/jabberd/jabberd-jit ${PREFIX}/sbin/jit @${INSTALL_DATA} ${WRKSRC}/jit/jabber-icq.example ${PREFIX}/etc - @${INSTALL_SCRIPT} ${WRKSRC}/jit/jit.sh ${PREFIX}/etc/rc.d post-install: @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL diff -Nru jit.orig/files/jabber_jit.sh.in jit/files/jabber_jit.sh.in --- jit.orig/files/jabber_jit.sh.in Thu Jan 1 03:00:00 1970 +++ jit/files/jabber_jit.sh.in Fri Jan 20 16:30:58 2006 @@ -0,0 +1,34 @@ +#!/bin/sh +# +# Startup script for JIT ICQ transport. +# +# $FreeBSD$ +# + +# PROVIDE: jabber_jit +# REQUIRE: DAEMON + +# Define these jabber_jit_* variables in one of these files: +# /etc/rc.conf +# /etc/rc.conf.local +# /etc/rc.conf.d/jabber_jit +# +# jabber_jit_enable : bool +# Enable the transport ("YES") or not ("NO", the default). +# + +. %%RC_SUBR%% + +name="jabber_jit" +rcvar=`set_rcvar` + +command="%%PREFIX%%/sbin/jit" +command_args="-c %%PREFIX%%/etc/jabber-icq.xml -d" +required_files="%%PREFIX%%/etc/jabber-icq.xml" + +load_rc_config "$name" + +: ${jabber_jit_enable="NO"} +: ${jabber_jit_user="jabber"} + +run_rc_command "$1" diff -Nru jit.orig/files/patch-jit::jit.sh jit/files/patch-jit::jit.sh --- jit.orig/files/patch-jit::jit.sh Fri Jan 20 16:47:16 2006 +++ jit/files/patch-jit::jit.sh Thu Jan 1 03:00:00 1970 @@ -1,16 +0,0 @@ ---- jit/jit.sh.orig Tue Jul 20 17:09:59 2004 -+++ jit/jit.sh Tue Jul 20 17:10:47 2004 -@@ -0,0 +1,13 @@ -+#!/bin/sh -+ -+PREFIX=%%PREFIX%% -+USER="jabber" -+ -+echo -n " jit" -+case ${1:-start} in -+start) -+ su -f -m ${USER} -c "$PREFIX/sbin/jit -c $PREFIX/etc/jabber-icq.xml -d " ;; -+ -+stop) -+ killall -SIGKILL -u ${USER} jit; -+esac diff -Nru jit.orig/pkg-plist jit/pkg-plist --- jit.orig/pkg-plist Fri Jan 20 16:47:16 2006 +++ jit/pkg-plist Fri Jan 20 16:32:41 2006 @@ -2,6 +2,5 @@ lib/jabber/jit/xdb_file.so sbin/jit etc/jabber-icq.example -etc/rc.d/jit.sh @dirrm lib/jabber/jit @unexec rmdir %D/lib/jabber 2>/dev/null || true >Release-Note: >Audit-Trail: >Unformatted: