From 6155fc8ed5133632a4702b0fe7dea8d3823089ea Mon Sep 17 00:00:00 2001
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Sat, 18 Sep 2004 08:14:56 +0000
Subject: [PATCH] Unbreak the build on 5.X and -CURRENT.

Reported by:	pointyhat.freebsd.org
Approved by:	portmgr (marcus), fjoe (mentor, implicit)
---
 .../files/patch-source::tools::data_entry.hh  | 44 +++++++++++++++++++
 .../files/patch-src:frontend:plotting:pvec.c  | 20 +++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 biology/avida/files/patch-source::tools::data_entry.hh
 create mode 100644 cad/ngspice_rework/files/patch-src:frontend:plotting:pvec.c

diff --git a/biology/avida/files/patch-source::tools::data_entry.hh b/biology/avida/files/patch-source::tools::data_entry.hh
new file mode 100644
index 000000000000..71ab0df011bf
--- /dev/null
+++ b/biology/avida/files/patch-source::tools::data_entry.hh
@@ -0,0 +1,44 @@
+--- source/tools/data_entry.hh.orig	Fri Sep 17 16:43:13 2004
++++ source/tools/data_entry.hh	Fri Sep 17 16:45:30 2004
+@@ -94,19 +94,19 @@
+       DataSet(_funS), DataCompare(_funC) { ; }
+ 
+   bool Print(std::ostream & fp) const {
+-    if (target == NULL) return false;
+-    fp << (target->*DataRetrieval)();
++    if (this->target == NULL) return false;
++    fp << (this->target->*DataRetrieval)();
+     return true;
+   }
+ 
+   //int Compare(T * other) const { return (target->*DataCompare)(other); }
+   int Compare(T * other) const {
+-    return (DataCompare)?((target->*DataCompare)(other)):(0);
++    return (DataCompare)?((this->target->*DataCompare)(other)):(0);
+   }
+   bool Set(const cString & value) {
+     OUT new_value(0);
+     if (DataSet == 0) return false;
+-    (target->*DataSet)( cStringUtil::Convert(value, new_value) );
++    (this->target->*DataSet)( cStringUtil::Convert(value, new_value) );
+     return true;
+   }
+ };
+@@ -128,14 +128,14 @@
+       DataRetrieval(_funR), DataCompare(_funC), arg(_arg) { ; }
+ 
+   bool Print(std::ostream & fp) const {
+-    if (target == NULL) return false;
+-    fp << (target->*DataRetrieval)(arg);
++    if (this->target == NULL) return false;
++    fp << (this->target->*DataRetrieval)(arg);
+     return true;
+   }
+ 
+   //int Compare(T * other) const { return (target->*DataCompare)(other, arg); }
+   int Compare(T * other) const {
+-    return (DataCompare)?((target->*DataCompare)(other, arg)):(0);
++    return (DataCompare)?((this->target->*DataCompare)(other, arg)):(0);
+   }
+ };
+ 
diff --git a/cad/ngspice_rework/files/patch-src:frontend:plotting:pvec.c b/cad/ngspice_rework/files/patch-src:frontend:plotting:pvec.c
new file mode 100644
index 000000000000..426f1e713b91
--- /dev/null
+++ b/cad/ngspice_rework/files/patch-src:frontend:plotting:pvec.c
@@ -0,0 +1,20 @@
+--- src/frontend/plotting/pvec.c.orig	Fri Sep 17 17:30:10 2004
++++ src/frontend/plotting/pvec.c	Fri Sep 17 17:30:33 2004
+@@ -47,8 +47,6 @@
+     case GRID_SMITHGRID:
+         strcat(buf, ", grid = smithgrid (not xformed)");
+         break;
+-
+-    default:
+     }
+ 
+     switch (d->v_plottype) {
+@@ -60,8 +58,6 @@
+     case PLOT_POINT:
+         strcat(buf, ", plot = point");
+         break;
+-
+-    default:
+     }
+     if (d->v_defcolor) {
+         sprintf(buf2, ", color = %s", d->v_defcolor);