Pullup ticket #3400 - requested by wiz

audio/gqmpeg-devel: build fix
devel/teem: build fix
games/ufoai: build fix
graphics/tuxpaint: build fix
lang/kaffe: build fix
sysutils/xnc: build fix
wm/afterstep: build fix
www/chimera: build fix
www/mMosaic: build fix
x11/xcursorgen: build fix

Revisions pulled up:
- audio/gqmpeg-devel/distinfo                                   1.5
- audio/gqmpeg-devel/patches/patch-src_ui__pixbuf__save.c       1.1
- devel/teem/distinfo                                           1.6
- devel/teem/patches/patch-ad                                   1.2
- games/ufoai/distinfo                                          1.5
- games/ufoai/patches/patch-ab                                  1.3
- graphics/tuxpaint/distinfo                                    1.21
- graphics/tuxpaint/patches/patch-ab                            1.5
- lang/kaffe/distinfo                                           1.30
- lang/kaffe/patches/patch-libraries_clib_awt_X_imgpng.c        1.1
- sysutils/xnc/distinfo                                         1.8
- sysutils/xnc/patches/patch-src_lib_image2_sdl__image_IMG__png.c 1.1
- wm/afterstep/distinfo                                         1.13
- wm/afterstep/patches/patch-libAfterImage_export.c             1.1
- wm/afterstep/patches/patch-libAfterImage_import.c             1.1
- www/chimera/distinfo                                          1.9
- www/chimera/patches/patch-ad                                  1.5
- www/mMosaic/distinfo                                          1.11
- www/mMosaic/patches/patch-ai                                  1.2
- www/mMosaic/patches/patch-src_MIME.c                          1.1
- x11/xcursorgen/distinfo                                       1.3
- x11/xcursorgen/patches/patch-xcursorgen.c                     1.1

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Tue Apr  5 08:09:47 UTC 2011

   Modified Files:
   	pkgsrc/audio/gqmpeg-devel: distinfo
   Added Files:
   	pkgsrc/audio/gqmpeg-devel/patches: patch-src_ui__pixbuf__save.c

   Log Message:
   Fix build with png-1.5.

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Tue Apr  5 11:04:40 UTC 2011

   Modified Files:
   	pkgsrc/graphics/tuxpaint: distinfo
   	pkgsrc/graphics/tuxpaint/patches: patch-ab

   Log Message:
   Fix build with png-1.5.

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Tue Apr  5 11:07:00 UTC 2011

   Modified Files:
   	pkgsrc/x11/xcursorgen: distinfo
   Added Files:
   	pkgsrc/x11/xcursorgen/patches: patch-xcursorgen.c

   Log Message:
   Fix build with png-1.5.

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Tue Apr  5 11:27:29 UTC 2011

   Modified Files:
   	pkgsrc/devel/teem: distinfo
   	pkgsrc/devel/teem/patches: patch-ad

   Log Message:
   Fix build with png-1.5.

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Tue Apr  5 11:32:46 UTC 2011

   Modified Files:
   	pkgsrc/games/ufoai: distinfo
   	pkgsrc/games/ufoai/patches: patch-ab

   Log Message:
   Fix build with png-1.5.

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Tue Apr  5 11:49:51 UTC 2011

   Modified Files:
   	pkgsrc/lang/kaffe: distinfo
   Added Files:
   	pkgsrc/lang/kaffe/patches: patch-libraries_clib_awt_X_imgpng.c

   Log Message:
   Fix build with png-1.5.

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Tue Apr  5 11:56:30 UTC 2011

   Modified Files:
   	pkgsrc/sysutils/xnc: distinfo
   Added Files:
   	pkgsrc/sysutils/xnc/patches: patch-src_lib_image2_sdl__image_IMG__png.c

   Log Message:
   Fix build with png-1.5.

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Tue Apr  5 12:02:00 UTC 2011

   Modified Files:
   	pkgsrc/wm/afterstep: distinfo
   Added Files:
   	pkgsrc/wm/afterstep/patches: patch-libAfterImage_export.c
   	    patch-libAfterImage_import.c

   Log Message:
   Fix build with png-1.5.

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Tue Apr  5 12:16:39 UTC 2011

   Modified Files:
   	pkgsrc/www/chimera: distinfo
   	pkgsrc/www/chimera/patches: patch-ad

   Log Message:
   Fix build with png-1.5.

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Tue Apr  5 12:27:06 UTC 2011

   Modified Files:
   	pkgsrc/www/mMosaic: distinfo
   	pkgsrc/www/mMosaic/patches: patch-ai
   Added Files:
   	pkgsrc/www/mMosaic/patches: patch-src_MIME.c

   Log Message:
   Fix build with png-1.5 and avoid conflict with getline() on NetBSD.

3 files changed, 33 insertions, 1 deletions

diff --git a/wm/afterstep/distinfo b/wm/afterstep/distinfo
index ac8970598d4..b5ab4d6e584 100644
--- a/wm/afterstep/distinfo
+++ b/wm/afterstep/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2007/03/07 04:41:57 rillig Exp $
+$NetBSD: distinfo,v 1.12.38.1 2011/04/06 22:17:43 tron Exp $
 
 SHA1 (AfterStep-2.1.2.tar.bz2) = c367e7c73561ddf03b3725f80d2f39f50d2b45bd
 RMD160 (AfterStep-2.1.2.tar.bz2) = f891ded642b9190bd261f3e3f92cb595da2d785b
@@ -6,3 +6,5 @@ Size (AfterStep-2.1.2.tar.bz2) = 5079333 bytes
 SHA1 (patch-aa) = c903ca64b609e4270ead1f1e03cb6ea962b294f8
 SHA1 (patch-ab) = b513b41f5be32170c3e7027d53e44625cbb4958a
 SHA1 (patch-ac) = bbf8b111e335941f5cf8f3fab28c1e1dcc884713
+SHA1 (patch-libAfterImage_export.c) = 0b450561673cb3351c2f8685ba7357cc6a1de366
+SHA1 (patch-libAfterImage_import.c) = b8651c189e49c41eeff91bbd3498b79cdb0a7496
diff --git a/wm/afterstep/patches/patch-libAfterImage_export.c b/wm/afterstep/patches/patch-libAfterImage_export.c
new file mode 100644
index 00000000000..88e0c631176
--- /dev/null
+++ b/wm/afterstep/patches/patch-libAfterImage_export.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-libAfterImage_export.c,v 1.1.2.2 2011/04/06 22:17:43 tron Exp $
+
+Fix build with png-1.5.
+
+--- libAfterImage/export.c.orig	2005-03-09 23:59:06.000000000 +0000
++++ libAfterImage/export.c
+@@ -371,7 +371,7 @@ ASImage2png_int ( ASImage *im, void *dat
+ 	png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
+     if ( png_ptr != NULL )
+     	if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
+-			if( setjmp(png_ptr->jmpbuf) )
++			if( setjmp(png_jmpbuf(png_ptr)) )
+ 			{
+ 				png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
+ 				info_ptr = NULL ;
diff --git a/wm/afterstep/patches/patch-libAfterImage_import.c b/wm/afterstep/patches/patch-libAfterImage_import.c
new file mode 100644
index 00000000000..298ee3533cf
--- /dev/null
+++ b/wm/afterstep/patches/patch-libAfterImage_import.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-libAfterImage_import.c,v 1.1.2.2 2011/04/06 22:17:43 tron Exp $
+
+Fix build with png-1.5.
+
+--- libAfterImage/import.c.orig	2005-06-21 22:58:24.000000000 +0000
++++ libAfterImage/import.c
+@@ -876,7 +876,7 @@ png2ASImage( const char * path, ASImageI
+ 			 * the normal method of doing things with libpng).  REQUIRED unless you
+ 			 * set up your own error handlers in the png_create_read_struct() earlier.
+ 			 */
+-			if ( !setjmp (png_ptr->jmpbuf))
++			if ( !setjmp (png_jmpbuf(png_ptr)))
+ 			{
+ 				ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
+