Fix build problem and suppress some warnings, espcially adapt to latest

libmng API.

5 files changed, 74 insertions, 12 deletions

diff --git a/graphics/magicpoint/distinfo b/graphics/magicpoint/distinfo
index 228dae47449..9c9a58e2a08 100644
--- a/graphics/magicpoint/distinfo
+++ b/graphics/magicpoint/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.19 2013/06/23 14:58:27 wiz Exp $
+$NetBSD: distinfo,v 1.20 2013/08/17 14:39:24 taca Exp $
 
 SHA1 (magicpoint-1.13a.tar.gz) = 2bc662ad0a482d42578766258a143b06a4718ae3
 RMD160 (magicpoint-1.13a.tar.gz) = 067d7dee3b90ec354975d9ad4ea0c0df48cca191
 Size (magicpoint-1.13a.tar.gz) = 890670 bytes
 SHA1 (patch-aa) = 59bc5a8bce25ac27a77ae8d03dd42f354d1d1bff
-SHA1 (patch-ab) = 6622ca95dfcf059d9464f8cc959d23c9c787d8b6
+SHA1 (patch-ab) = d6bb1dc09a8c57901b8db0f5c39ffc874985da43
 SHA1 (patch-ac) = b886607033a89e3ab46c41a2a5a8368b473682f4
 SHA1 (patch-ad) = 33c8fa61cb03cb53ad8783d2d79fa457cb21d235
 SHA1 (patch-ae) = 49aab80a13d7daf99671c69cf62f432c03054dad
@@ -13,7 +13,7 @@ SHA1 (patch-ag) = 96d7cac9157b9183dd2ba76b12f0927fc15dd5a6
 SHA1 (patch-ai) = 809b2cf509bab0ee1bed1fecb2cf2d8df912ce8b
 SHA1 (patch-aj) = 07ed5e995bf35dcbe65fc7c0ab800d1b8905e004
 SHA1 (patch-al) = 25faf28b240d90ead9a4283e46d1461118c509df
-SHA1 (patch-am) = dcc58a02946353262a78d5dfd81f81b25990019e
+SHA1 (patch-am) = b47093820816f045f25c9824d342541f73c1d226
 SHA1 (patch-an) = f5e3158b972feb20bf464e57c703e871537d074e
 SHA1 (patch-ao) = 64ba2d7ceaf6429f4bb8b88bebb26a83c12fbacd
 SHA1 (patch-ap) = 6c81429affe9dce518c304178dd6dfe571e5e44c
@@ -29,6 +29,8 @@ SHA1 (patch-ay) = 4c618b7c51f8b41a472ddd6cba938a2ccb3d91e1
 SHA1 (patch-az) = 893ec7e21199205c07933d5525a6eb394114fd11
 SHA1 (patch-ba) = 938e5714ddfcb8ca64d1cc6f756eeb69e592905d
 SHA1 (patch-bb) = 3a6c328adcb49aef0d4792ceff08407fcbc80c16
+SHA1 (patch-contrib_xwintoppm_multiVis.c) = 6eba818cc9ad853cbbc24059c3f109efaf47f1e0
 SHA1 (patch-image_imlib__loader.c) = 99aa122d4d4f474c448fa2767bee3496ca97110a
 SHA1 (patch-image_xloadimage.h) = 05a1caeedca9c33beecffb8f078270d88fc7184c
 SHA1 (patch-mgpembed.pl.in) = e3c9da5e10bc812b9a77a3ca9b8918595708e8c7
+SHA1 (patch-mng.c) = e0c60f8e367504f7f331590f7bd004ff83a5482e
diff --git a/graphics/magicpoint/patches/patch-ab b/graphics/magicpoint/patches/patch-ab
index 73754ba6665..4c48a3230c2 100644
--- a/graphics/magicpoint/patches/patch-ab
+++ b/graphics/magicpoint/patches/patch-ab
@@ -1,19 +1,23 @@
-$NetBSD: patch-ab,v 1.5 2011/02/25 17:02:53 wiz Exp $
+$NetBSD: patch-ab,v 1.6 2013/08/17 14:39:24 taca Exp $
+
+* Add Support freetype2.
+* Add some prototypes.
 
 --- mgp.h.orig	2008-01-18 17:43:20.000000000 +0000
 +++ mgp.h
-@@ -64,7 +64,9 @@
+@@ -64,7 +64,10 @@
  #ifdef USE_XFT2
  #include <ft2build.h>
  #include FT_FREETYPE_H
 -#include <fontconfig/fontconfig.h>
 +#include FT_CONFIG_CONFIG_H
++#include <freetype2/freetype/fttypes.h>
 +#include <freetype2/freetype/fterrors.h>
 +#include <freetype2/freetype/freetype.h>
  #include <X11/Xft/Xft.h>
  #ifdef HAVE_ICONV
  #include <iconv.h>
-@@ -308,6 +310,12 @@ struct ctrl_pcache {
+@@ -308,6 +311,12 @@ struct ctrl_pcache {
  struct ctrl {
  	u_char ct_op;
  	u_char ct_flag;
@@ -26,7 +30,7 @@ $NetBSD: patch-ab,v 1.5 2011/02/25 17:02:53 wiz Exp $
  	u_int ct_page;
  	struct ctrl *ct_next;
  	union {
-@@ -507,7 +515,7 @@ struct render_object {
+@@ -507,7 +516,7 @@ struct render_object {
  			float xzoom, yzoom;
  #ifdef USE_IMLIB
  			int zoomonclk;
@@ -35,11 +39,12 @@ $NetBSD: patch-ab,v 1.5 2011/02/25 17:02:53 wiz Exp $
  #endif
  		} image;
  		struct {
-@@ -745,6 +753,11 @@ extern int get_regid __P((char *));
+@@ -745,6 +754,12 @@ extern int get_regid __P((char *));
  extern void draw_line_itemsize __P((struct render_state *, int, int, int));
  extern void draw_line_start __P((struct render_state *));
  extern void draw_line_end __P ((struct render_state *));
 +#ifdef USE_IMLIB
++void manage_pixmap(Pixmap, int, int);
 +int search_zimage(int, int, int);
 +void zoomin_zimage(int);
 +void zoomout_zimage(int);
@@ -47,7 +52,17 @@ $NetBSD: patch-ab,v 1.5 2011/02/25 17:02:53 wiz Exp $
  
  #ifdef USE_M17N
  extern int obj_new_mtext __P((struct render_state *, int, int,
-@@ -843,6 +856,12 @@ extern void usleep __P((u_int));
+@@ -814,6 +829,9 @@ extern XImage *tfc_image __P((struct tfo
+ 
+ /* unimap.c */
+ extern void latin_unicode_map_init();
++#ifdef FREETYPE_CHARSET16
++extern void unicode_map_init();
++#endif
+ 
+ /* embed.c */
+ extern char *embed_fname __P((char *));
+@@ -843,6 +861,12 @@ extern void usleep __P((u_int));
  #define COLOR_BUGFIX
  #endif
  
diff --git a/graphics/magicpoint/patches/patch-am b/graphics/magicpoint/patches/patch-am
index b465888770c..a0765e49b4b 100644
--- a/graphics/magicpoint/patches/patch-am
+++ b/graphics/magicpoint/patches/patch-am
@@ -1,8 +1,17 @@
-$NetBSD: patch-am,v 1.2 2008/09/10 13:32:47 taca Exp $
+$NetBSD: patch-am,v 1.3 2013/08/17 14:39:24 taca Exp $
 
---- image/path.c.orig	2004-07-29 00:47:31.000000000 +0900
+* Always use <stdlib.h>.
+
+--- image/path.c.orig	2004-07-28 15:47:31.000000000 +0000
 +++ image/path.c
-@@ -27,8 +27,6 @@
+@@ -20,15 +20,11 @@
+ #if 1 /* SYSV */
+ #include <unistd.h>
+ #endif
+-#ifdef __APPLE__
+ #include <stdlib.h>
+-#endif
+ 
  /* SUPPRESS 530 */
  /* SUPPRESS 560 */
  
diff --git a/graphics/magicpoint/patches/patch-contrib_xwintoppm_multiVis.c b/graphics/magicpoint/patches/patch-contrib_xwintoppm_multiVis.c
new file mode 100644
index 00000000000..7d8ebaf1af1
--- /dev/null
+++ b/graphics/magicpoint/patches/patch-contrib_xwintoppm_multiVis.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-contrib_xwintoppm_multiVis.c,v 1.1 2013/08/17 14:39:24 taca Exp $
+
+* Add missing parameter declartion.
+
+--- contrib/xwintoppm/multiVis.c.orig	1998-02-13 07:48:33.000000000 +0000
++++ contrib/xwintoppm/multiVis.c
+@@ -982,6 +982,7 @@ static void add_window_to_list( image_wi
+     int 	y_vis;
+     int 	width;
+     int 	height;
++    int		border_width;
+     Visual	*vis;
+     Colormap	cmap;
+     Window	parent;
diff --git a/graphics/magicpoint/patches/patch-mng.c b/graphics/magicpoint/patches/patch-mng.c
new file mode 100644
index 00000000000..9756d4d9b09
--- /dev/null
+++ b/graphics/magicpoint/patches/patch-mng.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-mng.c,v 1.1 2013/08/17 14:39:24 taca Exp $
+
+* Use modern libmng API.
+
+--- mng.c.orig	2004-09-01 03:50:32.000000000 +0000
++++ mng.c
+@@ -48,13 +48,13 @@ void mng_window_setup __P((mngstuff *mym
+ /* callbacks for the mng decoder */
+ 
+ /* memory allocation; data must be zeroed */
+-mng_ptr mymngalloc(mng_uint32 size)
++mng_ptr mymngalloc(mng_size_t size)
+ {
+ 	return (mng_ptr)calloc(1, size);
+ }
+ 
+ /* memory deallocation */
+-void mymngfree(mng_ptr p, mng_uint32 size)
++void mymngfree(mng_ptr p, mng_size_t size)
+ {
+ 	free(p);
+ 	return;