ports/54671: audio/abcde-2.1.4 system config file path fix

[Munish Chopra]

The following reply was made to PR ports/54671; it has been noted by GNATS.

From: Munish Chopra <mchopra at engmail.uwaterloo.ca>
To: "Bjoern A. Zeeb" <bzeeb+freebsdports at zabbadoz.net>
Cc: "Sergey A. Osokin" <osa at FreeBSD.org>,
	FreeBSD-gnats-submit at FreeBSD.org
Subject: Re: ports/54671: audio/abcde-2.1.4 system config file path fix
Date: Fri, 1 Aug 2003 18:06:06 -0400

 On 2003-07-21 16:15 +0000, Bjoern A. Zeeb wrote:
 > On Mon, 21 Jul 2003, Sergey A. Osokin wrote:
 > 
 > Hi,
 > 
 > > > -in this file override those in /etc/abcde.conf or $HOME/.abcde.conf.
 > > > +in this file override those in /usr/local/etc/abcde.conf or $HOME/.abcde.conf.
 > >                                ^^^^^^^^^^^^^^^^^^^ not right.
 > > Use %%PREFIX/etc/bla-bla-bla instead of hardcoded path.
 > 
 > this brings us to where I had been with abcde-2.1.2. Most likely those
 > changes had been missed and not - what I first thought - dropped so do
 > it that way again:
 > 
 > o one new file: files/patch-ab
 > 
 > --- patch for Makfile ---
 > --- Makefile.orig	Mon Jul 21 16:09:36 2003
 > +++ Makefile	Mon Jul 21 16:10:12 2003
 > @@ -67,6 +67,14 @@
 >  	@${ECHO_MSG} ""
 >  .endif
 > 
 > +post-patch:
 > +	@${CP} ${WRKSRC}/abcde.1 ${WRKSRC}/abcde.1.orig
 > +	@${SED} -e 's#@PKG_SYSCONFDIR@#${PREFIX}/etc#g' \
 > +		${WRKSRC}/abcde.1.orig > ${WRKSRC}/abcde.1
 > +	@${CP} ${WRKSRC}/abcde ${WRKSRC}/abcde.orig
 > +	@${SED} -e 's#@PKG_SYSCONFDIR@#${PREFIX}/etc#g' \
 > +		${WRKSRC}/abcde.orig > ${WRKSRC}/abcde
 > +
 >  do-install:
 >  	${INSTALL_SCRIPT} ${WRKSRC}/abcde ${PREFIX}/bin
 >  	${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${PREFIX}/bin
 > --- /Makefile ---
 > 
 > 
 > --- files/patch-ab ---
 > --- abcde.1.orig	Sun Jul 20 18:37:47 2003
 > +++ abcde.1	Sun Jul 20 18:38:31 2003
 > @@ -46,7 +46,7 @@
 >  .TP
 >  .B \-c [filename]
 >  Specifies an additional configuration file to parse. Configuration options
 > -in this file override those in /etc/abcde.conf or $HOME/.abcde.conf.
 > +in this file override those in @PKG_SYSCONFDIR@/abcde.conf or $HOME/.abcde.conf.
 >  .TP
 >  .B \-C [discid]
 >  Allows you to resume a session for
 > @@ -109,7 +109,7 @@
 >  This can be modified using the OUTPUTFORMAT and VAOUTPUTFORMAT
 >  variables in your abcde.conf.
 >  .SH CONFIGURATION
 > -abcde sources two configuration files on startup - /etc/abcde.conf and
 > +abcde sources two configuration files on startup - @PKG_SYSCONFDIR@/abcde.conf and
 >  $HOME/.abcde.conf, in that order.
 >  .TP
 >  The configuration variables have to be set as follows:
 > --- abcde.orig	Sun Jul 20 18:37:21 2003
 > +++ abcde	Sun Jul 20 18:38:14 2003
 > @@ -1239,8 +1239,8 @@
 >  fi
 > 
 >  # Load system defaults
 > -if [ -r /etc/abcde.conf ]; then
 > -	. /etc/abcde.conf
 > +if [ -r @PKG_SYSCONFDIR@/abcde.conf ]; then
 > +	. @PKG_SYSCONFDIR@/abcde.conf
 >  fi
 >  # Load user preference defaults
 >  if [ -r $HOME/.abcde.conf ]; then
 > --- /files/patch-ab ---
 
 Sergey,
 
 Are you going to be able to commit this soon?
 
 Thanks.
 
 -- 
 Munish Chopra