- Update to 1.0.6

Submitted by:	Ports Fury
PR:		ports/90192

7 files changed, 62 insertions, 75 deletions

diff --git a/editors/texmacs/files/patch-plugins__r__src__tm_r.c b/editors/texmacs/files/patch-plugins__r__src__tm_r.c
new file mode 100644
index 000000000000..9a5d81a5f1fd
--- /dev/null
+++ b/editors/texmacs/files/patch-plugins__r__src__tm_r.c
@@ -0,0 +1,36 @@
+--- plugins/r/src/tm_r.c.orig	Sat Dec  3 03:08:07 2005
++++ plugins/r/src/tm_r.c	Tue Dec  6 01:00:12 2005
+@@ -10,8 +10,13 @@
+ ******************************************************************************/
+ 
+ #include <stdio.h>
++#include <sys/types.h>
+ #include <sys/select.h>
++#ifdef __FreeBSD__
++#include <libutil.h>
++#else
+ #include <pty.h>
++#endif
+ #include <utmp.h>
+ #include <unistd.h>
+ #include <termios.h>
+@@ -20,7 +25,6 @@
+ #include <string.h>
+ 
+ 
+-#include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <sys/time.h>
+@@ -458,7 +462,11 @@
+ #endif
+ 
+       /* Main pselect switch --------------- */
++#if defined(__FreeBSD__) && __FreeBSD__ < 5
++      if( select( master+1, &rd, &wr, &er, NULL ) > 0 ) {
++#else
+       if( pselect( master+1, &rd, &wr, &er, NULL, &orig_sigmask ) > 0 ) {
++#endif
+ 	if( FD_ISSET( STDIN_FILENO, &rd ) ) {
+ 	  /* =============== read input from TeXmacs */
+ 	  nread = read_B( STDIN_FILENO, RB, 1000 ) ;
diff --git a/editors/texmacs/files/patch-src_Guile_Scheme_object.hpp b/editors/texmacs/files/patch-src_Guile_Scheme_object.hpp
deleted file mode 100644
index 829e5261815d..000000000000
--- a/editors/texmacs/files/patch-src_Guile_Scheme_object.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/Guile/Scheme/object.hpp.orig	Sun Oct  3 13:26:27 2004
-+++ ./src/Guile/Scheme/object.hpp	Sat Oct 23 17:39:48 2004
-@@ -16,7 +16,7 @@
- #include "path.hpp"
- #include "command.hpp"
- #include "url.hpp"
--#include <libguile.h>
-+#include "libguile.h"
- 
- class object_rep: concrete_struct {
-   SCM handle;
diff --git a/editors/texmacs/files/patch-src_System_Link_pipe__link.cpp b/editors/texmacs/files/patch-src_System_Link_pipe__link.cpp
deleted file mode 100644
index 5de87f134c40..000000000000
--- a/editors/texmacs/files/patch-src_System_Link_pipe__link.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./src/System/Link/pipe_link.cpp.orig	Sun Oct  3 13:26:37 2004
-+++ ./src/System/Link/pipe_link.cpp	Sat Oct 23 17:39:48 2004
-@@ -10,6 +10,8 @@
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- ******************************************************************************/
- 
-+#include <osreldate.h>
-+
- #include "pipe_link.hpp"
- #include "sys_utils.hpp"
- #include "hashset.hpp"
-@@ -23,8 +25,12 @@
- #ifdef OS_WIN32
- #include <sys/misc.h>
- #endif
-+#if __FreeBSD_version < 500000
- #ifndef __APPLE__
- #include <malloc.h>
-+#endif
-+#else
-+#include <stdlib.h>
- #endif
- 
- hashset<pointer> pipe_link_set;
diff --git a/editors/texmacs/files/patch-src_Window_display.hpp b/editors/texmacs/files/patch-src_Window_display.hpp
deleted file mode 100644
index 8dae8f6cb19b..000000000000
--- a/editors/texmacs/files/patch-src_Window_display.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./src/Window/display.hpp.orig	Sun Oct  3 13:26:38 2004
-+++ ./src/Window/display.hpp	Sat Oct 23 17:39:48 2004
-@@ -12,12 +12,17 @@
- 
- #ifndef DISPLAY_H
- #define DISPLAY_H
-+
-+#include <osreldate.h>
-+
- #include "tree.hpp"
- #include "bitmap_font.hpp"
- 
-+#if __FreeBSD_version < 500000
- #ifndef _TIME_T
- #define _TIME_T
- typedef long time_t;
-+#endif
- #endif
- 
- struct font;
diff --git a/editors/texmacs/files/patch-src_Window_event.hpp b/editors/texmacs/files/patch-src_Window_event.hpp
deleted file mode 100644
index 515ea69e1444..000000000000
--- a/editors/texmacs/files/patch-src_Window_event.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./src/Window/event.hpp.orig	Sun Oct  3 13:26:38 2004
-+++ ./src/Window/event.hpp	Sat Oct 23 17:39:48 2004
-@@ -12,12 +12,17 @@
- 
- #ifndef EVENT_H
- #define EVENT_H
-+
-+#include <osreldate.h>
-+
- #include "tree.hpp"
- #include "command.hpp"
- 
-+#if __FreeBSD_version < 500000
- #ifndef _TIME_T
- #define _TIME_T
- typedef long time_t;
-+#endif
- #endif
- 
- class window_rep;
diff --git a/editors/texmacs/files/patch-src__Classes__Abstract__basic.hpp b/editors/texmacs/files/patch-src__Classes__Abstract__basic.hpp
new file mode 100644
index 000000000000..b013fdd719b6
--- /dev/null
+++ b/editors/texmacs/files/patch-src__Classes__Abstract__basic.hpp
@@ -0,0 +1,15 @@
+--- src/Classes/Abstract/basic.hpp.orig	Sat Dec  3 03:08:07 2005
++++ src/Classes/Abstract/basic.hpp	Mon Dec  5 18:43:02 2005
+@@ -24,9 +24,10 @@
+ // instead of include <iostream.h>
+ 
+ #ifdef HAVE_INTPTR_T
+-#ifdef OS_SUN
++#ifdef HAVE_INTTYPES_H
+ #include <inttypes.h>
+-#else
++#endif
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
+ #endif
+ #else
diff --git a/editors/texmacs/files/patch-src__System__Link__pipe_link.cpp b/editors/texmacs/files/patch-src__System__Link__pipe_link.cpp
new file mode 100644
index 000000000000..543030d82fc4
--- /dev/null
+++ b/editors/texmacs/files/patch-src__System__Link__pipe_link.cpp
@@ -0,0 +1,11 @@
+--- src/System/Link/pipe_link.cpp.orig	Sat Dec  3 03:08:13 2005
++++ src/System/Link/pipe_link.cpp	Mon Dec  5 17:29:15 2005
+@@ -23,7 +23,7 @@
+ #ifdef OS_WIN32
+ #include <sys/pipe.h>
+ #endif
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
+ #include <malloc.h>
+ #endif
+