From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Mar 29 05:50:25 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 97B9616A400 for ; Wed, 29 Mar 2006 05:50:25 +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 E030E43D4C for ; Wed, 29 Mar 2006 05:50:24 +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 k2T5oOjC053118 for ; Wed, 29 Mar 2006 05:50:24 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k2T5oOIg053117; Wed, 29 Mar 2006 05:50:24 GMT (envelope-from gnats) Resent-Date: Wed, 29 Mar 2006 05:50:24 GMT Resent-Message-Id: <200603290550.k2T5oOIg053117@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, "Anish Mistry" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1CB6B16A400 for ; Wed, 29 Mar 2006 05:46:22 +0000 (UTC) (envelope-from amistry@am-productions.biz) Received: from smtp1.fuse.net (mail-out1.fuse.net [216.68.8.174]) by mx1.FreeBSD.org (Postfix) with ESMTP id A674243D48 for ; Wed, 29 Mar 2006 05:46:21 +0000 (GMT) (envelope-from amistry@am-productions.biz) Received: from gx6.fuse.net ([69.61.164.22]) by smtp1.fuse.net (InterMail vM.6.01.04.04 201-2131-118-104-20050224) with ESMTP id <20060329054621.PFMK22519.smtp1.fuse.net@gx6.fuse.net> for ; Wed, 29 Mar 2006 00:46:21 -0500 Received: from bigguy.am-productions.biz ([69.61.164.22]) by gx6.fuse.net (InterMail vG.1.02.00.02 201-2136-104-102-20041210) with ESMTP id <20060329054620.SQKH4722.gx6.fuse.net@bigguy.am-productions.biz> for ; Wed, 29 Mar 2006 00:46:20 -0500 Message-Id: <1143611380.75660@bigguy.am-productions.biz> Date: Wed, 29 Mar 2006 00:49:40 -0500 From: "Anish Mistry" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.7 Cc: Subject: ports/95064: RCify sysutils/fusefs-kmod 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: Wed, 29 Mar 2006 05:50:25 -0000 >Number: 95064 >Category: ports >Synopsis: RCify sysutils/fusefs-kmod >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: Wed Mar 29 05:50:24 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Anish Mistry >Release: FreeBSD 6.1-PRERELEASE i386 >Organization: AM Productions >Environment: System: FreeBSD 6.1-PRERELEASE #0: Sun Mar 12 15:46:31 EST 2006 amistry@bigguy.am-productions.biz:/usr/obj/usr/src/sys/BIGGUY >Description: Update to use the RC system. >How-To-Repeat: >Fix: --- fusefs-kmod-RCify.patch begins here --- diff -ruN fusefs-kmod.orig/Makefile fusefs-kmod/Makefile --- fusefs-kmod.orig/Makefile Wed Mar 29 00:27:33 2006 +++ fusefs-kmod/Makefile Wed Mar 29 00:45:13 2006 @@ -7,6 +7,7 @@ PORTNAME= fusefs PORTVERSION= 0.3.0 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://fuse4bsd.creo.hu/downloads/ \ http://am-productions.biz/docs/ @@ -24,7 +25,7 @@ KMODDIR= ${PREFIX}/modules MAKE_ARGS= KMODDIR=${KMODDIR} SRC_BASE?= /usr/src -STARTUP= fuse.sh +USE_RC_SUBR= fusefs.sh SETUP= setup.sh MODULE_PATH= `sysctl -n kern.module_path`;${KMODDIR} TXT_DOCS= doc.txt @@ -61,7 +62,6 @@ ${MKDIR} ${KMODDIR} post-install: - ${INSTALL_SCRIPT} ${FILESDIR}/${STARTUP} ${PREFIX}/etc/rc.d/ .if (defined(WITH_AUTOSETUP) && !defined(BATCH) && !defined(PACKAGE_BUILDING)) \ || (defined(WITH_AUTOSETUP) && defined(BATCH) && !defined(PACKAGE_BUILDING)) @${SED} -e 's|@@PREFIX@@|${PREFIX}|g' \ diff -ruN fusefs-kmod.orig/files/fuse.sh fusefs-kmod/files/fuse.sh --- fusefs-kmod.orig/files/fuse.sh Wed Mar 29 00:27:33 2006 +++ fusefs-kmod/files/fuse.sh Wed Dec 31 19:00:00 1969 @@ -1,34 +0,0 @@ -#!/bin/sh -# $FreeBSD: ports/sysutils/fusefs-kmod/files/fuse.sh,v 1.2 2006/02/20 20:47:42 dougb Exp $ - -# PROVIDE: fusefs -# REQUIRE: sysctl -# KEYWORD: shutdown - -[ -z "${fusefs_enable}" ] && fusefs_enable="NO" - -kmod=fuse.ko -name=fusefs - -. /etc/rc.subr - -rcvar=`set_rcvar` - -start_cmd="fusefs_start" -stop_cmd="fusefs_stop" - -load_rc_config $name - -fusefs_start() -{ - echo "Loading ${name}" - kldload $kmod -} - -fusefs_stop() -{ - echo "Unloading ${name}" - kldunload $kmod -} - -run_rc_command $* diff -ruN fusefs-kmod.orig/files/fusefs.sh.in fusefs-kmod/files/fusefs.sh.in --- fusefs-kmod.orig/files/fusefs.sh.in Wed Dec 31 19:00:00 1969 +++ fusefs-kmod/files/fusefs.sh.in Wed Mar 29 00:37:07 2006 @@ -0,0 +1,34 @@ +#!/bin/sh +# $FreeBSD: ports/sysutils/fusefs-kmod/files/fuse.sh,v 1.2 2006/02/20 20:47:42 dougb Exp $ + +# PROVIDE: fusefs +# REQUIRE: sysctl +# KEYWORD: shutdown + +[ -z "${fusefs_enable}" ] && fusefs_enable="NO" + +kmod=fuse.ko +name=fusefs + +. /etc/rc.subr + +rcvar=`set_rcvar` + +start_cmd="fusefs_start" +stop_cmd="fusefs_stop" + +load_rc_config $name + +fusefs_start() +{ + echo "Loading ${name}." + kldload $kmod +} + +fusefs_stop() +{ + echo "Unloading ${name}." + kldunload $kmod +} + +run_rc_command $* diff -ruN fusefs-kmod.orig/files/setup.sh fusefs-kmod/files/setup.sh --- fusefs-kmod.orig/files/setup.sh Wed Mar 29 00:27:33 2006 +++ fusefs-kmod/files/setup.sh Wed Mar 29 00:40:11 2006 @@ -45,7 +45,7 @@ echo 'fusefs_enable="YES"' >> ${LOADER_CONFIG} fi -@@PREFIX@@/etc/rc.d/fuse.sh start > /dev/null 2>&1 ; RESULT=$? +@@PREFIX@@/etc/rc.d/fusefs start > /dev/null 2>&1 ; RESULT=$? if [ ${RESULT} -ne 0 ]; then echo 'NOTICE: Failed to load the Fuse module!' echo 'NOTICE: Unload and load Fuse module manually, or reboot.' diff -ruN fusefs-kmod.orig/pkg-message fusefs-kmod/pkg-message --- fusefs-kmod.orig/pkg-message Wed Mar 29 00:27:33 2006 +++ fusefs-kmod/pkg-message Wed Mar 29 00:40:19 2006 @@ -6,6 +6,6 @@ - Add fusefs_enable="YES" to your /etc/rc.conf -%%PREFIX%%/etc/rc.d/fuse.sh start will load the module for the first time +%%PREFIX%%/etc/rc.d/fusefs start will load the module for the first time after the installation. Set "sysctl vfs.usermount=1" if you want to be able to mount fuse devices as an ordinary user. diff -ruN fusefs-kmod.orig/pkg-plist fusefs-kmod/pkg-plist --- fusefs-kmod.orig/pkg-plist Wed Mar 29 00:27:33 2006 +++ fusefs-kmod/pkg-plist Wed Mar 29 00:31:31 2006 @@ -1,4 +1,3 @@ -etc/rc.d/fuse.sh modules/fuse.ko sbin/mount_fusefs @unexec kldxref %D/modules --- fusefs-kmod-RCify.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: