update Fri Jun 18 00:37:00 PDT 2010

diff --git a/graphics/povray/distinfo b/graphics/povray/distinfo
index 76be064..db9a163 100644 (file)
--- a/graphics/povray/distinfo
+++ b/graphics/povray/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.14 2006/10/19 23:46:01 rillig Exp $
+$NetBSD: distinfo,v 1.15 2010/06/18 06:55:43 wiz Exp $
 
 SHA1 (povray-3.6.1.tar.bz2) = 1fab3ccbdedafbf77e3a66087709bbdf60bc643d
 RMD160 (povray-3.6.1.tar.bz2) = 84ba679da66089f192cc1bfcf8bdd498e736a9a3
 Size (povray-3.6.1.tar.bz2) = 8200160 bytes
 SHA1 (patch-aa) = 351e2eb509cdb3e95c788de5f9ff41c993d4363d
 SHA1 (patch-ad) = fa4056ca956cb2872960fcb649e259aad1f065e4
-SHA1 (patch-af) = b941ffe6f1f54b5bc6139ec2b7fba480f6393bf1
+SHA1 (patch-af) = 92cdaf9261c0196b1404ba3dff32131cf250dee1
 SHA1 (patch-ag) = 67ad332366614e60b0842572d7d07debe8b6e8f2
 SHA1 (patch-ah) = b8184166d1641d5147f2d532a3e5433f2a686ede
 SHA1 (patch-ai) = 4d6d1f7fa38f5d2bf5511f54b1743f734753672d

diff --git a/graphics/povray/patches/patch-af b/graphics/povray/patches/patch-af
index 60f3862..53cae66 100644 (file)
--- a/graphics/povray/patches/patch-af
+++ b/graphics/povray/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2006/05/06 11:59:49 wiz Exp $
+$NetBSD: patch-af,v 1.2 2010/06/18 06:55:44 wiz Exp $
 
 --- source/png_pov.cpp.orig    2004-08-02 23:11:37.000000000 +0000
 +++ source/png_pov.cpp
@@ -20,3 +20,21 @@ $NetBSD: patch-af,v 1.1 2006/05/06 11:59:49 wiz Exp $
        }
  
  #ifdef POV_COMMENTS // temporarily skip comment writing code 
+@@ -1428,7 +1424,7 @@ void Read_Png_Image(IMAGE *Image, char *
+               if(r_info_ptr->valid & PNG_INFO_tRNS)
+               {
+                       for (index = 0; index < r_info_ptr->num_trans; index++)
+-                              cmap[index].Transmit = 255 - r_info_ptr->trans[index];
++                              cmap[index].Transmit = 255 - r_info_ptr->trans_alpha[index];
+               }
+ 
+               Image->data.map_lines = (unsigned char **)POV_MALLOC(height * sizeof(unsigned char *), "PNG image");
+@@ -1461,7 +1457,7 @@ void Read_Png_Image(IMAGE *Image, char *
+               if(r_info_ptr->valid & PNG_INFO_tRNS)
+               {
+                       for (index = 0; index < r_info_ptr->num_trans; index++)
+-                              cmap[index].Transmit = 255 - r_info_ptr->trans[index];
++                              cmap[index].Transmit = 255 - r_info_ptr->trans_alpha[index];
+               }
+ 
+               Image->data.map_lines = (unsigned char **)POV_MALLOC(height * sizeof(unsigned char *), "PNG image");

diff --git a/math/gcalctool/distinfo b/math/gcalctool/distinfo
index e1d476e..0ca334e 100644 (file)
--- a/math/gcalctool/distinfo
+++ b/math/gcalctool/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.44 2010/06/17 08:56:46 obache Exp $
+$NetBSD: distinfo,v 1.45 2010/06/18 01:53:47 obache Exp $
 
 SHA1 (gcalctool-5.30.1.tar.bz2) = 9a7f561705e931416ba028f712ef3f16c9b58fee
 RMD160 (gcalctool-5.30.1.tar.bz2) = 27122e63ceb2880ca27cf550ab8c55bfd865d169
 Size (gcalctool-5.30.1.tar.bz2) = 1125957 bytes
-SHA1 (patch-aa) = dd8311ca98bf93748a904e623af2043e5da6e402
+SHA1 (patch-aa) = 67e23446b886b4bb442a7650e5bbe2e394c05958

diff --git a/math/gcalctool/patches/patch-aa b/math/gcalctool/patches/patch-aa
index 3f7471d..9a01962 100644 (file)
--- a/math/gcalctool/patches/patch-aa
+++ b/math/gcalctool/patches/patch-aa
@@ -1,32 +1,34 @@
-$NetBSD: patch-aa,v 1.15 2010/06/17 08:56:46 obache Exp $
+$NetBSD: patch-aa,v 1.16 2010/06/18 01:53:47 obache Exp $
 
 portability fix (no advantage to use getline(3) here)
-  https://bugzilla.gnome.org/show_bug.cgi?id=621863
+  http://git.gnome.org/browse/gcalctool/commit/?id=436147a1f63fbf980d117f880d253fa0abbd11f8
 
 --- src/gcalccmd.c.orig        2010-04-26 01:14:22.000000000 +0000
 +++ src/gcalccmd.c
-@@ -73,7 +73,7 @@ int
+@@ -72,8 +72,7 @@ str_adjust(char *str)
+ int
  main(int argc, char **argv)
  {
-     char *equation;
+-    char *equation;
 -    int bytes_read;
-+    char *line_read;
++    char *equation, *line;
      size_t nbytes = MAXLINE;
  
      /* Seed random number generator. */
-@@ -82,12 +82,12 @@ main(int argc, char **argv)
+@@ -82,12 +81,12 @@ main(int argc, char **argv)
      equation = (char *) malloc(MAXLINE * sizeof(char));
      while (1) {
          printf("> ");
 -        bytes_read = getline(&equation, &nbytes, stdin);
-+        line_read = fgets(equation, nbytes, stdin);
-       
+-      
 -        if (bytes_read >= 0)
-+        if (line_read != NULL)
++        line = fgets(equation, nbytes, stdin);
++
++        if (line != NULL)
              str_adjust(equation);
  
 -        if (bytes_read < 0 || strcmp(equation, "exit") == 0 || strcmp(equation, "quit") == 0 || strlen(equation) == 0)
-+        if (line_read == NULL || strcmp(equation, "exit") == 0 || strcmp(equation, "quit") == 0 || strlen(equation) == 0)
++        if (line == NULL || strcmp(equation, "exit") == 0 || strcmp(equation, "quit") == 0 || strlen(equation) == 0)
              break;
  
          solve(equation);