Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1510486787103810"
MIME-Version: 1.0
Date: Sun, 12 Nov 2017 11:39:47 +0000
From: "Benny Siegert" <bsiegert@netbsd.org>
Subject: CVS commit: [pkgsrc-2017Q3] pkgsrc/devel/idutils
To: pkgsrc-changes@NetBSD.org
Reply-To: bsiegert@netbsd.org
Message-Id: <20171112113947.5D4F0FBDE@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1510486787103810
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	bsiegert
Date:		Sun Nov 12 11:39:47 UTC 2017

Modified Files:
	pkgsrc/devel/idutils [pkgsrc-2017Q3]: distinfo
	pkgsrc/devel/idutils/patches [pkgsrc-2017Q3]: patch-lib_fflush_c
	    patch-lib_fseeko_c

Log Message:
Pullup ticket #5630 - requested by sevan
devel/idutils: FreeBSD build fix

Revisions pulled up:
- devel/idutils/distinfo                                        1.10
- devel/idutils/patches/patch-lib_fflush_c                      1.2
- devel/idutils/patches/patch-lib_fseeko_c                      1.2

---
   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

---
   Module Name:    pkgsrc
   Committed By:   maya
   Date:           Thu Nov  2 04:54:27 UTC 2017

   Modified Files:
           pkgsrc/devel/idutils: distinfo

   Log Message:
   idutils: regen patch sums after previous commit


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.18.1 pkgsrc/devel/idutils/distinfo
cvs rdiff -u -r1.1 -r1.1.26.1 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.


--_----------=_1510486787103810
Content-Disposition: inline
Content-Length: 3590
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/idutils/distinfo
diff -u pkgsrc/devel/idutils/distinfo:1.9 pkgsrc/devel/idutils/distinfo:1.9.18.1
--- pkgsrc/devel/idutils/distinfo:1.9	Tue Nov  3 03:27:35 2015
+++ pkgsrc/devel/idutils/distinfo	Sun Nov 12 11:39:47 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 03:27:35 agc Exp $
+$NetBSD: distinfo,v 1.9.18.1 2017/11/12 11:39:47 bsiegert Exp $
 
 SHA1 (idutils-4.6.tar.xz) = cb977ce3e4b2bacda85797e9048986e1c1765148
 RMD160 (idutils-4.6.tar.xz) = 9b136e5bedf04183a631c1c7642c7982deb5016d
@@ -14,5 +14,5 @@ SHA1 (patch-aj) = 8381724be238e518a86377
 SHA1 (patch-ak) = c2b3573a5386e77fc6bc1d5a4e89ccd1af830630
 SHA1 (patch-al) = 163e06074da62edbcacd459788cfea3528e94e30
 SHA1 (patch-configure) = 06e53f65b7515276f054049c502b3187ba7a156f
-SHA1 (patch-lib_fflush_c) = 41e1dcfc0982148d1a2c7cceb6aa117c1ded774a
-SHA1 (patch-lib_fseeko_c) = 35ac50c58f8d6339d37ff72a0e2b58f0233a7cc0
+SHA1 (patch-lib_fflush_c) = 61e35e848c54a5d1a51b37f57619aae6d641f04a
+SHA1 (patch-lib_fseeko_c) = db25ba77b9c4e471e446cf917046cdf0f96b630f

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.1.26.1
--- 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	Sun Nov 12 11:39:47 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.1.26.1 2017/11/12 11:39:47 bsiegert 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.1.26.1
--- 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	Sun Nov 12 11:39:47 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.1.26.1 2017/11/12 11:39:47 bsiegert 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;


--_----------=_1510486787103810--