From mig@mig-29.net  Fri Jan  7 04:27:08 2005
Return-Path: <mig@mig-29.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 92C7116A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  7 Jan 2005 04:27:08 +0000 (GMT)
Received: from mail.eurorscg.com.mx (mail.eurorscg.com.mx [148.245.12.10])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C03E143D1D
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  7 Jan 2005 04:27:07 +0000 (GMT)
	(envelope-from mig@mig-29.net)
Received: from localhost (localhost.eurorscg.com.mx [127.0.0.1])
	by mail.eurorscg.com.mx (Postfix) with ESMTP id 792B57D13B;
	Thu,  6 Jan 2005 22:28:38 -0600 (CST)
Received: from mail.eurorscg.com.mx ([127.0.0.1])
 by localhost (mail.eurorscg.com.mx [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 70352-03; Thu,  6 Jan 2005 22:28:35 -0600 (CST)
Received: from fulcrum.mig-29.net (dsl-200-78-45-190.prod-infinitum.com.mx [200.78.45.190])
	by mail.eurorscg.com.mx (Postfix) with ESMTP id 7F6947D129;
	Thu,  6 Jan 2005 22:28:34 -0600 (CST)
Received: by fulcrum.mig-29.net (Postfix, from userid 1000)
	id DCBE35EC36; Thu,  6 Jan 2005 22:27:01 -0600 (CST)
Message-Id: <20050107042701.DCBE35EC36@fulcrum.mig-29.net>
Date: Thu,  6 Jan 2005 22:27:01 -0600 (CST)
From: Manuel Rabade Garcia <mig@mig-29.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: shoesoft@gmx.net
Subject: [PATCH] net/giFT: New startup script that uses rc.subr
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         75905
>Category:       ports
>Synopsis:       [PATCH] net/giFT: New startup script that uses rc.subr
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sem
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 07 04:30:20 GMT 2005
>Closed-Date:    Sat Jan 08 18:45:17 GMT 2005
>Last-Modified:  Sat Jan 08 18:45:17 GMT 2005
>Originator:     Manuel Rabade Garcia
>Release:        FreeBSD 5.3-RELEASE i386
>Organization:
>Environment:
System: FreeBSD fulcrum.mig-29.net 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Wed Nov 10 21:18:30 CST 2004
>Description:

I made a rc.d startup script for giftd that uses rc.subr and integrated it with
the port. The maintainer already reviewed the patch.

Greetings.

Added file(s):
- files/giftd.sh

Port maintainer (shoesoft@gmx.net) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- giFT-0.11.8.1_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/gift.orig/Makefile /usr/ports/net/gift/Makefile
--- /usr/ports/net/gift.orig/Makefile	Fri Dec 31 13:04:21 2004
+++ /usr/ports/net/gift/Makefile	Thu Jan  6 22:21:26 2005
@@ -7,6 +7,7 @@
 
 PORTNAME=	giFT
 PORTVERSION=	0.11.8.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
@@ -27,18 +28,28 @@
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
+USE_RC_SUBR=	yes
 
 MAN1=	giftd.1
 
 DOC_FILES=	AUTHORS COPYING src/ChangeLog \
 		INSTALL NEWS QUICKSTART README TODO
 
+.include <bsd.port.pre.mk>
+
+SED_SCRIPT+=	-e 's,%%PREFIX%%,${PREFIX},g' \
+		-e 's,%%RC_SUBR%%,${RC_SUBR},g'
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 	's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
 	${WRKSRC}/lib/Makefile.in
 
+post-build:
+	@${SED} ${SED_SCRIPT} <${FILESDIR}/giftd.sh >${WRKDIR}/giftd.sh
+
 post-install:
+	@${INSTALL_SCRIPT} ${WRKDIR}/giftd.sh ${PREFIX}/etc/rc.d/
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for doc in ${DOC_FILES}
@@ -47,4 +58,4 @@
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/net/gift.orig/files/giftd.sh /usr/ports/net/gift/files/giftd.sh
--- /usr/ports/net/gift.orig/files/giftd.sh	Wed Dec 31 18:00:00 1969
+++ /usr/ports/net/gift/files/giftd.sh	Thu Jan  6 22:16:35 2005
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: giftd
+# REQUIRE: DAEMON
+# KEYWORD: FreeBSD shutdown
+
+# Define these giftd_* variables in one of these files:
+#       /etc/rc.conf
+#       /etc/rc.conf.local
+#       /etc/rc.conf.d/giftd
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+
+giftd_enable="NO"
+giftd_flags="-d -q"
+giftd_user=""
+giftd_local_dir=""
+
+. "%%RC_SUBR%%"
+
+name="giftd"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/bin/giftd"
+
+required_dirs=${giftd_local_dir}
+start_precmd="giftd_check_vars"
+
+giftd_check_vars() 
+{
+	if [ -z ${giftd_user} ]; then
+		giftd_user=$(whoami)
+	fi
+
+	if [ $giftd_user = 'root' ]; then
+		warn "You should set giftd_user to a non-root user for security reasons"
+	fi
+
+	if [ -z ${giftd_local_dir} ]; then
+		giftd_local_dir="$(pw usershow $giftd_user | awk -F : '{ print $9 }')/.giFT"
+	fi
+
+	rc_flags="${giftd_flags} --local-dir=${giftd_local_dir}"
+}
+
+load_rc_config $name
+run_rc_command "$1"
diff -ruN --exclude=CVS /usr/ports/net/gift.orig/pkg-message /usr/ports/net/gift/pkg-message
--- /usr/ports/net/gift.orig/pkg-message	Fri Dec 31 13:04:21 2004
+++ /usr/ports/net/gift/pkg-message	Wed Jan  5 00:14:28 2005
@@ -11,3 +11,12 @@
 Note that giFT and OpenFT will not work with the default setup, so make sure you
 read and understand all questions before answering or just pressing enter. To
 reconfigure giFT and OpenFT later, just run gift-setup again.
+
+If you want to run giFT from startup tweak and add the folowing variables to your 
+/etc/rc.conf:
+
+giftd_enable="YES"
+# Run gift as (defaults to root, avoid this for security reasons)
+giftd_user=""
+# Path to giftd.conf (defaults to .giFT in the giftd_user home)
+giftd_local_dir=""
diff -ruN --exclude=CVS /usr/ports/net/gift.orig/pkg-plist /usr/ports/net/gift/pkg-plist
--- /usr/ports/net/gift.orig/pkg-plist	Fri Dec 31 13:04:21 2004
+++ /usr/ports/net/gift/pkg-plist	Wed Jan  5 00:00:02 2005
@@ -1,3 +1,4 @@
+etc/rc.d/giftd.sh
 bin/gift-setup
 bin/giftd
 include/libgift/array.h
--- giFT-0.11.8.1_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sem 
Responsible-Changed-By: sem 
Responsible-Changed-When: Sat Jan 8 17:57:09 GMT 2005 
Responsible-Changed-Why:  
Take it 

http://www.freebsd.org/cgi/query-pr.cgi?pr=75905 

From: Sergey Matveychuk <sem@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org, mig@mig-29.net,
	shoesoft@gmx.net
Cc:  
Subject: Re: ports/75905: [PATCH] net/giFT: New startup script that uses rc.subr
Date: Sat, 08 Jan 2005 20:51:11 +0300

 Dear maintainer!
 
 Do you approve the patch?
 
 --
 Sem.

From: Stefan Ehmann <shoesoft@gmx.net>
To: Sergey Matveychuk <sem@FreeBSD.org>
Cc: freebsd-gnats-submit@FreeBSD.org, mig@mig-29.net
Subject: Re: ports/75905: [PATCH] net/giFT: New startup script that uses
	rc.subr
Date: Sat, 08 Jan 2005 19:02:41 +0100

 On Sat, 2005-01-08 at 20:51 +0300, Sergey Matveychuk wrote:
 > Dear maintainer!
 > 
 > Do you approve the patch?
 
 Yes, he got my approval.
 
 Greetings
 
State-Changed-From-To: open->closed 
State-Changed-By: sem 
State-Changed-When: Sat Jan 8 18:45:07 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=75905 
>Unformatted:
