cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

convert patch to unified diff

Browse Source
This commit is contained in:
brad 1999-10-30 22:14:50 +00:00
parent 80fad25d9b
commit e094078274
2 changed files with 80 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
mbone/wbd/patches/patch-aa
View File

@ -1,75 +1,54 @@
*** makefile.orig Thu Jan 29 06:46:41 1998
--- makefile Thu Jul 15 10:29:16 1999
***************
*** 3,14 ****
YFLAGS = -dv
CFLAGS = -g $(LIBFLAGS) $(IFLAGS) -DSTAND_ALONE
! LIBDIR = /cs/research/mice/starship/common/solaris/lib
! INCDIR = /cs/research/mice/starship/common/solaris/include
# The files needed from the tcl/tk library directories...
! LIBRARY_TK = $(LIBDIR)/tk4.2
! LIBRARY_TCL = $(LIBDIR)/tcl7.6
# Uncomment these lines for SGI (IRIX 5.3).
--- 3,14 ----
YFLAGS = -dv
CFLAGS = -g $(LIBFLAGS) $(IFLAGS) -DSTAND_ALONE
! LIBDIR = /usr/local/lib
! INCDIR = /usr/local/include/tcl8.0
# The files needed from the tcl/tk library directories...
! LIBRARY_TK = $(LIBDIR)/tk8.0
! LIBRARY_TCL = $(LIBDIR)/tcl8.0
# Uncomment these lines for SGI (IRIX 5.3).
***************
*** 32,47 ****
#LIBS = -ll -ltk4.2 -ltcl7.6 -lm -lX11
# Uncomment these lines for Sun (SunOS 5.5.1).
! CC = gcc -DFNDELAY=O_NDELAY -DBYTE_ORDER=4321 -ansi
! LIBFLAGS = -L$(LIBDIR) -L/usr/openwin/lib
! IFLAGS = -I$(INCDIR) -I/usr/openwin/include
! LIBS = -ll -ltk4.2 -ltcl7.6 -lm -lX11 -lsocket -lnsl -ldl
# Uncomment these lines for NetBSD 1.2.
! #CC = cc -ansi
! #LIBFLAGS = -L$(LIBDIR)
! #IFLAGS = -I$(INCDIR)
! #LIBS = -ll -ltk4.2 -ltcl7.6 -lm -lX11
# Tcl initialisation files to be compiled into a C string.
TCL_FILES = \
--- 32,47 ----
#LIBS = -ll -ltk4.2 -ltcl7.6 -lm -lX11
# Uncomment these lines for Sun (SunOS 5.5.1).
! #CC = gcc -DFNDELAY=O_NDELAY -DBYTE_ORDER=4321 -ansi
! #LIBFLAGS = -L$(LIBDIR) -L/usr/openwin/lib
! #IFLAGS = -I$(INCDIR) -I/usr/openwin/include
! #LIBS = -ll -ltk4.2 -ltcl7.6 -lm -lX11 -lsocket -lnsl -ldl
# Uncomment these lines for NetBSD 1.2.
! CC = cc -ansi
! LIBFLAGS = -L$(LIBDIR) -L/usr/X11R6/lib
! IFLAGS = -I$(INCDIR) -I/usr/local/include/tk8.0 -I/usr/X11R6/include
! LIBS = -ll -ltk80 -ltcl80 -lm -lX11
# Tcl initialisation files to be compiled into a C string.
TCL_FILES = \
***************
*** 73,78 ****
--- 73,80 ----
INC = wb.h db.h
SRC = main.c comms.c db.c wbd.tcl
OBJ = main.o comms.o db.o tcllibs.o
+
+ all: wbd
wbd : $(OBJ) $(INC)
$(CC) $(CFLAGS) $(OBJ) $(LIBS) -o wbd
--- makefile.orig Thu Jan 29 06:46:41 1998
+++ makefile Sat Oct 30 18:05:39 1999
@@ -2,13 +2,13 @@
LEX = flex -I -i
YFLAGS = -dv
-CFLAGS = -g $(LIBFLAGS) $(IFLAGS) -DSTAND_ALONE
-LIBDIR = /cs/research/mice/starship/common/solaris/lib
-INCDIR = /cs/research/mice/starship/common/solaris/include
+CFLAGS += $(LIBFLAGS) $(IFLAGS) -DSTAND_ALONE
+LIBDIR = ${LOCALBASE}/lib
+INCDIR = ${LOCALBASE}/include/tcl8.0
# The files needed from the tcl/tk library directories...
-LIBRARY_TK = $(LIBDIR)/tk4.2
-LIBRARY_TCL = $(LIBDIR)/tcl7.6
+LIBRARY_TK = $(LIBDIR)/tk8.0
+LIBRARY_TCL = $(LIBDIR)/tcl8.0
# Uncomment these lines for SGI (IRIX 5.3).
@@ -32,16 +32,16 @@
#LIBS = -ll -ltk4.2 -ltcl7.6 -lm -lX11
# Uncomment these lines for Sun (SunOS 5.5.1).
-CC = gcc -DFNDELAY=O_NDELAY -DBYTE_ORDER=4321 -ansi
-LIBFLAGS = -L$(LIBDIR) -L/usr/openwin/lib
-IFLAGS = -I$(INCDIR) -I/usr/openwin/include
-LIBS = -ll -ltk4.2 -ltcl7.6 -lm -lX11 -lsocket -lnsl -ldl
+#CC = gcc -DFNDELAY=O_NDELAY -DBYTE_ORDER=4321 -ansi
+#LIBFLAGS = -L$(LIBDIR) -L/usr/openwin/lib
+#IFLAGS = -I$(INCDIR) -I/usr/openwin/include
+#LIBS = -ll -ltk4.2 -ltcl7.6 -lm -lX11 -lsocket -lnsl -ldl
# Uncomment these lines for NetBSD 1.2.
#CC = cc -ansi
-#LIBFLAGS = -L$(LIBDIR)
-#IFLAGS = -I$(INCDIR)
-#LIBS = -ll -ltk4.2 -ltcl7.6 -lm -lX11
+LIBFLAGS = -L$(LIBDIR) -L${X11BASE}/lib
+IFLAGS = -I$(INCDIR) -I${LOCALBASE}/include/tk8.0 -I${X11BASE}/include
+LIBS = -ll -ltk80 -ltcl80 -lm -lX11
# Tcl initialisation files to be compiled into a C string.
TCL_FILES = \
@@ -73,6 +73,8 @@
INC = wb.h db.h
SRC = main.c comms.c db.c wbd.tcl
OBJ = main.o comms.o db.o tcllibs.o
+
+all: wbd
wbd : $(OBJ) $(INC)
$(CC) $(CFLAGS) $(OBJ) $(LIBS) -o wbd

68
mbone/wbd/patches/patch-ab
View File

@ -1,42 +1,26 @@
*** comms.c.orig Fri Sep 3 12:27:47 1999
--- comms.c Fri Sep 3 12:35:34 1999
***************
*** 1260,1266 ****
struct action *action = NULL;
struct pk_draw_msg *message = NULL;
char arg[LEN];
! char filename[L_tmpnam] = "";
FILE *tmpfile;
int i, result;
--- 1260,1266 ----
struct action *action = NULL;
struct pk_draw_msg *message = NULL;
char arg[LEN];
! char filename[L_tmpnam] = "wbd.XXXXXXXX";
FILE *tmpfile;
int i, result;
***************
*** 1287,1299 ****
}
/* Dump the PostScript to a temp file. */
! if (tmpnam (filename) == NULL)
! {
! printf ("Failed to create temp file.\n");
! return -1;
! }
! tmpfile = fopen (filename, "wb");
! if (tmpfile == NULL)
{
printf ("Failed to create temp file.\n");
return -1;
--- 1287,1293 ----
}
/* Dump the PostScript to a temp file. */
! if ((tmpfile = fdopen(mkstemp(filename), "wb")) == NULL)
{
printf ("Failed to create temp file.\n");
return -1;
--- comms.c.orig Tue Feb 16 10:24:20 1999
+++ comms.c Sat Oct 30 17:24:59 1999
@@ -1260,7 +1260,7 @@
struct action *action = NULL;
struct pk_draw_msg *message = NULL;
char arg[LEN];
- char filename[L_tmpnam] = "";
+ char filename[L_tmpnam] = "wbd.XXXXXXXX";
FILE *tmpfile;
int i, result;
@@ -1287,13 +1287,7 @@
}
/* Dump the PostScript to a temp file. */
- if (tmpnam (filename) == NULL)
- {
- printf ("Failed to create temp file.\n");
- return -1;
- }
- tmpfile = fopen (filename, "wb");
- if (tmpfile == NULL)
+ if ((tmpfile = fdopen(mkstemp(filename), "wb")) == NULL)
{
printf ("Failed to create temp file.\n");
return -1;