OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 09-Jan-2004 21:57:51
Branch: HEAD Handle: 2004010920574901
Added files:
openpkg-src/ddd ddd.patch
Modified files:
openpkg-src/ddd ddd.spec
openpkg-web news.txt
Log:
resurrect important and accidentally removed parts of old patch to get
rid of TTY warnings under FreeBSD again.
Summary:
Revision Changes Path
1.11 +131 -0 openpkg-src/ddd/ddd.patch
1.22 +3 -7 openpkg-src/ddd/ddd.spec
1.8040 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ddd/ddd.patch
============================================================================
$ cvs diff -u -r0 -r1.11 ddd.patch
--- /dev/null 2004-01-09 21:57:51.000000000 +0100
+++ ddd.patch 2004-01-09 21:57:51.000000000 +0100
@@ -0,0 +1,131 @@
+Index: ddd/LiterateA.C
+--- ddd/LiterateA.C.orig 2003-05-24 17:27:03.000000000 +0200
++++ ddd/LiterateA.C 2004-01-09 21:33:33.000000000 +0100
+@@ -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;
+Index: ddd/TTYAgent.C
+--- ddd/TTYAgent.C.orig 2003-05-24 17:27:05.000000000 +0200
++++ ddd/TTYAgent.C 2004-01-09 21:33:33.000000000 +0100
+@@ -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
+
+Index: ddd/ddd.C
+--- ddd/ddd.C.orig 2003-10-07 13:58:23.000000000 +0200
++++ ddd/ddd.C 2004-01-09 21:33:02.000000000 +0100
+@@ -883,7 +883,7 @@
+ //-----------------------------------------------------------------------------
+
+ struct RecentItems {
+- enum RecentItem { R1, R2, R3, R4, R5, R6, R7, R8, R9 };
++ enum RecentItem { Re1, R2, R3, R4, R5, R6, R7, R8, R9 };
+ };
+
+ #define RECENT_MENU \
+Index: libiberty/strerror.c
+--- libiberty/strerror.c.orig 2003-10-22 20:46:55.000000000 +0200
++++ libiberty/strerror.c 2004-01-09 21:33:33.000000000 +0100
+@@ -460,6 +460,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;
+@@ -470,7 +471,8 @@
+ extern int sys_nerr;
+ extern char *sys_errlist[];
+
+-#endif
++#endif /* #ifndef HAVE_SYS_ERRLIST */
++#endif /* #ifndef __FreeBSD__ */
+
+
+ /*
+Index: libiberty/strsignal.c
+--- libiberty/strsignal.c.orig 2003-10-22 20:46:55.000000000 +0200
++++ libiberty/strsignal.c 2004-01-09 21:33:33.000000000 +0100
+@@ -241,6 +241,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;
+@@ -257,7 +258,8 @@
+ #endif
+ extern const char * const sys_siglist[];
+
+-#endif
++#endif /* #ifndef HAVE_SYS_ERRLIST */
++#endif /* #ifndef __FreeBSD__ */
+
+
+ /*
+Index: termcap/termcap.h
+--- termcap/termcap.h.orig 1995-05-17 20:47:28.000000000 +0200
++++ termcap/termcap.h 2004-01-09 21:33:17.000000000 +0100
+@@ -26,7 +26,7 @@
+ extern int tgetflag (const char *name);
+ extern char *tgetstr (const char *name, char **area);
+
+-extern char PC;
++/*extern char PC;*/
+ extern short ospeed;
+ extern void tputs (const char *string, int nlines, int (*outfun) ());
+
+@@ -45,7 +45,7 @@
+ extern int tgetflag ();
+ extern char *tgetstr ();
+
+-extern char PC;
++/*extern char PC;*/
+ extern short ospeed;
+
+ extern void tputs ();
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ddd/ddd.spec
============================================================================
$ cvs diff -u -r1.21 -r1.22 ddd.spec
--- openpkg-src/ddd/ddd.spec 14 Nov 2003 08:38:31 -0000 1.21
+++ openpkg-src/ddd/ddd.spec 9 Jan 2004 20:57:50 -0000 1.22
@@ -33,10 +33,11 @@
Group: Development
License: GPL
Version: 3.3.8
-Release: 20031114
+Release: 20040109
# list of sources
Source0: ftp://ftp.gnu.org/gnu/ddd/ddd-%{version}.tar.gz
+Patch0: ddd.patch
# build information
Prefix: %{l_prefix}
@@ -55,12 +56,7 @@
%prep
%setup -q
- %{l_shtool} subst \
- -e 's; R\([0-9][, ]\); Re\1;' \
- ddd/ddd.C
- %{l_shtool} subst \
- -e 's;extern char PC\;;/*extern char PC\;*/;g' \
- termcap/termcap.h
+ %patch -p0
%build
%{l_shtool} subst \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.8039 -r1.8040 news.txt
--- openpkg-web/news.txt 9 Jan 2004 19:59:36 -0000 1.8039
+++ openpkg-web/news.txt 9 Jan 2004 20:57:49 -0000 1.8040
@@ -1,3 +1,4 @@
+09-Jan-2004: Upgraded package: P<ddd-3.3.8-20040109>
09-Jan-2004: Upgraded package: P<mplayer-1.0pre3-20040109>
09-Jan-2004: Upgraded package: P<orbit2-2.9.3-20040109>
09-Jan-2004: Upgraded package: P<vim-6.2.178-20040109>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
