Fix PR pkg/47914. Bump PKGREVISION.

* Fix build on NetBSD 6.0.1.
  Update for fpos_t change (like devel/m4).
  Tested on NetBSD/amd64 6.0.1 and 6.99.21.

5 files changed, 35 insertions, 6 deletions

diff --git a/archivers/gzip/Makefile b/archivers/gzip/Makefile
index 135cf372115..bc7dd17cf9c 100644
--- a/archivers/gzip/Makefile
+++ b/archivers/gzip/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2013/06/09 16:55:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.27 2013/06/10 11:56:58 ryoon Exp $
 #
 
 DISTNAME=	gzip-1.5
 SVR4_PKGNAME=	gzip
+PKGREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GNU:=gzip/}
 EXTRACT_SUFX=	.tar.gz
diff --git a/archivers/gzip/distinfo b/archivers/gzip/distinfo
index 8e0d34cfda7..bf99caa2596 100644
--- a/archivers/gzip/distinfo
+++ b/archivers/gzip/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.5 2013/06/09 16:55:08 ryoon Exp $
+$NetBSD: distinfo,v 1.6 2013/06/10 11:56:58 ryoon Exp $
 
 SHA1 (gzip-1.5.tar.gz) = 56a80da7b032107372d3f3343bed7c7af452a826
 RMD160 (gzip-1.5.tar.gz) = 641a4a095a44174e924569c051a089c86081c7ac
 Size (gzip-1.5.tar.gz) = 1114684 bytes
-SHA1 (patch-aa) = 77b3cb5c2824f88295eb8c8c7c46c4ca23b776c4
+SHA1 (patch-aa) = a08b277aa95df808d055f4daf95fd1462c300290
 SHA1 (patch-ab) = 53f75c7852c29dc00098c756dfd68b2831df13ed
+SHA1 (patch-lib_fflush.c) = 365fa9255262a9e5133dca9ac62d40adca19207d
+SHA1 (patch-lib_fseeko.c) = dcee26ff403a62da09a49ae79c99231d49d8e205
diff --git a/archivers/gzip/patches/patch-aa b/archivers/gzip/patches/patch-aa
index a11eace1194..282226978a7 100644
--- a/archivers/gzip/patches/patch-aa
+++ b/archivers/gzip/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2007/11/08 19:26:53 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2013/06/10 11:56:58 ryoon Exp $
 
---- gzip.h.orig	1993-08-13 08:35:00.000000000 +0100
+--- gzip.h.orig	2012-01-01 08:53:58.000000000 +0000
 +++ gzip.h
-@@ -199,6 +199,8 @@ extern int test;           /* check .z f
+@@ -204,6 +204,8 @@ extern int test;           /* check .z f
  extern int to_stdout;      /* output to stdout (-c) */
  extern int save_orig_name; /* set if original name must be saved */
  
diff --git a/archivers/gzip/patches/patch-lib_fflush.c b/archivers/gzip/patches/patch-lib_fflush.c
new file mode 100644
index 00000000000..50717f45cdd
--- /dev/null
+++ b/archivers/gzip/patches/patch-lib_fflush.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_fflush.c,v 1.1 2013/06/10 11:56:58 ryoon Exp $
+
+--- lib/fflush.c.orig	2012-06-17 17:05:17.000000000 +0000
++++ lib/fflush.c
+@@ -94,7 +94,7 @@ update_fpos_cache (FILE *fp _GL_UNUSED_P
+                    off_t pos _GL_UNUSED_PARAMETER)
+ {
+ #if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
+-# if defined __CYGWIN__
++# if defined(__CYGWIN__) || defined(__NetBSD__)
+   /* fp_->_offset is typed as an integer.  */
+   fp_->_offset = pos;
+ # else
diff --git a/archivers/gzip/patches/patch-lib_fseeko.c b/archivers/gzip/patches/patch-lib_fseeko.c
new file mode 100644
index 00000000000..29c08240cf8
--- /dev/null
+++ b/archivers/gzip/patches/patch-lib_fseeko.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_fseeko.c,v 1.1 2013/06/10 11:56:58 ryoon Exp $
+
+--- lib/fseeko.c.orig	2012-06-17 17:06:44.000000000 +0000
++++ lib/fseeko.c
+@@ -119,7 +119,7 @@ fseeko (FILE *fp, off_t offset, int when
+       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(__NetBSD__)
+       /* fp_->_offset is typed as an integer.  */
+       fp_->_offset = pos;
+ # else