CVS commit: pkgsrc/devel/idutils/patches

["Alistair G. Crooks" <agc%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   agc
Date:           Thu Nov  2 04:26:21 UTC 2017

Modified Files:
        pkgsrc/devel/idutils/patches: patch-lib_fflush_c patch-lib_fseeko_c

Log Message:
patch fflush.c and fseeko.c so that this package builds on FreeBSD HEAD


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/idutils/patches/patch-lib_fflush_c \
    pkgsrc/devel/idutils/patches/patch-lib_fseeko_c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/idutils/patches/patch-lib_fflush_c
diff -u pkgsrc/devel/idutils/patches/patch-lib_fflush_c:1.1 pkgsrc/devel/idutils/patches/patch-lib_fflush_c:1.2
--- pkgsrc/devel/idutils/patches/patch-lib_fflush_c:1.1 Mon Dec 15 11:35:42 2014
+++ pkgsrc/devel/idutils/patches/patch-lib_fflush_c     Thu Nov  2 04:26:21 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_fflush_c,v 1.1 2014/12/15 11:35:42 mef Exp $
+$NetBSD: patch-lib_fflush_c,v 1.2 2017/11/02 04:26:21 agc Exp $
 
 fflush.c:108:16: error: incompatible types when assigning to type '__off_t' from type 'fpos_t'
    fp_->_offset = u.f;
@@ -6,7 +6,16 @@ fflush.c:108:16: error: incompatible typ
 
 --- lib/fflush.c.orig  2012-01-29 01:22:33.000000000 +0900
 +++ lib/fflush.c       2014-11-20 23:50:41.000000000 +0900
-@@ -105,7 +105,7 @@ update_fpos_cache (FILE *fp, off_t pos)
+@@ -91,7 +91,7 @@
+ update_fpos_cache (FILE *fp, off_t pos)
+ {
+ #if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
+-# if defined __CYGWIN__
++# if defined(__CYGWIN__) || defined(__FreeBSD__)
+   /* fp_->_offset is typed as an integer.  */
+   fp_->_offset = pos;
+ # else
+@@ -105,7 +105,7 @@
        off_t o;
      } u;
    u.o = pos;
Index: pkgsrc/devel/idutils/patches/patch-lib_fseeko_c
diff -u pkgsrc/devel/idutils/patches/patch-lib_fseeko_c:1.1 pkgsrc/devel/idutils/patches/patch-lib_fseeko_c:1.2
--- pkgsrc/devel/idutils/patches/patch-lib_fseeko_c:1.1 Mon Dec 15 11:35:42 2014
+++ pkgsrc/devel/idutils/patches/patch-lib_fseeko_c     Thu Nov  2 04:26:21 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_fseeko_c,v 1.1 2014/12/15 11:35:42 mef Exp $
+$NetBSD: patch-lib_fseeko_c,v 1.2 2017/11/02 04:26:21 agc Exp $
 
 fseeko.c:127:22: error: incompatible types when assigning to type '__off_t' from type 'fpos_t'
          fp_->_offset = u.f;
@@ -6,7 +6,16 @@ fseeko.c:127:22: error: incompatible typ
 
 --- lib/fseeko.c~      2012-01-29 01:26:04.000000000 +0900
 +++ lib/fseeko.c       2014-11-20 23:51:55.000000000 +0900
-@@ -124,7 +124,7 @@ fseeko (FILE *fp, off_t offset, int when
+@@ -109,7 +109,7 @@
+       fp->_flags &= ~_IO_EOF_SEEN;
+       fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
+-# if defined __CYGWIN__
++# if defined(__CYGWIN__) || defined(__FreeBSD__)
+       /* fp_->_offset is typed as an integer.  */
+       fp_->_offset = pos;
+ # else
+@@ -124,7 +124,7 @@
              off_t o;
            } u;
          u.o = pos;