[pkgsrc/trunk]: pkgsrc/graphics/mgl Fix GCC 3.4+: label at end of compound st...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e59581a66cda
branches:  trunk
changeset: 504754:e59581a66cda
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Dec 20 14:32:01 2005 +0000

description:
Fix GCC 3.4+: label at end of compound statement.
Fix ISO C conflict: depend on stdlib.h for malloc.

diffstat:

 graphics/mgl/distinfo         |   5 +++--
 graphics/mgl/patches/patch-ap |  14 +++++++++++---
 graphics/mgl/patches/patch-aq |  12 ++++++++++++
 3 files changed, 26 insertions(+), 5 deletions(-)

diffs (61 lines):

diff -r a778db93ccdb -r e59581a66cda graphics/mgl/distinfo
--- a/graphics/mgl/distinfo     Tue Dec 20 14:31:30 2005 +0000
+++ b/graphics/mgl/distinfo     Tue Dec 20 14:32:01 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 08:45:10 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/12/20 14:32:01 joerg Exp $
 
 SHA1 (mgl2-alpha-020.tar.gz) = aa6be2be28749ba9952afbb359ca0525cad3717f
 RMD160 (mgl2-alpha-020.tar.gz) = 4c1b6772d9b9adc96279b016fb574defb78f1fe7
@@ -18,7 +18,8 @@
 SHA1 (patch-am) = a0b8c7b4c37f5bad8ff5fa3d23d72e918595b72f
 SHA1 (patch-an) = 958eea3832f726950357f0b6856d2d6347943dfa
 SHA1 (patch-ao) = a8baeadfb048e397409d027ac5c53b49e4cbd6b9
-SHA1 (patch-ap) = 850e6515a78d3bbf8716a70b2b6f3f88c1a06b6f
+SHA1 (patch-ap) = f77dbbd3ae25e17e34d2a81155fdefa8765429a2
+SHA1 (patch-aq) = 67b42759d6036d9dbc43789c4bdf9d8c7ed5364a
 SHA1 (patch-ar) = 680c2f40e37f8f71d305c8f46460a1fbdc0f0242
 SHA1 (patch-as) = fceb87ac6fb9644bd7a640dcc81cf29ca0f824e5
 SHA1 (patch-at) = 263b09454b9900d383e3447bc5b3da2e37b495cf
diff -r a778db93ccdb -r e59581a66cda graphics/mgl/patches/patch-ap
--- a/graphics/mgl/patches/patch-ap     Tue Dec 20 14:31:30 2005 +0000
+++ b/graphics/mgl/patches/patch-ap     Tue Dec 20 14:32:01 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ap,v 1.1 2003/10/14 16:22:21 salo Exp $
+$NetBSD: patch-ap,v 1.2 2005/12/20 14:32:01 joerg Exp $
 
---- mgterm/msame.c.orig        2000-09-09 05:35:24.000000000 +0200
-+++ mgterm/msame.c     2003-10-14 17:52:19.000000000 +0200
+--- mgterm/msame.c.orig        2000-09-09 03:35:24.000000000 +0000
++++ mgterm/msame.c
 @@ -33,113 +33,113 @@
  
  char *picts[6] ={
@@ -218,3 +218,11 @@
  "};
  static int vk_attached=0;
  static struct virtual_key *vk_canvas;
+@@ -410,7 +410,6 @@ struct undo_buf {
+ } *undo_top;
+ 
+ static void push_undo() {
+-      extern char *malloc();
+       struct undo_buf *buf;
+       int i,j;
+       unsigned int x;
diff -r a778db93ccdb -r e59581a66cda graphics/mgl/patches/patch-aq
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/mgl/patches/patch-aq     Tue Dec 20 14:32:01 2005 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-aq,v 1.1 2005/12/20 14:32:01 joerg Exp $
+
+--- lib/draw_engine.c.orig     2005-12-20 14:27:42.000000000 +0000
++++ lib/draw_engine.c
+@@ -413,6 +413,7 @@ void bitblt_generic(struct screen *dst, 
+           }
+       }
+ ret:
++      ;
+ }
+ 
+ static void gen_bitblt(struct screen *dst, int dx, int dy, struct screen *src,