*** xc/config/cf/NetBSD.cf-orig Sat Apr 2 13:37:19 1994 --- xc/config/cf/NetBSD.cf Thu Oct 6 13:45:08 1994 *************** *** 1,10 **** XCOMM platform: $XConsortium: NetBSD.cf,v 1.1 94/03/29 15:34:45 gildea Exp $ #define OSName NetBSD #define OSVendor /**/ XCOMM operating system: OSName ! #define OSMajorVersion 0 ! #define OSMinorVersion 9 #define HasPutenv YES #define HasBSD44Sockets YES --- 1,11 ---- XCOMM platform: $XConsortium: NetBSD.cf,v 1.1 94/03/29 15:34:45 gildea Exp $ + XCOMM changed for NetBSD 1.0 and XAmigaServer, v1.0 94/09/24 erbe0011@FH-Karlsruhe.DE #define OSName NetBSD #define OSVendor /**/ XCOMM operating system: OSName ! #define OSMajorVersion 1 ! #define OSMinorVersion 0 #define HasPutenv YES #define HasBSD44Sockets YES *************** *** 118,120 **** --- 119,168 ---- #ifdef __i386__ # include #endif + + #ifdef mc68000 + #define Mc68020Architecture + #endif + + #ifdef Mc68020Architecture + /* + * This is meant for amiga -- wish I could have a better ifdef... + */ + #ifdef ServerOSDefines + #undef ServerOSDefines + #endif + #define ServerOSDefines /* -DDDXOSINIT */ + + #define StripInstalledPrograms YES + #define InstPgmFlags -s -m 0555 -o bin -g bin + #define InstBinFlags -m 0555 -o bin -g bin + #define InstUidFlags -m 4555 -o root -g bin + #define InstLibFlags -m 0444 -o bin -g bin + #define InstIncFlags -m 0444 -o bin -g bin + #define InstManFlags -m 0444 -o bin -g bin + #define InstDatFlags -m 0444 -o bin -g bin + #define InstKmemFlags -g kmem -m 2555 + + #define XamigaRetinaServer YES + #define XamigaMonoECSServer YES + #define XamigaColorECSServer YES + + #ifndef BuildPexExt + #define BuildPexExt YES + #endif + #ifndef BuildXKB + #define BuildXKB YES + #endif + #ifndef Build75Dpi + #define Build75Dpi YES + #endif + #ifndef Build100Dpi + #define Build100Dpi YES + #endif + #ifndef BuildSpeedo + #define BuildSpeedo YES + #endif + #ifndef BuildType1 + #define BuildType1 YES + #endif + #endif + *** xc/config/imake/imake.c-orig Sun Sep 18 13:50:24 1994 --- xc/config/imake/imake.c Sat Sep 24 18:13:34 1994 *************** *** 1,4 **** --- 1,5 ---- /* $XConsortium: imake.c,v 1.89 94/08/12 00:45:51 gildea Exp $ */ + /* changed for NetBSD 1.0, v1.0 94/09/24 erbe0011@FH-Karlsruhe.DE */ /*************************************************************************** * * *************** *** 509,515 **** LogFatal(x0,x1) char *x0, *x1; { ! #ifndef WIN32 extern char *sys_errlist[]; #endif static boolean entered = FALSE; --- 510,516 ---- LogFatal(x0,x1) char *x0, *x1; { ! #if !defined(WIN32) && !defined(__NetBSD__) extern char *sys_errlist[]; #endif static boolean entered = FALSE; *************** *** 872,878 **** #if defined(SYSV) || defined(WIN32) freopen(tmpfname, "w+", tmpfd); #else /* !SYSV */ ! ftruncate(fileno(tmpfd), 0); #endif /* !SYSV */ initialized = TRUE; fprintf (tmpfd, "# Makefile generated by imake - do not edit!\n"); --- 873,879 ---- #if defined(SYSV) || defined(WIN32) freopen(tmpfname, "w+", tmpfd); #else /* !SYSV */ ! ftruncate(fileno(tmpfd), (off_t)0); #endif /* !SYSV */ initialized = TRUE; fprintf (tmpfd, "# Makefile generated by imake - do not edit!\n"); *** xc/lib/Xaw/AsciiSrc.c-orig Mon Jul 25 01:07:17 1994 --- xc/lib/Xaw/AsciiSrc.c Sat Sep 24 18:26:24 1994 *************** *** 1,4 **** --- 1,5 ---- /* $XConsortium: AsciiSrc.c,v 1.65 94/04/17 20:11:45 kaleb Exp $ */ + /* changed for NetBSD 1.0, v1.0 94/09/24 erbe0011@FH-Karlsruhe.DE */ /* *************** *** 101,107 **** #ifdef X_NOT_STDC_ENV extern int errno; #endif ! #if !defined(WIN32) && (defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4)) || defined(macII)) extern int sys_nerr; extern char* sys_errlist[]; #endif --- 102,108 ---- #ifdef X_NOT_STDC_ENV extern int errno; #endif ! #if !defined(WIN32) && (defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4)) || defined(macII)) || !defined(__NetBSD__) extern int sys_nerr; extern char* sys_errlist[]; #endif *** xc/lib/Xaw/TextPop.c-orig Mon Jul 25 01:16:02 1994 --- xc/lib/Xaw/TextPop.c Sat Sep 24 18:26:39 1994 *************** *** 1,4 **** --- 1,5 ---- /* $XConsortium: TextPop.c,v 1.31 94/04/17 20:13:10 kaleb Exp $ */ + /* changed for NetBSD 1.0, v1.0 94/09/24 erbe0011@FH-Karlsruhe.DE */ /* *************** *** 68,74 **** extern int errno; #endif ! #if !defined(WIN32) && (defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4)) || defined(macII)) extern int sys_nerr; extern char* sys_errlist[]; #endif --- 69,75 ---- extern int errno; #endif ! #if !defined(WIN32) && (defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4)) || defined(macII)) || !defined(__NetBSD__) extern int sys_nerr; extern char* sys_errlist[]; #endif *** xc/programs/Xserver/Imakefile.orig Mon Sep 26 13:15:25 1994 --- xc/programs/Xserver/Imakefile Thu Oct 6 14:18:05 1994 *************** *** 1,4 **** --- 1,5 ---- XCOMM $XConsortium: Imakefile,v 1.184 94/05/09 13:16:03 dpw Exp $ + XCOMM changed for NetBSD 1.0, v1.0 94/09/24 erbe0011@FH-Karlsruhe.DE /* * Server Master Makefile */ *************** *** 565,570 **** --- 566,588 ---- #endif /* XnestServer */ + #if XamigaMonoECSServer + XCOMM + XCOMM Amiga server + XCOMM + MFBDIR = mfb + XAMIGADDXDIR = hw/amigaMono + XAMIGADIRS = $(STDDIRS) $(MFBDIR) $(XAMIGADDXDIR) $(DEPDIRS) + XAMIGAOBJS = hw/amigaMono/amigaInit.o + XAMIGALIBS = hw/amigaMono/libamiga.a MFBLibs + XAMIGASYSLIBS = $(SYSLIBS) + SetUIDServerTarget(XamigaMono,$(XAMIGADIRS),$(XAMIGAOBJS),$(XAMIGALIBS),$(XAMIGASYSLIBS)) + #ifndef ServerToInstall + #define ServerToInstall XamigaMono + #endif + #endif /* XamigaMonoECSServer */ + + #if XnonServer XCOMM XCOMM non server, just compile sources for build test *************** *** 600,606 **** CFBDIRS = $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) ! DDXDIRS = $(DDXDIR1) $(DDXDIR2) $(DDXDIR3) $(XVFBDDXDIR) $(XNESTDDXDIR) SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFBDIRS) $(DDXDIRS) #ifdef ServerToInstall --- 618,624 ---- CFBDIRS = $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) ! DDXDIRS = $(DDXDIR1) $(DDXDIR2) $(DDXDIR3) $(XVFBDDXDIR) $(XNESTDDXDIR) $(XAMIGADDXDIR) SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFBDIRS) $(DDXDIRS) #ifdef ServerToInstall *** xc/programs/Xserver/cfb/Imakefile-orig Tue Feb 22 13:47:11 1994 --- xc/programs/Xserver/cfb/Imakefile Sat Sep 24 18:50:19 1994 *************** *** 1,4 **** --- 1,5 ---- XCOMM $XConsortium: Imakefile,v 5.41 93/09/06 18:37:23 rws Exp $ + XCOMM changed for NetBSD 1.0, v1.0 94/09/24 erbe0011@FH-Karlsruhe.DE #include #ifndef PixelSize *************** *** 19,24 **** --- 20,30 ---- STIPPLEOBJ = stipsparc.o stipsparcte.o STIPPLEDEF = -DHAS_STIPPLE_CODE #endif + #ifdef Mc68020Architecture + STIPPLESRC = stipple68k.s stipple68kte.s + STIPPLEOBJ = stipple68k.o stipple68kte.o + STIPPLEDEF = -DHAS_STIPPLE_CODE + #endif #endif #if PixelSize == 32 *************** *** 29,35 **** #endif #endif - SRCS = cfbgc.c cfbrrop.c cfbwindow.c \ cfbpntwin.c cfbmskbits.c cfbpixmap.c cfbbitblt.c \ cfbfillsp.c cfbsetsp.c cfbscrinit.c cfballpriv.c \ --- 35,40 ---- *************** *** 197,202 **** --- 202,221 ---- stipsparcte.o: stipsparcte.s $(CPP) -DTETEXT stipsparcte.s | $(AS) -o $@ - + #endif + + #ifdef Mc68020Architecture + stipple68kte.s: stipple68k.s + $(RM) $@ + $(LN) stipple68k.s stipple68kte.s + clean:: + $(RM) stipple68kte.s + + stipple68k.o: stipple68k.s + $(CPP) stipple68k.s | $(AS) -o $@ - + + stipple68kte.o: stipple68kte.s + $(CPP) -DTETEXT stipple68kte.s | $(AS) -o $@ - #endif #endif *** xc/programs/Xserver/cfb/stip68kgnu.h-orig Mon Apr 18 00:29:08 1994 --- xc/programs/Xserver/cfb/stip68kgnu.h Sat Sep 24 18:30:41 1994 *************** *** 1,5 **** --- 1,6 ---- /* * $XConsortium: stip68kgnu.h,v 1.3 94/04/17 20:29:08 dpw Exp $ + * changed for NetBSD 1.0, v1.0 94/09/24 erbe0011@FH-Karlsruhe.DE * Copyright (c) 1990 X Consortium *************** *** 127,129 **** --- 128,131 ---- /* rshift */ "d3", \ /* atemp */ "a0", \ /* case */ "a1") + #undef STIPPLE *** xc/programs/Xserver/include/servermd.h-orig Tue Jul 19 16:41:38 1994 --- xc/programs/Xserver/include/servermd.h Sat Sep 24 18:36:08 1994 *************** *** 48,53 **** --- 48,54 ---- #ifndef SERVERMD_H #define SERVERMD_H 1 /* $XConsortium: servermd.h,v 1.71 94/05/05 16:03:22 dpw Exp $ */ + /* changed for NetBSD 1.0, v1.0 94/09/24 erbe0011@FH-Karlsruhe.DE */ /* * Machine dependent values: *************** *** 371,376 **** --- 372,385 ---- #define PLENTIFUL_REGISTERS #endif + + #if defined(__NetBSD__) && defined(mc68020) + #define IMAGE_BYTE_ORDER MSBFirst + #define BITMAP_BIT_ORDER MSBFirst + #define FAST_UNALIGNED_READS + #define GLYPHPADBYTES 4 + #define GETLEFTBITS_ALIGNMENT 1 + #endif /* __NetBSD__ && mc68020 */ /* size of buffer to use with GetImage, measured in bytes. There's obviously * a trade-off between the amount of stack (or whatever ALLOCATE_LOCAL gives *** xc/programs/Xserver/os/WaitFor.c-orig Mon Apr 18 00:26:52 1994 --- xc/programs/Xserver/os/WaitFor.c Sat Sep 24 18:35:42 1994 *************** *** 47,52 **** --- 47,53 ---- ******************************************************************/ /* $XConsortium: WaitFor.c,v 1.68 94/04/17 20:26:52 dpw Exp $ */ + /* changed for NetBSD 1.0, v1.0 94/09/24 erbe0011@FH-Karlsruhe.DE */ /***************************************************************** * OS Dependent input routines: *************** *** 264,270 **** --- 265,275 ---- if (! ANYSET (AllClients)) return 0; } + #ifndef __NetBSD__ else if (selecterr != EINTR) + #else + else if (selecterr != EINTR && selecterr != EAGAIN) + #endif /* __NetBSD */ ErrorF("WaitForSomething(): select: errno=%d\n", selecterr); if (timers) *** xc/programs/rgb/Imakefile-orig Tue Jul 19 16:41:39 1994 --- xc/programs/rgb/Imakefile Sat Sep 24 18:59:14 1994 *************** *** 1,4 **** --- 1,5 ---- XCOMM $XConsortium: Imakefile,v 1.30 94/05/14 16:36:45 rws Exp $ + XCOMM changed for NetBSD 1.0, v1.0 94/09/24 erbe0011@FH-Karlsruhe.DE #if UseRgbTxt RGB_DEFINES = -DUSE_RGB_TXT *************** *** 20,26 **** OBJS = $(OBJS1) $(OBJS2) PROGRAMS = $(RGB_PROG) showrgb #if !UseRgbTxt ! #ifdef BSD386Architecture DATAFILES = rgb.db DATADEP = rgb.db #else --- 21,27 ---- OBJS = $(OBJS1) $(OBJS2) PROGRAMS = $(RGB_PROG) showrgb #if !UseRgbTxt ! #if defined(BSD386Architecture) || defined(NetBSDArchitecture) DATAFILES = rgb.db DATADEP = rgb.db #else *** xc/programs/rgb/rgb.c-orig Mon Jul 25 01:23:26 1994 --- xc/programs/rgb/rgb.c Sat Sep 24 18:33:12 1994 *************** *** 1,4 **** --- 1,5 ---- /* $XConsortium: rgb.c,v 11.19 94/04/17 20:24:45 rws Exp $ */ + /* changed for NetBSD 1.0, v1.0 94/09/24 erbe0011@FH-Karlsruhe.DE */ /* Copyright (c) 1985 X Consortium *************** *** 62,68 **** --- 63,71 ---- #endif + #ifndef __NetBSD__ extern int sys_nerr; extern char *sys_errlist[]; + #endif char *ProgramName; *************** *** 98,103 **** --- 101,107 ---- else dbname = RGB_DB; + #ifndef DBM_SUFFIX strcpy (name, dbname); strcat (name, ".dir"); fd = open (name, O_WRONLY|O_CREAT, 0666); *************** *** 121,129 **** --- 125,140 ---- (void) close (fd); rgb_dbm = dbm_open (dbname, O_RDWR|O_CREAT, 0666); + #else + rgb_dbm = dbm_open (dbname, O_RDWR | O_CREAT, 0666); + #endif if (!rgb_dbm) { fprintf (stderr, + #ifndef __NetBSD__ "%s: unable to open dbm database \"%s\" (error %d, %s)\n", + #else + "%s: unable to create dbm database \"%s\" (error %d, %s)\n", + #endif /* __NetBSD__ */ ProgramName, dbname, errno, SysError()); exit (1); } *** xc/programs/twm/lex.l-orig Mon Apr 18 00:38:15 1994 --- xc/programs/twm/lex.l Mon Oct 3 16:00:15 1994 *************** *** 54,59 **** --- 54,60 ---- /*********************************************************************** * * $XConsortium: lex.l,v 1.68 94/04/17 20:38:14 rws Exp $ + * changed for NetBSD 1.0, v1.0 94/09/24 erbe0011@FH-Karlsruhe.DE * * .twmrc lex file * *************** *** 67,73 **** extern char *ProgramName; extern int ParseError; ! #ifdef __bsdi__ int yylineno; #undef YY_INPUT --- 68,74 ---- extern char *ProgramName; extern int ParseError; ! #if defined(__bsdi__) || defined(__NetBSD__) int yylineno; #undef YY_INPUT *** xc/programs/xdm/Imakefile-orig Fri Apr 1 22:49:40 1994 --- xc/programs/xdm/Imakefile Sat Sep 24 18:37:45 1994 *************** *** 1,4 **** --- 1,5 ---- XCOMM $XConsortium: Imakefile,v 1.72 94/04/01 12:37:39 gildea Exp $ + XCOMM changed for NetBSD 1.0, v1.0 94/09/24 erbe0011@FH-Karlsruhe.DE #define IHaveSubdirs #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' *************** *** 51,56 **** --- 52,61 ---- #if (defined(AIXArchitecture) && (OSMajorVersion >= 3)) SYS_LIBRARIES = -ls #endif + + #ifdef NetBSDArchitecture + SYS_LIBRARIES = -lcrypt + #endif #if HasBSD44Sockets SOCK_DEFINES = -DBSD44SOCKETS *** xc/programs/xdm/xdmshell.c-orig Mon Apr 18 00:03:51 1994 --- xc/programs/xdm/xdmshell.c Sat Sep 24 18:39:51 1994 *************** *** 35,40 **** --- 35,41 ---- * way of invoking the abort-display() action. Otherwise, you won't be able * bring down X when you are finished. */ + /* changed for NetBSD 1.0, v1.0 94/09/24 erbe0011@FH-Karlsruhe.DE */ #include #include "dm.h" *************** *** 44,50 **** --- 45,53 ---- #endif + #ifndef __NetBSD__ extern int sys_nerr; extern char *sys_errlist[]; + #endif /* __NetBSD__ */ #ifdef macII #define ON_CONSOLE_ONLY *** xc/programs/xinit/xinit.c-orig Mon Apr 18 00:24:30 1994 --- xc/programs/xinit/xinit.c Sat Sep 24 19:03:17 1994 *************** *** 1,4 **** --- 1,5 ---- /* $XConsortium: xinit.c,v 11.58 94/04/17 20:24:30 rws Exp $ */ + /* changed for NetBSD 1.0, v1.0 94/09/24 erbe0011@FH-Karlsruhe.DE */ /* *************** *** 93,98 **** --- 94,102 ---- #endif #ifdef M4310 /* Tektronix Pegasus */ "Xpeg Tektronix Pegasus display on 431x series", + #endif + #if defined(__NetBSD__) && defined(amiga) && defined(XamigaMonoECSServer) + "XamigaMono Custom chip monochrome", #endif NULL}; *** xc/programs/xterm/main.c-orig Mon Apr 18 00:23:29 1994 --- xc/programs/xterm/main.c Sat Sep 24 18:40:42 1994 *************** *** 1,5 **** --- 1,6 ---- #ifndef lint static char *rid="$XConsortium: main.c,v 1.222 94/04/17 20:23:28 gildea Exp $"; + /* changed for NetBSD 1.0, v1.0 94/09/24 erbe0011@FH-Karlsruhe.DE */ #endif /* lint */ /* *************** *** 272,279 **** --- 273,284 ---- #endif #ifndef LASTLOG_FILENAME + #ifdef LASTLOG_FILE + #define LASTLOG_FILENAME LASTLOG_FILE + #else #define LASTLOG_FILENAME "/usr/adm/lastlog" /* only on BSD systems */ #endif + #endif #ifndef WTMP_FILENAME #ifdef WTMP_FILE *************** *** 468,474 **** --- 473,483 ---- */ #ifdef USE_LOGIN_DASH_P #ifndef LOGIN_FILENAME + #ifdef __NetBSD__ + #define LOGIN_FILENAME "/usr/bin/login" + #else #define LOGIN_FILENAME "/bin/login" + #endif #endif static char bin_login[] = LOGIN_FILENAME; #endif *** xc/config/imake/imakemdep.h-orig Sun Oct 16 08:04:05 1994 --- xc/config/imake/imakemdep.h Sun Oct 16 08:04:05 1994 *************** *** 594,599 **** --- 594,605 ---- #ifdef PC_UX {"PC_UX", "1"}, #endif + #ifdef __NetBSD__ + {"__NetBSD__", "1"}, + #endif + #ifdef amiga + {"amiga", "1"}, + #endif /* add any additional symbols before this line */ {NULL, NULL} }; *** xc/config/makedepend/main.c-orig Sun Oct 16 08:04:06 1994 --- xc/config/makedepend/main.c Sun Oct 16 08:04:07 1994 *************** *** 45,50 **** --- 45,56 ---- #endif #endif + #ifdef X_NOT_POSIX + #include + #else + #include + #endif + #if NeedVarargsPrototypes #include #endif *** xc/fonts/PEX/lex.l-orig Mon Sep 26 13:17:08 1994 --- xc/fonts/PEX/lex.l Sun Oct 16 08:04:17 1994 *************** *** 62,73 **** #endif #endif %} %% \'[^']*\' | \"[^"]*\" return string(yytext, yyleng); #.* ; ! [ ,;\t\n]* /* natural dilimters */ ; [a-zA-Z][a-zA-Z0-9_.]* { int token; --- 62,82 ---- #endif #endif + #ifdef __NetBSD__ + int yylineno; + #endif /* __NetBSD__ */ + %} %% \'[^']*\' | \"[^"]*\" return string(yytext, yyleng); #.* ; ! \n { ! #ifdef __NetBSD__ ! yylineno++; ! #endif /* __NetBSD__ */ ! } ! [ ,;\t]* /* natural delimiters */ ; [a-zA-Z][a-zA-Z0-9_.]* { int token; *** xc/lib/font/bitmap/bdfread.c-orig Mon Apr 18 00:17:10 1994 --- xc/lib/font/bitmap/bdfread.c Tue Oct 25 00:06:54 1994 *************** *** 476,482 **** --- 476,501 ---- for (char_row = pFont->info.firstRow; char_row <= pFont->info.lastRow; char_row++) { + #if defined(__NetBSD__) && defined(m68k) + CharInfoPtr **plonk(); + CharInfoPtr **kerplonk = plonk(bdfEncoding, char_row); + + /* + * The current compiler on NetBSD has problems with this code + * when optimized with -O2. The generated code screws up + * such that &bdfEncoding[char_row] is not the same address + * as bdfEncoding + char_row, so the below encoding stuff + * generates bad information, and double-byte fonts get + * all screwed up. + */ + /*cowpie(&bdfEncoding[char_row], bdfEncoding, char_row);*/ + /*cowpie(kerplonk, bdfEncoding, char_row);*/ + if (*kerplonk == (CharInfoPtr *) NULL) { + /*printf("-setting up encoding for char_row %d nothing %08lx\n", char_row, kerplonk);*/ + #else /* __NetBSD__ */ if (bdfEncoding[char_row] == (CharInfoPtr *) NULL) { + printf("setting up encoding for char_row %d nothing %08lx\n", char_row, &bdfEncoding[char_row]); + #endif /* __NetBSD__ */ pFont->info.allExist = FALSE; for (char_col = pFont->info.firstCol; char_col <= pFont->info.lastCol; *************** *** 484,495 **** --- 503,521 ---- bitmapFont->encoding[i++] = NullCharInfo; } } else { + /*printf("setting up encoding for char_row %d something\n", char_row);*/ for (char_col = pFont->info.firstCol; char_col <= pFont->info.lastCol; char_col++) { + #if defined(__NetBSD__) && defined(m68k) + if (!(*kerplonk)[char_col]) + pFont->info.allExist = FALSE; + bitmapFont->encoding[i++] = (*kerplonk)[char_col]; + #else /* __NetBSD__ */ if (!bdfEncoding[char_row][char_col]) pFont->info.allExist = FALSE; bitmapFont->encoding[i++] = bdfEncoding[char_row][char_col]; + #endif /* __NetBSD__ */ } } } *************** *** 504,509 **** --- 530,554 ---- /* bdfFreeFontBits will clean up the rest */ return (FALSE); } + + #if defined(__NetBSD__) && defined(m68k) + CharInfoPtr ** + plonk(b, c) + CharInfoPtr *b; + int c; + { + return (CharInfoPtr **) (b + c); + } + + cowpie(a, b, c) + CharInfoPtr **a; + CharInfoPtr *b; + int c; + { + if (a != (CharInfoPtr **) (b + c)) + printf("barf %08lx %08lx\n", a, b + c); + } + #endif /* __NetBSD__ */ /***====================================================================***/ *** xc/lib/Xmu/Imakefile-orig Sat Apr 2 21:00:50 1994 --- xc/lib/Xmu/Imakefile Sun Oct 16 08:04:08 1994 *************** *** 10,16 **** #define IncSubdir Xmu #ifdef SharedXmuReqs ! REQUIREDLIBS = SharedXmuReqs #endif /* Since people link in Xmu without Xt, we avoid references to string data. */ --- 10,16 ---- #define IncSubdir Xmu #ifdef SharedXmuReqs ! REQUIREDLIBS = LdPreLib SharedXmuReqs #endif /* Since people link in Xmu without Xt, we avoid references to string data. */ *** xc/programs/Xserver/PEX5/ddpex/mi/level2/recompile-miNSurf-orig Sun Oct 30 18:26:36 1994 --- xc/programs/Xserver/PEX5/ddpex/mi/level2/recompile-miNSurf Sun Oct 30 18:27:04 1994 *************** *** 0 **** --- 1,12 ---- + #!/bin/sh + + # Run this script to recompile miNSurf.c in such a way that + # gcc can take it. I suppose the Imakefile should be fixed + # so that isn't necessary, but oh well. + + make CDEBUGFLAGS=-O miNSurf.o + #gcc -c -O -I. -I../include -I../../../../../include/PEX \ + # -I../../../../../.././X11 -I../../../include \ + # -I../../../../../.././server/include \ + # -I../../../../../../. -DXDCMP -DSHAPE -DMULTIBUFFER \ + # -DMITMISC -DPEXECT -DMITSHM miNSurf.c *** xc/programs/rstart/Imakefile-orig Tue Mar 29 08:43:40 1994 --- xc/programs/rstart/Imakefile Mon Oct 17 21:13:50 1994 *************** *** 30,36 **** --- 30,40 ---- ENVPREFIX=RSTART PACKAGEname=rstart + #ifndef NetBSDArchitecture USRBIN=DefaultUsrBin + #else + USRBIN=/usr/libexec + #endif #ifndef RshCmd # if SystemV *************** *** 62,72 **** AllTarget($(SERVERNAME)) CppScriptTarget($(SERVERNAME),server.cpp,-DLIBDIR=$(MYLIBDIR) -DSERVERNAME=$(SERVERNAME),NullParameter) ! InstallProgram($(SERVERNAME),$(USRBIN)) AllTarget($(CLIENTNAME)) CppScriptTarget($(CLIENTNAME),client.cpp,-DRSHCMD=$(RSHCMD) -DSERVERNAME=$(SERVERNAME),NullParameter) ! InstallProgram($(CLIENTNAME),$(BINDIR)) AllTarget(config) CppFileTarget(config,config.cpp,-DBINDIR=$(BINDIR) -DLIBDIR=$(MYLIBDIR) -DPACKAGEname=$(PACKAGEname) -DENVPREFIX=$(ENVPREFIX),NullParameter) --- 66,76 ---- AllTarget($(SERVERNAME)) CppScriptTarget($(SERVERNAME),server.cpp,-DLIBDIR=$(MYLIBDIR) -DSERVERNAME=$(SERVERNAME),NullParameter) ! InstallNamedProg($(SERVERNAME),$(SERVERNAME),$(BINDIR)) AllTarget($(CLIENTNAME)) CppScriptTarget($(CLIENTNAME),client.cpp,-DRSHCMD=$(RSHCMD) -DSERVERNAME=$(SERVERNAME),NullParameter) ! InstallNamedProg($(CLIENTNAME),$(CLIENTNAME),$(BINDIR)) AllTarget(config) CppFileTarget(config,config.cpp,-DBINDIR=$(BINDIR) -DLIBDIR=$(MYLIBDIR) -DPACKAGEname=$(PACKAGEname) -DENVPREFIX=$(ENVPREFIX),NullParameter) *** xc/programs/xdm/dm.h-orig Mon Apr 18 00:03:37 1994 --- xc/programs/xdm/dm.h Mon Oct 3 16:42:44 1994 *************** *** 352,358 **** #define SIGVAL void #endif ! #ifdef X_NOT_POSIX #ifdef SYSV #define SIGNALS_RESET_WHEN_CAUGHT #define UNRELIABLE_SIGNALS --- 352,358 ---- #define SIGVAL void #endif ! #if defined(X_NOT_POSIX) || defined(__NetBSD__) #ifdef SYSV #define SIGNALS_RESET_WHEN_CAUGHT #define UNRELIABLE_SIGNALS *** xc/programs/xterm/Imakefile-orig Sun Apr 10 20:03:38 1994 --- xc/programs/xterm/Imakefile Sun Oct 16 08:04:09 1994 *************** *** 23,31 **** --- 23,41 ---- OSMAJORVERSION = OSMajorVersion OSMINORVERSION = OSMinorVersion + #ifndef NetBSDArchitecture MAIN_DEFINES = -DUTMP $(TTYGROUPDEF) $(PUCCPTYDDEF) \ -DOSMAJORVERSION=$(OSMAJORVERSION) \ -DOSMINORVERSION=$(OSMINORVERSION) + #else + MAIN_DEFINES = -DUTMP $(TTYGROUPDEF) $(PUCCPTYDDEF) \ + -DOSMAJORVERSION=$(OSMAJORVERSION) \ + -DOSMINORVERSION=$(OSMINORVERSION) \ + -DUTMP_FILE=_PATH_UTMP \ + -DLASTLOG_FILENAME=_PATH_LASTLOG \ + -DWTMP_FILE=_PATH_WTMP \ + -DLOGIN_FILENAME=\"/usr/bin/login\" + #endif MISC_DEFINES = /* -DALLOWLOGFILEEXEC */ SRCS1 = button.c charproc.c cursor.c data.c input.c \ *** xc/programs/xdm/session.c-orig Sat Dec 17 17:42:33 1994 --- xc/programs/xdm/session.c Sat Dec 17 17:44:48 1994 *************** *** 527,532 **** --- 527,545 ---- return (0); } #else /* AIXV3 */ + + #ifdef __NetBSD__ + /* + * 4.4BSD's setlogin() and getlogin() are implimented in the kernel, + * not from utmp. + */ + if (setlogin(name) < 0) + { + LogError("setlogin for \"%s\" failed, errno=%d\n", name, errno); + return (0); + } + #endif + #ifdef NGROUPS_MAX if (setgid(verify->groups[0]) < 0) { *** ./xc/config/cf/site.def-orig Sun Oct 16 08:04:03 1994 --- ./xc/config/cf/site.def Sun Oct 16 17:33:25 1994 *************** *** 47,53 **** #ifdef AfterVendorCF ! #define ProjectRoot /usr/X11R6 /* #define HasXdmAuth YES */ --- 47,53 ---- #ifdef AfterVendorCF ! #define ProjectRoot /usr/local/X11R6 /* #define HasXdmAuth YES