ports/136892: Fixup username in prayer-cyclog

[Antonio Querubin]

>Number:         136892
>Category:       ports
>Synopsis:       Fixup username in prayer-cyclog
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 19 01:50:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Antonio Querubin
>Release:        FreeBSD 7.1-RELEASE-p6 i386
>Organization:
LavaNet
>Environment:
System: FreeBSD guriguri.lava.net 7.1-RELEASE-p6 FreeBSD 7.1-RELEASE-p6 #0: Tue Jun 9 16:26:47 UTC 2009 root at i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386


>Description:
	prayer-cyclog uses a different username from the default config
	and what is created by pkg-install.  The current Makefile and 
	pkg-install install a username of '_prayer'.  However,
	prayer-cyclog assumes a username of 'prayer'.  This causes 
	run-time errors when prayer-cyclog is run.
	
>How-To-Repeat:
	Install prayer on a clean system.
	Run prayer-cyclog.

>Fix:
	Update the ports/prayer Makefile so that the username used 
	by prayer-cyclog matches the installed username:

--- Makefile.orig	2009-07-18 15:03:01.000000000 -1000
+++ Makefile	2009-07-18 15:07:20.000000000 -1000
@@ -47,8 +47,9 @@
 post-patch:
 	# correct chroot
 	@${REINPLACE_CMD} "s#\"/chroot/prayer\"#config->var_prefix#" ${WRKSRC}/servers/prayer_chroot.c
-	# change the user in the default config
+	# change the user in the default config and cyclog util
 	@${REINPLACE_CMD} "s#prayer_user           = \"prayer\"#prayer_user           = \"_prayer\"#" ${WRKSRC}/files/etc/prayer.cf.SRC
+	@${REINPLACE_CMD} "s#\"prayer\" \"prayer\"#\"_prayer\" \"prayer\"#" ${WRKSRC}/utils/prayer-cyclog.SRC
 	@${REINPLACE_CMD} "s#%%PREFIX%%#${PREFIX}#" ${WRKSRC}/Config
 
 post-configure:
>Release-Note:
>Audit-Trail:
>Unformatted: