[Midnightbsd-cvs] mports: net-p2p/gift: Try to use USE_RC_SUBR correctly

[laffer1 at midnightbsd.org]

Log Message:
-----------
Try to use USE_RC_SUBR correctly

Modified Files:
--------------
    mports/net-p2p/gift:
        Makefile (r1.3 -> r1.4)

Added Files:
-----------
    mports/net-p2p/gift/files:
        giftd.sh.in (r1.1)

Removed Files:
-------------
    mports/net-p2p/gift/files:
        giftd.sh

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/net-p2p/gift/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L net-p2p/gift/Makefile -L net-p2p/gift/Makefile -u -r1.3 -r1.4
--- net-p2p/gift/Makefile
+++ net-p2p/gift/Makefile
@@ -30,7 +30,7 @@
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	giftd.sh
 
 MAN1=		giftd.1
 
@@ -48,7 +48,7 @@
 	${WRKSRC}/lib/Makefile.in
 
 post-build:
-	@${SED} ${SED_SCRIPT} <${FILESDIR}/giftd.sh >${WRKDIR}/giftd.sh
+	@${SED} ${SED_SCRIPT} <${FILESDIR}/giftd.sh.in >${WRKDIR}/giftd.sh
 
 post-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/giftd.sh ${PREFIX}/etc/rc.d/
@@ -58,6 +58,5 @@
 	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 .endfor
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
--- /dev/null
+++ net-p2p/gift/files/giftd.sh.in
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/net-p2p/gift/files/giftd.sh,v 1.3 2006/02/20 20:47:35 dougb Exp $
+#
+
+# PROVIDE: giftd
+# REQUIRE: DAEMON
+# KEYWORD: 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="${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"
--- net-p2p/gift/files/giftd.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/net-p2p/gift/files/giftd.sh,v 1.3 2006/02/20 20:47:35 dougb Exp $
-#
-
-# PROVIDE: giftd
-# REQUIRE: DAEMON
-# KEYWORD: 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="${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"