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

(-)science/hdf/Makefile (-28 / +19 lines)
Lines 1-16 Link Here
1
# New ports collection makefile for:	HDF_lib
1
# Created by: mi
2
# Date created:		17 November 1996
3
# Whom:			mi
4
#
5
# $FreeBSD: ports/science/hdf/Makefile,v 1.52 2012/09/08 07:49:05 linimon Exp $
2
# $FreeBSD: ports/science/hdf/Makefile,v 1.52 2012/09/08 07:49:05 linimon Exp $
6
#
7
3
8
PORTNAME=	hdf
4
PORTNAME=	hdf
9
DISTVERSION=	4.2.7-patch1
5
PORTVERSION=	4.2.8
10
PORTEPOCH=	1
6
PORTEPOCH=	1
11
CATEGORIES=	science archivers graphics
7
CATEGORIES=	science archivers graphics
12
MASTER_SITES=	ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/	\
8
MASTER_SITES=	http://www.hdfgroup.org/ftp/HDF/releases/%SUBDIR%/
13
		ftp://ftp.hdfgroup.org/HDF/prev-releases/HDF${PORTVERSION:R}/src/
9
MASTER_SITE_SUBDIR=	${PORTNAME:U}${PORTVERSION}/src
14
10
15
MAINTAINER=	ports@FreeBSD.org
11
MAINTAINER=	ports@FreeBSD.org
16
COMMENT=	Hierarchical Data Format library (from NCSA)
12
COMMENT=	Hierarchical Data Format library (from NCSA)
Lines 22-52 Link Here
22
18
23
USE_BZIP2=	yes
19
USE_BZIP2=	yes
24
USE_FORTRAN=	yes
20
USE_FORTRAN=	yes
25
MAKE_JOBS_SAFE=	yes
26
# XXX Our libtool breaks, when building this:
27
# XXX can't link libraries with fortran
28
#USE_AUTOTOOLS=	libtool
29
30
GNU_CONFIGURE=	yes
21
GNU_CONFIGURE=	yes
31
CONFIGURE_ARGS+=--with-jpeg="${LOCALBASE}" \
22
CONFIGURE_ARGS=	--with-jpeg="${LOCALBASE}" \
32
		--with-szlib="${LOCALBASE}"\
23
		--with-szlib="${LOCALBASE}" \
33
		--enable-shared
24
		--enable-shared
25
USE_LDCONFIG=	yes
26
MAKE_JOBS_SAFE=	yes
34
27
35
MAN1=		hdf.1 hdfunpac.1 ncdump.1 ncgen.1
28
MAN1=		hdf.1 hdfunpac.1 ncdump.1 ncgen.1
36
MAN3=		gr_chunk.3
29
MAN3=		gr_chunk.3
37
MANCOMPRESSED=	no
38
39
USE_LDCONFIG=	yes
40
41
check regression-test test: build
42
	${MAKE} ${_MAKE_JOBS} -C ${WRKSRC}/hdf/test check
43
44
post-install:
45
	# Install man-pages omitted by HDF's own install process
46
	${INSTALL_MAN} ${WRKSRC}/man/hdfunpac.1 ${MAN1PREFIX}/man/man1/
47
	${INSTALL_MAN} ${WRKSRC}/man/gr_chunk.3 ${MAN1PREFIX}/man/man3/
48
	# Removing useless .la files from ${PREFIX}/lib
49
	${RM} -f ${PREFIX}/lib/libdf.la ${PREFIX}/lib/libmfhdf.la
50
30
51
.include <bsd.port.pre.mk>
31
.include <bsd.port.pre.mk>
52
32
Lines 54-57 Link Here
54
BROKEN=		Does not compile on powerpc
34
BROKEN=		Does not compile on powerpc
55
.endif
35
.endif
56
36
37
post-patch:
38
	@${REINPLACE_CMD} -e \
39
		'/PROD_/s|=.*|=""|' ${WRKSRC}/config/freebsd
40
41
post-install:
42
	${INSTALL_MAN} ${WRKSRC}/man/hdfunpac.1 ${MAN1PREFIX}/man/man1
43
	${INSTALL_MAN} ${WRKSRC}/man/gr_chunk.3 ${MAN3PREFIX}/man/man3
44
45
check regression-test test: build
46
	${MAKE} -C ${WRKSRC}/hdf/test check
47
57
.include <bsd.port.post.mk>
48
.include <bsd.port.post.mk>
(-)science/hdf/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (hdf-4.2.7-patch1.tar.bz2) = 3a7b5ba0ac47e5283bee3ec365e8027e88937cd1632d001ceec33af80947d1bd
1
SHA256 (hdf-4.2.8.tar.bz2) = e8a94ae2c838007ccdd55bb3cd9684adba3ded367c09803ffc84a2704f83c00f
2
SIZE (hdf-4.2.7-patch1.tar.bz2) = 3027309
2
SIZE (hdf-4.2.8.tar.bz2) = 3027253
(-)science/hdf/files/patch-compile-flags (-41 lines)
Lines 1-41 Link Here
1
Don't append optimization flags -- rely on what the building
2
machine has set.
3
--- config/freebsd	2012-03-17 23:44:05.000000000 -0400
4
+++ config/freebsd	2012-04-21 10:30:43.000000000 -0400
5
@@ -102,5 +102,5 @@
6
     DEBUG_CFLAGS="-g -ansi -Wall -pedantic "
7
     DEBUG_CPPFLAGS=
8
-    PROD_CFLAGS="-ansi -Wall -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wmissing-prototypes -Wnested-externs -pedantic -O2"
9
+    PROD_CFLAGS="-ansi -Wall -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wmissing-prototypes -Wnested-externs -pedantic"
10
     PROD_CPPFLAGS=
11
     PROFILE_CFLAGS="-pg"
12
@@ -112,5 +112,4 @@
13
     DEBUG_CFLAGS="-g"
14
     DEBUG_CPPFLAGS=
15
-    PROD_CFLAGS="-O"
16
     PROD_CPPFLAGS=
17
     PROFILE_CFLAGS="-pg"
18
@@ -123,5 +122,4 @@
19
     FFLAGS="$FFLAGS"
20
     DEBUG_FFLAGS="-g"
21
-    PROD_FFLAGS="-O"
22
     PROFILE_FFLAGS="-pg"
23
     ;;
24
@@ -130,5 +128,4 @@
25
     FFLAGS="$FFLAGS"
26
     DEBUG_FFLAGS="-g"
27
-    PROD_FFLAGS="-O"
28
     PROFILE_FFLAGS="-pg"
29
     ;;
30
@@ -139,5 +136,4 @@
31
     CXXFLAGS="$CXXFLAGS"
32
     DEBUG_CXXFLAGS="-g -fverbose-asm"
33
-    PROD_CXXFLAGS="-O3 -fomit-frame-pointer"
34
     PROFILE_CXXFLAGS="-pg"
35
     ;;
36
@@ -146,5 +142,4 @@
37
     CXXFLAGS="$CXXFLAGS -ansi"
38
     DEBUG_CXXFLAGS="-g"
39
-    PROD_CXXFLAGS="-O"
40
     PROFILE_CXXFLAGS="-pg"
41
     ;;
(-)science/hdf/files/patch-configure (+19 lines)
Line 0 Link Here
1
--- configure.orig	2012-08-07 13:11:45.000000000 +0900
2
+++ configure	2012-08-14 21:08:48.000000000 +0900
3
@@ -5837,11 +5837,11 @@
4
     enable_shared="no"
5
 fi
6
 
7
-if test "X${enable_shared}" = "Xyes"; then
8
-    if test "X${BUILD_FORTRAN}" = "Xyes"; then
9
-        as_fn_error $? "Cannot build shared fortran libraries. Please configure with --disable-fortran flag." "$LINENO" 5
10
-    fi
11
-fi
12
+#if test "X${enable_shared}" = "Xyes"; then
13
+#    if test "X${BUILD_FORTRAN}" = "Xyes"; then
14
+#        as_fn_error $? "Cannot build shared fortran libraries. Please configure with --disable-fortran flag." "$LINENO" 5
15
+#    fi
16
+#fi
17
 
18
 
19
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
(-)science/hdf/files/patch-hdf__src__Makefile.in (+20 lines)
Line 0 Link Here
1
--- hdf/src/Makefile.in.orig	2012-08-07 13:11:36.000000000 +0900
2
+++ hdf/src/Makefile.in	2012-08-14 21:08:53.000000000 +0900
3
@@ -187,7 +187,7 @@
4
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
5
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
6
 LD = @LD@
7
-LDFLAGS = @LDFLAGS@
8
+LDFLAGS = @LDFLAGS@ -version-number 2
9
 LEX = @LEX@
10
 LIBOBJS = @LIBOBJS@
11
 LIBS = @LIBS@
12
@@ -290,8 +290,6 @@
13
 CP = cp
14
 H4CC = $(bindir)/h4cc
15
 H4FC = $(bindir)/h4fc
16
-@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
17
-@HDF_BUILD_SHARED_TRUE@AM_LDFLAGS = -R$(abs_top_builddir)/mfhdf/libsrc/.libs -R$(abs_top_builddir)/hdf/src/.libs $(XDR_ADD)
18
 ACLOCAL_AMFLAGS = "-I m4"
19
 lib_LTLIBRARIES = libdf.la
20
 FSOURCES = df24ff.f dfanf.c dfanff.f dff.c dfff.f dfpf.c dfpff.f dfr8f.c    \
(-)science/hdf/files/patch-lib-versions (-31 lines)
Lines 1-31 Link Here
1
--- hdf/src/Makefile.in	2012-03-17 23:45:49.000000000 -0400
2
+++ hdf/src/Makefile.in	2012-04-21 13:33:36.000000000 -0400
3
@@ -188,5 +188,5 @@
4
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
5
 LD = @LD@
6
-LDFLAGS = @LDFLAGS@
7
+LDFLAGS = @LDFLAGS@ -version-number 2
8
 LEX = @LEX@
9
 LIBOBJS = @LIBOBJS@
10
@@ -291,6 +291,4 @@
11
 H4CC = $(bindir)/h4cc
12
 H4FC = $(bindir)/h4fc
13
-@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
14
-@HDF_BUILD_SHARED_TRUE@AM_LDFLAGS = -R$(abs_top_builddir)/mfhdf/libsrc/.libs -R$(abs_top_builddir)/hdf/src/.libs $(XDR_ADD)
15
 ACLOCAL_AMFLAGS = "-I m4"
16
 lib_LTLIBRARIES = libdf.la
17
+++ mfhdf/libsrc/Makefile.in	2012-04-21 13:33:36.000000000 -0400
18
@@ -188,5 +188,5 @@
19
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
20
 LD = @LD@
21
-LDFLAGS = @LDFLAGS@
22
+LDFLAGS = @LDFLAGS@ -version-number 3
23
 LEX = @LEX@
24
 LIBOBJS = @LIBOBJS@
25
@@ -291,6 +291,4 @@
26
 H4CC = $(bindir)/h4cc
27
 H4FC = $(bindir)/h4fc
28
-@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
29
-@HDF_BUILD_SHARED_TRUE@AM_LDFLAGS = -R$(abs_top_builddir)/mfhdf/libsrc/.libs -R$(abs_top_builddir)/hdf/src/.libs $(XDR_ADD)
30
 ACLOCAL_AMFLAGS = "-I m4"
31
 lib_LTLIBRARIES = libdf.la
(-)science/hdf/files/patch-mfhdf__libsrc__Makefile.in (+20 lines)
Line 0 Link Here
1
--- mfhdf/libsrc/Makefile.in.orig	2012-08-07 13:11:12.000000000 +0900
2
+++ mfhdf/libsrc/Makefile.in	2012-08-14 21:08:58.000000000 +0900
3
@@ -161,7 +161,7 @@
4
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
5
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
6
 LD = @LD@
7
-LDFLAGS = @LDFLAGS@
8
+LDFLAGS = @LDFLAGS@ -version-number 3
9
 LEX = @LEX@
10
 LIBOBJS = @LIBOBJS@
11
 LIBS = @LIBS@
12
@@ -264,8 +264,6 @@
13
 CP = cp
14
 H4CC = $(bindir)/h4cc
15
 H4FC = $(bindir)/h4fc
16
-@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
17
-@HDF_BUILD_SHARED_TRUE@AM_LDFLAGS = -R$(abs_top_builddir)/mfhdf/libsrc/.libs -R$(abs_top_builddir)/hdf/src/.libs $(XDR_ADD)
18
 ACLOCAL_AMFLAGS = "-I m4"
19
 INCLUDES = -I$(top_srcdir)/hdf/src        \
20
          -I$(top_srcdir)/mfhdf/libsrc   
(-)science/hdf/files/patch-shared-fortran (-31 lines)
Lines 1-31 Link Here
1
--- configure.ac	2012-03-17 23:45:46.000000000 -0400
2
+++ configure.ac	2012-04-21 10:01:41.000000000 -0400
3
@@ -199,6 +199,5 @@
4
 dnl -------------------------------------------------------------------------
5
 dnl Build static libraries by default. Furthermore, fortran shared libraries
6
-dnl are unsupported. Disallow a user from enabling both shared libraries and
7
-dnl fortran.
8
+dnl are unsupported.
9
 if test "X${enable_shared}" != "Xyes"; then
10
     enable_shared="no"
11
@@ -207,5 +206,5 @@
12
 if test "X${enable_shared}" = "Xyes"; then
13
     if test "X${BUILD_FORTRAN}" = "Xyes"; then
14
-        AC_MSG_ERROR([Cannot build shared fortran libraries. Please configure with --disable-fortran flag.])
15
+        AC_MSG_WARN([Fortran shared libraries aren't supported.])
16
     fi
17
 fi
18
--- configure	2012-03-17 23:45:51.000000000 -0400
19
+++ configure	2012-04-21 09:51:08.000000000 -0400
20
@@ -5838,11 +5838,4 @@
21
 fi
22
 
23
-if test "X${enable_shared}" = "Xyes"; then
24
-    if test "X${BUILD_FORTRAN}" = "Xyes"; then
25
-        as_fn_error $? "Cannot build shared fortran libraries. Please configure with --disable-fortran flag." "$LINENO" 5
26
-    fi
27
-fi
28
-
29
-
30
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
31
 $as_echo_n "checking whether ln -s works... " >&6; }
(-)science/hdf/pkg-plist (-3 / +5 lines)
Lines 67-79 Link Here
67
include/htags.h
67
include/htags.h
68
include/linklist.h
68
include/linklist.h
69
include/local_nc.h
69
include/local_nc.h
70
include/mfan.h
70
include/mfdatainfo.h
71
include/mfdatainfo.h
71
include/mffunc.inc
72
include/mffunc.f90
72
include/mffunc.f90
73
include/mfhdfi.h
73
include/mffunc.inc
74
include/mfan.h
75
include/mfgr.h
74
include/mfgr.h
76
include/mfhdf.h
75
include/mfhdf.h
76
include/mfhdfi.h
77
include/mstdio.h
77
include/mstdio.h
78
include/netcdf.f90
78
include/netcdf.f90
79
include/netcdf.h
79
include/netcdf.h
Lines 82-90 Link Here
82
include/vattr.h
82
include/vattr.h
83
include/vg.h
83
include/vg.h
84
lib/libdf.a
84
lib/libdf.a
85
lib/libdf.la
85
lib/libdf.so
86
lib/libdf.so
86
lib/libdf.so.2
87
lib/libdf.so.2
87
lib/libhdf4.settings
88
lib/libhdf4.settings
88
lib/libmfhdf.a
89
lib/libmfhdf.a
90
lib/libmfhdf.la
89
lib/libmfhdf.so
91
lib/libmfhdf.so
90
lib/libmfhdf.so.3
92
lib/libmfhdf.so.3

Return to bug 172052