svn commit: r555543 - in head: astro/merkaartor astro/qmapshack cad/sumo converters/osm2pgsql databases/grass7 databases/postgis24 databases/postgis25 databases/postgis30 databases/spatialite datab...

[Loïc Bartoletti]

You're right, sorry.

I missed a conflict on my patch. I'm double-checking my port and 
correcting it as soon as possible.

Thanks

Loïc

Le 17/11/2020 à 11:12, Christoph Moench-Tegeder a écrit :
> ## Loïc Bartoletti (lbartoletti at FreeBSD.org):
>
>> Log:
>>    graphics/proj: Update to 7.1.1
> Your commit in graphics/proj does not match the patches in PR 219603,
> e.g. the LIB_DEPENDS changes are missing, the OPTIONS are not there
> and DATA_DISTFILES is not defined. The build fails in configure
> with "Package 'libtiff-4', required by 'virtual:world', not found",
> which clearly show that the LIB_DEPENDS changes in the PR were not
> optional.
>
> Compare:
>>    - Add curl and tiff dependencies since proj can read datum grids from remote
>>      COG (Cloud Optimized Geotiff)
> and:
>> Modified: head/graphics/proj/Makefile
>> ==============================================================================
>> --- head/graphics/proj/Makefile	Tue Nov 17 08:49:03 2020	(r555542)
>> +++ head/graphics/proj/Makefile	Tue Nov 17 09:23:58 2020	(r555543)
>> @@ -2,14 +2,15 @@
>>   # $FreeBSD$
>>   
>>   PORTNAME=	proj
>> -PORTVERSION=	6.3.1
>> +PORTVERSION=	7.1.1
>>   PORTEPOCH=	1
>>   CATEGORIES=	graphics geography
>>   MASTER_SITES=	https://download.osgeo.org/proj/
>> -DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATUM_GRID_FILES}
>> +DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
>> +		${DATUM_GRID_FILES}
>>   EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
>>   
>> -MAINTAINER=	wen at FreeBSD.org
>> +MAINTAINER=	lbartoletti at FreeBSD.org
>>   COMMENT=	Cartographic Projections library
>>   
>>   LICENSE=	MIT
>> @@ -36,8 +37,14 @@ post-extract:
>>   .for f in ${DATUM_GRID_FILES}
>>   	@${TAR} -xf ${DISTDIR}/${f} -C ${WRKSRC}/datum
>>   .endfor
>> +post-extract-DATA-on:
>> +	${MKDIR} ${WRKSRC}/proj_data
>> +	@${TAR} -xf ${DISTDIR}/${DATA_DISTFILES} -C ${WRKSRC}/proj_data
>>   
>>   post-install:
>>   	cd ${WRKSRC}/datum && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}
>> +
>> +post-install-DATA-on:
>> +	cd ${WRKSRC}/proj_data && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}
>>   
>>   .include <bsd.port.mk>
>
> Regards,
> Christoph
>