Received: by mail.netbsd.org (Postfix, from userid 605) id 4EE1A84D84; Sun, 28 Oct 2018 20:53:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5EA4F84D82 for ; Sun, 28 Oct 2018 20:53:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id cFtu_6LL9oJ7 for ; Sun, 28 Oct 2018 20:53:44 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 9054684D64 for ; Sun, 28 Oct 2018 20:53:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 88D8CFBEE; Sun, 28 Oct 2018 20:53:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1540760024179010" MIME-Version: 1.0 Date: Sun, 28 Oct 2018 20:53:44 +0000 From: "Sevan Janiyan" Subject: CVS commit: pkgsrc/devel/m4 To: pkgsrc-changes@NetBSD.org Reply-To: sevan@netbsd.org X-Mailer: log_accum Message-Id: <20181028205344.88D8CFBEE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1540760024179010 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: sevan Date: Sun Oct 28 20:53:44 UTC 2018 Modified Files: pkgsrc/devel/m4: distinfo Added Files: pkgsrc/devel/m4/patches: patch-lib_fseeko.c patch-lib_stdio-impl.h Log Message: Unbreak build on Minix 3 To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 pkgsrc/devel/m4/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/devel/m4/patches/patch-lib_fseeko.c \ pkgsrc/devel/m4/patches/patch-lib_stdio-impl.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1540760024179010 Content-Disposition: inline Content-Length: 3262 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/m4/distinfo diff -u pkgsrc/devel/m4/distinfo:1.44 pkgsrc/devel/m4/distinfo:1.45 --- pkgsrc/devel/m4/distinfo:1.44 Tue Sep 25 20:21:51 2018 +++ pkgsrc/devel/m4/distinfo Sun Oct 28 20:53:44 2018 @@ -1,11 +1,13 @@ -$NetBSD: distinfo,v 1.44 2018/09/25 20:21:51 joerg Exp $ +$NetBSD: distinfo,v 1.45 2018/10/28 20:53:44 sevan Exp $ SHA1 (m4-1.4.18.tar.gz) = 2f76f8105a45b05c8cfede97b3193cd88b31c657 RMD160 (m4-1.4.18.tar.gz) = 16396a6ffbb2105cdd0a36c773b44d16854ed740 SHA512 (m4-1.4.18.tar.gz) = 29254dd4267a093e8d9da3a26df8b02564044cdb4506be539ec1aff4e5d406477bcf32f5e813c840f3aec77293bfe2cdde18f6a21724a7e0bfff646ec88b74ae Size (m4-1.4.18.tar.gz) = 2006643 bytes SHA1 (patch-isnan.c) = a960f35e5168bed47c5924e36bfb254dc1a44621 +SHA1 (patch-lib_fseeko.c) = d8531a1f7e0a941228deddc1eba522f0263ca783 SHA1 (patch-lib_getprogname.c) = 3a8e7c028342ef3a9f86839f1a5ae36571a65f12 +SHA1 (patch-lib_stdio-impl.h) = 8b58d52439a5f9d23043c22c702fd4c41f781fda SHA1 (patch-lib_stdio.in.h) = 21557ea9d86dbeb36062df4e62cb71735b06480b SHA1 (patch-lib_vasnprintf.c) = 2bced6c121efc9bc5894174c7745ba89e8f53033 SHA1 (patch-lib_xalloc-oversized.h) = 9e74adec2f43770d419f60d5c3e7bdea2424daa6 Added files: Index: pkgsrc/devel/m4/patches/patch-lib_fseeko.c diff -u /dev/null pkgsrc/devel/m4/patches/patch-lib_fseeko.c:1.1 --- /dev/null Sun Oct 28 20:53:44 2018 +++ pkgsrc/devel/m4/patches/patch-lib_fseeko.c Sun Oct 28 20:53:44 2018 @@ -0,0 +1,15 @@ +$NetBSD: patch-lib_fseeko.c,v 1.1 2018/10/28 20:53:44 sevan Exp $ + +Treat Minix 3 same as NetBSD + +--- lib/fseeko.c.orig 2018-10-28 20:33:23.728090000 +0000 ++++ lib/fseeko.c +@@ -128,7 +128,7 @@ fseeko (FILE *fp, off_t offset, int when + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ +-# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) ++# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) || defined __Minix__ + /* fp_->_offset is typed as an integer. */ + fp_->_offset = pos; + # else Index: pkgsrc/devel/m4/patches/patch-lib_stdio-impl.h diff -u /dev/null pkgsrc/devel/m4/patches/patch-lib_stdio-impl.h:1.1 --- /dev/null Sun Oct 28 20:53:44 2018 +++ pkgsrc/devel/m4/patches/patch-lib_stdio-impl.h Sun Oct 28 20:53:44 2018 @@ -0,0 +1,15 @@ +$NetBSD: patch-lib_stdio-impl.h,v 1.1 2018/10/28 20:53:44 sevan Exp $ + +Treat Minix 3 same as NetBSD + +--- lib/stdio-impl.h.orig 2018-10-28 20:27:54.933015000 +0000 ++++ lib/stdio-impl.h +@@ -58,7 +58,7 @@ + # define fp_ fp + # endif + +-# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD, Android */ ++# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __ANDROID__ || defined __Minix__ /* NetBSD >= 1.5ZA, OpenBSD, Android, Minix3 */ + /* See + and */ + struct __sfileext --_----------=_1540760024179010--