aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2006-10-07 22:52:56 +0800
committermiwi <miwi@FreeBSD.org>2006-10-07 22:52:56 +0800
commit4993fa61d44cf9c797d79f37df89f31bc32d9a44 (patch)
tree6f0598312a8ca7495f6cd06b80c6f9613d2a6f69
parent391958159400233067d286facd799238b733b0ff (diff)
downloadfreebsd-ports-gnome-4993fa61d44cf9c797d79f37df89f31bc32d9a44.tar.gz
freebsd-ports-gnome-4993fa61d44cf9c797d79f37df89f31bc32d9a44.tar.zst
freebsd-ports-gnome-4993fa61d44cf9c797d79f37df89f31bc32d9a44.zip
- Fix build with gcc41
PR: ports/104104 Submitted by: trasz <trasz@pin.if.uz.zgora.pl>
-rw-r--r--misc/splitvt/files/patch-config.c7
-rw-r--r--misc/splitvt/files/patch-cut-paste.c10
-rw-r--r--misc/splitvt/files/patch-misc.c7
-rw-r--r--misc/splitvt/files/patch-splitvt.c7
-rw-r--r--misc/splitvt/files/patch-terminal.c10
-rw-r--r--misc/splitvt/files/patch-utmp.c7
-rw-r--r--misc/splitvt/files/patch-vt100.c7
-rw-r--r--misc/splitvt/files/patch-vtmouse.c7
-rw-r--r--misc/splitvt/files/patch-vtmouse.h9
-rw-r--r--misc/splitvt/files/patch-vttest.c17
10 files changed, 73 insertions, 15 deletions
diff --git a/misc/splitvt/files/patch-config.c b/misc/splitvt/files/patch-config.c
index 2e31cdd28875..d8954961a830 100644
--- a/misc/splitvt/files/patch-config.c
+++ b/misc/splitvt/files/patch-config.c
@@ -1,5 +1,12 @@
--- config.c.orig Sun May 4 06:48:04 2003
+++ config.c Sat Feb 19 11:30:53 2005
+@@ -1,5 +1,6 @@
+ #include <sys/types.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/stat.h>
+ #include <signal.h>
+
@@ -238,8 +238,8 @@
fprintf(makefile, "\nclean: \n\trm -f *.o core \n");
fprintf(makefile, "\ndistclean: clean\n\trm -f splitvt Makefile\n");
diff --git a/misc/splitvt/files/patch-cut-paste.c b/misc/splitvt/files/patch-cut-paste.c
new file mode 100644
index 000000000000..80033a3b7091
--- /dev/null
+++ b/misc/splitvt/files/patch-cut-paste.c
@@ -0,0 +1,10 @@
+--- cut-paste.c.orig Sat Oct 7 14:38:24 2006
++++ cut-paste.c Sat Oct 7 14:38:37 2006
+@@ -2,6 +2,7 @@
+ /* The cut-paste module for splitvt */
+
+ #include <stdio.h>
++#include <string.h>
+ #include "vt100.h"
+ #include "video.h"
+
diff --git a/misc/splitvt/files/patch-misc.c b/misc/splitvt/files/patch-misc.c
index 9a69b1c49c60..b7ca9933c968 100644
--- a/misc/splitvt/files/patch-misc.c
+++ b/misc/splitvt/files/patch-misc.c
@@ -1,10 +1,11 @@
---- misc.c.orig Sat Jan 13 13:48:13 2001
-+++ misc.c Wed Jun 18 04:44:02 2003
-@@ -5,6 +5,7 @@
+--- misc.c.orig Wed Dec 15 10:28:45 2004
++++ misc.c Sat Oct 7 14:34:28 2006
+@@ -5,6 +5,8 @@
#include <fcntl.h>
#include <stdio.h>
#include <signal.h>
+#include <stdlib.h>
++#include <string.h>
#ifdef HAVE_TERMIO_H
diff --git a/misc/splitvt/files/patch-splitvt.c b/misc/splitvt/files/patch-splitvt.c
index 6a91f7f7a061..58b09e81d004 100644
--- a/misc/splitvt/files/patch-splitvt.c
+++ b/misc/splitvt/files/patch-splitvt.c
@@ -1,10 +1,11 @@
---- splitvt.c.orig Sat Jan 13 14:00:22 2001
-+++ splitvt.c Wed Jun 18 04:44:39 2003
-@@ -21,6 +21,7 @@
+--- splitvt.c.orig Sat Jan 13 23:00:22 2001
++++ splitvt.c Sat Oct 7 14:33:17 2006
+@@ -21,6 +21,8 @@
#include <stdio.h>
#include <errno.h>
#include <pwd.h>
+#include <stdlib.h>
++#include <string.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
diff --git a/misc/splitvt/files/patch-terminal.c b/misc/splitvt/files/patch-terminal.c
new file mode 100644
index 000000000000..c1f7bac01537
--- /dev/null
+++ b/misc/splitvt/files/patch-terminal.c
@@ -0,0 +1,10 @@
+--- terminal.c.orig Sat Oct 7 14:37:05 2006
++++ terminal.c Sat Oct 7 14:37:17 2006
+@@ -6,6 +6,7 @@
+
+
+ #include <stdio.h>
++#include <string.h>
+ #include "video.h"
+ #include "terminal.h"
+
diff --git a/misc/splitvt/files/patch-utmp.c b/misc/splitvt/files/patch-utmp.c
index 1c94db51ad7c..bcd1e0ff6cd8 100644
--- a/misc/splitvt/files/patch-utmp.c
+++ b/misc/splitvt/files/patch-utmp.c
@@ -1,10 +1,11 @@
---- utmp.c.orig Sat Jan 13 13:48:13 2001
-+++ utmp.c Wed Jun 18 04:45:38 2003
-@@ -6,13 +6,14 @@
+--- utmp.c.orig Sat Jan 13 22:48:13 2001
++++ utmp.c Sat Oct 7 14:35:08 2006
+@@ -6,13 +6,15 @@
#include <fcntl.h>
#include <utmp.h>
#include <stdio.h>
+#include <unistd.h>
++#include <string.h>
#ifdef DEBUG_UTMP
#undef UTMP_FILE
diff --git a/misc/splitvt/files/patch-vt100.c b/misc/splitvt/files/patch-vt100.c
index aa28037afe5e..2dae0b97fd6f 100644
--- a/misc/splitvt/files/patch-vt100.c
+++ b/misc/splitvt/files/patch-vt100.c
@@ -1,10 +1,11 @@
---- vt100.c.orig Sat Jun 3 14:31:05 2000
-+++ vt100.c Wed Jun 18 04:44:21 2003
-@@ -17,6 +17,7 @@
+--- vt100.c.orig Sat Jun 3 23:31:05 2000
++++ vt100.c Sat Oct 7 14:35:57 2006
+@@ -17,6 +17,8 @@
#include <errno.h>
#include <stdio.h>
#include <ctype.h>
+#include <stdlib.h>
++#include <string.h>
#include "vt100.h"
#include "video.h"
#include "terminal.h"
diff --git a/misc/splitvt/files/patch-vtmouse.c b/misc/splitvt/files/patch-vtmouse.c
index d505e801c101..b7cbee59722d 100644
--- a/misc/splitvt/files/patch-vtmouse.c
+++ b/misc/splitvt/files/patch-vtmouse.c
@@ -1,10 +1,11 @@
---- vtmouse.c.orig Sat Jun 3 14:05:57 2000
-+++ vtmouse.c Wed Jun 18 04:46:02 2003
-@@ -8,6 +8,7 @@
+--- vtmouse.c.orig Sat Jun 3 23:05:57 2000
++++ vtmouse.c Sat Oct 7 14:37:42 2006
+@@ -8,6 +8,8 @@
#define SPLITVT_SOURCE
#include <stdio.h>
+#include <stdlib.h>
++#include <string.h>
#include "vtmouse.h"
extern FILE *safe_popen(); /* From misc.c */
diff --git a/misc/splitvt/files/patch-vtmouse.h b/misc/splitvt/files/patch-vtmouse.h
new file mode 100644
index 000000000000..a2484f2bce58
--- /dev/null
+++ b/misc/splitvt/files/patch-vtmouse.h
@@ -0,0 +1,9 @@
+--- vtmouse.h.orig Sat Oct 7 02:22:11 2006
++++ vtmouse.h Sat Oct 7 02:22:36 2006
+@@ -39,5 +39,5 @@
+ extern int event_getc();
+ extern void event_quit();
+
+-extern FILE *xt_input, *xt_output; /* Usually untouched */
++static FILE *xt_input, *xt_output; /* Usually untouched */
+
diff --git a/misc/splitvt/files/patch-vttest.c b/misc/splitvt/files/patch-vttest.c
new file mode 100644
index 000000000000..fa228a90cb5e
--- /dev/null
+++ b/misc/splitvt/files/patch-vttest.c
@@ -0,0 +1,17 @@
+--- vttest.c.orig Sat Oct 7 15:38:17 2006
++++ vttest.c Sat Oct 7 15:40:43 2006
+@@ -87,9 +87,13 @@
+ setjmp(alarm_buf);
+ #endif
+ while ( !alarmed && (x < 20) ) {
+- if ( read(fd, &buff[x++], 1) <= 0 )
++ // Workaround for gcc41. Without it, splitvt fails with
++ // "Can't initialize screen: Terminal type must be set to vt100".
++ if ( read(fd, &buff[x], 1) <= 0 )
+ break;
++ x++;
+ }
++ x++;
+ buff[x]='\0'; /* For printing, if we desire. */
+ if ( buff[0] == '\033' ) /* An escape sequence? :) */
+ rc=1;