From 232cced75a5d6d32a017c0c20de0b309e63a7d0f Mon Sep 17 00:00:00 2001
From: plunky <plunky>
Date: Wed, 1 Dec 2010 19:28:25 +0000
Subject: update rc.d script: it is now optional to specify the RFCOMM channel

(bump PKGREVISION)
---
 comms/obexapp/Makefile         |  3 ++-
 comms/obexapp/files/obexapp.sh | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'comms/obexapp')

diff --git a/comms/obexapp/Makefile b/comms/obexapp/Makefile
index c44c2a535af..76e5ec3cf11 100644
--- a/comms/obexapp/Makefile
+++ b/comms/obexapp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2010/11/17 19:14:33 plunky Exp $
+# $NetBSD: Makefile,v 1.27 2010/12/01 19:28:25 plunky Exp $
 #
 
 DISTNAME=	obexapp-1.4.14
+PKGREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	http://people.freebsd.org/~emax/obexapp/
 
diff --git a/comms/obexapp/files/obexapp.sh b/comms/obexapp/files/obexapp.sh
index 1cc3619246f..fa1d92986b4 100644
--- a/comms/obexapp/files/obexapp.sh
+++ b/comms/obexapp/files/obexapp.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: obexapp.sh,v 1.1 2007/03/01 21:39:09 plunky Exp $
+# $NetBSD: obexapp.sh,v 1.2 2010/12/01 19:28:27 plunky Exp $
 #
 # PROVIDE: obexapp
 # REQUIRE: sdpd
@@ -20,11 +20,11 @@ command="@PREFIX@/bin/${name}"
 
 load_rc_config ${name}
 
-if @TEST@ -z "${obexapp_channel}"; then
-	err 1 "Must specify obexapp_channel"
-fi
+command_args="-s -S -r ${obexapp_pathname:-@VARBASE@/spool/obex}"
 
-command_args="-s -S -C ${obexapp_channel} -r ${obexapp_pathname:-@VARBASE@/spool/obex}"
+if @TEST@ "${obexapp_channel}"; then
+	command_args="${command_args} -C ${obexapp_channel}"
+fi
 
 if @TEST@ "${obexapp_username}"; then
 	command_args="${command_args} -u ${obexapp_username}"
-- 
cgit v1.2.3