Update to 2.20.

PR:		ports/47760
Submitted by:	Ports Fury

12 files changed, 52 insertions, 293 deletions

diff --git a/graphics/tcm/files/patch-Config.tmpl b/graphics/tcm/files/patch-Config.tmpl
index 8b0b42e70be1..9832ddf48927 100644
--- a/graphics/tcm/files/patch-Config.tmpl
+++ b/graphics/tcm/files/patch-Config.tmpl
@@ -1,75 +1,52 @@
---- src/Config.tmpl_freebsd.orig	Tue Jul 17 23:53:35 2001
-+++ src/Config.tmpl_freebsd	Tue Jul 17 23:53:49 2001
-@@ -0,0 +1,71 @@
-+# Configuration file for FreeBSD and gcc compiler.
-+
-+include $(TCM_HOME)/src/Config.GEN
-+
-+STRIP           = /usr/bin/strip --strip-debug
-+# STRIP           = true
-+
-+CFLAGS          += -Wall -pedantic -fomit-frame-pointer
-+# CFLAGS      	+= -g
-+
-+LEX		= flex
-+YACC		= bison
-+
-+#XWIN_HOME	= /usr/X11R6
+--- src/Config.tmpl_freebsd.orig	Thu Jan  9 23:37:38 2003
++++ src/Config.tmpl_freebsd	Tue Jan 28 03:06:02 2003
+@@ -5,14 +5,16 @@
+ STRIP           = /usr/bin/strip --strip-debug
+ # STRIP           = true
+ 
+-CFLAGS          = -Wall -pedantic
++CC              = $(CXX)
++
++CFLAGS          = $(CXXFLAGS)
+ CFLAGS      	+= -fomit-frame-pointer
+ # CFLAGS      	+= -g
+ 
+ LEX		= flex
+ YACC		= bison
+ 
+-XWIN_HOME	= /usr/X11R6
 +XWIN_HOME	= $(X11BASE)
-+
-+SYSFLAGS        = -DBSD
-+# SYSFLAGS += -DDEBUG
-+
-+# Uncomment one of the following Motif/Lesstif segments or
-+# add your own.
-+
-+# Lesstif 1.2 (dynamic linked)
-+#MOTIF_HOME = /usr/X11R6/LessTif/Motif1.2
-+#LDLIBS = -lXm
-+
-+# Lesstif 1.2 (static linked)
+ 
+ SYSFLAGS        = -DBSD
+ # SYSFLAGS += -DDEBUG
+@@ -21,8 +23,8 @@
+ # add your own.
+ 
+ # Lesstif 1.2 (dynamic linked)
+-MOTIF_HOME = /usr/X11R6/LessTif/Motif1.2
+-LDLIBS = -lXm
 +# MOTIF_HOME = /usr/X11R6/LessTif/Motif1.2
-+# LDLIBS = $(MOTIF_LIB)/libXm.a
-+
-+# OSF/Motif 1.2 (dynamic linked)
-+# MOTIF_HOME = /local/opt/motif12
 +# LDLIBS = -lXm
-+
-+# OSF/Motif 1.2 (static linked)
-+# MOTIF_HOME = /local/opt/motif12
-+# LDLIBS = $(MOTIF_LIB)/libXm.a
-+
-+# OSF/Motif 2.0 (dynamic linked)
-+# MOTIF_HOME = /local/opt/motif20
-+# LDLIBS = -lXpm -lXm
-+
-+# OSF/Motif 2.0 (static linked)
-+# MOTIF_HOME = /local/opt/motif20
-+# LDLIBS = $(MOTIF_LIB)/libXpm.a $(MOTIF_LIB)/libXm.a
-+
-+# OSF/Motif 2.1 (dynamic linked)
-+# MOTIF_HOME = /local/opt/motif21
-+# LDLIBS = -lXp -lXm
-+
-+# OSF/Motif 2.1 (static linked)
-+# MOTIF_HOME = /local/opt/motif21
-+# LDLIBS = $(MOTIF_LIB)/libXm.a $(XWIN_LIB)/libXp.a
-+
-+# OpenMotif 2.1 (dynamic linked)
+ 
+ # Lesstif 1.2 (static linked)
+ # MOTIF_HOME = /usr/X11R6/LessTif/Motif1.2
+@@ -53,8 +55,8 @@
+ # LDLIBS = $(MOTIF_LIB)/libXm.a $(XWIN_LIB)/libXp.a
+ 
+ # OpenMotif 2.1 (dynamic linked)
+-# MOTIF_HOME = $(XWIN_HOME)
+-# LDLIBS = -lXm -lXp
 +MOTIF_HOME = $(XWIN_HOME)
 +LDLIBS = -lXm -lXp
-+
-+# OpenMotif 2.1 (static linked)
-+# MOTIF_HOME  = $(XWIN_HOME)
-+# LDLIBS = $(MOTIF_LIB)/libXm.a -lXp
-+
-+# The other libraries (don't change these)
-+LDLIBS += -lXt -lSM -lICE -lXext -lX11 -lm
-+
-+# 'make depend' and its flags
-+MKDEPEND=$(TCM_HOME)/bin/makedepend.sh
-+MKDEPENDFLAGS := $(CPPFLAGS) -D__i386__ -I/usr/include/g++-3 \
-+                -I/usr/include/g++-2 \
-+                -I/usr/include/g++ \
-+                -I/usr/include/g++/backward
-+
+ 
+ # OpenMotif 2.1 (static linked)
+ # MOTIF_HOME  = $(XWIN_HOME)
+@@ -65,7 +67,6 @@
+ 
+ # 'make depend' and its flags
+ MKDEPEND=$(TCM_HOME)/bin/makedepend.sh
+-MKDEPENDFLAGS := $(CPPFLAGS) -D__i386__ -I/usr/include/g++-3 \
+-                -I/usr/include/g++-2 \
++MKDEPENDFLAGS := $(CPPFLAGS) -D__i386__ -I/usr/include/g++/backward \
+                 -I/usr/include/g++
+ 
diff --git a/graphics/tcm/files/patch-Makefile b/graphics/tcm/files/patch-Makefile
index b754d2e35a8a..5b28081b0638 100644
--- a/graphics/tcm/files/patch-Makefile
+++ b/graphics/tcm/files/patch-Makefile
@@ -1,27 +1,15 @@
---- Makefile.orig	Wed Dec 13 15:19:34 2000
-+++ Makefile	Wed Jul 18 02:20:35 2001
+--- Makefile.orig	Mon Jan 20 21:32:37 2003
++++ Makefile	Tue Jan 28 01:52:19 2003
 @@ -4,7 +4,7 @@
  
  # change this if you want to install it in a different place
- ifndef TCM_INSTALL_DIR
+ ifndef $(TCM_INSTALL_DIR)
 -	TCM_INSTALL_DIR=/opt/tcm
 +	TCM_INSTALL_DIR=$(PREFIX)/tcm
  endif
  
  # the current version.
-@@ -42,6 +42,11 @@
-     TCM_PLATFORM = osf1
-     TCM_COMPILER = gcc
- endif
-+ifeq ($(UNAME),FreeBSD)
-+    TCM_PLATFORM = freebsd
-+    TCM_COMPILER = gcc
-+    TCM_INSTALL_CMD = /bin/cp -Rp
-+endif
- ifeq ($(UNAME),SunOS)
-     TCM_PLATFORM = solaris
-     TCM_COMPILER = suncc
-@@ -70,7 +75,7 @@
+@@ -107,7 +107,7 @@
  	@echo make all: to do all this in one run
  	@echo make clean: to remove all binaries, object and temporary files.
  
@@ -29,4 +17,4 @@
 +all: config depend execs
  
  execs:
- 	(cd ./src; ${MAKE} TCM_HOME='$(TCM_COMPILE_DIR)' \
+ 	(cd ./src; ${MAKE} $(MFLAGS) all)
diff --git a/graphics/tcm/files/patch-atdiagram.c b/graphics/tcm/files/patch-atdiagram.c
deleted file mode 100644
index f764f6a363e0..000000000000
--- a/graphics/tcm/files/patch-atdiagram.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/sd/bv/atdiagram.c.orig	Wed Jul 18 01:50:27 2001
-+++ src/sd/bv/atdiagram.c	Wed Jul 18 01:50:46 2001
-@@ -314,14 +314,14 @@
- 	errors += atChecks->CheckNodeCount(1, Code::ATD_FINAL_STATE_NODE, chkbuf);
- 	if (errors == 0)    // only useful with 1 INITIAL && 1 FINAL state
- 		errors += atChecks->CheckUnreachableStates(chkbuf);
--	errors += atChecks->CheckNodeCount(1, MAXINT, Code::ATD_ACTION_STATE_NODE, chkbuf);
-+	errors += atChecks->CheckNodeCount(1, INT_MAX, Code::ATD_ACTION_STATE_NODE, chkbuf);
- 
- 	errors += atChecks->CheckNamelessNodes(Code::ATD_ACTION_STATE_NODE, chkbuf);
- 	errors += atChecks->CheckNamelessNodes(Code::ATD_WAIT_STATE_NODE, chkbuf);
- 
- 
- 	errors += atChecks->CheckCountEdgesFrom(Code::ATD_SYNCHRONIZATION_NODE, 
--		Code::ATD_TRANSITION_EDGE, 2, MAXINT, False, False, chkbuf);
-+		Code::ATD_TRANSITION_EDGE, 2, INT_MAX, False, False, chkbuf);
- 
- 	ReportCheck(errors, &chkbuf);
- }
diff --git a/graphics/tcm/files/patch-crdiagram.c b/graphics/tcm/files/patch-crdiagram.c
deleted file mode 100644
index a1abd4677d9b..000000000000
--- a/graphics/tcm/files/patch-crdiagram.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/sd/dv/crdiagram.c.orig	Mon Sep 25 13:34:40 2000
-+++ src/sd/dv/crdiagram.c	Wed Jul 18 01:27:46 2001
-@@ -38,7 +38,7 @@
- #include "textbox.h"
- #include "comment.h"
- #include "crdiagram.h"
--#include <values.h>
-+#include <limits.h>
- 
- CRDiagram::CRDiagram(Config *c, CRWindow *d, CRViewer *v, CRGraph *g): 
- 	   ERDiagram(c, d, v, g) {
-@@ -481,7 +481,7 @@
- 		Code::EMPTY_EDGE, 2, chkbuf);
- 	// Check that classes have not 1 comp. function.
- 	total += crChecks->CheckCountEdgesFrom(
--		Code::CLASS_NODE, Code::COMPONENT_FUNCTION, 2, MAXINT, 
-+		Code::CLASS_NODE, Code::COMPONENT_FUNCTION, 2, INT_MAX, 
- 		True, False, chkbuf);
- 	// Check that rel. classes are not spec. of classes.
- 	total += crChecks->CheckRelationshipIsaClassNode(chkbuf);
diff --git a/graphics/tcm/files/patch-diagramchecks.h b/graphics/tcm/files/patch-diagramchecks.h
deleted file mode 100644
index 1ed372591b60..000000000000
--- a/graphics/tcm/files/patch-diagramchecks.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/dg/diagramchecks.h.orig	Tue Jul 17 23:46:17 2001
-+++ src/dg/diagramchecks.h	Tue Jul 17 23:46:54 2001
-@@ -23,7 +23,7 @@
- #define _DIAGRAMCHECKS_H
- 
- #include "bool.h"
--#include <values.h>
-+#include <limits.h>
- class Graph;
- class Diagram;
- class string;
diff --git a/graphics/tcm/files/patch-esddiagram.c b/graphics/tcm/files/patch-esddiagram.c
deleted file mode 100644
index 24de9cdb38a3..000000000000
--- a/graphics/tcm/files/patch-esddiagram.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sd/dv/esddiagram.c.orig	Tue Jul 17 23:48:45 2001
-+++ src/sd/dv/esddiagram.c	Tue Jul 17 23:49:21 2001
-@@ -56,7 +56,7 @@
- #include "miniellipse.h"
- #include "esddiagram.h"
- #include <stdio.h>
--#include <values.h>
-+#include <limits.h>
- 
- const int ESDDiagram::MINI_ELLIPSE_WIDTH = 8;
- const int ESDDiagram::MINI_ELLIPSE_HEIGHT = 8;
diff --git a/graphics/tcm/files/patch-rpdiagram.c b/graphics/tcm/files/patch-rpdiagram.c
deleted file mode 100644
index 988a47d1fb51..000000000000
--- a/graphics/tcm/files/patch-rpdiagram.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/sd/bv/rpdiagram.c.orig	Mon Jul 26 12:44:03 1999
-+++ src/sd/bv/rpdiagram.c	Wed Jul 18 01:29:02 2001
-@@ -34,7 +34,7 @@
- #include "line.h"
- #include "rpdiagram.h"
- #include "diagramchecks.h"
--#include <values.h>
-+#include <limits.h>
- 
- const int RPDiagram::BOX_WIDTH = 58;
- const int RPDiagram::BOX_HEIGHT = 38;
-@@ -247,7 +247,7 @@
- 	chkbuf = "";
- 	unsigned total = 0;
- 	total += checks->CheckNodeCount(
--			1, MAXINT, Code::PROCESS_GRAPH_ROOT, chkbuf);
-+			1, INT_MAX, Code::PROCESS_GRAPH_ROOT, chkbuf);
- 	if (total == 0) {
- 		total += checks->CheckNamelessNodes(
- 				Code::PROCESS_GRAPH_ROOT, chkbuf);
diff --git a/graphics/tcm/files/patch-src:gl:inputfile.c b/graphics/tcm/files/patch-src:gl:inputfile.c
deleted file mode 100644
index 10f066c8a9e1..000000000000
--- a/graphics/tcm/files/patch-src:gl:inputfile.c
+++ /dev/null
@@ -1,65 +0,0 @@
---- src/gl/inputfile.c.orig	Sat Oct 19 21:37:26 2002
-+++ src/gl/inputfile.c	Sat Oct 19 21:37:53 2002
-@@ -51,7 +51,7 @@
- }
- 
- void InputFile::SkipLine() {
--	unsigned char c;
-+	char c;
- 	while (!ifile->eof()) {
- 		ifile->get(c);
- 		if (c == '\n') {
-@@ -62,7 +62,7 @@
- }
- 
- int InputFile::ReadChar() {
--	unsigned char c;
-+	char c;
- 	while (!ifile->eof()) {
- 		ifile->get(c);
- 		if (c == '\n')
-@@ -78,7 +78,7 @@
- }
- 
- bool InputFile::LookupChar(const char c) {
--	unsigned char c2;
-+	char c2;
- 	while (!ifile->eof()) {
- 		ifile->get(c2);
- 		if (c2 == '\n')
-@@ -100,7 +100,7 @@
- 
- bool InputFile::LookupWord(const string *word) {
- 	string word2;
--	unsigned char c;
-+	char c;
- 	// skip white space and comment.
- 	do {
- 		if (ifile->eof())
-@@ -138,7 +138,7 @@
- 
- bool InputFile::LookupString(const string *s) {
- 	string string2;
--	unsigned char c;
-+	char c;
- 	bool escaped = False;
- 	if (!LookupChar('"'))
- 		return False;
-@@ -179,7 +179,7 @@
- }
- 
- bool InputFile::ReadWord(string *word) {
--	unsigned char c;
-+	char c;
- 	*word = "";
- 	// skip white space and comment.
- 	do {
-@@ -211,7 +211,7 @@
- }
- 
- bool InputFile::ReadString(string *s) {
--	unsigned char c;
-+	char c;
- 	*s = "";
- 	bool escaped = False;
- 	if (!LookupChar('"'))
diff --git a/graphics/tcm/files/patch-src:gl:point.c b/graphics/tcm/files/patch-src:gl:point.c
deleted file mode 100644
index 8785d46663c8..000000000000
--- a/graphics/tcm/files/patch-src:gl:point.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/gl/point.c.orig	Sat Oct 19 21:32:33 2002
-+++ src/gl/point.c	Sat Oct 19 21:33:30 2002
-@@ -41,8 +41,8 @@
- bool operator!=(const Point &p1, const Point &p2) {
- 	return (p1.x != p2.x || p1.y != p2.y); }
- 
--ostream &operator<<(ostream &o, const Point p)
-+std::ostream &operator<<(std::ostream &o, const Point p)
- 	{o << p.x << " "; o << p.y; return o;}
-  
--istream &operator>>(istream &i, Point &p)
-+std::istream &operator>>(std::istream &i, Point &p)
- 	{i >> p.x; i >> p.y; return i;}
diff --git a/graphics/tcm/files/patch-src:gl:point.h b/graphics/tcm/files/patch-src:gl:point.h
deleted file mode 100644
index 3a1b182e59f7..000000000000
--- a/graphics/tcm/files/patch-src:gl:point.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/gl/point.h.orig	Sat Oct 19 21:32:28 2002
-+++ src/gl/point.h	Sat Oct 19 21:33:12 2002
-@@ -74,10 +74,10 @@
- 	void operator*(double c) {x = int(x*c); y = int(y*c);}
- 
- 	/// Write string representation to ostream.
--	friend ostream &operator<<(ostream &o, const Point p);
-+	friend std::ostream &operator<<(std::ostream &o, const Point p);
- 
- 	/// Read string representation from istream.
--	friend istream &operator>>(istream &i, Point &p);
-+	friend std::istream &operator>>(std::istream &i, Point &p);
- 
- 	/// the x-coordinate.
- 	int x;
diff --git a/graphics/tcm/files/patch-src:gl:rectangle.c b/graphics/tcm/files/patch-src:gl:rectangle.c
deleted file mode 100644
index 1542b0ce679c..000000000000
--- a/graphics/tcm/files/patch-src:gl:rectangle.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/gl/rectangle.c.orig	Sat Oct 19 21:33:51 2002
-+++ src/gl/rectangle.c	Sat Oct 19 21:34:21 2002
-@@ -26,12 +26,12 @@
- bool Rectangle::Inside(int a, int b) const
-                 {return (a>x && b>y && a<(x+width) && b<(y+height));}
-  
--ostream &operator<<(ostream &s, const Rectangle r)
-+std::ostream &operator<<(std::ostream &s, const Rectangle r)
- 	{s << r.x << " "; s << r.y << " ";
- 	 s << r.width << " "; s << r.height << " ";
- 	 return s;}
-  
--istream &operator>>(istream &s, Rectangle &r)
-+std::istream &operator>>(std::istream &s, Rectangle &r)
- 	{s >> r.x; s >> r.y;
- 	 s >> r.width; s >> r.height;
- 	 return s;}
diff --git a/graphics/tcm/files/patch-src:gl:rectangle.h b/graphics/tcm/files/patch-src:gl:rectangle.h
deleted file mode 100644
index d981757c2f30..000000000000
--- a/graphics/tcm/files/patch-src:gl:rectangle.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/gl/rectangle.h.orig	Sat Oct 19 21:33:45 2002
-+++ src/gl/rectangle.h	Sat Oct 19 21:34:44 2002
-@@ -80,10 +80,10 @@
- 	friend bool operator!=(const Rectangle &x, const Rectangle &y);
- 
- 	/// Write string representation to ostream.
--	friend ostream &operator<<(ostream &s, const Rectangle r);
-+	friend std::ostream &operator<<(std::ostream &s, const Rectangle r);
- 
- 	/// Read string representation from istream.
--	friend istream &operator>>(istream &s, Rectangle &r);
-+	friend std::istream &operator>>(std::istream &s, Rectangle &r);
- 
- 	/// the left x-coordinate of the rectangle
- 	int x;