ports/95064: RCify sysutils/fusefs-kmod

[Anish Mistry]

>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 at 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: