From owner-freebsd-ports  Tue Jul 25  3: 0:11 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id 7794937BD6A
	for <freebsd-ports@FreeBSD.org>; Tue, 25 Jul 2000 03:00:02 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id DAA09078;
	Tue, 25 Jul 2000 03:00:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: from set.freshports.org (chilled.unixathome.org [203.79.82.27])
	by hub.freebsd.org (Postfix) with ESMTP id 1FB7937BAF8
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 25 Jul 2000 02:59:39 -0700 (PDT)
	(envelope-from dan@freshports.org)
Received: (from root@localhost)
	by set.freshports.org (8.9.3/8.9.3) id VAA18966;
	Tue, 25 Jul 2000 21:58:22 +1200 (NZST)
	(envelope-from dan)
Message-Id: <200007250958.VAA18966@set.freshports.org>
Date: Tue, 25 Jul 2000 21:58:22 +1200 (NZST)
From: dan@freebsddiary.org
Reply-To: dan@freebsddiary.org
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: ports/20171: postgresql7 user message contains $PREFIX not /usr/local
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         20171
>Category:       ports
>Synopsis:       postgresql7 user message contains $PREFIX not /usr/local
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 25 03:00:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Dan Langille
>Release:        FreeBSD 4.0-STABLE i386
>Organization:
The FreeBSD Diary
>Environment:

	

>Description:

	as discussed on -ports, 397C2196.23289.11751B8F@localhost
I just installed databases/postgresql7 and spotted the following
message:

###
To start PostgreSQL, run the startup script: $PREFIX/etc/rc.d/pgsql.sh start 
===>   Compressing manual pages for postgresql-7.0.2
###

To be nice to the user, who we all know doesn't know much, should we say
"/usr/local" instead of "$PREFIX"?


>How-To-Repeat:

	

>Fix:

diff -druN postgresql7.original/Makefile postgresql7.madeinstall/Makefile
--- postgresql7.original/Makefile	Mon Jul 24 20:50:08 2000
+++ postgresql7.madeinstall/Makefile	Tue Jul 25 20:49:23 2000
@@ -204,7 +204,8 @@
 		> ${PREFIX}/etc/rc.d/pgsql.sh
 	@ ${CHMOD} 554 ${PREFIX}/etc/rc.d/pgsql.sh
 	@ ${CHOWN} root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh
-	@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql
+	@ ${SED} -e 's#%%PREFIX%%#${PREFIX}#' < ${FILESDIR}/post-install-notes \
+ 		> ${PREFIX}/pgsql/post-install-notes
 .if defined(WITHOUT_MULTIBYTE)
 	@${CP} ${TMPPLIST} ${TMPPLIST}.nomulti
 	@${GREP} -v pgsql/bin/pg_encoding ${TMPPLIST}.nomulti > ${TMPPLIST}
@@ -248,7 +249,7 @@
 #	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/doc/*ps.gz ${PREFIX}/share/doc/pgsql
 .endif
 .if !defined(BATCH)
-	@ more -e ${FILESDIR}/post-install-notes
+	@ ${SED} -e "s#%%PREFIX%%#${PREFIX}#" ${FILESDIR}/post-install-notes | more
 .endif
 .if !defined(DEBUG_FLAGS)
 .for file in ecpg pg_dump pg_id pg_passwd pg_version postgres psql
diff -druN postgresql7.original/files/post-install-notes postgresql7.madeinstall/files/post-install-notes
--- postgresql7.original/files/post-install-notes	Mon Jul 24 20:44:58 2000
+++ postgresql7.madeinstall/files/post-install-notes	Mon Jul 24 21:20:40 2000
@@ -13,4 +13,4 @@
 operations.
 
 To start PostgreSQL, run the startup script:
-$PREFIX/etc/rc.d/pgsql.sh start
+%%PREFIX%%/etc/rc.d/pgsql.sh start

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


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message