3 files changed, 18 insertions, 21 deletions

diff --git a/graphics/pngnq/files/patch-errors.h b/graphics/pngnq/files/patch-errors.h
new file mode 100644
index 000000000000..b230035ad678
--- /dev/null
+++ b/graphics/pngnq/files/patch-errors.h
@@ -0,0 +1,18 @@
+--- src/errors.h.orig	2011-04-14 19:57:13.000000000 +0400
++++ src/errors.h	2011-04-14 20:00:25.000000000 +0400
+@@ -20,9 +20,11 @@
+     PNGNQ_LOG_ERR(__VA_ARGS__)\
+     fflush(stderr);
+ 
+-#define PNGNQ_WARNING(...) (fprintf(stderr,"pngnq - Warning: "));\
+-    fprintf(stderr, __VA_ARGS__);\
+-    PNGNQ_LOG_WARNING(__VA_ARGS__)\
+-    fflush(stderr);
++#define PNGNQ_WARNING(...)                                \
++    do {                                                  \
++        fprintf(stderr, "pngnq - Warning: " __VA_ARGS__); \
++        PNGNQ_LOG_WARNING(__VA_ARGS__)                    \
++        fflush(stderr);                                   \
++    } while (0)
+ 
+ #define PNGNQ_MESSAGE(...) {if(verbose) {fprintf(stderr,__VA_ARGS__);fflush(stderr);}}
diff --git a/graphics/pngnq/files/patch-pngcomp.c b/graphics/pngnq/files/patch-pngcomp.c
deleted file mode 100644
index 9fd8e2c1e76a..000000000000
--- a/graphics/pngnq/files/patch-pngcomp.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- pngcomp.c.orig	2007-11-12 13:59:38.000000000 +0100
-+++ pngcomp.c	2009-05-10 15:07:38.000000000 +0200
-@@ -41,6 +41,7 @@
- #include <string.h>
- #include <math.h>
- #include <ctype.h>
-+#include <unistd.h>
- 
- #include "png.h"
- #include "rwpng.h"
diff --git a/graphics/pngnq/files/patch-rwpng.c b/graphics/pngnq/files/patch-rwpng.c
deleted file mode 100644
index 195051162411..000000000000
--- a/graphics/pngnq/files/patch-rwpng.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- rwpng.c.orig	2006-06-15 11:39:29.000000000 +0200
-+++ rwpng.c	2010-03-29 15:35:32.000000000 +0200
-@@ -77,7 +77,7 @@
-      * have used slightly more general png_sig_cmp() function instead */
- 
-     fread(sig, 1, 8, infile);
--    if (!png_check_sig(sig, 8)) {
-+    if (png_sig_cmp(sig, 0, 8)) {
-         mainprog_ptr->retval = 21;   /* bad signature */
-         return mainprog_ptr->retval;
-     }