Bring in patch from upstream to fix Sun Studio compile.

2 files changed, 11 insertions, 11 deletions

diff --git a/print/teTeX3-bin/distinfo b/print/teTeX3-bin/distinfo
index f6b8208873c..95d7917cc17 100644
--- a/print/teTeX3-bin/distinfo
+++ b/print/teTeX3-bin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2009/01/08 22:09:35 minskim Exp $
+$NetBSD: distinfo,v 1.14 2009/01/20 23:56:58 sketch Exp $
 
 SHA1 (teTeX/tetex-src-3.0.tar.gz) = 7637789f7f4929694aed1b89820f5bad4753e8fc
 RMD160 (teTeX/tetex-src-3.0.tar.gz) = 15a139f5f36993e4ed3583260e175cfb13ce7bcc
@@ -21,7 +21,7 @@ SHA1 (patch-ap) = 0ca7341b416842fbc00a935d6cfdb0531c4169ba
 SHA1 (patch-aq) = d7a4dd4864e43cd27b1ca803f8ebfe82e65f84a7
 SHA1 (patch-ar) = 7f0c6cdca69b73bad1c8f8298e417ede1cd89d77
 SHA1 (patch-at) = aaeddf2240f1b0e394ab78122352c111f3aa9718
-SHA1 (patch-au) = 119e3714b5c1ff2fe7b7ec8041a3bb8eab6fb944
+SHA1 (patch-au) = e8f556ac27ba9a22731b8e7c37356a64eb115860
 SHA1 (patch-av) = 53c963ac1b5f1963f707228badeaf0d57b159344
 SHA1 (patch-aw) = 4876a029e00298aa0f01b2e652fe101b6453afbd
 SHA1 (patch-ax) = 6f32d91113254335f683466149f25050d21dbc08
diff --git a/print/teTeX3-bin/patches/patch-au b/print/teTeX3-bin/patches/patch-au
index a038ee853f8..8956457bf3d 100644
--- a/print/teTeX3-bin/patches/patch-au
+++ b/print/teTeX3-bin/patches/patch-au
@@ -1,7 +1,7 @@
-$NetBSD: patch-au,v 1.2 2008/08/24 20:35:37 tonnerre Exp $
+$NetBSD: patch-au,v 1.3 2009/01/20 23:56:58 sketch Exp $
 
---- texk/dviljk/dvi2xx.h.orig	1999-03-16 08:03:33.000000000 +0100
-+++ texk/dviljk/dvi2xx.h
+--- texk/dviljk/dvi2xx.h.orig	1999-03-16 07:03:33.000000000 +0000
++++ texk/dviljk/dvi2xx.h	2009-01-20 23:47:46.847736250 +0000
 @@ -8,10 +8,14 @@
  /* #define LJ */
  /* #define DRAWGLYPH */
@@ -44,7 +44,7 @@ $NetBSD: patch-au,v 1.2 2008/08/24 20:35:37 tonnerre Exp $
  
  
  #define PK_POST 245
-@@ -281,7 +284,14 @@ char *MFMODE     = MFMODE600;
+@@ -281,7 +284,14 @@
  #define VisChar(c) (unsigned char)(c)
  #endif
  
@@ -55,12 +55,12 @@ $NetBSD: patch-au,v 1.2 2008/08/24 20:35:37 tonnerre Exp $
 +   write a new one. [27 Jun 07 -js] */
 +#define GetBytes(fp,buf,n) \
 +    ( sizeof(buf) != sizeof(void *) && sizeof(buf) > n ? \
-+        read_multi(buf, 1, n, fp) \
++        (void)read_multi(buf, 1, n, fp) \
 +      : Fatal("Try to read %d bytes in an array of size %d", n, sizeof(buf)) )
  
  
  /**********************************************************************/
-@@ -307,6 +317,7 @@ int     printf();
+@@ -307,6 +317,7 @@
  int     sscanf();
  int     strcmp();
  char   *strcpy();
@@ -68,7 +68,7 @@ $NetBSD: patch-au,v 1.2 2008/08/24 20:35:37 tonnerre Exp $
  #   ifdef MSC5
  unsigned int strlen();
  #   endif
-@@ -393,7 +404,7 @@ struct font_entry {    /* font entry */
+@@ -393,7 +404,7 @@
      char n[STRSIZE];          /* FNT_DEF command parameters                */
      long4    font_mag;         /* computed from FNT_DEF s and d parameters  */
      /*char psname[STRSIZE];*/ /* PostScript name of the font               */
@@ -77,7 +77,7 @@ $NetBSD: patch-au,v 1.2 2008/08/24 20:35:37 tonnerre Exp $
      FILEPTR font_file_id;      /* file identifier (NO_FILE if none)         */
  #ifdef USEPXL
      long4    magnification;    /* magnification read from PXL file          */
-@@ -487,8 +498,8 @@ void    LoadAChar DVIPROTO((long4, regis
+@@ -487,8 +498,8 @@
  long4   NoSignExtend DVIPROTO((FILEPTR, int));
  void    OpenFontFile DVIPROTO((void));
  long4   PixRound DVIPROTO((long4, long4));
@@ -88,7 +88,7 @@ $NetBSD: patch-au,v 1.2 2008/08/24 20:35:37 tonnerre Exp $
  			     unsigned int, unsigned char *));
  void    RasterChar DVIPROTO((struct char_entry *));
  void    ReadFontDef DVIPROTO((long4));
-@@ -534,11 +545,12 @@ bool    LastPageSpecified = _FALSE;
+@@ -534,11 +545,12 @@
  #ifndef KPATHSEA
  char   *PXLpath = FONTAREA;
  #endif