ports/136839: [PATCH] databases/postgresql-relay: USE_RC_SUBR != yes

[Philip M. Gollucci]

>Number:         136839
>Category:       ports
>Synopsis:       [PATCH] databases/postgresql-relay: USE_RC_SUBR != yes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 17 07:20:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Philip M. Gollucci
>Release:        FreeBSD 7.2-STABLE i386
>Organization:
RideCharge Inc.
>Environment:
System: FreeBSD freefall.freebsd.org 7.2-STABLE FreeBSD 7.2-STABLE #38 r194101: Sat Jun 13 11:12:24 UTC
>Description:

Added file(s):
- files/postgresql-relay.in

Removed file(s):
- files/postgresql-relay.sh.in

Port maintainer (edwin at mavetju.org) is cc'd.

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

--- postgresql-relay-1.3.2_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/databases/postgresql-relay/Makefile,v
retrieving revision 1.9
diff -u -u -r1.9 Makefile
--- Makefile	2 Sep 2006 08:18:36 -0000	1.9
+++ Makefile	17 Jul 2009 07:10:14 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	postgresql-relay
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	databases net
 MASTER_SITES=	http://www.mavetju.org/download/
 
@@ -15,18 +16,15 @@
 
 MAN8=		postgresql-relay.8
 PLIST_FILES=	bin/postgresql-relay \
-		etc/postgresql-relay.conf-sample \
-		etc/rc.d/postgresql-relay.sh
+		etc/postgresql-relay.conf-sample
 
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	postgresql-relay
 USE_PERL5_BUILD=yes
-SUB_FILES=	postgresql-relay.sh
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/postgresql-relay ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/postgresql-relay.conf-sample ${PREFIX}/etc/postgresql-relay.conf-sample
 	${INSTALL_MAN} ${WRKSRC}/postgresql-relay.8 ${MAN8PREFIX}/man/man8
-	${INSTALL_SCRIPT} ${WRKDIR}/postgresql-relay.sh ${PREFIX}/etc/rc.d
 
 post-install:
 	${CAT} ${PKGMESSAGE}
Index: files/postgresql-relay.in
===================================================================
RCS file: files/postgresql-relay.in
diff -N files/postgresql-relay.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/postgresql-relay.in	17 Jul 2009 07:10:14 -0000
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/databases/postgresql-relay/files/postgresql-relay.sh.in,v 1.1 2006/04/01 11:57:25 edwin Exp $
+#
+
+# PROVIDE: postgresql-relay
+# REQUIRE: LOGIN
+# AFTER: postgresql
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable spamd:
+#
+#postgresqlrelay_enable="YES"
+#
+# See postgresql-relay(8) for flags
+#
+
+. %%RC_SUBR%%
+
+name=postgresqlrelay
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/bin/postgresql-relay
+required_files=%%PREFIX%%/etc/postgresql-relay.conf
+
+load_rc_config $name
+
+postgresqlrelay_enable=${postgresqlrelay_enable:-"NO"}
+
+run_rc_command "$1"
Index: files/postgresql-relay.sh.in
===================================================================
RCS file: files/postgresql-relay.sh.in
diff -N files/postgresql-relay.sh.in
--- files/postgresql-relay.sh.in	1 Apr 2006 11:57:25 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/databases/postgresql-relay/files/postgresql-relay.sh.in,v 1.1 2006/04/01 11:57:25 edwin Exp $
-#
-
-# PROVIDE: postgresql-relay
-# REQUIRE: LOGIN
-# AFTER: postgresql
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable spamd:
-#
-#postgresqlrelay_enable="YES"
-#
-# See postgresql-relay(8) for flags
-#
-
-. %%RC_SUBR%%
-
-name=postgresqlrelay
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/bin/postgresql-relay
-required_files=%%PREFIX%%/etc/postgresql-relay.conf
-
-# set defaults
-
-postgresqlrelay_enable=${postgresqlrelay_enable:-"NO"}
-
-load_rc_config $name
-run_rc_command "$1"
--- postgresql-relay-1.3.2_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: