From sevan@newbie.thingamajig-systems.co.uk  Sat Jan 23 03:42:51 2010
Return-Path: <sevan@newbie.thingamajig-systems.co.uk>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CD2CB106566B;
	Sat, 23 Jan 2010 03:42:51 +0000 (UTC)
	(envelope-from sevan@newbie.thingamajig-systems.co.uk)
Received: from newbie.thingamajig-systems.co.uk (newbie.thingamajig-systems.co.uk [93.97.185.103])
	by mx1.freebsd.org (Postfix) with ESMTP id E24AF8FC0C;
	Sat, 23 Jan 2010 03:42:50 +0000 (UTC)
Received: from newbie.thingamajig-systems.co.uk (localhost [127.0.0.1])
	by newbie.thingamajig-systems.co.uk (8.14.3/8.14.3) with ESMTP id o0N3dKxX036641;
	Sat, 23 Jan 2010 03:39:21 GMT
	(envelope-from sevan@newbie.thingamajig-systems.co.uk)
Received: (from root@localhost)
	by newbie.thingamajig-systems.co.uk (8.14.3/8.14.3/Submit) id o0N3dKQF036640;
	Sat, 23 Jan 2010 03:39:20 GMT
	(envelope-from sevan)
Message-Id: <201001230339.o0N3dKQF036640@newbie.thingamajig-systems.co.uk>
Date: Sat, 23 Jan 2010 03:39:20 GMT
From: Sevan Janiyan <venture37@geeklan.co.uk>
To: FreeBSD-gnats-submit@freebsd.org
Cc: mich@freebsd.org
Subject: [PATCH] net/apinger: add a new rc script, move message to pkg-message 
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         143102
>Category:       ports
>Synopsis:       [PATCH] net/apinger: add a new rc script, move message to pkg-message
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    mich
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 23 03:50:01 UTC 2010
>Closed-Date:    Mon Jan 25 12:24:49 UTC 2010
>Last-Modified:  Mon Jan 25 12:30:09 UTC 2010
>Originator:     Sevan Janiyan
>Release:        FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD newbie.thingamajig-systems.co.uk 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan  5 21:11:58 UTC
>Description:
move message to pkg-message so users installing by a package recieve the message
add a new rc script which is installed via USE_RC_SUBR


Added file(s):
- files/apinger.in
- files/pkg-message.in

Removed file(s):
- files/apinger.sh

Port maintainer (mich@FreeBSD.org) is cc'd.

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

--- apinger-0.6.1_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/apinger/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile	16 Jul 2008 15:25:51 -0000	1.14
+++ Makefile	23 Jan 2010 03:33:28 -0000
@@ -17,29 +17,23 @@
 COMMENT=	An IP device monitoring tool
 
 GNU_CONFIGURE=	yes
+USE_RC_SUBR=	apinger
+SUB_FILES=	pkg-message
 
 OPTIONS=	IPV6 "With support for IPv6" on
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if !defined(WITH_IPV6)
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-post-extract:
-	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${FILESDIR}/apinger.sh \
-		> ${WRKSRC}/apinger.sh
+.include <bsd.port.pre.mk>
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/apinger.conf ${PREFIX}/etc/apinger.conf.sample
-	${INSTALL_SCRIPT} ${WRKSRC}/apinger.sh ${PREFIX}/etc/rc.d/apinger.sh.sample
 .if !defined(BATCH)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "###############################################################################"
-	@${ECHO_MSG} "# Please edit ${PREFIX}/etc/apinger.conf to your needs.                      #"
-	@${ECHO_MSG} "# A sample shell script has been installed in ${PREFIX}/etc/rc.d/            #"
-	@${ECHO_MSG} "# rename it to automatically start apinger at boot.                           #"
-	@${ECHO_MSG} "###############################################################################"
+	@${CAT} ${PKGMESSAGE}
 .endif
 
 .if !defined(NOPORTDOCS)
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/apinger/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- pkg-plist	3 Nov 2004 13:14:08 -0000	1.5
+++ pkg-plist	23 Jan 2010 03:33:28 -0000
@@ -1,6 +1,5 @@
 sbin/apinger
 etc/apinger.conf.sample
-etc/rc.d/apinger.sh.sample
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
Index: files/apinger.in
===================================================================
RCS file: files/apinger.in
diff -N files/apinger.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/apinger.in	23 Jan 2010 03:33:28 -0000
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: apinger
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# apinger_enable (bool):   Set to NO by default.
+#               Set it to YES to enable apinger.
+#
+
+. /etc/rc.subr
+
+name="apinger"
+rcvar=${name}_enable
+
+command=%%PREFIX%%/sbin/${name}
+pidfile=/var/run/${name}.pid
+
+load_rc_config $name
+
+: ${apinger_enable="NO"}
+
+run_rc_command "$1"
Index: files/apinger.sh
===================================================================
RCS file: files/apinger.sh
diff -N files/apinger.sh
--- files/apinger.sh	4 Jun 2003 09:49:31 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-case $1 in
-start)
-	[ -x %%PREFIX%%/sbin/apinger ] && %%PREFIX%%/sbin/apinger && echo -n ' apinger'
-	;;
-restart)
-	killall -HUP apinger && echo -n ' apinger'
-	;;
-stop)
-	killall apinger && echo -n ' apinger'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
-
-exit 0
Index: files/pkg-message.in
===================================================================
RCS file: files/pkg-message.in
diff -N files/pkg-message.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/pkg-message.in	23 Jan 2010 03:33:28 -0000
@@ -0,0 +1,5 @@
+#########################################################################
+# Please copy:								# 
+# ${PREFIX}/etc/apinger.conf.sample to ${PREFIX}/etc/apinger.conf	# 
+# & edit to your needs.							#
+#########################################################################
--- apinger-0.6.1_2.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->mich 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Jan 23 03:50:12 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=143102 
State-Changed-From-To: open->closed 
State-Changed-By: mich 
State-Changed-When: Mon Jan 25 12:24:31 UTC 2010 
State-Changed-Why:  
Committed, thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/143102: commit references a PR
Date: Mon, 25 Jan 2010 12:24:23 +0000 (UTC)

 mich        2010-01-25 12:24:06 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/apinger          Makefile pkg-plist 
   Added files:
     net/apinger/files    apinger.in pkg-message.in 
   Removed files:
     net/apinger/files    apinger.sh 
   Log:
   - move message to pkg-message so users installing by a package recieve the
   message
   - add a new rc script which is installed via USE_RC_SUBR
   
   PR:             ports/143102
   Submitted by:   Sevan Janiyan <venture37@geeklan.co.uk>
   
   Revision  Changes    Path
   1.15      +5 -11     ports/net/apinger/Makefile
   1.1       +28 -0     ports/net/apinger/files/apinger.in (new)
   1.2       +0 -19     ports/net/apinger/files/apinger.sh (dead)
   1.1       +5 -0      ports/net/apinger/files/pkg-message.in (new)
   1.6       +0 -1      ports/net/apinger/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
