From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Aug 1 15:10:12 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3310437B401 for ; Fri, 1 Aug 2003 15:10:12 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A1EBE43FBD for ; Fri, 1 Aug 2003 15:10:11 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h71MABUp096060 for ; Fri, 1 Aug 2003 15:10:11 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h71MABcS096059; Fri, 1 Aug 2003 15:10:11 -0700 (PDT) Date: Fri, 1 Aug 2003 15:10:11 -0700 (PDT) Message-Id: <200308012210.h71MABcS096059@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Munish Chopra Subject: Re: ports/54671: audio/abcde-2.1.4 system config file path fix X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Munish Chopra List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Aug 2003 22:10:12 -0000 The following reply was made to PR ports/54671; it has been noted by GNATS. From: Munish Chopra To: "Bjoern A. Zeeb" Cc: "Sergey A. Osokin" , 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