sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

devel/xxgdb: Expand patches to support malloc.h-less DF

Browse source 
While here, regenerate all the patches.
This commit is contained in:
John Marino 2015-11-13 09:02:16 +00:00
parent bbe2ea9e1d
commit 20c13c3a06
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=401490
11 changed files with 53 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
devel/xxgdb/files/patch-Imakefile
View file

@ -1,6 +1,6 @@
--- Imakefile.orig 1995-06-19 15:20:55.000000000 -0700 --- Imakefile.orig 1995-06-19 22:20:55 UTC
+++ Imakefile 2014-03-25 21:44:23.829815727 -0700 +++ Imakefile
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@ DEFGDB =
#endif #endif
#CC = gcc #CC = gcc
@ -8,7 +8,7 @@
#if mc68000 /* for SUN 3 */ #if mc68000 /* for SUN 3 */
CCOPTIONS=-m68881 CCOPTIONS=-m68881
@@ -79,11 +80,15 @@ @@ -79,11 +80,15 @@ DEFINES = -DOLDSUNOS $(DEFGDB) -DNEXTOS_
# Add to open all windows at startup # Add to open all windows at startup
#DEFINES+=-DOPEN_ALL_WINDOWS #DEFINES+=-DOPEN_ALL_WINDOWS

24
devel/xxgdb/files/patch-calldbx.c
View file

@ -1,5 +1,5 @@
--- calldbx.c.orig 1995-06-19 15:11:00.000000000 -0700 --- calldbx.c.orig 1995-06-19 22:11:00 UTC
+++ calldbx.c 2014-03-26 12:20:00.741924675 -0700 +++ calldbx.c
@@ -74,8 +74,16 @@ @@ -74,8 +74,16 @@
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
@ -19,7 +19,7 @@
#else #else
#include <sgtty.h> #include <sgtty.h>
#endif #endif
@@ -116,6 +124,7 @@ @@ -116,6 +124,7 @@ extern char *dbxprompt;
char iowintty[] = "/dev/ttyp0"; char iowintty[] = "/dev/ttyp0";
int iowinpid = 0; int iowinpid = 0;
#endif /* CREATE_IO_WINDOW */ #endif /* CREATE_IO_WINDOW */
@ -27,7 +27,7 @@
/* /*
* Xdbx talks to dbx through a pseudo terminal which is a pair of master * Xdbx talks to dbx through a pseudo terminal which is a pair of master
* and slave devices: /dev/pty?? and /dev/tty??, where ?? goes from p0 to * and slave devices: /dev/pty?? and /dev/tty??, where ?? goes from p0 to
@@ -137,13 +146,17 @@ @@ -137,13 +146,17 @@ static int open_master()
#ifndef sco #ifndef sco
for (c='p'; c<'t'; c++) { for (c='p'; c<'t'; c++) {
@ -46,7 +46,7 @@
if ((master = open(pty, O_RDWR)) >= 0) if ((master = open(pty, O_RDWR)) >= 0)
return (master); return (master);
} }
@@ -194,6 +207,7 @@ @@ -194,6 +207,7 @@ static int open_slave(master)
return slave; return slave;
#endif /* SVR4 */ #endif /* SVR4 */
} }
@ -54,7 +54,7 @@
#ifdef CREATE_IO_WINDOW #ifdef CREATE_IO_WINDOW
/* use a separate io window to talk to gdb, so program output is not confused with gdb output. */ /* use a separate io window to talk to gdb, so program output is not confused with gdb output. */
@@ -246,8 +260,8 @@ @@ -246,8 +260,8 @@ char *argv[];
/* /*
* (JBL)10MAY91 : use sgttyb if generic BSD * (JBL)10MAY91 : use sgttyb if generic BSD
*/ */
@ -65,7 +65,7 @@
#else #else
struct sgttyb Termio; struct sgttyb Termio;
#endif #endif
@@ -261,8 +275,10 @@ @@ -261,8 +275,10 @@ char *argv[];
#ifdef GDB /* for GDB, we use XXGDB_DEBUGGER instead */ #ifdef GDB /* for GDB, we use XXGDB_DEBUGGER instead */
debugger = (char *) getenv("XXGDB_DEBUGGER"); /* first looks up env var */ debugger = (char *) getenv("XXGDB_DEBUGGER"); /* first looks up env var */
@ -76,7 +76,7 @@
#endif #endif
/* CRL mod 4 3/15/91 GWC if no env var then try app res for db_name */ /* CRL mod 4 3/15/91 GWC if no env var then try app res for db_name */
@@ -275,7 +291,8 @@ @@ -275,7 +291,8 @@ char *argv[];
debugger = XtNewString(DEBUGGER); debugger = XtNewString(DEBUGGER);
/* CRL mod 4 3/15/91 GWC - allow the user to specify a db_prompt */ /* CRL mod 4 3/15/91 GWC - allow the user to specify a db_prompt */
@ -86,7 +86,7 @@
strcmp(app_resources.db_prompt, "") != 0) strcmp(app_resources.db_prompt, "") != 0)
dbxprompt = XtNewString(app_resources.db_prompt); dbxprompt = XtNewString(app_resources.db_prompt);
@@ -288,7 +305,15 @@ @@ -288,7 +305,15 @@ char *argv[];
if (debug) if (debug)
fprintf(stderr,"debugger=\"%s\"\nprompt=\"%s\"\n",debugger,dbxprompt); fprintf(stderr,"debugger=\"%s\"\nprompt=\"%s\"\n",debugger,dbxprompt);
@ -102,7 +102,7 @@
dbxpid = fork(); dbxpid = fork();
if (dbxpid == -1) { if (dbxpid == -1) {
@@ -305,6 +330,7 @@ @@ -305,6 +330,7 @@ char *argv[];
* set line buffered mode * set line buffered mode
* register dbx input with X * register dbx input with X
*/ */
@ -110,7 +110,7 @@
close(0); close(0);
close(1); close(1);
@@ -345,7 +371,9 @@ @@ -345,7 +371,9 @@ char *argv[];
} }
#endif #endif
@ -120,7 +120,7 @@
close(master); close(master);
/* /*
@@ -355,11 +383,11 @@ @@ -355,11 +383,11 @@ char *argv[];
/* /*
* (JBL)10MAY91 : use sgttyb if OLDSUN or generic BSD * (JBL)10MAY91 : use sgttyb if OLDSUN or generic BSD
*/ */

8
devel/xxgdb/files/patch-command.c
View file

@ -1,6 +1,6 @@
--- command.c.orig Fri Sep 6 22:46:19 2002 --- command.c.orig 1994-11-23 00:27:05 UTC
+++ command.c Fri Sep 6 22:49:30 2002 +++ command.c
@@ -383,7 +383,7 @@ @@ -383,7 +383,7 @@ void Quit(w, client_data, call_data)
XtPointer client_data; XtPointer client_data;
XtPointer call_data; XtPointer call_data;
{ {
@ -9,7 +9,7 @@
int status; int status;
#else #else
union wait status; union wait status;
@@ -392,7 +392,7 @@ @@ -392,7 +392,7 @@ void Quit(w, client_data, call_data)
write_dbx("quit\n"); write_dbx("quit\n");
XtDestroyApplicationContext(app_context); XtDestroyApplicationContext(app_context);
kill(dbxpid, SIGKILL); kill(dbxpid, SIGKILL);

15
devel/xxgdb/files/patch-dialog.c
View file

@ -1,7 +1,6 @@
diff -urNad dialog.c dialog.c --- dialog.c.orig 1995-06-19 22:15:13 UTC
--- dialog.c 1995-06-20 00:15:13.000000000 +0200 +++ dialog.c
+++ dialog.c 2008-05-16 17:31:45.000000000 +0200 @@ -130,8 +130,8 @@ void DeleteWord(w, event, params, num_pa
@@ -130,8 +130,8 @@
Cardinal i; Cardinal i;
textblock.firstPos = 0; textblock.firstPos = 0;
@ -12,7 +11,7 @@ diff -urNad dialog.c dialog.c
pos = XawTextGetInsertionPoint(w); pos = XawTextGetInsertionPoint(w);
if (pos <= StartPos) if (pos <= StartPos)
@@ -142,6 +142,30 @@ @@ -142,6 +142,30 @@ void DeleteWord(w, event, params, num_pa
XawTextSetInsertionPoint(w, i); XawTextSetInsertionPoint(w, i);
} }
@ -43,7 +42,7 @@ diff -urNad dialog.c dialog.c
/* Deletes the entire current input line. /* Deletes the entire current input line.
* simulates the action of the KILL character (ctrl-U). * simulates the action of the KILL character (ctrl-U).
@@ -159,8 +183,8 @@ @@ -159,8 +183,8 @@ void DeleteLine(w, event, params, num_pa
char *s; char *s;
textblock.firstPos = 0; textblock.firstPos = 0;
@ -54,7 +53,7 @@ diff -urNad dialog.c dialog.c
pos = XawTextGetInsertionPoint(w); pos = XawTextGetInsertionPoint(w);
if (w == dialogWindow) { if (w == dialogWindow) {
@@ -307,6 +331,7 @@ @@ -307,6 +331,7 @@ Widget parent;
{"SigQuit", (XtActionProc) SigQuit}, {"SigQuit", (XtActionProc) SigQuit},
{"InsertSpace", (XtActionProc) InsertSpace}, {"InsertSpace", (XtActionProc) InsertSpace},
{"Dispatch", (XtActionProc) Dispatch}, {"Dispatch", (XtActionProc) Dispatch},
@ -62,7 +61,7 @@ diff -urNad dialog.c dialog.c
{NULL, NULL} {NULL, NULL}
}; };
@@ -316,10 +341,10 @@ @@ -316,10 +341,10 @@ Widget parent;
Ctrl<Key>|: SigQuit()\n\ Ctrl<Key>|: SigQuit()\n\
Ctrl<Key>W: DeleteWord()\n\ Ctrl<Key>W: DeleteWord()\n\
Ctrl<Key>U: DeleteLine()\n\ Ctrl<Key>U: DeleteLine()\n\

14
devel/xxgdb/files/patch-filemenu.c
View file

@ -1,5 +1,5 @@
--- filemenu.c.orig Tue Aug 30 04:38:28 1994 --- filemenu.c.orig 1994-08-29 19:38:28 UTC
+++ filemenu.c Fri Nov 17 22:05:05 2000 +++ filemenu.c
@@ -95,7 +95,7 @@ @@ -95,7 +95,7 @@
#endif #endif
#endif /* _POSIX_SOURCE */ #endif /* _POSIX_SOURCE */
@ -9,7 +9,7 @@
#include <dirent.h> #include <dirent.h>
#else #else
#include <sys/dir.h> #include <sys/dir.h>
@@ -185,7 +185,7 @@ @@ -185,7 +185,7 @@ char *dir;
* text files * text files
* executable files * executable files
*/ */
@ -18,7 +18,7 @@
static int InList(entry) static int InList(entry)
Directory *entry; Directory *entry;
{ {
@@ -228,7 +228,7 @@ @@ -228,7 +228,7 @@ Directory *entry;
static void ScanDir(dir) static void ScanDir(dir)
char *dir; char *dir;
{ {
@ -27,7 +27,7 @@
extern alphasort(); extern alphasort();
Directory **namelist; Directory **namelist;
#else #else
@@ -238,7 +238,7 @@ @@ -238,7 +238,7 @@ char *dir;
#endif #endif
register int i,j; register int i,j;
@ -36,7 +36,7 @@
if(!(WorkingDir = opendir(dir))) if(!(WorkingDir = opendir(dir)))
{ {
UpdateMessageWindow("scandir: cannot open %s", dir); UpdateMessageWindow("scandir: cannot open %s", dir);
@@ -262,7 +262,7 @@ @@ -262,7 +262,7 @@ char *dir;
filelist = (char **) XtMalloc((nfiles+1) * sizeof(char *)); filelist = (char **) XtMalloc((nfiles+1) * sizeof(char *));
i = 0; i = 0;
for (j=0; j<nfiles; j++) { for (j=0; j<nfiles; j++) {
@ -45,7 +45,7 @@
WorkingDirEntry = readdir(WorkingDir); WorkingDirEntry = readdir(WorkingDir);
if(!strcmp(WorkingDirEntry->d_name, ".")) if(!strcmp(WorkingDirEntry->d_name, "."))
strcpy(store, "./"); strcpy(store, "./");
@@ -305,7 +305,7 @@ @@ -305,7 +305,7 @@ char *dir;
} }
filelist[i++] = NULL; filelist[i++] = NULL;

4
devel/xxgdb/files/patch-global.h
View file

@ -1,5 +1,5 @@
--- global.h.orig Fri Apr 7 01:23:42 1995 --- global.h.orig 1995-04-06 16:23:42 UTC
+++ global.h Fri Nov 17 21:27:09 2000 +++ global.h
@@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@
#define alloca __builtin_alloca #define alloca __builtin_alloca
#endif #endif

10
devel/xxgdb/files/patch-regex.c
View file

@ -1,15 +1,15 @@
--- regex.c.orig Wed Apr 19 12:58:00 1995 --- regex.c.orig 1995-04-19 16:58:00 UTC
+++ regex.c Thu Jul 6 22:30:45 2006 +++ regex.c
@@ -114,7 +114,7 @@ @@ -114,7 +114,7 @@ what you give them. Help stamp out sof
* Date : July 27, 1990 * Date : July 27, 1990
*/ */
-#ifndef NeXT -#ifndef NeXT
+#if !defined(NeXT) && !defined(__FreeBSD__) +#if !defined(NeXT) && !defined(__FreeBSD__) && !defined(__DragonFly__)
#include <malloc.h> #include <malloc.h>
#endif #endif
#include <string.h> #include <string.h>
@@ -123,7 +123,7 @@ @@ -123,7 +123,7 @@ what you give them. Help stamp out sof
#include <assert.h> #include <assert.h>
#ifdef sparc #ifdef sparc

8
devel/xxgdb/files/patch-signals.c
View file

@ -1,6 +1,6 @@
--- signals.c.orig Fri Sep 6 22:52:25 2002 --- signals.c.orig 1995-04-06 16:25:04 UTC
+++ signals.c Fri Sep 6 22:52:56 2002 +++ signals.c
@@ -93,7 +93,7 @@ @@ -93,7 +93,7 @@ kill_handler(sig)
static void quit_handler(int sig) static void quit_handler(int sig)
{ {
int pid; int pid;
@ -9,7 +9,7 @@
int status; int status;
#else #else
union wait status; union wait status;
@@ -102,7 +102,7 @@ @@ -102,7 +102,7 @@ static void quit_handler(int sig)
/* wait for the child to report its status; if the child has died, /* wait for the child to report its status; if the child has died,
* exit gracefully. * exit gracefully.
*/ */

6
devel/xxgdb/files/patch-source.c
View file

@ -1,11 +1,11 @@
--- source.c.orig Sat Apr 22 01:16:02 1995 --- source.c.orig 1995-04-21 16:16:02 UTC
+++ source.c Fri Nov 17 21:38:58 2000 +++ source.c
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
* LoadFile(): Search for a file and open it for display. * LoadFile(): Search for a file and open it for display.
*/ */
-#ifndef NeXT -#ifndef NeXT
+#if !defined(NeXT) && !defined(__FreeBSD__) +#if !defined(NeXT) && !defined(__FreeBSD__) && !defined(__DragonFly__)
#include <malloc.h> #include <malloc.h>
#endif #endif
#include <stdlib.h> #include <stdlib.h>

4
devel/xxgdb/files/patch-xdbx.c
View file

@ -1,5 +1,5 @@
--- xdbx.c.orig 1995-04-20 19:37:31.000000000 -0700 --- xdbx.c.orig 1995-04-21 02:37:31 UTC
+++ xdbx.c 2014-03-25 20:54:19.951463142 -0700 +++ xdbx.c
@@ -74,11 +74,9 @@ @@ -74,11 +74,9 @@
#define XGDBVERSION "1.12" #define XGDBVERSION "1.12"
#endif #endif

6
devel/xxgdb/files/patch-xxgdb.man
View file

@ -1,6 +1,6 @@
--- xxgdb.man.orig 1994-12-02 17:40:19.000000000 -0800 --- xxgdb.man.orig 1994-12-03 01:40:19 UTC
+++ xxgdb.man 2014-03-26 12:27:51.559896216 -0700 +++ xxgdb.man
@@ -29,7 +29,8 @@ @@ -29,7 +29,8 @@ state of the program when the core dump
.LP .LP
The name of the debugger invoked by \fIxxgdb\fP is, by default, gdb, but The name of the debugger invoked by \fIxxgdb\fP is, by default, gdb, but
it can be overridden with the environment variable XXGDB_DEBUGGER or with it can be overridden with the environment variable XXGDB_DEBUGGER or with