From e9154daf1abf5dd930205df7ed8e83145cd6c523 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Tue, 10 Sep 2013 14:41:18 +0000
Subject: Fix format string. Fix error handling. Don't bail out on pointer sign
 casts for clang.

---
 print/stylewriter/Makefile         |  7 +++++--
 print/stylewriter/distinfo         |  4 ++--
 print/stylewriter/patches/patch-aa | 23 +++++++++++++++++++++--
 3 files changed, 28 insertions(+), 6 deletions(-)

(limited to 'print/stylewriter')

diff --git a/print/stylewriter/Makefile b/print/stylewriter/Makefile
index dda0a7c4367..dfc16dbeb2d 100644
--- a/print/stylewriter/Makefile
+++ b/print/stylewriter/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2013/04/24 10:06:52 sbd Exp $
+# $NetBSD: Makefile,v 1.26 2013/09/10 14:41:18 joerg Exp $
 #
 
 DISTNAME=	stylewriter
 PKGNAME=	stylewriter-0.9.9
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/
 
@@ -19,6 +19,9 @@ NO_CONFIGURE=	yes
 
 INSTALLATION_DIRS=	sbin
 
+CWARNFLAGS.clang=	-Wno-error=pointer-sign
+MAKE_ENV+=	CWARNFLAGS.clang=${CWARNFLAGS.clang:Q}
+
 PLIST_SRC=	${WRKDIR}/PLIST
 FILTER_DIR=	libexec/stylewriter
 FILTERS=	direct_stylpbm direct_stylps \
diff --git a/print/stylewriter/distinfo b/print/stylewriter/distinfo
index f45187ce3d5..25015f71d63 100644
--- a/print/stylewriter/distinfo
+++ b/print/stylewriter/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2006/01/20 01:19:23 joerg Exp $
+$NetBSD: distinfo,v 1.5 2013/09/10 14:41:18 joerg Exp $
 
 SHA1 (stylewriter.tar.gz) = 8efbbe7510341584ac5170b178f8e6c50c0f6f91
 RMD160 (stylewriter.tar.gz) = 86484c2e8e357d891533c2d52c8e5f5ff64eb544
 Size (stylewriter.tar.gz) = 30136 bytes
-SHA1 (patch-aa) = 95102908a20719d06503b3d51c026f70747c88ef
+SHA1 (patch-aa) = 753d1eff4a1ca6d4048cc0bc4074f4f4f0f25ceb
diff --git a/print/stylewriter/patches/patch-aa b/print/stylewriter/patches/patch-aa
index 5eed62685da..e8ca5239a3e 100644
--- a/print/stylewriter/patches/patch-aa
+++ b/print/stylewriter/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2006/01/20 01:19:23 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2013/09/10 14:41:18 joerg Exp $
 
---- lpstyl.c.orig	2006-01-20 01:13:29.000000000 +0000
+--- lpstyl.c.orig	1999-03-31 09:05:21.000000000 +0000
 +++ lpstyl.c
 @@ -1015,10 +1015,13 @@ size_t readFileScanline(char *bufK, char
  					if((i & 0x03) == 0)
@@ -35,3 +35,22 @@ $NetBSD: patch-aa,v 1.1 2006/01/20 01:19:23 joerg Exp $
  			}
  			else
  			{
+@@ -1327,7 +1330,7 @@ void sendEncodedData(unsigned char *buff
+ 
+ 	if(verbose)
+ 	{
+-		fprintf(stderr, "%s: Sending encoded data (0x%x bytes).\n", 
++		fprintf(stderr, "%s: Sending encoded data (0x%zx bytes).\n", 
+ 				ProcName, size);
+ 	}	
+ 	begin[0] = 'G';
+@@ -1827,7 +1830,8 @@ void waitStatus(int stat, int canHandleP
+ static int inputBack = -1;
+ size_t inputRead(void *buffer, size_t size)
+ {
+-	size_t result = 0, len = 0;
++	size_t result = 0;
++	ssize_t len = 0;
+ 	
+ 	if((inputBack != -1) && (size > result))
+ 	{
-- 
cgit v1.2.3