Attachment #85507 for bug #121731

View | Details | Raw Unified | Return to bug 121731
Collapse All | Expand All





PORTNAME=	hdf5
PORTVERSION=	1.6.7
PORTREVISION=	1
CATEGORIES=	science archivers graphics
MASTER_SITES=	ftp://ftp.hdfgroup.org/HDF5/current16/src/ \
		ftp://ftp.hdfgroup.org/HDF5/prev-releases/ \


.include <bsd.port.pre.mk>

.if defined(WITH_FORTRAN)
LIBTOOLFILES+=		fortran/configure
USE_FORTRAN=		yes
CONFIGURE_ENV+=		F9X=${FC}
CONFIGURE_ARGS+=	--enable-fortran
PLIST_SUB+=		FORTRAN=""
.else
PLIST_SUB+=		FORTRAN="@comment "
.endif

.if ${ARCH} == "sparc64"
BROKEN=		Does not compile on ${ARCH}
.endif

Line 0 Link Here

(-)hdf5/files/patch-fortran::H5f90i.h (+11 lines)
	1	--- fortran/src/H5f90i.h.orig Thu Jul 12 21:26:46 2007
	2	+++ fortran/src/H5f90i.h Thu Jul 12 21:27:18 2007
	3	@@ -71,7 +71,7 @@
	4	#endif /APPLE/
	5
	6	/* LINUX definitions */
	7	-#if (defined(linux) \|\| defined(__gnu_linux__) \|\| defined(__linux__))
	8	+#if (defined(linux) \|\| defined(__gnu_linux__) \|\| defined(__linux__) \|\| defined(__FreeBSD__))
	9
	10	/* Common definitions */
	11	typedef char *_fcd;




--- fortran/config/commence.in.orig	Thu Jul 12 21:28:40 2007
+++ fortran/config/commence.in	Thu Jul 12 21:33:56 2007
@@ -47,7 +47,7 @@
 RM=rm -f
 CP=cp
 INSTALL=@INSTALL@
-INSTALL_PROGRAM=@INSTALL_PROGRAM@
+INSTALL_PROGRAM=@INSTALL_SCRIPT@
 INSTALL_DATA=@INSTALL_DATA@
 PARALLEL=@PARALLEL@
 RUNSERIAL=@RUNSERIAL@
@@ -62,7 +62,7 @@
 bindir=@bindir@
 libdir=@libdir@
 includedir=@includedir@
-docdir=@exec_prefix@/doc
+docdir=@exec_prefix@/share
 PUB_LIB=$(LIB)
 
 ## Shared libraries
@@ -85,8 +85,8 @@
 ## Optional variables. We must declare them here because Irix pmake
 ## complains if it sees a reference to a variable which has never been
 ## defined. The main makefile is free to redefine these to something else.
-DOCDIR=$(docdir)
-EXAMPLEDIR=$(docdir)/hdf5/examples/fortran
+DOCDIR=$(docdir)/doc/hdf5
+EXAMPLEDIR=$(docdir)/examples/hdf5/fortran
 LIB=
 LIB_SRC=
 LIB_OBJ=

Line 0 Link Here

(-)hdf5/files/patch-fortran::configure (+10 lines)
	1	--- fortran/configure.orig Thu Jul 12 21:36:24 2007
	2	+++ fortran/configure Thu Jul 12 21:36:49 2007
	3	@@ -7602,6 +7602,7 @@
	4
	5	# This can be used to rebuild libtool when needed
	6	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
	7	+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
	8
	9	# Always use our own libtool.
	10	LIBTOOL='$(SHELL) $(top_builddir)/libtool'




--- fortran/config/freebsd.orig	Thu Jul 12 21:23:06 2007
+++ fortran/config/freebsd	Thu Jul 12 21:25:09 2007
@@ -27,3 +27,20 @@
 
 # Figure out compiler flags
 . $srcdir/config/gnu-flags
+
+#
+# HDF5 integers
+#
+# 	R_LARGE is the number of digits for the bigest integer supported.
+#	R_INTEGER is the number of digits in INTEGER
+#
+# (for the Linux architechture)
+#
+R_LARGE=18
+R_INTEGER=9
+HADDR_T='SELECTED_INT_KIND(R_LARGE)'
+HSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HSSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HID_T='SELECTED_INT_KIND(R_INTEGER)'
+SIZE_T='SELECTED_INT_KIND(R_INTEGER)'
+OBJECT_NAMELEN_DEFAULT_F=-1




bin/h5debug
bin/h5diff
bin/h5dump
%%FORTRAN%%bin/h5fc
bin/h5import
bin/h5jam
bin/h5ls

include/H5api_adpt.h
include/H5cxx_pubconf.h
include/H5pubconf.h
%%FORTRAN%%include/H5pubconf_fortran.h
include/H5public.h
include/hdf5.h
%%FORTRAN%%lib/h5a.mod
%%FORTRAN%%lib/h5d.mod
%%FORTRAN%%lib/h5e.mod
%%FORTRAN%%lib/h5f.mod
%%FORTRAN%%lib/h5fortran_flags.mod
%%FORTRAN%%lib/h5fortran_types.mod
%%FORTRAN%%lib/h5g.mod
%%FORTRAN%%lib/h5global.mod
%%FORTRAN%%lib/h5i.mod
%%FORTRAN%%lib/h5lib.mod
%%FORTRAN%%lib/h5p.mod
%%FORTRAN%%lib/h5r.mod
%%FORTRAN%%lib/h5s.mod
%%FORTRAN%%lib/h5t.mod
%%FORTRAN%%lib/h5z.mod
%%FORTRAN%%lib/hdf5.mod
lib/libhdf5.a
lib/libhdf5.la
lib/libhdf5.settings

lib/libhdf5.so.0
lib/libhdf5_cpp.a
lib/libhdf5_cpp.la
%%FORTRAN%%lib/libhdf5_fortran.a
%%FORTRAN%%lib/libhdf5_fortran.la
%%FORTRAN%%lib/libhdf5_fortran.settings
lib/libhdf5_hl.a
lib/libhdf5_hl.la
lib/libhdf5_hl.so

%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_select.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_write.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ph5example.c
%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/attrexample.f90
%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/compound.f90
%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/dsetexample.f90
%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/fileexample.f90
%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/groupexample.f90
%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/grpdsetexample.f90
%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/grpit.f90
%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/grpsexample.f90
%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/hyperslab.f90
%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/mountexample.f90
%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/refobjexample.f90
%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/refregexample.f90
%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/rwdsetexample.f90
%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/selectele.f90
%%PORTEXAMPLES%%%%FORTRAN%%@dirrm %%EXAMPLESDIR%%/fortran
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/c++
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/c
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%

Return to bug 121731

Lines 8-13 Link Here

(-)hdf5/Makefile (+11 lines)
8		8
9	PORTNAME= hdf5	9	PORTNAME= hdf5
10	PORTVERSION= 1.6.7	10	PORTVERSION= 1.6.7
		11	PORTREVISION= 1
11	CATEGORIES= science archivers graphics	12	CATEGORIES= science archivers graphics
12	MASTER_SITES= ftp://ftp.hdfgroup.org/HDF5/current16/src/ \	13	MASTER_SITES= ftp://ftp.hdfgroup.org/HDF5/current16/src/ \
13	ftp://ftp.hdfgroup.org/HDF5/prev-releases/ \	14	ftp://ftp.hdfgroup.org/HDF5/prev-releases/ \
Lines 34-39 Link Here
34		35
35	.include <bsd.port.pre.mk>	36	.include <bsd.port.pre.mk>
36		37
		38	.if defined(WITH_FORTRAN)
		39	LIBTOOLFILES+= fortran/configure
		40	USE_FORTRAN= yes
		41	CONFIGURE_ENV+= F9X=${FC}
		42	CONFIGURE_ARGS+= --enable-fortran
		43	PLIST_SUB+= FORTRAN=""
		44	.else
		45	PLIST_SUB+= FORTRAN="@comment "
		46	.endif
		47
37	.if ${ARCH} == "sparc64"	48	.if ${ARCH} == "sparc64"
38	BROKEN= Does not compile on ${ARCH}	49	BROKEN= Does not compile on ${ARCH}
39	.endif	50	.endif

Line 0 Link Here

(-)hdf5/files/patch-fortran::commence.in (+31 lines)
	1	--- fortran/config/commence.in.orig Thu Jul 12 21:28:40 2007
	2	+++ fortran/config/commence.in Thu Jul 12 21:33:56 2007
	3	@@ -47,7 +47,7 @@
	4	RM=rm -f
	5	CP=cp
	6	INSTALL=@INSTALL@
	7	-INSTALL_PROGRAM=@INSTALL_PROGRAM@
	8	+INSTALL_PROGRAM=@INSTALL_SCRIPT@
	9	INSTALL_DATA=@INSTALL_DATA@
	10	PARALLEL=@PARALLEL@
	11	RUNSERIAL=@RUNSERIAL@
	12	@@ -62,7 +62,7 @@
	13	bindir=@bindir@
	14	libdir=@libdir@
	15	includedir=@includedir@
	16	-docdir=@exec_prefix@/doc
	17	+docdir=@exec_prefix@/share
	18	PUB_LIB=$(LIB)
	19
	20	## Shared libraries
	21	@@ -85,8 +85,8 @@
	22	## Optional variables. We must declare them here because Irix pmake
	23	## complains if it sees a reference to a variable which has never been
	24	## defined. The main makefile is free to redefine these to something else.
	25	-DOCDIR=$(docdir)
	26	-EXAMPLEDIR=$(docdir)/hdf5/examples/fortran
	27	+DOCDIR=$(docdir)/doc/hdf5
	28	+EXAMPLEDIR=$(docdir)/examples/hdf5/fortran
	29	LIB=
	30	LIB_SRC=
	31	LIB_OBJ=

Line 0 Link Here

(-)hdf5/files/patch-fortran::freebsd (+23 lines)
	1	--- fortran/config/freebsd.orig Thu Jul 12 21:23:06 2007
	2	+++ fortran/config/freebsd Thu Jul 12 21:25:09 2007
	3	@@ -27,3 +27,20 @@
	4
	5	# Figure out compiler flags
	6	. $srcdir/config/gnu-flags
	7	+
	8	+#
	9	+# HDF5 integers
	10	+#
	11	+# R_LARGE is the number of digits for the bigest integer supported.
	12	+# R_INTEGER is the number of digits in INTEGER
	13	+#
	14	+# (for the Linux architechture)
	15	+#
	16	+R_LARGE=18
	17	+R_INTEGER=9
	18	+HADDR_T='SELECTED_INT_KIND(R_LARGE)'
	19	+HSIZE_T='SELECTED_INT_KIND(R_LARGE)'
	20	+HSSIZE_T='SELECTED_INT_KIND(R_LARGE)'
	21	+HID_T='SELECTED_INT_KIND(R_INTEGER)'
	22	+SIZE_T='SELECTED_INT_KIND(R_INTEGER)'
	23	+OBJECT_NAMELEN_DEFAULT_F=-1

Lines 5-10 Link Here

(-)hdf5/pkg-plist (-1 / +37 lines)
5	bin/h5debug	5	bin/h5debug
6	bin/h5diff	6	bin/h5diff
7	bin/h5dump	7	bin/h5dump
		8	%%FORTRAN%%bin/h5fc
8	bin/h5import	9	bin/h5import
9	bin/h5jam	10	bin/h5jam
10	bin/h5ls	11	bin/h5ls
Lines 78-85 Link Here
78	include/H5api_adpt.h	79	include/H5api_adpt.h
79	include/H5cxx_pubconf.h	80	include/H5cxx_pubconf.h
80	include/H5pubconf.h	81	include/H5pubconf.h
		82	%%FORTRAN%%include/H5pubconf_fortran.h
81	include/H5public.h	83	include/H5public.h
82	include/hdf5.h	84	include/hdf5.h
		85	%%FORTRAN%%lib/h5a.mod
		86	%%FORTRAN%%lib/h5d.mod
		87	%%FORTRAN%%lib/h5e.mod
		88	%%FORTRAN%%lib/h5f.mod
		89	%%FORTRAN%%lib/h5fortran_flags.mod
		90	%%FORTRAN%%lib/h5fortran_types.mod
		91	%%FORTRAN%%lib/h5g.mod
		92	%%FORTRAN%%lib/h5global.mod
		93	%%FORTRAN%%lib/h5i.mod
		94	%%FORTRAN%%lib/h5lib.mod
		95	%%FORTRAN%%lib/h5p.mod
		96	%%FORTRAN%%lib/h5r.mod
		97	%%FORTRAN%%lib/h5s.mod
		98	%%FORTRAN%%lib/h5t.mod
		99	%%FORTRAN%%lib/h5z.mod
		100	%%FORTRAN%%lib/hdf5.mod
83	lib/libhdf5.a	101	lib/libhdf5.a
84	lib/libhdf5.la	102	lib/libhdf5.la
85	lib/libhdf5.settings	103	lib/libhdf5.settings
Lines 87-92 Link Here
87	lib/libhdf5.so.0	105	lib/libhdf5.so.0
88	lib/libhdf5_cpp.a	106	lib/libhdf5_cpp.a
89	lib/libhdf5_cpp.la	107	lib/libhdf5_cpp.la
		108	%%FORTRAN%%lib/libhdf5_fortran.a
		109	%%FORTRAN%%lib/libhdf5_fortran.la
		110	%%FORTRAN%%lib/libhdf5_fortran.settings
90	lib/libhdf5_hl.a	111	lib/libhdf5_hl.a
91	lib/libhdf5_hl.la	112	lib/libhdf5_hl.la
92	lib/libhdf5_hl.so	113	lib/libhdf5_hl.so
Lines 128-133 Link Here
128	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_select.c	149	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_select.c
129	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_write.c	150	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_write.c
130	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ph5example.c	151	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ph5example.c
131	%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/c	152	%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/attrexample.f90
		153	%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/compound.f90
		154	%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/dsetexample.f90
		155	%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/fileexample.f90
		156	%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/groupexample.f90
		157	%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/grpdsetexample.f90
		158	%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/grpit.f90
		159	%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/grpsexample.f90
		160	%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/hyperslab.f90
		161	%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/mountexample.f90
		162	%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/refobjexample.f90
		163	%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/refregexample.f90
		164	%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/rwdsetexample.f90
		165	%%PORTEXAMPLES%%%%FORTRAN%%%%EXAMPLESDIR%%/fortran/selectele.f90
		166	%%PORTEXAMPLES%%%%FORTRAN%%@dirrm %%EXAMPLESDIR%%/fortran
132	%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/c++	167	%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/c++
		168	%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/c
133	%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%	169	%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%