Attachment 174103 Details for Bug 212186 – silo-4.10.2.patch

[patch] silo-4.10.2.patch

silo-4.10.2.patch (text/plain), 5.90 KB, created by Danilo G. Baio on 2016-08-26 21:48:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Danilo G. Baio

Created: 2016-08-26 21:48:07 UTC

Size: 5.90 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 420921)
>+++ Makefile	(working copy)
>@@ -2,13 +2,12 @@
> # $FreeBSD$
> 
> PORTNAME=	silo
>-PORTVERSION=	4.10
>+PORTVERSION=	4.10.2
> DISTVERSIONSUFFIX=	-bsd
>-PORTREVISION=	3
> CATEGORIES=	science
>-MASTER_SITES=	https://wci.llnl.gov/codes/${PORTNAME}/silo-${PORTVERSION}/
>+MASTER_SITES=	https://wci.llnl.gov/content/assets/docs/simulation/computer-codes/${PORTNAME}/silo-${PORTVERSION}/
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	dbaio@bsd.com.br
> COMMENT=	Mesh and field I/O library and scientific database
> 
> LICENSE=	BSD3CLAUSE
>Index: distinfo
>===================================================================
>--- distinfo	(revision 420921)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (silo-4.10-bsd.tar.gz) = e801f2c86de8e42059c09b2a274285ad8d30da1fff4134e359fadf70fd07aca0
>-SIZE (silo-4.10-bsd.tar.gz) = 13067090
>+TIMESTAMP = 1472243085
>+SHA256 (silo-4.10.2-bsd.tar.gz) = 4b901dfc1eb4656e83419a6fde15a2f6c6a31df84edfad7f1dc296e01b20140e
>+SIZE (silo-4.10.2-bsd.tar.gz) = 13067837
>Index: files/patch-src_hdf5__drv_H5FDsilo.c
>===================================================================
>--- files/patch-src_hdf5__drv_H5FDsilo.c	(nonexistent)
>+++ files/patch-src_hdf5__drv_H5FDsilo.c	(working copy)
>@@ -0,0 +1,39 @@
>+--- 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
>
>Property changes on: files/patch-src_hdf5__drv_H5FDsilo.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_silo_silo.c
>===================================================================
>--- files/patch-src_silo_silo.c	(nonexistent)
>+++ files/patch-src_silo_silo.c	(working copy)
>@@ -0,0 +1,39 @@
>+--- 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;
>
>Property changes on: files/patch-src_silo_silo.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_silo_silo__json.c
>===================================================================
>--- files/patch-src_silo_silo__json.c	(nonexistent)
>+++ files/patch-src_silo_silo__json.c	(working copy)
>@@ -0,0 +1,15 @@
>+--- 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));
>
>Property changes on: files/patch-src_silo_silo__json.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 212186: 174103 | 174104