From 20bbe6a2b9e9643f52406751db7e22c92d963aab Mon Sep 17 00:00:00 2001
From: Christian Weisgerber <naddy@FreeBSD.org>
Date: Tue, 29 Jul 2003 19:32:12 +0000
Subject: [PATCH] Fix gcc 3.3 compile failure.

Submitted by:	Simon Barner <barner@in.tum.de>
---
 math/topaz/files/patch-topaz::tpv2ps.cc | 65 +++++++++++++++++++++++--
 1 file changed, 60 insertions(+), 5 deletions(-)

diff --git a/math/topaz/files/patch-topaz::tpv2ps.cc b/math/topaz/files/patch-topaz::tpv2ps.cc
index dab9c65b2fc7..5177744ef353 100644
--- a/math/topaz/files/patch-topaz::tpv2ps.cc
+++ b/math/topaz/files/patch-topaz::tpv2ps.cc
@@ -1,11 +1,66 @@
---- topaz/tpv2ps.cc.orig	Wed Dec  4 23:02:28 2002
-+++ topaz/tpv2ps.cc	Fri Dec 27 04:51:06 2002
-@@ -31,7 +31,7 @@
+--- topaz/tpv2ps.cc.orig	Fri Jun 27 14:35:40 2003
++++ topaz/tpv2ps.cc	Thu Jul 24 02:50:11 2003
+@@ -31,8 +31,6 @@
  #include <math.h>
  #include <string>
  #include <time.h>
 -#include <getopt.h>
-+//#include <getopt.h>
- //char *optarg;
+-//char *optarg;
  
  extern int errno;
+ #include "vectdefs.h"
+@@ -63,31 +61,31 @@
+ 
+ #define buffersize 1024
+ 
+-char* entry[] = {
+-  {"Times-Roman-Q"},
+-  {"Times-Bold-Q"},
+-  {"Times-Italic-Q"},
+-  {"Times-BoldItalic-Q"},
+-  {"Helvetica-Q"},
+-  {"Helvetica-Bold-Q"},
+-  {"Helvetica-Oblique-Q"},
+-  {"Helvetica-BoldOblique-Q"},
+-  {"Courier-Q"},
+-  {"Courier-Bold-Q"},
+-  {"Courier-Oblique-Q"},
+-  {"Courier-BoldOblique-Q"},
+-  {"Symbol"}
++static const char *entry[] = {
++  "Times-Roman-Q",
++  "Times-Bold-Q",
++  "Times-Italic-Q",
++  "Times-BoldItalic-Q",
++  "Helvetica-Q",
++  "Helvetica-Bold-Q",
++  "Helvetica-Oblique-Q",
++  "Helvetica-BoldOblique-Q",
++  "Courier-Q",
++  "Courier-Bold-Q",
++  "Courier-Oblique-Q",
++  "Courier-BoldOblique-Q",
++  "Symbol"
+ };
+ 
+-char* kentry[] = {
+-  {"Ryumin-Light-H"},
+-  {"Ryumin-Light-H"},
+-  {"Ryumin-Light-H"},
+-  {"Ryumin-Light-H"},
+-  {"GothicBBB-Medium-H"},
+-  {"GothicBBB-Medium-H"},
+-  {"GothicBBB-Medium-H"},
+-  {"GothicBBB-Medium-H"},
++static const char *kentry[] = {
++  "Ryumin-Light-H",
++  "Ryumin-Light-H",
++  "Ryumin-Light-H",
++  "Ryumin-Light-H",
++  "GothicBBB-Medium-H",
++  "GothicBBB-Medium-H",
++  "GothicBBB-Medium-H",
++  "GothicBBB-Medium-H",
+ };
+ 
+ double papery;