Date: Sun, 22 Sep 2002 11:16:45 -0700 (PDT) From: "Steven G. Kargl" <kargl@troutmask.apl.washington.edu> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/43258: Make emulators/dlx build on -current Message-ID: <200209221816.g8MIGjsC004343@troutmask.apl.washington.edu>
next in thread | raw e-mail | index | archive | help
>Number: 43258
>Category: ports
>Synopsis: Make emulators/dlx build on -current
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Sep 22 11:20:02 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Steven G. Kargl
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
APL/UW
>Environment:
System: FreeBSD troutmask.apl.washington.edu 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Wed Sep 4 12:10:46 PDT 2002 kargl@troutmask.apl.washington.edu:/usr/obj/usr/src/sys/TROUTMASK i386
>Description:
emulators/dlx does not build on FreeBSD-current.
>How-To-Repeat:
>Fix:
cd /usr/ports/emulators/dlx
patch -p1 < dlx.diff
find . -name \*.orig | xargs rm
rm files/patch-ab files/patch-bc files/patch-bd
diff -urN dlx/files/patch-ab dlx.sgk/files/patch-ab
--- dlx/files/patch-ab Tue Dec 29 20:27:21 1998
+++ dlx.sgk/files/patch-ab Wed Dec 31 16:00:00 1969
@@ -1,11 +0,0 @@
---- dlxsim/sim.c.orig Wed May 8 13:37:56 1991
-+++ dlxsim/sim.c Sat Dec 26 13:08:12 1998
-@@ -2833,7 +2833,7 @@
- static char *errstring()
- {
- extern int errno, sys_nerr;
-- extern char *sys_errlist[];
-+ /* extern char *sys_errlist[]; */
- static char msgbuf[64];
-
- if( !errno )
diff -urN dlx/files/patch-bc dlx.sgk/files/patch-bc
--- dlx/files/patch-bc Tue Dec 29 20:27:21 1998
+++ dlx.sgk/files/patch-bc Wed Dec 31 16:00:00 1969
@@ -1,32 +0,0 @@
---- gcc/gcc.c.orig Mon Aug 13 14:03:57 1990
-+++ gcc/gcc.c Sat Dec 26 12:59:35 1998
-@@ -1867,7 +1867,9 @@
- char *name;
- {
- extern int errno, sys_nerr;
-+ /*
- extern char *sys_errlist[];
-+ */
- char *s;
-
- if (errno < sys_nerr)
-@@ -1881,7 +1883,9 @@
- char *name;
- {
- extern int errno, sys_nerr;
-+ /*
- extern char *sys_errlist[];
-+ */
- char *s;
-
- if (errno < sys_nerr)
-@@ -1895,7 +1899,9 @@
- char *name;
- {
- extern int errno, sys_nerr;
-+ /*
- extern char *sys_errlist[];
-+ */
- char *s;
-
- if (errno < sys_nerr)
diff -urN dlx/files/patch-bd dlx.sgk/files/patch-bd
--- dlx/files/patch-bd Tue Dec 29 20:27:21 1998
+++ dlx.sgk/files/patch-bd Wed Dec 31 16:00:00 1969
@@ -1,22 +0,0 @@
---- gcc/cccp.c.orig Mon Aug 13 14:03:34 1990
-+++ gcc/cccp.c Sat Dec 26 13:05:53 1998
-@@ -4752,7 +4752,9 @@
- int i;
- FILE_BUF *ip = NULL;
- extern int errno, sys_nerr;
-+ /*
- extern char *sys_errlist[];
-+ */
-
- for (i = indepth; i >= 0; i--)
- if (instack[i].fname != NULL) {
-@@ -5389,7 +5391,9 @@
- char *name;
- {
- extern int errno, sys_nerr;
-+ /*
- extern char *sys_errlist[];
-+ */
-
- fprintf (stderr, "%s: ", progname);
- if (errno < sys_nerr)
diff -urN dlx/files/patch-cb dlx.sgk/files/patch-cb
--- dlx/files/patch-cb Wed Dec 31 16:00:00 1969
+++ dlx.sgk/files/patch-cb Sun Sep 22 10:30:51 2002
@@ -0,0 +1,22 @@
+--- dlxsim/tcl/glob.c.orig Sun Sep 22 09:40:54 2002
++++ dlxsim/tcl/glob.c Sun Sep 22 09:43:49 2002
+@@ -122,9 +122,8 @@
+ #define direct dirent
+ #define DP_NAMELEN(x) strlen ((x)->d_name)
+ #else
+-#include <sys/dir.h>
++#include <dirent.h>
+ #include <strings.h>
+-extern bcopy ();
+ #endif /* USG */
+ #endif /* USG_OLD */
+
+@@ -341,7 +340,7 @@
+ };
+
+ DIR *d;
+- register struct direct *dp;
++ register struct dirent *dp;
+ struct globval *lastlink;
+ register struct globval *nextlink;
+ register char *nextname;
diff -urN dlx/files/patch-cd dlx.sgk/files/patch-cd
--- dlx/files/patch-cd Wed Dec 31 16:00:00 1969
+++ dlx.sgk/files/patch-cd Sun Sep 22 10:30:51 2002
@@ -0,0 +1,29 @@
+--- dlxsim/tcl/tclCmdAH.c.orig Sun Sep 22 09:45:45 2002
++++ dlxsim/tcl/tclCmdAH.c Sun Sep 22 10:02:26 2002
+@@ -17,7 +17,7 @@
+
+ #ifndef lint
+ static char rcsid[] = "$Header: /sprite/src/lib/tcl/RCS/tclCmdAH.c,v 1.38 90/01/15 15:15:48 ouster Exp Locker: ouster $ SPRITE (Berkeley)";
+-#endif not lint
++#endif
+
+ #include <ctype.h>
+ #include <errno.h>
+@@ -413,7 +413,7 @@
+ * id. */
+ void (*oldHandler)();
+ int handlerSet = 0;
+- union wait status;
++ int status;
+ char *cmdName;
+
+ /*
+@@ -557,7 +557,7 @@
+ execSignalled = 0;
+ deadPid = wait3(&status, WNOHANG, (struct rusage *) 0);
+ if (deadPid == pid) {
+- result = status.w_T.w_Retcode;
++ result = WIFEXITED(status);
+ }
+
+ /*
diff -urN dlx/files/patch-cq dlx.sgk/files/patch-cq
--- dlx/files/patch-cq Wed Dec 31 16:00:00 1969
+++ dlx.sgk/files/patch-cq Sun Sep 22 10:30:51 2002
@@ -0,0 +1,41 @@
+--- dlxsim/sim.c.orig Sun Sep 22 09:32:12 2002
++++ dlxsim/sim.c Sun Sep 22 10:20:30 2002
+@@ -22,7 +22,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <values.h>
++#include <limits.h>
+ #include <tcl.h>
+ #include "asm.h"
+ #include "dlx.h"
+@@ -2522,7 +2522,7 @@
+ break;
+ }
+
+- for (i = 0, soonest = MAXINT; i < num_units; i++) {
++ for (i = 0, soonest = INT_MAX; i < num_units; i++) {
+ if (!(j = machPtr->fp_units[unitType][i])) break;
+ else if (j < soonest) soonest = j;
+ }
+@@ -2832,8 +2832,11 @@
+
+ static char *errstring()
+ {
++/*
+ extern int errno, sys_nerr;
+ extern char *sys_errlist[];
++*/
++ extern int errno;
+ static char msgbuf[64];
+
+ if( !errno )
+@@ -2842,7 +2845,7 @@
+ sprintf( msgbuf, "unknown error %d", errno );
+ return msgbuf;
+ }
+- return sys_errlist[ errno ];
++ return (char *)(sys_errlist[ errno ]);
+ }
+
+ /*
diff -urN dlx/files/patch-da dlx.sgk/files/patch-da
--- dlx/files/patch-da Wed Dec 31 16:00:00 1969
+++ dlx.sgk/files/patch-da Sun Sep 22 10:30:51 2002
@@ -0,0 +1,11 @@
+--- dlxsim/Hash_InitTable.c.orig Sun Sep 22 10:23:49 2002
++++ dlxsim/Hash_InitTable.c Sun Sep 22 10:23:57 2002
+@@ -15,7 +15,7 @@
+
+ #ifndef lint
+ static char rcsid[] = "$Header: Hash_InitTable.c,v 1.3 88/07/28 17:57:28 ouster Exp $ SPRITE (Berkeley)";
+-#endif not lint
++#endif
+
+ #include "hash.h"
+ #include <list.h>
diff -urN dlx/files/patch-db dlx.sgk/files/patch-db
--- dlx/files/patch-db Wed Dec 31 16:00:00 1969
+++ dlx.sgk/files/patch-db Sun Sep 22 10:40:15 2002
@@ -0,0 +1,32 @@
+--- gcc/gcc.c.orig Sun Sep 22 10:38:27 2002
++++ gcc/gcc.c Sun Sep 22 10:39:33 2002
+@@ -1866,8 +1866,7 @@
+ pfatal_with_name (name)
+ char *name;
+ {
+- extern int errno, sys_nerr;
+- extern char *sys_errlist[];
++ extern int errno;
+ char *s;
+
+ if (errno < sys_nerr)
+@@ -1880,8 +1879,7 @@
+ perror_with_name (name)
+ char *name;
+ {
+- extern int errno, sys_nerr;
+- extern char *sys_errlist[];
++ extern int errno;
+ char *s;
+
+ if (errno < sys_nerr)
+@@ -1894,8 +1892,7 @@
+ perror_exec (name)
+ char *name;
+ {
+- extern int errno, sys_nerr;
+- extern char *sys_errlist[];
++ extern int errno;
+ char *s;
+
+ if (errno < sys_nerr)
diff -urN dlx/files/patch-dc dlx.sgk/files/patch-dc
--- dlx/files/patch-dc Wed Dec 31 16:00:00 1969
+++ dlx.sgk/files/patch-dc Sun Sep 22 10:51:05 2002
@@ -0,0 +1,22 @@
+--- gcc/cccp.c.orig Sun Sep 22 10:45:02 2002
++++ gcc/cccp.c Sun Sep 22 10:46:22 2002
+@@ -4751,8 +4751,7 @@
+ {
+ int i;
+ FILE_BUF *ip = NULL;
+- extern int errno, sys_nerr;
+- extern char *sys_errlist[];
++ extern int errno;
+
+ for (i = indepth; i >= 0; i--)
+ if (instack[i].fname != NULL) {
+@@ -5388,8 +5387,7 @@
+ perror_with_name (name)
+ char *name;
+ {
+- extern int errno, sys_nerr;
+- extern char *sys_errlist[];
++ extern int errno;
+
+ fprintf (stderr, "%s: ", progname);
+ if (errno < sys_nerr)
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209221816.g8MIGjsC004343>