Attachment #174103 for bug #212186




# $FreeBSD$

PORTNAME=	silo
PORTVERSION=	4.10.2
DISTVERSIONSUFFIX=	-bsd
PORTREVISION=	3
CATEGORIES=	science
MASTER_SITES=	https://wci.llnl.gov/content/assets/docs/simulation/computer-codes/${PORTNAME}/silo-${PORTVERSION}/

MAINTAINER=	dbaio@bsd.com.br
COMMENT=	Mesh and field I/O library and scientific database

LICENSE=	BSD3CLAUSE

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (silo-4.10-bsd.tar.gz) = e801f2c86de8e42059c09b2a274285ad8d30da1fff4134e359fadf70fd07aca0	1	TIMESTAMP = 1472243085
2	SIZE (silo-4.10-bsd.tar.gz) = 13067090	2	SHA256 (silo-4.10.2-bsd.tar.gz) = 4b901dfc1eb4656e83419a6fde15a2f6c6a31df84edfad7f1dc296e01b20140e
		3	SIZE (silo-4.10.2-bsd.tar.gz) = 13067837




--- src/hdf5_drv/H5FDsilo.c.orig	2014-10-14 00:22:32 UTC
+++ src/hdf5_drv/H5FDsilo.c
@@ -160,27 +160,15 @@ product endorsement purposes.
  * xxx64 versions if available.
  */
 #if !defined(HDfstat) || !defined(HDstat)
-    #if H5_SIZEOF_OFF_T!=8 && H5_SIZEOF_OFF64_T==8 && defined(H5_HAVE_STAT64)
-        #ifndef HDfstat
-            #define HDfstat(F,B)        fstat64(F,B)
-        #endif /* HDfstat */
-        #ifndef HDstat
-            #define HDstat(S,B)         stat64(S,B)
-        #endif /* HDstat */
-        typedef struct stat64       h5_stat_t;
-        typedef off64_t             h5_stat_size_t;
-        #define H5_SIZEOF_H5_STAT_SIZE_T H5_SIZEOF_OFF64_T
-    #else /* H5_SIZEOF_OFF_T!=8 && ... */
-        #ifndef HDfstat
-            #define HDfstat(F,B)        fstat(F,B)
-        #endif /* HDfstat */
-        #ifndef HDstat
-            #define HDstat(S,B)         stat(S,B)
-        #endif /* HDstat */
-        typedef struct stat         h5_stat_t;
-        typedef off_t               h5_stat_size_t;
-        #define H5_SIZEOF_H5_STAT_SIZE_T H5_SIZEOF_OFF_T
-    #endif /* H5_SIZEOF_OFF_T!=8 && ... */
+    #ifndef HDfstat
+        #define HDfstat(F,B)        fstat(F,B)
+    #endif /* HDfstat */
+    #ifndef HDstat
+        #define HDstat(S,B)         stat(S,B)
+    #endif /* HDstat */
+    typedef struct stat         h5_stat_t;
+    typedef off_t               h5_stat_size_t;
+    #define H5_SIZEOF_H5_STAT_SIZE_T H5_SIZEOF_OFF_T
 #endif /* !defined(HDfstat) || !defined(HDstat) */
 #ifndef HDlseek
     #ifdef H5_HAVE_LSEEK64




--- src/silo/silo.c.orig	2014-10-14 00:22:33 UTC
+++ src/silo/silo.c
@@ -226,12 +226,8 @@ typedef struct db_silo_stat_t {
 #ifndef SIZEOF_OFF64_T
 #error missing definition for SIZEOF_OFF64_T in silo_private.h
 #else
-#if SIZEOF_OFF64_T > 4
-    struct stat64 s;
-#else
     struct stat s;
 #endif
-#endif
 #ifdef _WIN32
     DWORD fileindexlo;
     DWORD fileindexhi;
@@ -2283,11 +2279,7 @@ db_silo_stat_one_file(const char *name, 
     errno = 0;
     memset(&(statbuf->s), 0, sizeof(statbuf->s));
 
-#if SIZEOF_OFF64_T > 4
-    retval = stat64(name, &(statbuf->s));
-#else
     retval = stat(name, &(statbuf->s));
-#endif /* #if SIZEOF_OFF64_T > 4 */
 
 #ifdef _WIN32
     if (retval == 0)
@@ -4225,11 +4217,7 @@ DBOpenReal(const char *name, int type, i
                 /********************************/
                 /* System level error occured.  */
                 /********************************/
-#if SIZEOF_OFF64_T > 4
-                printf("stat64() failed with error: ");
-#else
                 printf("stat() failed with error: ");
-#endif
                 switch (errno)
                 {
                   case EACCES:       printf("EACCES\n");       break;




--- src/silo/silo_json.c.orig	2014-10-14 00:22:33 UTC
+++ src/silo/silo_json.c
@@ -441,12 +441,8 @@ json_object_from_binary_file(char const 
 #ifndef SIZEOF_OFF64_T
 #error missing definition for SIZEOF_OFF64_T in silo_private.h
 #else
-#if SIZEOF_OFF64_T > 4
-    struct stat64 s;
-#else
     struct stat s;
 #endif
-#endif
 
     errno = 0;
     memset(&s, 0, sizeof(s));

Return to bug 212186

Lines 2-14 Link Here

(-)Makefile (-4 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= silo	4	PORTNAME= silo
5	PORTVERSION= 4.10	5	PORTVERSION= 4.10.2
6	DISTVERSIONSUFFIX= -bsd	6	DISTVERSIONSUFFIX= -bsd
7	PORTREVISION= 3
8	CATEGORIES= science	7	CATEGORIES= science
9	MASTER_SITES= https://wci.llnl.gov/codes/${PORTNAME}/silo-${PORTVERSION}/	8	MASTER_SITES= https://wci.llnl.gov/content/assets/docs/simulation/computer-codes/${PORTNAME}/silo-${PORTVERSION}/
10		9
11	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= dbaio@bsd.com.br
12	COMMENT= Mesh and field I/O library and scientific database	11	COMMENT= Mesh and field I/O library and scientific database
13		12
14	LICENSE= BSD3CLAUSE	13	LICENSE= BSD3CLAUSE

Line 0 Link Here

(-)files/patch-src_hdf5__drv_H5FDsilo.c (+39 lines)
	1	--- src/hdf5_drv/H5FDsilo.c.orig 2014-10-14 00:22:32 UTC
	2	+++ src/hdf5_drv/H5FDsilo.c
	3	@@ -160,27 +160,15 @@ product endorsement purposes.
	4	* xxx64 versions if available.
	5	*/
	6	#if !defined(HDfstat) \|\| !defined(HDstat)
	7	- #if H5_SIZEOF_OFF_T!=8 && H5_SIZEOF_OFF64_T==8 && defined(H5_HAVE_STAT64)
	8	- #ifndef HDfstat
	9	- #define HDfstat(F,B) fstat64(F,B)
	10	- #endif /* HDfstat */
	11	- #ifndef HDstat
	12	- #define HDstat(S,B) stat64(S,B)
	13	- #endif /* HDstat */
	14	- typedef struct stat64 h5_stat_t;
	15	- typedef off64_t h5_stat_size_t;
	16	- #define H5_SIZEOF_H5_STAT_SIZE_T H5_SIZEOF_OFF64_T
	17	- #else /* H5_SIZEOF_OFF_T!=8 && ... */
	18	- #ifndef HDfstat
	19	- #define HDfstat(F,B) fstat(F,B)
	20	- #endif /* HDfstat */
	21	- #ifndef HDstat
	22	- #define HDstat(S,B) stat(S,B)
	23	- #endif /* HDstat */
	24	- typedef struct stat h5_stat_t;
	25	- typedef off_t h5_stat_size_t;
	26	- #define H5_SIZEOF_H5_STAT_SIZE_T H5_SIZEOF_OFF_T
	27	- #endif /* H5_SIZEOF_OFF_T!=8 && ... */
	28	+ #ifndef HDfstat
	29	+ #define HDfstat(F,B) fstat(F,B)
	30	+ #endif /* HDfstat */
	31	+ #ifndef HDstat
	32	+ #define HDstat(S,B) stat(S,B)
	33	+ #endif /* HDstat */
	34	+ typedef struct stat h5_stat_t;
	35	+ typedef off_t h5_stat_size_t;
	36	+ #define H5_SIZEOF_H5_STAT_SIZE_T H5_SIZEOF_OFF_T
	37	#endif /* !defined(HDfstat) \|\| !defined(HDstat) */
	38	#ifndef HDlseek
	39	#ifdef H5_HAVE_LSEEK64

Line 0 Link Here

(-)files/patch-src_silo_silo.c (+39 lines)
	1	--- src/silo/silo.c.orig 2014-10-14 00:22:33 UTC
	2	+++ src/silo/silo.c
	3	@@ -226,12 +226,8 @@ typedef struct db_silo_stat_t {
	4	#ifndef SIZEOF_OFF64_T
	5	#error missing definition for SIZEOF_OFF64_T in silo_private.h
	6	#else
	7	-#if SIZEOF_OFF64_T > 4
	8	- struct stat64 s;
	9	-#else
	10	struct stat s;
	11	#endif
	12	-#endif
	13	#ifdef _WIN32
	14	DWORD fileindexlo;
	15	DWORD fileindexhi;
	16	@@ -2283,11 +2279,7 @@ db_silo_stat_one_file(const char *name,
	17	errno = 0;
	18	memset(&(statbuf->s), 0, sizeof(statbuf->s));
	19
	20	-#if SIZEOF_OFF64_T > 4
	21	- retval = stat64(name, &(statbuf->s));
	22	-#else
	23	retval = stat(name, &(statbuf->s));
	24	-#endif /* #if SIZEOF_OFF64_T > 4 */
	25
	26	#ifdef _WIN32
	27	if (retval == 0)
	28	@@ -4225,11 +4217,7 @@ DBOpenReal(const char *name, int type, i
	29	/********************************/
	30	/* System level error occured. */
	31	/********************************/
	32	-#if SIZEOF_OFF64_T > 4
	33	- printf("stat64() failed with error: ");
	34	-#else
	35	printf("stat() failed with error: ");
	36	-#endif
	37	switch (errno)
	38	{
	39	case EACCES: printf("EACCES\n"); break;

Line 0 Link Here

(-)files/patch-src_silo_silo__json.c (+15 lines)
	1	--- src/silo/silo_json.c.orig 2014-10-14 00:22:33 UTC
	2	+++ src/silo/silo_json.c
	3	@@ -441,12 +441,8 @@ json_object_from_binary_file(char const
	4	#ifndef SIZEOF_OFF64_T
	5	#error missing definition for SIZEOF_OFF64_T in silo_private.h
	6	#else
	7	-#if SIZEOF_OFF64_T > 4
	8	- struct stat64 s;
	9	-#else
	10	struct stat s;
	11	#endif
	12	-#endif
	13
	14	errno = 0;
	15	memset(&s, 0, sizeof(s));