Simplify relative path in libGLU/Makefile

Chris Rees crees at freebsd.org
Mon Jul 11 09:39:04 UTC 2011


On 11 July 2011 09:37, Gerald Pfeifer <gerald at 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.  graphics/libGLU is one of them.
>>
>>
>> I am pretty convinced my patch is not less correcty technically,
>> but rather more.  It works both with a full ports checkout, and
>> the scenario I describe below.
>
> how about this patch?  I did not see a response and would like to
> commit if there are no objections.
>
> Gerald @FreeBSD.org
>
> Index: Makefile
> ===================================================================
> RCS file: /home/pcvs/ports/graphics/libGLU/Makefile,v
> retrieving revision 1.14
> diff -u -r1.14 Makefile
> --- Makefile    25 Feb 2011 16:52:06 -0000      1.14
> +++ Makefile    11 Jul 2011 08:35:13 -0000
> @@ -19,5 +19,5 @@
>        ${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/
>        cd ${WRKSRC}/src/glu; ${GMAKE} install
>
> -.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
> +.include "${.CURDIR}/../libGL/bsd.mesalib.mk"
>  .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


More information about the freebsd-x11 mailing list