From owner-freebsd-ports  Mon Jul 24  7:19: 4 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from bastuba.partitur.se (bastuba.partitur.se [193.219.246.194])
	by hub.freebsd.org (Postfix) with ESMTP
	id A6E6E37BA45; Mon, 24 Jul 2000 07:18:55 -0700 (PDT)
	(envelope-from girgen@partitur.se)
Received: from stordatan.palle.se (c193.150.250.87.cm-upc.chello.se [193.150.250.87])
	by bastuba.partitur.se (8.9.3/8.9.3) with ESMTP id QAA65290;
	Mon, 24 Jul 2000 16:18:52 +0200 (CEST)
	(envelope-from girgen@partitur.se)
Received: from partitur.se (localhost [127.0.0.1])
	by stordatan.palle.se (8.9.3/8.9.3) with ESMTP id QAA03092;
	Mon, 24 Jul 2000 16:18:19 +0200 (CEST)
	(envelope-from girgen@partitur.se)
Message-ID: <397C502B.54FCE204@partitur.se>
Date: Mon, 24 Jul 2000 16:18:19 +0200
From: Palle Girgensohn <girgen@partitur.se>
Organization: Partitur
X-Mailer: Mozilla 4.73 [en] (X11; I; FreeBSD 4.1-RC i386)
X-Accept-Language: sv, en
MIME-Version: 1.0
To: Bill Fumerola <billf@chimesnet.com>
Cc: dan@langille.org, ports@freebsd.org, andreas@freebsd.org
Subject: Re: postgresql7 user message contains $PREFIX not /usr/local
References: <397C274F.16659.118B7499@localhost> <397BA31C.B0623967@partitur.se> <20000723223642.P51462@jade.chc-chimes.com>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org

Bill Fumerola wrote:
> 
> On Mon, Jul 24, 2000 at 03:59:56AM +0200, Palle Girgensohn wrote:
> 
> > > And those advanced users who are not using /usr/local will know what
> > > $PREFIX means and will know where their "etc/rc.d" directory is.
> > ...
> >
> > Lets keep it simple. I suggest a hardcoded /usr/local.
> 
> Hi. Can we go on with life now? (untested patch follows)

Not quite yet :)
There are two references to this file; it is installed as well.
(another untested patch follows)

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/postgresql7/Makefile,v
retrieving revision 1.61
diff -u -r1.61 Makefile
--- Makefile	2000/07/11 19:03:58	1.61
+++ Makefile	2000/07/24 14:15:52
@@ -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 -e
 .endif
 .if !defined(DEBUG_FLAGS)
 .for file in ecpg pg_dump pg_id pg_passwd pg_version postgres
psql

-- 
Palle


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