Attachment 137810 Details for Bug 183519 – svndiff

svndiff

svndiff (text/x-diff; charset=us-ascii), 2.97 KB, created by Johannes Meixner on 2013-11-11 16:30:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johannes Meixner

Created: 2013-11-11 16:30:24 UTC

Size: 2.97 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 333479)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	h5py
>-PORTVERSION=	2.1.1
>+PORTVERSION=	2.2.0
> CATEGORIES=	science python
> MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -10,6 +10,8 @@
> MAINTAINER=	fmysh@iijmio-mail.jp
> COMMENT=	General-purpose Python interface to the HDF5 library
> 
>+LICENSE=	BSD
>+
> BUILD_DEPENDS=	${PYNUMPY}
> RUN_DEPENDS=	${PYNUMPY}
> LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5-18
>@@ -16,12 +18,21 @@
> 
> USE_PYTHON=		yes
> USE_PYDISTUTILS=	yes
>+
> PYDISTUTILS_AUTOPLIST=	yes
> 
>+PORTDOCS=	README.rst
>+
>+OPTIONS_DEFINE=	DOCS
>+
> post-patch:
> 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
> 		${WRKSRC}/setup.py
> 
>+post-install:
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
>+
> regression-test: build
> 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 333479)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (h5py-2.1.1.tar.gz) = 6e4f135268436cda1dc19a081dc5384d431057344fa1121a886016cd8c89c716
>-SIZE (h5py-2.1.1.tar.gz) = 984939
>+SHA256 (h5py-2.2.0.tar.gz) = 021c63a57a5ae231e3d60333634d1ae0fd4adaede2f918d6a699d38246dbd8a2
>+SIZE (h5py-2.2.0.tar.gz) = 975911
>Index: files/patch-setup.py
>===================================================================
>--- files/patch-setup.py	(revision 333479)
>+++ files/patch-setup.py	(working copy)
>@@ -1,12 +1,13 @@
>---- ./setup.py.orig	2013-10-29 15:50:15.741120947 +0200
>-+++ ./setup.py	2013-10-29 15:51:01.621119992 +0200
>-@@ -68,6 +68,9 @@
>-     elif sys.platform == 'darwin':
>-         COMPILER_SETTINGS['include_dirs'] += ['/opt/local/include']
>-         COMPILER_SETTINGS['library_dirs'] += ['/opt/local/lib']
>-+    elif sys.platform.startswith('freebsd'):
>-+        COMPILER_SETTINGS['include_dirs'] += ['%%LOCALBASE%%/include']
>-+        COMPILER_SETTINGS['library_dirs'] += ['%%LOCALBASE%%/lib']
>+--- ./setup.py.orig	2013-09-04 02:32:03.000000000 +0300
>++++ ./setup.py	2013-10-30 23:46:03.668134592 +0200
>+@@ -136,8 +136,8 @@
>+         COMPILER_SETTINGS['include_dirs'] += ['/usr/local/include'] # homebrew
>+         COMPILER_SETTINGS['library_dirs'] += ['/usr/local/lib']     # homebrew
>+     elif sys.platform.startswith('freebsd'):
>+-        COMPILER_SETTINGS['include_dirs'] += ['/usr/local/include'] # homebrew
>+-        COMPILER_SETTINGS['library_dirs'] += ['/usr/local/lib']     # homebrew
>++        COMPILER_SETTINGS['include_dirs'] += ['%%LOCALBASE%%/include'] # homebrew
>++        COMPILER_SETTINGS['library_dirs'] += ['%%LOCALBASE%%/lib']     # homebrew
>+     if MPI:
>+         COMPILER_SETTINGS['include_dirs'] += [mpi4py.get_include()]
>      COMPILER_SETTINGS['runtime_library_dirs'] = [op.abspath(x) for x in COMPILER_SETTINGS['library_dirs']]
>- 
>- MODULES =  ['defs','_errors','_objects','_proxy', 'h5fd', 'h5z',

Actions: View

Attachments on bug 183519: 137809 | 137810