Attachment 141021 Details for Bug 187745 – file.diff

[patch] file.diff

file.diff (text/plain), 2.98 KB, created by tkato432 on 2014-03-19 18:40:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-03-19 18:40:03 UTC

Size: 2.98 KB

patch

obsolete

>diff -urN /usr/ports/science/py-netCDF4/Makefile science/py-netCDF4/Makefile
>--- /usr/ports/science/py-netCDF4/Makefile	2014-03-11 06:39:39.000000000 +0900
>+++ science/py-netCDF4/Makefile	2014-03-20 00:00:00.000000000 +0900
>@@ -2,11 +2,9 @@
> # $FreeBSD: head/science/py-netCDF4/Makefile 347809 2014-03-10 20:55:20Z gerald $
> 
> PORTNAME=	netCDF4
>-PORTVERSION=	1.0.5
>-PORTREVISION=	2
>+PORTVERSION=	1.0.8
> CATEGORIES=	science python
>-MASTER_SITES=	GOOGLE_CODE
>-PROJECTHOST=	netcdf4-python
>+MASTER_SITES=	GH
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
> MAINTAINER=	ports@FreeBSD.org
>@@ -15,30 +13,39 @@
> LICENSE=	MIT
> 
> BUILD_DEPENDS=	${PYNUMPY}
>-LIB_DEPENDS=	hdf5:${PORTSDIR}/science/hdf5-18 \
>-		netcdf:${PORTSDIR}/science/netcdf4
>+LIB_DEPENDS=	libhdf5.so.7:${PORTSDIR}/science/hdf5-18 \
>+		libnetcdf.so.7:${PORTSDIR}/science/netcdf4
> RUN_DEPENDS=	${PYNUMPY}
> 
>-OPTIONS_DEFINE=	DOCS EXAMPLES
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	Unidata
>+GH_PROJECT=	netcdf4-python
>+GH_TAGNAME=	v${PORTVERSION}rel
>+GH_COMMIT=	1344040
> 
>-USES=		dos2unix
>-DOS2UNIX_FILES=	utils/nc3tonc4
> USE_PYTHON=	yes
> USE_PYDISTUTILS=	yes
> PYDISTUTILS_AUTOPLIST=	yes
>-MAKE_ENV=	HDF5_INCDIR=${LOCALBASE}/include \
>-		HDF5_LIBDIR=${LOCALBASE}/lib \
>-		NETCDF4_INCDIR=${LOCALBASE}/include \
>-		NETCDF4_LIBDIR=${LOCALBASE}/lib
>+
>+DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
>+EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
> 
> PORTDOCS=	*
> PORTEXAMPLES=	*
> 
>-.include <bsd.port.options.mk>
>+OPTIONS_DEFINE=		DOCS EXAMPLES
> 
> post-patch:
>-	@${REINPLACE_CMD} -e \
>-		"/dirstosearch/s|=.*|= ['${LOCALBASE}']|" ${WRKSRC}/setup.py
>+	@${ECHO_CMD} -n > ${WRKSRC}/setup.cfg
>+	@${ECHO_CMD} "[options]" >> ${WRKSRC}/setup.cfg
>+	@${ECHO_CMD} "use_ncconfig=True" >> ${WRKSRC}/setup.cfg
>+	@${ECHO_CMD} "ncconfig=${LOCALBASE}/bin/nc-config" \
>+		>> ${WRKSRC}/setup.cfg
>+	@${ECHO_CMD} "[directories]" >> ${WRKSRC}/setup.cfg
>+	@${ECHO_CMD} "HDF5_libdir=${LOCALBASE}/lib" \
>+		>> ${WRKSRC}/setup.cfg
>+	@${ECHO_CMD} "HDF5_incdir=${LOCALBASE}/include" \
>+		>> ${WRKSRC}/setup.cfg
> 
> post-install:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>diff -urN /usr/ports/science/py-netCDF4/distinfo science/py-netCDF4/distinfo
>--- /usr/ports/science/py-netCDF4/distinfo	2013-11-06 22:05:50.000000000 +0900
>+++ science/py-netCDF4/distinfo	2014-03-20 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (netCDF4-1.0.5.tar.gz) = a87751f85d823c22727183c78f8f20d83569399dc73c4bb30a247063756e46bd
>-SIZE (netCDF4-1.0.5.tar.gz) = 538945
>+SHA256 (netCDF4-1.0.8.tar.gz) = cc6582011ff2937a4c6250e6df1fd9b33f15c18ae74bace0f519503d1402df66
>+SIZE (netCDF4-1.0.8.tar.gz) = 571836
>diff -urN /usr/ports/science/py-netCDF4/pkg-descr science/py-netCDF4/pkg-descr
>--- /usr/ports/science/py-netCDF4/pkg-descr	2014-01-23 03:07:14.000000000 +0900
>+++ science/py-netCDF4/pkg-descr	2014-03-20 00:00:00.000000000 +0900
>@@ -11,4 +11,4 @@
> implemented, except variable-length strings (NC_STRING). User defined
> data types (compound, vlen, enum etc.) are not supported.
> 
>-WWW: http://code.google.com/p/netcdf4-python/
>+WWW: http://unidata.github.io/netcdf4-python/

Actions: View | Diff

Attachments on bug 187745: 141021 | 141022 | 141023