From bz@zabbadoz.net  Sun Jul 20 11:51:02 2003
Return-Path: <bz@zabbadoz.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AB8EC37B401
	for <freebsd-gnats-submit@freebsd.org>; Sun, 20 Jul 2003 11:51:02 -0700 (PDT)
Received: from transport.cksoft.de (transport.cksoft.de [62.111.66.27])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B5D1643F75
	for <freebsd-gnats-submit@freebsd.org>; Sun, 20 Jul 2003 11:51:01 -0700 (PDT)
	(envelope-from bz@zabbadoz.net)
Received: from localhost (localhost [127.0.0.1])
	by transport.cksoft.de (Postfix) with ESMTP
	id B9A2B1FFBCA; Sun, 20 Jul 2003 20:50:59 +0200 (CEST)
Received: by transport.cksoft.de (Postfix, from userid 66)
	id 929471FFAEF; Sun, 20 Jul 2003 20:50:58 +0200 (CEST)
Received: by mail.int.zabbadoz.net (Postfix, from userid 1060)
	id 8B74E15540; Sun, 20 Jul 2003 18:45:44 +0000 (UTC)
Message-Id: <20030720184544.8B74E15540@mail.int.zabbadoz.net>
Date: Sun, 20 Jul 2003 18:45:44 +0000 (UTC)
From: "Bjoern A. Zeeb" <bzeeb+freebsdports@zabbadoz.net>
Reply-To: "Bjoern A. Zeeb" <bzeeb+freebsdports@zabbadoz.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: bzeeb+freebsdports@zabbadoz.net, mchopra@engmail.uwaterloo.ca
Subject: audio/abcde-2.1.4 system config file path fix
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         54671
>Category:       ports
>Synopsis:       audio/abcde-2.1.4 system config file path fix
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 20 12:00:31 PDT 2003
>Closed-Date:    Thu Aug 07 02:30:46 PDT 2003
>Last-Modified:  Thu Aug 07 02:30:46 PDT 2003
>Originator:     Bjoern A. Zeeb
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
Zabbadoz.NeT
>Environment:
System: 	mine

>Description:

	abcde 2.1.4 port has wrong builtin defaults to system config file

>How-To-Repeat:
>Fix:
	attached patch-ab fixes this, please add

	o 1 new file: files/patch-ab

--- 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 /usr/local/etc/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 - /usr/local/etc/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 /usr/local/etc/abcde.conf ]; then
+	. /usr/local/etc/abcde.conf
 fi
 # Load user preference defaults
 if [ -r $HOME/.abcde.conf ]; then
--- /patch-ab ---

>Release-Note:
>Audit-Trail:

From: "Sergey A. Osokin" <osa@FreeBSD.org>
To: "Bjoern A. Zeeb" <bzeeb+freebsdports@zabbadoz.net>
Cc: FreeBSD-gnats-submit@FreeBSD.org, mchopra@engmail.uwaterloo.ca
Subject: Re: ports/54671: audio/abcde-2.1.4 system config file path fix
Date: Mon, 21 Jul 2003 15:15:30 +0400

 On Sun, Jul 20, 2003 at 06:45:44PM +0000, Bjoern A. Zeeb wrote:
 > 	attached patch-ab fixes this, please add
 > 
 > 	o 1 new file: files/patch-ab
 > 
 > --- 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 /usr/local/etc/abcde.conf or $HOME/.abcde.conf.
                                ^^^^^^^^^^^^^^^^^^^ not right.
 Use %%PREFIX/etc/bla-bla-bla instead of hardcoded path.
 >  .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 - /usr/local/etc/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 /usr/local/etc/abcde.conf ]; then
 > +	. /usr/local/etc/abcde.conf
 >  fi
 >  # Load user preference defaults
 >  if [ -r $HOME/.abcde.conf ]; then
 > --- /patch-ab ---
 
 -- 
 
 Rgdz,                        /"\  ASCII RIBBON CAMPAIGN
 Sergey Osokin aka oZZ,       \ /    AGAINST HTML MAIL
 http://ozz.pp.ru/             X          AND NEWS
                              / \

From: "Bjoern A. Zeeb" <bzeeb+freebsdports@zabbadoz.net>
To: "Sergey A. Osokin" <osa@FreeBSD.org>
Cc: "Bjoern A. Zeeb" <bzeeb+freebsdports@zabbadoz.net>,
	FreeBSD-gnats-submit@FreeBSD.org, mchopra@engmail.uwaterloo.ca
Subject: Re: ports/54671: audio/abcde-2.1.4 system config file path fix
Date: Mon, 21 Jul 2003 16:15:25 +0000 (UTC)

 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 ---
 
 -- 
 Bjoern A. Zeeb				bzeeb at Zabbadoz dot NeT
 56 69 73 69 74				http://www.zabbadoz.net/

From: Munish Chopra <mchopra@engmail.uwaterloo.ca>
To: "Bjoern A. Zeeb" <bzeeb+freebsdports@zabbadoz.net>
Cc: "Sergey A. Osokin" <osa@FreeBSD.org>,
	FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/54671: audio/abcde-2.1.4 system config file path fix
Date: Mon, 21 Jul 2003 14:40:55 -0400

 On 2003-07-21 16:15 +0000, Bjoern A. Zeeb wrote:
 > 
 > 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:
 
 Give me a day or so to take a look at this and talk to the author. I'd
 do it sooner, but I'm in the middle of a deployment run that's lasted 36
 hours straight so far, so I hope you understand :)
 
 -- 
 Munish Chopra

From: Munish Chopra <mchopra@engmail.uwaterloo.ca>
To: "Bjoern A. Zeeb" <bzeeb+freebsdports@zabbadoz.net>
Cc: "Sergey A. Osokin" <osa@FreeBSD.org>,
	FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/54671: audio/abcde-2.1.4 system config file path fix
Date: Tue, 22 Jul 2003 22:05:12 -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
 > +
 
 [...]
 
 I was assuming %%PREFIX like Sergey was, but if what you're doing is The
 Right Thing(TM), I've got no problem with it. I'll bug the author for an
 upstream change later, if at all. I'd have to see how it could work
 through some Makefile magic I suppose.
 
 Thanks for the patch.
 
 -- 
 Munish Chopra

From: Munish Chopra <mchopra@engmail.uwaterloo.ca>
To: "Bjoern A. Zeeb" <bzeeb+freebsdports@zabbadoz.net>
Cc: "Sergey A. Osokin" <osa@FreeBSD.org>,
	FreeBSD-gnats-submit@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
State-Changed-From-To: open->closed 
State-Changed-By: osa 
State-Changed-When: Thu Aug 7 02:30:15 PDT 2003 
State-Changed-Why:  
Problem resolved, thanks from report! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=54671 
>Unformatted:
