Fri Aug 24 19:04:59 2012 UTC ()
pkgtools/rpm2pkg: Fix broken zlib 1.26+ support

gzFile wasn't used currently.  Trying to build rpm2pkg on zlib 1.27
exposed the misuse.  rpm2pkg should build on all version of zlib now.


(marino)
diff -r1.59 -r1.60 pkgsrc/pkgtools/rpm2pkg/Makefile
diff -r1.1 -r1.2 pkgsrc/pkgtools/rpm2pkg/files/fileio-zlib.c
cvs diff -r1.59 -r1.60 pkgsrc/pkgtools/rpm2pkg/Makefile (expand / switch to context diff)
--- pkgsrc/pkgtools/rpm2pkg/Makefile 2011/04/12 22:36:11 1.59
+++ pkgsrc/pkgtools/rpm2pkg/Makefile 2012/08/24 19:04:58 1.60
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2011/04/12 22:36:11 tron Exp $
+# $NetBSD: Makefile,v 1.60 2012/08/24 19:04:58 marino Exp $
 
 DISTNAME=	rpm2pkg-3.2.2
 CATEGORIES=	pkgtools
+PKGREVISION=	1
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 NO_CHECKSUM=	yes
cvs diff -r1.1 -r1.2 pkgsrc/pkgtools/rpm2pkg/files/fileio-zlib.c (expand / switch to context diff)
--- pkgsrc/pkgtools/rpm2pkg/files/fileio-zlib.c 2011/01/12 00:26:33 1.1
+++ pkgsrc/pkgtools/rpm2pkg/files/fileio-zlib.c 2012/08/24 19:04:59 1.2
@@ -36,7 +36,7 @@
 static void
 ZLibCloseFunc(FileHandle *fh)
 {
-	gzFile *mygzfile = fh->fh_InstData;
+	gzFile mygzfile = fh->fh_InstData;
 	if (mygzfile != NULL)
 		(void)gzclose(mygzfile);
 }
@@ -44,7 +44,7 @@
 static ssize_t
 ZLibReadFunc(FileHandle *fh, void *buffer, size_t bytes)
 {
-	gzFile *mygzfile = fh->fh_InstData;
+	gzFile mygzfile = fh->fh_InstData;
 	return gzread(mygzfile, buffer, bytes);
 }