summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2001-12-25 23:45:54 +0000
committerwiz <wiz@pkgsrc.org>2001-12-25 23:45:54 +0000
commit1ebd71acd2315e3a8859d1e3c1b5e335d7cdd7ed (patch)
tree9ac739feebfd6647beba4434e6b448f4b5cbdc71 /graphics
parentc32ed6905260e457b7fe8cb892f4cc0391f419be (diff)
downloadpkgsrc-1ebd71acd2315e3a8859d1e3c1b5e335d7cdd7ed.tar.gz
Really fix compilation error on 1.5.x. Patch provided by Scott Presnell.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/ogle/distinfo4
-rw-r--r--graphics/ogle/patches/patch-aa45
2 files changed, 38 insertions, 11 deletions
diff --git a/graphics/ogle/distinfo b/graphics/ogle/distinfo
index cfedcc8f55e..39976693f42 100644
--- a/graphics/ogle/distinfo
+++ b/graphics/ogle/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/12/23 00:03:56 mycroft Exp $
+$NetBSD: distinfo,v 1.3 2001/12/25 23:45:54 wiz Exp $
SHA1 (ogle-0.8.2.tar.gz) = 84f3505eaa8f6d002f663bfe036c533a4a83f714
Size (ogle-0.8.2.tar.gz) = 480190 bytes
-SHA1 (patch-aa) = 8fca6c2af2d4ab0ba39001314d5f496266241e37
+SHA1 (patch-aa) = 2b3953c7d724bc7ce486233b24623ed492d11e8f
diff --git a/graphics/ogle/patches/patch-aa b/graphics/ogle/patches/patch-aa
index a3f6dede226..85381762b4e 100644
--- a/graphics/ogle/patches/patch-aa
+++ b/graphics/ogle/patches/patch-aa
@@ -1,13 +1,40 @@
-$NetBSD: patch-aa,v 1.1 2001/12/23 00:03:57 mycroft Exp $
+$NetBSD: patch-aa,v 1.2 2001/12/25 23:45:54 wiz Exp $
---- include/debug_print.h.orig Sat Dec 22 13:02:26 2001
-+++ include/debug_print.h Sat Dec 22 13:02:12 2001
-@@ -26,7 +26,7 @@
- #define ERROR(str, args...) \
- fprintf(stderr, "ERROR[%s]: " str, program_name, ## args)
+--- include/debug_print.h.orig Sun Nov 25 03:42:29 2001
++++ include/debug_print.h
+@@ -20,20 +20,25 @@
+
+ #if defined(__GNUC__) && ( __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 95))
+
+-#define FATAL(str, args...) \
+-fprintf(stderr, "FATAL[%s]: " str, program_name, ## args)
++#define FATAL(str...) _FATAL( , ##str)
++#define _FATAL(str, args...) \
++fprintf(stderr, "FATAL[%s]: " str, program_name, ##args)
+
+-#define ERROR(str, args...) \
+-fprintf(stderr, "ERROR[%s]: " str, program_name, ## args)
++#define ERROR(str...) _ERROR( , ##str)
++#define _ERROR(str, args...) \
++fprintf(stderr, "ERROR[%s]: " str, program_name, ##args)
-#define WARNING(str, ...) \
-+#define WARNING(str, args...) \
- fprintf(stderr, "WARNING[%s]: " str, program_name, ## args)
+-fprintf(stderr, "WARNING[%s]: " str, program_name, ## args)
++#define WARNING(str...) _WARNING( , ##str)
++#define _WARNING(str, args...) \
++fprintf(stderr, "WARNING[%s]: " str, program_name, ##args)
+
+-#define NOTE(str, args...) \
+-fprintf(stderr, "Note[%s]: " str, program_name, ## args)
++#define NOTE(str...) _NOTE(, ##str)
++#define _NOTE(str, args...) \
++fprintf(stderr, "Note[%s]: " str, program_name, ##args)
+
+-#define DNOTE(str, args...) \
+-fprintf(stderr, "Debug[%s]: " str, program_name, ## args)
++#define DNOTE(str...) _DNOTE( , ##str)
++#define _DNOTE(str, args...) \
++fprintf(stderr, "Debug[%s]: " str, program_name, ##args)
+
+ #ifdef DEBUG
- #define NOTE(str, args...) \