svn commit: r336087 - head/science/netcdf4

[Mathieu Arnold]

+--On 10 décembre 2013 19:17:09 +0000 Sunpoet Po-Chuan Hsieh
<sunpoet at FreeBSD.org> wrote:
| Log:
|   - Use CONFLICTS_INSTALL instead of CONFLICTS
| 
| Modified:
|   head/science/netcdf4/Makefile
| 
| Modified: head/science/netcdf4/Makefile
| =========================================================================
| ===== --- head/science/netcdf4/Makefile	Tue Dec 10 19:16:01 2013	(r336086)
| +++ head/science/netcdf4/Makefile	Tue Dec 10 19:17:08 2013	(r336087) @@
| -12,7 +12,7 @@ MASTER_SITES=	http://www.unidata.ucar.ed
|  MAINTAINER=	sunpoet at FreeBSD.org
|  COMMENT?=	Library for machine-independent, array-oriented data access
|  
| -CONFLICTS=	hdf-4.[0-9]* netcdf-3.[0-9]* netcdf3-3.[0-9]*
| +CONFLICTS_INSTALL=	hdf-4.[0-9]* netcdf-3.[0-9]* netcdf3-3.[0-9]*
|  PORTSCOUT=	limit:^4\.
|  
|  OPTIONS_DEFINE=	DAP FORTRAN SZIP
| 

BTW, no real relation to this, but it fails to build with SZIP :

<http://pkg.absolight.net/logs/bulk/91amd64-pkgng/2013-12-10_19h17m17s/logs/errors/netcdf-ftn-4.1.3_2.log>

-- 
Mathieu Arnold