<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3ef0c6ef1a9446347bfc8a7812ab875c0dfec7ba">https://github.com/macports/macports-ports/commit/3ef0c6ef1a9446347bfc8a7812ab875c0dfec7ba</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3ef0c6e terra: Move reinplaces to patchfile
</span>3ef0c6e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3ef0c6ef1a9446347bfc8a7812ab875c0dfec7ba
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Apr 11 19:18:03 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> terra: Move reinplaces to patchfile
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> And refresh and clean up patches, fix license so that port becomes
</span><span style='display:block; white-space:pre;color:#404040;'> distributable, and add size to checksums.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56238
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56274
</span>---
gis/terra/Portfile | 15 +--
gis/terra/files/patch-compiler.diff | 187 ++++++++++++++++++++++--------------
gis/terra/files/patch-opengl.diff | 5 +-
3 files changed, 122 insertions(+), 85 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/terra/Portfile b/gis/terra/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c5f35d0..f3a1429 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/terra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/terra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,19 +17,20 @@ Terra is based on algorithms described in: \
</span> Fast Polygonal Approximation of Terrains and Height Fields \
by Michael Garland and Paul Heckbert (Technical Report CMU-CS-95-181).
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license Public Domain
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license public-domain
</span> platforms darwin
homepage http://mgarland.org/software/scape.html
master_sites http://mgarland.org/dist/
checksums rmd160 885639282ffe5244f5289ef3f453390c8acdb30f \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 22470e13e1f0659d23dbf7e0ecbfd8f6490bcd1d0a953537c1dfec18f4df3bd7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 22470e13e1f0659d23dbf7e0ecbfd8f6490bcd1d0a953537c1dfec18f4df3bd7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 206256
</span>
depends_lib port:freeglut
worksrcdir ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles patch-compiler.diff patch-opengl.diff
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,14 +38,6 @@ post-patch {
</span> reinplace -E "s,@CXX@,${configure.cxx},g" ${worksrcpath}/Makefile
reinplace -E "s,@OPTFLAGS@,${configure.optflags},g" ${worksrcpath}/Makefile
reinplace -E "s,@PREFIX@,${prefix},g" ${worksrcpath}/Makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s,array,Array,g" ${worksrcpath}/Array.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s,array,Array,g" ${worksrcpath}/GreedyInsert.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s,array,Array,g" ${worksrcpath}/Heap.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s,array,Array,g" ${worksrcpath}/output.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s,typeof,decltype,g" ${worksrcpath}/Subdivision.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s,typeof,decltype,g" ${worksrcpath}/greedy.cc
</span> }
use_configure no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/terra/files/patch-compiler.diff b/gis/terra/files/patch-compiler.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9182fa2..b258977 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/terra/files/patch-compiler.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/terra/files/patch-compiler.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -u ../terra.orig/Array.h ./Array.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../terra.orig/Array.h 1995-12-19 11:24:31.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./Array.h 2014-03-18 15:04:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Array.h.orig 1995-12-19 13:24:31.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Array.h 2018-04-11 18:48:55.000000000 -0500
</span> @@ -1,6 +1,9 @@
#ifndef ARRAY_INCLUDED // -*- C++ -*-
#define ARRAY_INCLUDED
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,9 +10,62 @@ diff -u ../terra.orig/Array.h ./Array.h
</span> //
// Array classes
//
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -u ../terra.orig/GreedyInsert.cc ./GreedyInsert.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../terra.orig/GreedyInsert.cc 1996-01-19 09:07:18.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./GreedyInsert.cc 2014-03-18 15:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,14 +16,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<class T>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-class array {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class Array {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ protected:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ T *data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- array() { data=NULL; len=0; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- array(int l) { init(l); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ~array() { free(); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Array() { data=NULL; len=0; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Array(int l) { init(l); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ~Array() { free(); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline void init(int l);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,14 +38,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<class T>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-inline void array<T>::init(int l)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++inline void Array<T>::init(int l)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data = new T[l];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ len = l;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<class T>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-inline void array<T>::free()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++inline void Array<T>::free()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( data )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,7 +55,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<class T>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-inline T& array<T>::ref(int i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++inline T& Array<T>::ref(int i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SAFETY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert( data );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,7 +65,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<class T>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-inline void array<T>::resize(int l)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++inline void Array<T>::resize(int l)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ T *old = data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data = new T[l];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- GreedyInsert.cc.orig 1996-01-19 11:07:18.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ GreedyInsert.cc 2018-04-11 18:48:55.000000000 -0500
</span> @@ -1,9 +1,11 @@
-#include <iostream.h>
+#include <iostream>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,10 +92,8 @@ diff -u ../terra.orig/GreedyInsert.cc ./GreedyInsert.cc
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Only in .: GreedyInsert.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -u ../terra.orig/Heap.cc ./Heap.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../terra.orig/Heap.cc 1996-01-09 13:19:08.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./Heap.cc 2014-03-18 15:04:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Heap.cc.orig 1996-01-09 15:19:08.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Heap.cc 2018-04-11 18:48:55.000000000 -0500
</span> @@ -1,7 +1,9 @@
#include <assert.h>
-#include <iostream.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,10 +105,32 @@ diff -u ../terra.orig/Heap.cc ./Heap.cc
</span>
void Heap::swap(int i,int j)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Only in .: Heap.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -u ../terra.orig/Makefile ./Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../terra.orig/Makefile 1996-01-30 08:35:20.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./Makefile 2014-03-18 16:52:05.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Heap.h.orig 1996-01-30 10:35:18.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Heap.h 2018-04-11 18:48:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,10 +24,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-class Heap : public array<heap_node> {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class Heap : public Array<heap_node> {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // The actual size of the heap. array::length()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // The actual size of the heap. Array::length()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // simply returns the amount of allocated space
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,7 +43,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Heap() { size=0; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Heap(int s) : array<heap_node>(s) { size=0; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Heap(int s) : Array<heap_node>(s) { size=0; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void insert(Labelled *, real);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 1996-01-30 10:35:20.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2018-04-11 18:48:55.000000000 -0500
</span> @@ -4,23 +4,24 @@
# You should change these to fit your system.
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,9 +179,8 @@ diff -u ../terra.orig/Makefile ./Makefile
</span> /bin/rm -f Makefile.depend.bak
sinclude Makefile.depend
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -u ../terra.orig/Map.h ./Map.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../terra.orig/Map.h 1996-01-30 08:35:21.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./Map.h 2014-03-18 15:09:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Map.h.orig 1996-01-30 10:35:21.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Map.h 2018-04-11 18:48:55.000000000 -0500
</span> @@ -2,10 +2,13 @@
#define MAP_INCLUDED
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,10 +196,8 @@ diff -u ../terra.orig/Map.h ./Map.h
</span> class Map
{
public:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Only in .: Map.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -u ../terra.orig/Mask.cc ./Mask.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../terra.orig/Mask.cc 1996-01-17 08:03:13.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./Mask.cc 2014-03-18 15:04:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Mask.cc.orig 1996-01-17 10:03:13.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Mask.cc 2018-04-11 18:48:55.000000000 -0500
</span> @@ -1,10 +1,12 @@
#include <math.h>
#include <stdlib.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -143,9 +212,8 @@ diff -u ../terra.orig/Mask.cc ./Mask.cc
</span>
RealMask *readMask(istream& in)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -u ../terra.orig/Mask.h ./Mask.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../terra.orig/Mask.h 1996-01-17 08:03:14.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./Mask.h 2014-03-18 15:16:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Mask.h.orig 1996-01-17 10:03:14.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Mask.h 2018-04-11 18:48:55.000000000 -0500
</span> @@ -1,6 +1,11 @@
#ifndef MASK_INCLUDED // -*- C++ -*-
#define MASK_INCLUDED
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,10 +226,8 @@ diff -u ../terra.orig/Mask.h ./Mask.h
</span> class ImportMask
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Only in .: Mask.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -u ../terra.orig/Quadedge.cc ./Quadedge.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../terra.orig/Quadedge.cc 1995-12-19 14:05:48.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./Quadedge.cc 2014-03-18 15:04:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Quadedge.cc.orig 1995-12-19 16:05:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Quadedge.cc 2018-04-11 18:48:55.000000000 -0500
</span> @@ -1,8 +1,10 @@
#include <stdlib.h>
-#include <iostream.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -174,10 +240,8 @@ diff -u ../terra.orig/Quadedge.cc ./Quadedge.cc
</span> Edge::Edge(const Edge&)
{
cerr << "Edge: Edge assignments are forbidden." << endl;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Only in .: Quadedge.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -u ../terra.orig/Subdivision.cc ./Subdivision.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../terra.orig/Subdivision.cc 1996-01-30 08:35:22.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./Subdivision.cc 2014-04-01 17:12:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Subdivision.cc.orig 1996-01-30 10:35:22.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Subdivision.cc 2018-04-11 18:48:55.000000000 -0500
</span> @@ -1,9 +1,10 @@
#include <stdlib.h>
-#include <iostream.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -195,7 +259,7 @@ diff -u ../terra.orig/Subdivision.cc ./Subdivision.cc
</span> static void overEdge(Edge *e, edge_callback fn, void *closure)
{
- if( e->token != timestamp )
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if( static_cast<typeof(timestamp)>(e->token) != timestamp )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if( static_cast<decltype(timestamp)>(e->token) != timestamp )
</span> {
e->token = timestamp;
e->Sym()->token = timestamp;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -231,10 +295,8 @@ diff -u ../terra.orig/Subdivision.cc ./Subdivision.cc
</span>
if( isInterior(e) && shouldSwap(x, e) )
swap(e);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Only in .: Subdivision.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -u ../terra.orig/Vec2.h ./Vec2.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../terra.orig/Vec2.h 1996-01-30 08:35:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./Vec2.h 2014-03-18 16:55:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Vec2.h.orig 1996-01-30 10:35:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Vec2.h 2018-04-11 18:48:55.000000000 -0500
</span> @@ -1,6 +1,11 @@
#ifndef VEC2_INCLUDED // -*- C++ -*-
#define VEC2_INCLUDED
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -261,9 +323,8 @@ diff -u ../terra.orig/Vec2.h ./Vec2.h
</span> }
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -u ../terra.orig/Vec3.h ./Vec3.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../terra.orig/Vec3.h 1995-12-19 11:24:37.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./Vec3.h 2014-03-18 16:54:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Vec3.h.orig 1995-12-19 13:24:37.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Vec3.h 2018-04-11 18:48:55.000000000 -0500
</span> @@ -1,6 +1,11 @@
#ifndef VEC3_INCLUDED // -*- C++ -*-
#define VEC3_INCLUDED
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -290,11 +351,8 @@ diff -u ../terra.orig/Vec3.h ./Vec3.h
</span> }
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Only in .: altadena-lake.osm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Only in .: altadena.osm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -u ../terra.orig/cmdline.cc ./cmdline.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../terra.orig/cmdline.cc 1996-01-19 10:34:14.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./cmdline.cc 2014-04-01 17:11:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmdline.cc.orig 1996-01-19 12:34:14.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmdline.cc 2018-04-11 18:48:55.000000000 -0500
</span> @@ -1,7 +1,9 @@
#include <stdlib.h>
-#include <fstream.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -327,10 +385,8 @@ diff -u ../terra.orig/cmdline.cc ./cmdline.cc
</span> {
if( msg )
cerr << msg << endl;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Only in .: cmdline.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -u ../terra.orig/glHacks.h ./glHacks.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../terra.orig/glHacks.h 1996-01-30 08:35:27.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./glHacks.h 2014-03-18 16:55:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glHacks.h.orig 1996-01-30 10:35:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glHacks.h 2018-04-11 18:48:55.000000000 -0500
</span> @@ -4,6 +4,9 @@
#include <GL/glx.h>
#include <GL/gl.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -341,10 +397,8 @@ diff -u ../terra.orig/glHacks.h ./glHacks.h
</span>
/*************************************************************************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Only in .: glHacks.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -u ../terra.orig/greedy.cc ./greedy.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../terra.orig/greedy.cc 1996-01-19 10:34:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./greedy.cc 2014-04-01 17:14:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- greedy.cc.orig 1996-01-19 12:34:15.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ greedy.cc 2018-04-11 18:48:55.000000000 -0500
</span> @@ -1,4 +1,6 @@
#include "terra.h"
+#include <fstream>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -357,13 +411,12 @@ diff -u ../terra.orig/greedy.cc ./greedy.cc
</span> {
return mesh->maxError() > error_threshold &&
- mesh->pointCount() < point_limit;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static_cast<typeof(point_limit)>(mesh->pointCount()) < point_limit;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static_cast<decltype(point_limit)>(mesh->pointCount()) < point_limit;
</span> }
static void announce_goal()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -u ../terra.orig/output.cc ./output.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../terra.orig/output.cc 1996-01-30 08:35:30.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./output.cc 2014-04-01 17:08:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- output.cc.orig 1996-01-30 10:35:30.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ output.cc 2018-04-11 18:48:55.000000000 -0500
</span> @@ -1,8 +1,8 @@
#include "terra.h"
-#include <fstream.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -375,11 +428,8 @@ diff -u ../terra.orig/output.cc ./output.cc
</span> {
if( !filename )
filename = output_filename;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Only in .: output.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Only in .: terra
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -u ../terra.orig/terra.cc ./terra.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../terra.orig/terra.cc 1996-01-10 13:22:59.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./terra.cc 2014-03-18 15:09:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- terra.cc.orig 1996-01-10 15:22:59.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ terra.cc 2018-04-11 18:48:55.000000000 -0500
</span> @@ -1,10 +1,12 @@
#include "terra.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -394,9 +444,8 @@ diff -u ../terra.orig/terra.cc ./terra.cc
</span> +
+ return 0;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -u ../terra.orig/terra.h ./terra.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../terra.orig/terra.h 1996-01-19 10:34:17.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./terra.h 2014-04-01 17:08:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- terra.h.orig 1996-01-19 12:34:17.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ terra.h 2018-04-11 18:48:55.000000000 -0500
</span> @@ -24,7 +24,7 @@
extern void scripted_preinsertion(istream&);
extern void subsample_insertion(int target_width);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -406,11 +455,8 @@ diff -u ../terra.orig/terra.h ./terra.h
</span> FileFormat format=NULLfile);
extern void output_tin(ostream&);
extern void output_eps(ostream&);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Only in .: terra.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Only in .: xterra
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -u ../terra.orig/xterra.cc ./xterra.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../terra.orig/xterra.cc 1995-12-15 11:26:34.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./xterra.cc 2014-04-01 17:09:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- xterra.cc.orig 1995-12-15 13:26:34.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xterra.cc 2018-04-11 18:48:55.000000000 -0500
</span> @@ -5,7 +5,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -427,4 +473,3 @@ diff -u ../terra.orig/xterra.cc ./xterra.cc
</span> +
+ return 0;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Only in .: xterra.o
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/terra/files/patch-opengl.diff b/gis/terra/files/patch-opengl.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2fdbfe9..fa1111b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/terra/files/patch-opengl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/terra/files/patch-opengl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -u ../terra.orig/gui.cc ./gui.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../terra.orig/gui.cc 1996-01-30 08:35:28.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./gui.cc 2014-04-01 17:10:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gui.cc.orig 1996-01-30 10:35:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gui.cc 2018-04-11 18:48:55.000000000 -0500
</span> @@ -1,5 +1,5 @@
-#include <iostream.h>
-#include <fstream.h>
</pre><pre style='margin:0'>
</pre>