Date: Mon, 11 Jul 2011 10:15:51 +0100 From: Chris Rees <crees@freebsd.org> To: Gerald Pfeifer <gerald@pfeifer.com> Cc: x11@freebsd.org Subject: Re: Simplify relative path in libGLU/Makefile Message-ID: <CADLo83_TJnGHCyLfPmn-KQ6ppYUcq4RA7zmAWfcnN_Y46XKYRw@mail.gmail.com> In-Reply-To: <alpine.LNX.2.00.1107111034480.3864@gerinyyl.fvgr> References: <alpine.LSU.1.99.1005222044530.26362@acrux.dbai.tuwien.ac.at> <4BFA8A71.5000304@FreeBSD.org> <alpine.LNX.2.00.1105221547430.3210@gerinyyl.fvgr> <alpine.LNX.2.00.1107111034480.3864@gerinyyl.fvgr>
next in thread | previous in thread | raw e-mail | index | archive | help
On 11 July 2011 09:37, Gerald Pfeifer <gerald@pfeifer.com> wrote:
> Hi there,
>
> On Sun, 22 May 2011, Gerald Pfeifer wrote:
>> The usecase here is where someone checks out individual ports as
>> opposed to the entire tree or subtrees and builds them.
>>
>> This works very fine in general, there are but one or two ports
>> where this fails for me. =A0graphics/libGLU is one of them.
>>
>>
>> I am pretty convinced my patch is not less correcty technically,
>> but rather more. =A0It works both with a full ports checkout, and
>> the scenario I describe below.
>
> how about this patch? =A0I did not see a response and would like to
> commit if there are no objections.
>
> Gerald @FreeBSD.org
>
> Index: Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/pcvs/ports/graphics/libGLU/Makefile,v
> retrieving revision 1.14
> diff -u -r1.14 Makefile
> --- Makefile =A0 =A025 Feb 2011 16:52:06 -0000 =A0 =A0 =A01.14
> +++ Makefile =A0 =A011 Jul 2011 08:35:13 -0000
> @@ -19,5 +19,5 @@
> =A0 =A0 =A0 =A0${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/incl=
ude/GL/
> =A0 =A0 =A0 =A0cd ${WRKSRC}/src/glu; ${GMAKE} install
>
> -.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
> +.include "${.CURDIR}/../libGL/bsd.mesalib.mk"
> =A0.include <bsd.port.mk>
>
How about (*after* bsd.port.mk :/)
.include "${PORTSDIR}/${PKGCATEGORY}/libGL/bsd.mesalib.mk"
Or perhaps repocopy bsd.mesalib.mk to ${PORTSDIR}/Mk and make a
USE_MESALIB hook?
Chris
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CADLo83_TJnGHCyLfPmn-KQ6ppYUcq4RA7zmAWfcnN_Y46XKYRw>