Simplify relative path in libGLU/Makefile

Gerald Pfeifer gerald at pfeifer.com
Tue Jul 19 20:57:46 UTC 2011


On Mon, 11 Jul 2011, Chris Rees wrote:
>> 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?

I don't think either of these addresses my use case, which is 
installing a port (or some ports) without a full checkout, but
having those few ports individually checked out into one directory.

In general that works quite well for me, it's only the above change
I now need in all my testing, and that change seems harmless to me.
Any objections?

On Mon, 11 Jul 2011, b. f. wrote:
> I don't see a problem with it, but if you are going to make the change, 
> please make the corresponding changes in all of the other mesa ports.  
> The two-step appears in:
> 
> libGL/bsd.mesalib.mk:56:PATCHDIR=${.CURDIR}/../../graphics/libGL/files
> libGLU/Makefile:22:.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
> libGLw/Makefile:24:.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
> libglut/Makefile:26:.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"

I'll be happy to change the other similar cases as well.  Just not 
sure where this is now wrt. approval / rejection / don't care?

Gerald


More information about the freebsd-x11 mailing list