Mon Jun 10 11:56:58 2013 UTC ()
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.


(ryoon)
diff -r1.26 -r1.27 pkgsrc/archivers/gzip/Makefile
diff -r1.5 -r1.6 pkgsrc/archivers/gzip/distinfo
diff -r1.1 -r1.2 pkgsrc/archivers/gzip/patches/patch-aa
diff -r0 -r1.1 pkgsrc/archivers/gzip/patches/patch-lib_fflush.c
diff -r0 -r1.1 pkgsrc/archivers/gzip/patches/patch-lib_fseeko.c
cvs diff -r1.26 -r1.27 pkgsrc/archivers/gzip/Makefile (expand / switch to unified diff)

--- pkgsrc/archivers/gzip/Makefile 2013/06/09 16:55:08 1.26
+++ pkgsrc/archivers/gzip/Makefile 2013/06/10 11:56:58 1.27
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.26 2013/06/09 16:55:08 ryoon Exp $ 1# $NetBSD: Makefile,v 1.27 2013/06/10 11:56:58 ryoon Exp $
2# 2#
3 3
4DISTNAME= gzip-1.5 4DISTNAME= gzip-1.5
5SVR4_PKGNAME= gzip 5SVR4_PKGNAME= gzip
 6PKGREVISION= 1
6CATEGORIES= archivers 7CATEGORIES= archivers
7MASTER_SITES= ${MASTER_SITE_GNU:=gzip/} 8MASTER_SITES= ${MASTER_SITE_GNU:=gzip/}
8EXTRACT_SUFX= .tar.gz 9EXTRACT_SUFX= .tar.gz
9 10
10MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.gnu.org/software/gzip/gzip.html 12HOMEPAGE= http://www.gnu.org/software/gzip/gzip.html
12COMMENT= Compress or expand files 13COMMENT= Compress or expand files
13LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
14 15
15PKG_INSTALLATION_TYPES= overwrite pkgviews 16PKG_INSTALLATION_TYPES= overwrite pkgviews
16 17
17CONFLICTS+= gzip-base-[0-9]* gzip-info-[0-9]* 18CONFLICTS+= gzip-base-[0-9]* gzip-info-[0-9]*
18 19
cvs diff -r1.5 -r1.6 pkgsrc/archivers/gzip/distinfo (expand / switch to unified diff)

--- pkgsrc/archivers/gzip/distinfo 2013/06/09 16:55:08 1.5
+++ pkgsrc/archivers/gzip/distinfo 2013/06/10 11:56:58 1.6
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1$NetBSD: distinfo,v 1.5 2013/06/09 16:55:08 ryoon Exp $ 1$NetBSD: distinfo,v 1.6 2013/06/10 11:56:58 ryoon Exp $
2 2
3SHA1 (gzip-1.5.tar.gz) = 56a80da7b032107372d3f3343bed7c7af452a826 3SHA1 (gzip-1.5.tar.gz) = 56a80da7b032107372d3f3343bed7c7af452a826
4RMD160 (gzip-1.5.tar.gz) = 641a4a095a44174e924569c051a089c86081c7ac 4RMD160 (gzip-1.5.tar.gz) = 641a4a095a44174e924569c051a089c86081c7ac
5Size (gzip-1.5.tar.gz) = 1114684 bytes 5Size (gzip-1.5.tar.gz) = 1114684 bytes
6SHA1 (patch-aa) = 77b3cb5c2824f88295eb8c8c7c46c4ca23b776c4 6SHA1 (patch-aa) = a08b277aa95df808d055f4daf95fd1462c300290
7SHA1 (patch-ab) = 53f75c7852c29dc00098c756dfd68b2831df13ed 7SHA1 (patch-ab) = 53f75c7852c29dc00098c756dfd68b2831df13ed
 8SHA1 (patch-lib_fflush.c) = 365fa9255262a9e5133dca9ac62d40adca19207d
 9SHA1 (patch-lib_fseeko.c) = dcee26ff403a62da09a49ae79c99231d49d8e205
cvs diff -r1.1 -r1.2 pkgsrc/archivers/gzip/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/archivers/gzip/patches/Attic/patch-aa 2007/11/08 19:26:53 1.1
+++ pkgsrc/archivers/gzip/patches/Attic/patch-aa 2013/06/10 11:56:58 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-aa,v 1.1 2007/11/08 19:26:53 joerg Exp $ 1$NetBSD: patch-aa,v 1.2 2013/06/10 11:56:58 ryoon Exp $
2 2
3--- gzip.h.orig 1993-08-13 08:35:00.000000000 +0100 3--- gzip.h.orig 2012-01-01 08:53:58.000000000 +0000
4+++ gzip.h 4+++ gzip.h
5@@ -199,6 +199,8 @@ extern int test; /* check .z f 5@@ -204,6 +204,8 @@ extern int test; /* check .z f
6 extern int to_stdout; /* output to stdout (-c) */ 6 extern int to_stdout; /* output to stdout (-c) */
7 extern int save_orig_name; /* set if original name must be saved */ 7 extern int save_orig_name; /* set if original name must be saved */
8  8
9+#define MIN(a,b) ((a) <= (b) ? (a) : (b)) 9+#define MIN(a,b) ((a) <= (b) ? (a) : (b))
10+ 10+
11 #define get_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(0)) 11 #define get_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(0))
12 #define try_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(1)) 12 #define try_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(1))
13  13
File Added: pkgsrc/archivers/gzip/patches/Attic/patch-lib_fflush.c
$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
File Added: pkgsrc/archivers/gzip/patches/Attic/patch-lib_fseeko.c
$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