Fix buildling for gcc4

8 files changed, 49 insertions, 12 deletions

diff --git a/graphics/openexr/DESCR b/graphics/openexr/DESCR
index 5574b9693d1..9b9720d3d69 100644
--- a/graphics/openexr/DESCR
+++ b/graphics/openexr/DESCR
@@ -20,10 +20,3 @@ OpenEXR's features include:
   New image attributes (strings, vectors, integers, etc.) can be added to
   OpenEXR image headers without affecting backward compatibility with existing
   OpenEXR applications.
-
-This package provides development headers and libraries. It provides
-tools to display an OpenEXR image on the screen, convert OpenEXR
-latitude-longitude environment maps into cube-face environment maps
-(or vice versa), add preview image to header, produce tiled versions
-of an image, set the values of one or more standard attributes in
-the image's header, and print an image file's header.
diff --git a/graphics/openexr/buildlink3.mk b/graphics/openexr/buildlink3.mk
index 669a0568d35..f737cfe4c1e 100644
--- a/graphics/openexr/buildlink3.mk
+++ b/graphics/openexr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:19 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/06/14 19:20:05 adam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENEXR_BUILDLINK3_MK:=	${OPENEXR_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	openexr
 
 .if !empty(OPENEXR_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.openexr+=	openexr>=1.2.1
-BUILDLINK_ABI_DEPENDS.openexr?=	openexr>=1.2.2nb1
+BUILDLINK_ABI_DEPENDS.openexr+=	openexr>=1.2.2nb1
 BUILDLINK_PKGSRCDIR.openexr?=	../../graphics/openexr
 .endif	# OPENEXR_BUILDLINK3_MK
 
diff --git a/graphics/openexr/distinfo b/graphics/openexr/distinfo
index e5ac638d769..ad888811844 100644
--- a/graphics/openexr/distinfo
+++ b/graphics/openexr/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/03/29 16:02:36 wiz Exp $
+$NetBSD: distinfo,v 1.4 2006/06/14 19:20:05 adam Exp $
 
 SHA1 (OpenEXR-1.2.2.tar.gz) = 8ee37cd2a95b8561a4c850cc35781dec87b77bbf
 RMD160 (OpenEXR-1.2.2.tar.gz) = 54ceab6aa7a848f28a4cbd6cd63ab4023e3e372c
 Size (OpenEXR-1.2.2.tar.gz) = 9324108 bytes
+SHA1 (patch-aa) = 44649695ef175c0e2bf4caea8fcff6811286d559
diff --git a/graphics/openexr/patches/patch-aa b/graphics/openexr/patches/patch-aa
new file mode 100644
index 00000000000..7b980cad0b2
--- /dev/null
+++ b/graphics/openexr/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1 2006/06/14 19:20:05 adam Exp $
+
+--- exrmaketiled/Image.h.orig	2006-06-14 20:56:22.000000000 +0200
++++ exrmaketiled/Image.h
+@@ -49,6 +49,7 @@
+ #include <string>
+ #include <map>
+ 
++class Image;
+ 
+ class ImageChannel
+ {
diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo
index fd6adf45301..d6c3a2c7d00 100644
--- a/textproc/aspell/distinfo
+++ b/textproc/aspell/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.18 2006/01/06 14:51:19 wiz Exp $
+$NetBSD: distinfo,v 1.19 2006/06/14 19:21:54 adam Exp $
 
 SHA1 (aspell-0.60.4.tar.gz) = 07353593eb89e64c49b1fd8dd405e3ee0ed86291
 RMD160 (aspell-0.60.4.tar.gz) = e0408acd4f3304c957aeea0b17a28d0c44e11064
 Size (aspell-0.60.4.tar.gz) = 1676825 bytes
+SHA1 (patch-aa) = f68dd79ef2d3290b019d7588cadb4fdf53b3b988
 SHA1 (patch-ac) = 4d20eebd29932f1ba970a9d85793fb8611d76ba8
 SHA1 (patch-ag) = 04b34f2b780a632a5045120ae408ceea591a66de
 SHA1 (patch-ah) = b38fa850bb3ff3c62c020fb45ce388888f145286
diff --git a/textproc/aspell/patches/patch-aa b/textproc/aspell/patches/patch-aa
new file mode 100644
index 00000000000..28cc13c21ef
--- /dev/null
+++ b/textproc/aspell/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.9 2006/06/14 19:21:54 adam Exp $
+
+--- modules/filter/nroff.cpp.orig	2006-06-14 21:01:52.000000000 +0200
++++ modules/filter/nroff.cpp
+@@ -73,7 +73,7 @@ namespace {
+       return false;
+     }
+     
+-    bool NroffFilter::process_char (FilterChar::Chr c);
++    bool process_char (FilterChar::Chr c);
+       
+   public:
+ 
diff --git a/www/htdig-devel/distinfo b/www/htdig-devel/distinfo
index 8053224a03a..07f38a233c1 100644
--- a/www/htdig-devel/distinfo
+++ b/www/htdig-devel/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.2 2006/02/19 10:27:52 adam Exp $
+$NetBSD: distinfo,v 1.3 2006/06/14 19:23:30 adam Exp $
 
 SHA1 (htdig-3.2.0b6.tar.bz2) = 0b28134386e78fe724c56583fbc61b280551122a
 RMD160 (htdig-3.2.0b6.tar.bz2) = 1e0900e11618ffe3d43a6fc26163e3ed926a1012
 Size (htdig-3.2.0b6.tar.bz2) = 2498246 bytes
+SHA1 (patch-aa) = 6f4d22f84fe8caa809c1062e210200d9cea1a555
 SHA1 (patch-af) = d366aeac016505fce044e6bbdff9506fa68877ba
 SHA1 (patch-ag) = 6105b1526f31bb7b757c3ceeae286c7f2c0aa007
 SHA1 (patch-ah) = e6e87151c7bd0a44d138d431bdcc7ce7f950d1ee
diff --git a/www/htdig-devel/patches/patch-aa b/www/htdig-devel/patches/patch-aa
new file mode 100644
index 00000000000..c516eb72005
--- /dev/null
+++ b/www/htdig-devel/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.1 2006/06/14 19:23:30 adam Exp $
+
+--- htsearch/Collection.h.orig	2006-06-14 21:30:31.000000000 +0200
++++ htsearch/Collection.h
+@@ -36,9 +36,9 @@ public:
+                const char *docExcerpt);
+     ~Collection();
+ 
+-    void Collection::Open();
++    void Open();
+ 
+-    void Collection::Close(); 
++    void Close(); 
+ 
+     char *getWordFile() { return wordFile.get(); }
+     DocumentRef         *getDocumentRef(int id);