Bug 57531

Summary: Fix port: net/nicotine Makefile missing/broken RUN_DEPENDS
Product: Ports & Packages Reporter: Stefan Walter <sw>
Component: Individual Port(s)Assignee: freebsd-ports-bugs (Nobody) <ports-bugs>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
nicotine-run_depends.patch
none
nicotine.patch none

Description Stefan Walter 2003-10-03 14:50:16 UTC 
When given the parameter WITH_VORBIS, the nicotine port overwrites the
existing RUN_DEPENDS (containing x11-toolkits/py-gtk2) instead of adding
the new dependency (audio/py-vorbis) to it.
The attached patch fixes this behaviour.

How-To-Repeat: Install the port.
Comment 1 Jens Rehsack 2003-10-03 14:54:04 UTC 
Stefan Walter wrote:
>>Number:         57531
>>Category:       ports
>>Synopsis:       Fix port: net/nicotine Makefile missing/broken RUN_DEPENDS

...

> --- nicotine-run_depends.patch begins here ---
> --- Makefile~	Tue Sep 30 20:00:14 2003
> +++ Makefile	Fri Oct  3 15:23:42 2003
> @@ -22,7 +22,7 @@
>  .include <bsd.port.pre.mk>
>  
>  .if exists(${PYTHON_SITELIBDIR}/ogg/vorbis.so) || defined(WITH_VORBIS)
> -RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis
> +RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis
>  .else
>  pre-everything::
>  	@${ECHO_MSG} ""
> --- nicotine-run_depends.patch ends here ---

Could LIB_DEPENDS used here?

Jens
Comment 2 Peter Pentchev freebsd_committer freebsd_triage 2003-10-03 14:58:48 UTC 
State Changed
From-To: open->closed

Fix committed, thanks!
Comment 3 Stefan Walter 2003-10-03 15:13:02 UTC 
Jens Rehsack, 03.10.03, 15:54h CEST:

> >--- nicotine-run_depends.patch begins here ---
> >--- Makefile~	Tue Sep 30 20:00:14 2003
> >+++ Makefile	Fri Oct  3 15:23:42 2003
> >@@ -22,7 +22,7 @@
> > .include <bsd.port.pre.mk>
> > 
> > .if exists(${PYTHON_SITELIBDIR}/ogg/vorbis.so) || defined(WITH_VORBIS)
> >-RUN_DEPENDS= 
> >${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis
> >+RUN_DEPENDS+= 
> >${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis
> > .else
> > pre-everything::
> > 	@${ECHO_MSG} ""
> >--- nicotine-run_depends.patch ends here ---
> 
> Could LIB_DEPENDS used here?

Yes - thinking about it, it would probably be the more correct
way...should we change that again?

Stefan
Comment 4 Jens Rehsack 2003-10-03 15:20:15 UTC 
Stefan Walter wrote:
> Jens Rehsack, 03.10.03, 15:54h CEST:
> 
> 
>>>--- nicotine-run_depends.patch begins here ---
>>>--- Makefile~	Tue Sep 30 20:00:14 2003
>>>+++ Makefile	Fri Oct  3 15:23:42 2003
>>>@@ -22,7 +22,7 @@
>>>.include <bsd.port.pre.mk>
>>>
>>>.if exists(${PYTHON_SITELIBDIR}/ogg/vorbis.so) || defined(WITH_VORBIS)
>>>-RUN_DEPENDS= 
>>>${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis
>>>+RUN_DEPENDS+= 
>>>${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis
>>>.else
>>>pre-everything::
>>>	@${ECHO_MSG} ""
>>>--- nicotine-run_depends.patch ends here ---
>>
>>Could LIB_DEPENDS used here?
> 
> 
> Yes - thinking about it, it would probably be the more correct
> way...should we change that again?

I think you should do it. Because I don't use the port and have some
other things to do at the moment, this would be faster.

Jens
Comment 5 Peter Pentchev 2003-10-03 15:29:38 UTC 
On Fri, Oct 03, 2003 at 02:20:15PM +0000, Jens Rehsack wrote:
> Stefan Walter wrote:
> >Jens Rehsack, 03.10.03, 15:54h CEST:
> >
> >
> >>>--- nicotine-run_depends.patch begins here ---
> >>>--- Makefile~	Tue Sep 30 20:00:14 2003
> >>>+++ Makefile	Fri Oct  3 15:23:42 2003
> >>>@@ -22,7 +22,7 @@
> >>>.include <bsd.port.pre.mk>
> >>>
> >>>.if exists(${PYTHON_SITELIBDIR}/ogg/vorbis.so) || defined(WITH_VORBIS)
> >>>-RUN_DEPENDS= 
> >>>${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis
> >>>+RUN_DEPENDS+= 
> >>>${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis
> >>>.else
> >>>pre-everything::
> >>>	@${ECHO_MSG} ""
> >>>--- nicotine-run_depends.patch ends here ---
> >>
> >>Could LIB_DEPENDS used here?
> >
> >
> >Yes - thinking about it, it would probably be the more correct
> >way...should we change that again?
> 
> I think you should do it. Because I don't use the port and have some
> other things to do at the moment, this would be faster.

Stefan, could you test the attached patch?  If it works for you,
I can commit it in a minute.

G'luck,
Peter

-- 
Peter Pentchev	roam@ringlet.net    roam@sbnd.net    roam@FreeBSD.org
PGP key:	http://people.FreeBSD.org/~roam/roam.key.asc
Key fingerprint	FDBA FD79 C26F 3C51 C95E  DF9E ED18 B68D 1619 4553
This sentence contradicts itself - or rather - well, no, actually it doesn't!
Comment 6 Stefan Walter 2003-10-03 15:35:27 UTC 
Peter Pentchev, 03.10.03, 16:29h CEST:

> > >>Could LIB_DEPENDS used here?
> > >
> > >
> > >Yes - thinking about it, it would probably be the more correct
> > >way...should we change that again?
> > 
> > I think you should do it. Because I don't use the port and have some
> > other things to do at the moment, this would be faster.
> 
> Stefan, could you test the attached patch?  If it works for you,
> I can commit it in a minute.

Yes, it works - actually, I was about to send the same patch to you. ;)

Thanks to both of you,
Stefan
Comment 7 Stefan Walter 2003-10-03 16:31:12 UTC 
Peter Pentchev, 03.10.03, 16:29h CEST:

> Stefan, could you test the attached patch?  If it works for you,
> I can commit it in a minute.

It looks like I was wrong (my fault, I only did superficial testing
because I was too sure that it would work) - it doesn't work with
LIB_DEPENDS, as the output of 'ldconfig -r' doesn't contain the vorbis
libraries in ${PYTHON_SITELIBDIR} (or any other libraries there). I
guess that's the reason why RUN_DEPENDS was used in the first place.

Stefan
Comment 8 Peter Pentchev 2003-10-03 16:46:38 UTC 
On Fri, Oct 03, 2003 at 05:31:12PM +0200, Stefan Walter wrote:
> Peter Pentchev, 03.10.03, 16:29h CEST:
>=20
> > Stefan, could you test the attached patch?  If it works for you,
> > I can commit it in a minute.
>=20
> It looks like I was wrong (my fault, I only did superficial testing
> because I was too sure that it would work) - it doesn't work with
> LIB_DEPENDS, as the output of 'ldconfig -r' doesn't contain the vorbis
> libraries in ${PYTHON_SITELIBDIR} (or any other libraries there). I
> guess that's the reason why RUN_DEPENDS was used in the first place.

Yeah, I had a thought like this lurking at the back of my mind when I
originally read Jens's suggestion for LIB_DEPENDS; okay, we'll leave it
as RUN_DEPENDS then.

Thanks for your work on this!

G'luck,
Peter

--=20
Peter Pentchev	roam@ringlet.net    roam@sbnd.net    roam@FreeBSD.org
PGP key:	http://people.FreeBSD.org/~roam/roam.key.asc
Key fingerprint	FDBA FD79 C26F 3C51 C95E  DF9E ED18 B68D 1619 4553
If this sentence didn't exist, somebody would have invented it.