summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorhira <hira@pkgsrc.org>2005-04-07 23:11:56 +0000
committerhira <hira@pkgsrc.org>2005-04-07 23:11:56 +0000
commit1ec987a42e77c91fb1aadc01b4fe0a82840f3d7d (patch)
tree02aa46b0de249c5b339cc649a9e02ed38c54e622 /graphics
parentd9e6180432cfb857e07df827986af9d86094f638 (diff)
downloadpkgsrc-1ec987a42e77c91fb1aadc01b4fe0a82840f3d7d.tar.gz
Use size_t for the third and fifth arguments of the iconv(3).
Fix core dump on amd64. Bump PKGREVISION.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/magicpoint/Makefile4
-rw-r--r--graphics/magicpoint/distinfo4
-rw-r--r--graphics/magicpoint/patches/patch-ae12
3 files changed, 13 insertions, 7 deletions
diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile
index 3e702f93a3b..eb2fdadf7c6 100644
--- a/graphics/magicpoint/Makefile
+++ b/graphics/magicpoint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2005/02/07 13:34:44 hira Exp $
+# $NetBSD: Makefile,v 1.45 2005/04/07 23:11:56 hira Exp $
DISTNAME= magicpoint-1.10a
-PKGREVISION= 5
+PKGREVISION= 6
#DISTNAME= magicpoint-1.11b.tar.gz
CATEGORIES= x11 graphics
MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/ \
diff --git a/graphics/magicpoint/distinfo b/graphics/magicpoint/distinfo
index 7047f6c00fb..c953375eca3 100644
--- a/graphics/magicpoint/distinfo
+++ b/graphics/magicpoint/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2005/02/24 08:45:10 agc Exp $
+$NetBSD: distinfo,v 1.14 2005/04/07 23:11:56 hira Exp $
SHA1 (magicpoint-1.10a.tar.gz) = 7510ee965316cb52eac7a430f0e19a87a337fe5c
RMD160 (magicpoint-1.10a.tar.gz) = 167bf8b57bd4bb98c8f4fdba82a5733dda1f8a6a
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = f4d97279e878a58900ceff5ea07c61ca678e61f5
SHA1 (patch-ab) = 0553e8369f3337e53ecd8a8926ceeed9757953b8
SHA1 (patch-ac) = 1b2de41c2a8da28c9023552eff676c40069630fe
SHA1 (patch-ad) = d6dd11bee4091de4f1c8d5fffa61987d16a063e1
-SHA1 (patch-ae) = b8c48eddee83f78b24cd10e864e94c3dd39c552f
+SHA1 (patch-ae) = c293c8f9c406fe8f090378b328b6bdbe89050eee
SHA1 (patch-af) = b52455c3018d5de4ee7d20c42680df8978f15b55
SHA1 (patch-ag) = 02e53e3e498b150d528349c9712978f164e8836f
SHA1 (patch-ah) = 2cd87d9697be2ebd9d7c0a936d49583286de62d3
diff --git a/graphics/magicpoint/patches/patch-ae b/graphics/magicpoint/patches/patch-ae
index f349178dd19..05bf14096f0 100644
--- a/graphics/magicpoint/patches/patch-ae
+++ b/graphics/magicpoint/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2004/01/12 15:19:28 wennmach Exp $
+$NetBSD: patch-ae,v 1.2 2005/04/07 23:11:57 hira Exp $
--- draw.c.orig 2003-05-14 16:45:35.000000000 +0900
-+++ draw.c 2003-11-25 08:03:15.000000000 +0900
-@@ -4498,7 +4498,7 @@
++++ draw.c 2005-04-08 07:31:28.000000000 +0900
+@@ -4498,12 +4498,12 @@
struct ctrl *cp;
char *fontname = NULL;
int i;
@@ -11,6 +11,12 @@ $NetBSD: patch-ae,v 1.1 2004/01/12 15:19:28 wennmach Exp $
static char rtab[3][20] = { "jisx208", "gb2312", "ksc5601"};
static char prefix[3][20] = { "\033$B", "\033$A", "\033$(C"};
char buf16[1024], *p16;
+ char out16[1024], *o16;
+- int ileft, oleft;
++ size_t ileft, oleft;
+ #ifdef HAVE_ICONV
+ static iconv_t icv[3];
+ #endif
@@ -4529,8 +4529,8 @@
}
if (i == 3) return NULL; /* cannot find codeset */