Attachment 112042 Details for Bug 153400 – file.diff

[patch] file.diff

file.diff (text/plain), 6.21 KB, created by Robert Farmer on 2010-12-23 10:20:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Farmer

Created: 2010-12-23 10:20:09 UTC

Size: 6.21 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/science/hdf5-18/Makefile,v
>retrieving revision 1.58
>diff -u -r1.58 Makefile
>--- Makefile	4 May 2010 17:50:41 -0000	1.58
>+++ Makefile	23 Dec 2010 06:35:25 -0000
>@@ -6,10 +6,10 @@
> #
> 
> PORTNAME=	hdf5
>-PORTVERSION=	1.8.4
>+PORTVERSION=	1.8.5
> CATEGORIES=	science archivers graphics
> MASTER_SITES=	ftp://ftp.hdfgroup.org/HDF5/current/src/ \
>-		ftp://ftp.hdfgroup.org/HDF5/prev-releases/hdf5-1.8.4/src/
>+		ftp://ftp.hdfgroup.org/HDF5/prev-releases/${PORTNAME}-${PORTVERSION}-patch1/src/
> DISTNAME=	${PORTNAME}-${PORTVERSION}-patch1
> 
> MAINTAINER=	koziol@hdfgroup.org
>@@ -21,10 +21,8 @@
> USE_BZIP2=	yes
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--disable-debug \
>-		--enable-cxx \
>+CONFIGURE_ARGS=	--enable-cxx \
> 		--enable-instrument \
>-		--enable-production \
> 		--enable-strict-format-checks \
> 		--with-pthread=/usr \
> 		--with-zlib=/usr
>@@ -34,6 +32,12 @@
> 
> .include <bsd.port.pre.mk>
> 
>+.if !defined(WITH_DEBUG)
>+CONFIGURE_ARGS+=	--disable-debug
>+.else
>+CONFIGURE_ARGS+=	--enable-production
>+.endif
>+
> .if defined(WITH_FORTRAN)
> USE_FORTRAN=		yes
> CONFIGURE_ENV+=		F9X=${FC}
>@@ -55,6 +59,8 @@
> post-patch:
> 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
> 	@${REINPLACE_CMD} -e 's|-O3||g' ${WRKSRC}/config/gnu-flags
>+	@${REINPLACE_CMD} -e 's|perform examples|perform|' ${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} -e 's|install-recursive install-examples|install-recursive|' ${WRKSRC}/Makefile.in
> 
> post-install:
> .if !defined(NOPORTEXAMPLES)
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/science/hdf5-18/distinfo,v
>retrieving revision 1.22
>diff -u -r1.22 distinfo
>--- distinfo	4 May 2010 17:50:41 -0000	1.22
>+++ distinfo	23 Dec 2010 01:52:30 -0000
>@@ -1,3 +1,2 @@
>-MD5 (hdf5-1.8.4-patch1.tar.bz2) = b19f4dfbf654a2af3653c492fc1c7513
>-SHA256 (hdf5-1.8.4-patch1.tar.bz2) = 818b9f7ff767e9760d0c8aa0abc16ad20e616cfaab760dd3b18ead67326a3f18
>-SIZE (hdf5-1.8.4-patch1.tar.bz2) = 5251124
>+SHA256 (hdf5-1.8.5-patch1.tar.bz2) = 1028be671e24dcd9826d3eabe6c0ebe674282368689dcf0f6bb5926bc8d3be25
>+SIZE (hdf5-1.8.5-patch1.tar.bz2) = 5413471
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/science/hdf5-18/pkg-plist,v
>retrieving revision 1.26
>diff -u -r1.26 pkg-plist
>--- pkg-plist	4 May 2010 18:19:52 -0000	1.26
>+++ pkg-plist	23 Dec 2010 03:48:24 -0000
>@@ -1,11 +1,8 @@
>-bin/h5mkgrp
>-bin/h5copy
>-bin/h5stat
>-bin/h5perf_serial
> bin/gif2h5
> bin/h52gif
> bin/h5c++
> bin/h5cc
>+bin/h5copy
> bin/h5debug
> bin/h5diff
> bin/h5dump
>@@ -13,11 +10,13 @@
> bin/h5import
> bin/h5jam
> bin/h5ls
>+bin/h5mkgrp
>+bin/h5perf_serial
> bin/h5redeploy
> bin/h5repack
> bin/h5repart
>+bin/h5stat
> bin/h5unjam
>-include/hdf5_hl.h
> include/H5ACpublic.h
> include/H5AbstractDs.h
> include/H5Apublic.h
>@@ -30,12 +29,12 @@
> include/H5Cpp.h
> include/H5CppDoc.h
> include/H5Cpublic.h
>+include/H5DSpublic.h
> include/H5DataSet.h
> include/H5DataSpace.h
> include/H5DataType.h
> include/H5DcreatProp.h
> include/H5Dpublic.h
>-include/H5DSpublic.h
> include/H5DxferProp.h
> include/H5EnumType.h
> include/H5Epubgen.h
>@@ -59,13 +58,13 @@
> include/H5Fpublic.h
> include/H5Gpublic.h
> include/H5Group.h
>-include/H5IdComponent.h
> include/H5IMpublic.h
>+include/H5IdComponent.h
> include/H5Include.h
> include/H5IntType.h
> include/H5Ipublic.h
>-include/H5Library.h
> include/H5LTpublic.h
>+include/H5Library.h
> include/H5Lpublic.h
> include/H5MMpublic.h
> include/H5Object.h
>@@ -83,45 +82,35 @@
> include/H5VarLenType.h
> include/H5Zpublic.h
> include/H5api_adpt.h
>+%%FORTRAN%%include/H5f90i.h
>+%%FORTRAN%%include/H5f90i_gen.h
> include/H5overflow.h
> include/H5pubconf.h
> include/H5public.h
> include/H5version.h
>-include/hdf5.h
>+%%FORTRAN%%include/h5_dble_interface.mod
> %%FORTRAN%%include/h5a.mod
> %%FORTRAN%%include/h5d.mod
> %%FORTRAN%%include/h5e.mod
> %%FORTRAN%%include/h5f.mod
>-%%FORTRAN%%include/h5fortran_flags.mod
> %%FORTRAN%%include/h5fortran_types.mod
> %%FORTRAN%%include/h5g.mod
> %%FORTRAN%%include/h5global.mod
> %%FORTRAN%%include/h5i.mod
>+%%FORTRAN%%include/h5im.mod
>+%%FORTRAN%%include/h5l.mod
> %%FORTRAN%%include/h5lib.mod
>+%%FORTRAN%%include/h5lt.mod
>+%%FORTRAN%%include/h5o.mod
> %%FORTRAN%%include/h5p.mod
> %%FORTRAN%%include/h5r.mod
> %%FORTRAN%%include/h5s.mod
> %%FORTRAN%%include/h5t.mod
>+%%FORTRAN%%include/h5tb.mod
> %%FORTRAN%%include/h5z.mod
>+include/hdf5.h
> %%FORTRAN%%include/hdf5.mod
>-%%FORTRAN%%include/h5_dble_interface.mod
>-%%FORTRAN%%include/h5o.mod
>-%%FORTRAN%%include/h5l.mod
>-%%FORTRAN%%include/h5tb.mod
>-%%FORTRAN%%include/h5lt.mod
>-%%FORTRAN%%include/h5im.mod
>-%%FORTRAN%%lib/libhdf5_fortran.so
>-%%FORTRAN%%lib/libhdf5_fortran.so.0
>-%%FORTRAN%%lib/libhdf5hl_fortran.so
>-%%FORTRAN%%lib/libhdf5hl_fortran.so.0
>-%%FORTRAN%%lib/libhdf5hl_fortran.la
>-%%FORTRAN%%lib/libhdf5hl_fortran.a
>-lib/libhdf5_cpp.so
>-lib/libhdf5_cpp.so.6
>-lib/libhdf5_hl_cpp.so
>-lib/libhdf5_hl_cpp.so.6
>-lib/libhdf5_hl_cpp.la
>-lib/libhdf5_hl_cpp.a
>+include/hdf5_hl.h
> lib/libhdf5.a
> lib/libhdf5.la
> lib/libhdf5.settings
>@@ -129,13 +118,26 @@
> lib/libhdf5.so.6
> lib/libhdf5_cpp.a
> lib/libhdf5_cpp.la
>+lib/libhdf5_cpp.so
>+lib/libhdf5_cpp.so.6
> %%FORTRAN%%lib/libhdf5_fortran.a
> %%FORTRAN%%lib/libhdf5_fortran.la
>+%%FORTRAN%%lib/libhdf5_fortran.so
>+%%FORTRAN%%lib/libhdf5_fortran.so.6
> lib/libhdf5_hl.a
> lib/libhdf5_hl.la
> lib/libhdf5_hl.so
> lib/libhdf5_hl.so.6
>+lib/libhdf5_hl_cpp.a
>+lib/libhdf5_hl_cpp.la
>+lib/libhdf5_hl_cpp.so
>+lib/libhdf5_hl_cpp.so.6
>+%%FORTRAN%%lib/libhdf5hl_fortran.a
>+%%FORTRAN%%lib/libhdf5hl_fortran.la
>+%%FORTRAN%%lib/libhdf5hl_fortran.so
>+%%FORTRAN%%lib/libhdf5hl_fortran.so.6
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Attributes.txt
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/CMakeLists.txt
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.am
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.in
>@@ -157,6 +159,9 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/h5_shared_mesg.c
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/h5_write.c
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ph5example.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/run-all-ex.sh
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/run-c-ex.sh
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/run-c-ex.sh.in
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testh5cc.sh
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testh5cc.sh.in
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%

Actions: View | Diff

Attachments on bug 153400: 112042