OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 04-Aug-2003 13:32:37
Branch: HEAD Handle: 2003080412323501
Modified files:
openpkg-src/ddd ddd.patch ddd.spec
openpkg-web news.txt
Log:
Patch to try to repair ddd runtime, and remove initial unavailable
resources warnings from FreeBSD build
Summary:
Revision Changes Path
1.8 +139 -41 openpkg-src/ddd/ddd.patch
1.17 +1 -1 openpkg-src/ddd/ddd.spec
1.6022 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ddd/ddd.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 ddd.patch
--- openpkg-src/ddd/ddd.patch 1 Aug 2003 15:15:19 -0000 1.7
+++ openpkg-src/ddd/ddd.patch 4 Aug 2003 11:32:36 -0000 1.8
@@ -1,6 +1,75 @@
+diff -Naur ddd-3.3.7.orig/ddd/Ddd.in ddd-3.3.7/ddd/Ddd.in
+--- ddd-3.3.7.orig/ddd/Ddd.in Sat May 24 21:00:35 2003
++++ ddd-3.3.7/ddd/Ddd.in Mon Aug 4 12:46:23 2003
+@@ -649,9 +649,6 @@
+ ! The Perl Debugger settings. Usually overridden in `~/[EMAIL PROTECTED]@/init'.
+ @[EMAIL PROTECTED]:
+
[EMAIL PROTECTED]@*bashInitCommands: \
+- set prompt bashdb$_Dbg_less$_Dbg_greater$_Dbg_space\n\
+-
+ ! The Bash Debugger settings. Usually overridden in `~/[EMAIL PROTECTED]@/init'.
+ @[EMAIL PROTECTED]:
+
+diff -Naur ddd-3.3.7.orig/ddd/DispBox.C ddd-3.3.7/ddd/DispBox.C
+--- ddd-3.3.7.orig/ddd/DispBox.C Sat May 24 17:27:02 2003
++++ ddd-3.3.7/ddd/DispBox.C Mon Aug 4 12:46:23 2003
+@@ -59,7 +59,9 @@
+ #include "regexps.h"
+ #include "resolveP.h"
+
+-#include <ctype.h>
++#include <iostream>
++#include <strstream>
++#include <cctype>
+
+ #define assert_ok(x) assert(x)
+
+@@ -152,7 +154,7 @@
+ "#line 1 \"" Ddd_NAME "*vslDefs\"\n" +
+ vsllib_defs;
+
+- istrstream is(defs.chars());
++ std::istrstream is(defs.chars());
+ vsllib_ptr = new ThemedVSLLib(is, VSEFlags::optimize_mode());
+ #else
+ name = "vsllib/" ddd_NAME ".vsl";
+diff -Naur ddd-3.3.7.orig/ddd/LiterateA.C ddd-3.3.7/ddd/LiterateA.C
+--- ddd-3.3.7.orig/ddd/LiterateA.C Sat May 24 17:27:03 2003
++++ ddd-3.3.7/ddd/LiterateA.C Mon Aug 4 12:53:16 2003
+@@ -220,8 +220,12 @@
+ int flags = fcntl(fileno(fp), F_GETFL, 0);
+ if (flags == -1)
+ _raiseIOWarning("cannot get file descriptor status flags");
+- if (fcntl(fileno(fp), F_SETFL, flags | O_NONBLOCK) == -1)
+- _raiseIOWarning("cannot set file to non-blocking mode");
++ if (fcntl(fileno(fp), F_SETFL, flags | O_NONBLOCK) == -1) {
++#if defined(__FreeBSD__)
++ if(errno != EAGAIN)
++#endif
++ _raiseIOWarning("cannot set file to non-blocking mode");
++ }
+ #endif
+
+ // Read stuff
+@@ -255,8 +259,12 @@
+
+ #if HAVE_FCNTL && defined(F_SETFL)
+ // Reset file state
+- if (fcntl(fileno(fp), F_SETFL, flags) == -1)
+- _raiseIOWarning("cannot restore file mode");
++ if (fcntl(fileno(fp), F_SETFL, flags) == -1) {
++#if defined(__FreeBSD__)
++ if(errno != EAGAIN)
++#endif
++ _raiseIOWarning("cannot restore file mode");
++ }
+ #endif
+
+ return nitems;
diff -Naur ddd-3.3.7.orig/ddd/PannedGE.C ddd-3.3.7/ddd/PannedGE.C
--- ddd-3.3.7.orig/ddd/PannedGE.C Sat May 24 17:27:04 2003
-+++ ddd-3.3.7/ddd/PannedGE.C Fri Aug 1 12:09:16 2003
++++ ddd-3.3.7/ddd/PannedGE.C Mon Aug 4 12:46:23 2003
@@ -395,9 +395,9 @@
static bool warned = false;
if (!warned)
@@ -13,9 +82,32 @@
warned = true;
}
+diff -Naur ddd-3.3.7.orig/ddd/TTYAgent.C ddd-3.3.7/ddd/TTYAgent.C
+--- ddd-3.3.7.orig/ddd/TTYAgent.C Sat May 24 17:27:05 2003
++++ ddd-3.3.7/ddd/TTYAgent.C Mon Aug 4 12:55:45 2003
+@@ -719,8 +719,19 @@
+ }
+ else
+ {
++#if !defined(__FreeBSD__)
+ if (fcntl(master, F_SETFL, flags | O_NONBLOCK) == -1)
+ _raiseIOWarning("cannot set file to non-blocking mode");
++#else
++ do {
++ if (fcntl(master, F_SETFL, flags | O_NONBLOCK) != -1)
++ break;
++ else if(errno == EAGAIN)
++ sleep(1);
++ else
++ _raiseIOWarning("cannot set file to non-blocking mode");
++ } while(errno == EAGAIN);
++#endif
+ }
+ #endif
+
diff -Naur ddd-3.3.7.orig/ddd/ddd.C ddd-3.3.7/ddd/ddd.C
---- ddd-3.3.7.orig/ddd/ddd.C 2003-05-24 17:27:06.000000000 +0200
-+++ ddd-3.3.7/ddd/ddd.C 2003-08-01 07:59:08.677245000 +0200
+--- ddd-3.3.7.orig/ddd/ddd.C Sat May 24 17:27:06 2003
++++ ddd-3.3.7/ddd/ddd.C Mon Aug 4 12:46:23 2003
@@ -883,7 +883,7 @@
//-----------------------------------------------------------------------------
@@ -25,9 +117,51 @@
};
#define RECENT_MENU \
+diff -Naur ddd-3.3.7.orig/libiberty/strerror.c ddd-3.3.7/libiberty/strerror.c
+--- ddd-3.3.7.orig/libiberty/strerror.c Mon Mar 3 01:48:43 2003
++++ ddd-3.3.7/libiberty/strerror.c Mon Aug 4 12:48:53 2003
+@@ -455,6 +455,7 @@
+ same name, it differs from other implementations in that it is dynamically
+ initialized rather than statically initialized. */
+
++#ifndef __FreeBSD__
+ #ifndef HAVE_SYS_ERRLIST
+
+ static int sys_nerr;
+@@ -465,7 +466,8 @@
+ extern int sys_nerr;
+ extern char *sys_errlist[];
+
+-#endif
++#endif /* #ifndef HAVE_SYS_ERRLIST */
++#endif /* #ifndef __FreeBSD__ */
+
+
+ /*
+diff -Naur ddd-3.3.7.orig/libiberty/strsignal.c ddd-3.3.7/libiberty/strsignal.c
+--- ddd-3.3.7.orig/libiberty/strsignal.c Mon Mar 3 01:48:44 2003
++++ ddd-3.3.7/libiberty/strsignal.c Mon Aug 4 12:49:38 2003
+@@ -236,6 +236,7 @@
+ same name, it differs from other implementations in that it is dynamically
+ initialized rather than statically initialized. */
+
++#ifndef __FreeBSD__
+ #ifndef HAVE_SYS_SIGLIST
+
+ static int sys_nsig;
+@@ -252,7 +253,8 @@
+ #endif
+ extern const char * const sys_siglist[];
+
+-#endif
++#endif /* #ifndef HAVE_SYS_ERRLIST */
++#endif /* #ifndef __FreeBSD__ */
+
+
+ /*
diff -Naur ddd-3.3.7.orig/termcap/termcap.h ddd-3.3.7/termcap/termcap.h
---- ddd-3.3.7.orig/termcap/termcap.h 2003-03-03 01:49:15.000000000 +0100
-+++ ddd-3.3.7/termcap/termcap.h 2003-08-01 08:10:11.616917000 +0200
+--- ddd-3.3.7.orig/termcap/termcap.h Mon Mar 3 01:49:15 2003
++++ ddd-3.3.7/termcap/termcap.h Mon Aug 4 12:46:23 2003
@@ -26,7 +26,6 @@
extern int tgetflag (const char *name);
extern char *tgetstr (const char *name, char **area);
@@ -35,40 +169,4 @@
-extern char PC;
extern short ospeed;
extern void tputs (const char *string, int nlines, int (*outfun) ());
-
-diff -Naur ddd-3.3.7.orig/ddd/DispBox.C ddd-3.3.7/ddd/DispBox.C
---- ddd-3.3.7.orig/ddd/DispBox.C Sat May 24 17:27:02 2003
-+++ ddd-3.3.7/ddd/DispBox.C Fri Aug 1 15:49:30 2003
-@@ -59,7 +59,9 @@
- #include "regexps.h"
- #include "resolveP.h"
-
--#include <ctype.h>
-+#include <iostream>
-+#include <strstream>
-+#include <cctype>
-
- #define assert_ok(x) assert(x)
-
-@@ -152,7 +154,7 @@
- "#line 1 \"" Ddd_NAME "*vslDefs\"\n" +
- vsllib_defs;
-
-- istrstream is(defs.chars());
-+ std::istrstream is(defs.chars());
- vsllib_ptr = new ThemedVSLLib(is, VSEFlags::optimize_mode());
- #else
- name = "vsllib/" ddd_NAME ".vsl";
-diff -Naur ddd-3.3.7.orig/ddd/Ddd.in ddd-3.3.7/ddd/Ddd.in
---- ddd-3.3.7.orig/ddd/Ddd.in Sat May 24 21:00:35 2003
-+++ ddd-3.3.7/ddd/Ddd.in Fri Aug 1 15:43:54 2003
-@@ -649,9 +649,6 @@
- ! The Perl Debugger settings. Usually overridden in `~/[EMAIL PROTECTED]@/init'.
- @[EMAIL PROTECTED]:
-
[EMAIL PROTECTED]@*bashInitCommands: \
-- set prompt bashdb$_Dbg_less$_Dbg_greater$_Dbg_space\n\
--
- ! The Bash Debugger settings. Usually overridden in `~/[EMAIL PROTECTED]@/init'.
- @[EMAIL PROTECTED]:
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ddd/ddd.spec
============================================================================
$ cvs diff -u -r1.16 -r1.17 ddd.spec
--- openpkg-src/ddd/ddd.spec 1 Aug 2003 15:15:19 -0000 1.16
+++ openpkg-src/ddd/ddd.spec 4 Aug 2003 11:32:36 -0000 1.17
@@ -33,7 +33,7 @@
Group: Development
License: GPL
Version: 3.3.7
-Release: 20030801
+Release: 20030804
# list of sources
Source0: ftp://ftp.gnu.org/gnu/ddd/ddd-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6021 -r1.6022 news.txt
--- openpkg-web/news.txt 4 Aug 2003 11:16:40 -0000 1.6021
+++ openpkg-web/news.txt 4 Aug 2003 11:32:35 -0000 1.6022
@@ -1,3 +1,4 @@
+04-Aug-2003: Upgraded package: P<ddd-3.3.7-20030804>
04-Aug-2003: Upgraded package: P<pgadmin-0.8.0.20030804-20030804>
04-Aug-2003: Upgraded package: P<vim-6.2.58-20030804>
04-Aug-2003: Upgraded package: P<pv-0.6.0-20030804>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
