X Window System Version 11 Release 6.4 Patchlevel 3 for NEWS-OS Release 6.1.2 構築環境: NWS-5000TF NEWS-OS Release 6.1.2 NEWS-C 1.010 GNU make 3.76.1 インストール方法: % cat tog-?.tar.gz | tar xf - % patch -p0 < fix-01 % patch -p0 < fix-02 % patch -p0 < fix-03 % patch -p1 < [ThisFile] % make World # make install # make install.man Toshio Hiraga diff -urP X11R6.4/xc/config/cf/site.def X11R6.4-newsos6/xc/config/cf/site.def --- X11R6.4/xc/config/cf/site.def Wed Feb 18 06:23:02 1998 +++ X11R6.4-newsos6/xc/config/cf/site.def Tue Aug 25 10:46:44 1998 @@ -0,0 +1,127 @@ +XCOMM site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ + +/*************************************************************************** + * * + * SITE-SPECIFIC DEFINITIONS * + * * + * This file contains two halves, one included before the vendor-specific * + * configuration file (.cf file), and one included after the .cf file. * + * The before-half should be protected by #ifdef BeforeVendorCF, and the * + * after-half should be protected by #ifdef AfterVendorCF. * + * * + * The before-half should only set things that the .cf file depends on. * + * For the .cf files shipped in this release, the main variables in this * + * category are HasGcc, HasGcc2, HasCplusplus, OSMajorVersion, * + * OSMinorVersion, and OSTeenyVersion. * + * * + * The after-half should contain all other definitions. For example, * + * place your ProjectRoot definition here. * + * * + * OS Major and Minor version numbers should be changed directly in the * + * .cf file, not overridden in site.def. * + * * + ***************************************************************************/ + +/* if you want host-specific customization, this is one way to do it */ +/* +#ifndef SiteIConfigFiles +#define SiteIConfigFiles $(IRULESRC)/host.def +#define LocalConfigFiles host.def +#endif +*/ + + +#ifdef BeforeVendorCF + +/* #include */ + +/* On systems where cpp doesn't expand correctly macros in include directives + * the two following macros need to be defined directly (where "X11" is + * really whatever the TopLevelProject macro is defined to be). + */ +# if defined(AIXArchitecture) || defined(SVR4Architecture) || \ + defined(SCOArchitecture) || defined(Win32Architecture) || \ + defined(UXPArchitecture) || defined(SunArchitecture) +# ifndef ProjectRulesFile +# define ProjectRulesFile +# endif +# ifndef ProjectTmplFile +# define ProjectTmplFile +# endif +# endif + +/* +#ifndef HasGcc2 +#define HasGcc2 YES +#endif +*/ + +#endif /* BeforeVendorCF */ + +#ifdef AfterVendorCF + +#define ProjectRoot /usr/X11R6 + +/* Only set HasXdmAuth to YES if you have a Wraphelp.c file. */ +#define HasXdmAuth YES + +/* +#if defined(SunArchitecture) && defined(SparcArchitecture) +#define HasCodeCenter YES +#ifndef SVR4Architecture +#define HasTestCenter YES +#endif +#endif +*/ + +/* +#ifdef __hp9000s800 +#define HasCodeCenter YES +#endif +*/ + +/* +#if defined(SunArchitecture) && defined(SparcArchitecture) && !defined(SVR4Architecture) +#define HasPurify YES +#endif +*/ + +/* +#define HasSentinel YES +*/ + +/* +#undef DefaultUserPath +#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin +*/ + + +/* You do NOT need SetUID if you only run the server under xdm */ +/* You MAY need SetUID if users run the server by hand or under xinit */ +/* Consult your system administrator before making the X server setuid */ +/* +#if defined(SunArchitecture) && OSMajorVersion > 4 +#define InstallXserverSetUID YES +#endif +*/ + +/* You do NOT need SetUID if you only run the server under xdm */ +/* You MAY need SetUID if users run the server by hand or under xinit */ +/* Consult your system administrator before making the X server setuid */ +/* +#ifdef XFree86Version +#define InstallXserverSetUID YES +#endif +*/ + +#ifndef XnestServer +#undef BuildServer +#define BuildServer YES +#define XnestServer YES +#endif + +#define ForceNormalLib YES + +/* #include */ + +#endif /* AfterVendorCF */ diff -urP X11R6.4/xc/config/cf/sony.cf X11R6.4-newsos6/xc/config/cf/sony.cf --- X11R6.4/xc/config/cf/sony.cf Mon Sep 30 07:23:42 1996 +++ X11R6.4-newsos6/xc/config/cf/sony.cf Tue Aug 25 10:45:10 1998 @@ -3,7 +3,7 @@ #ifdef SonyBsdArchitecture #ifndef OSName -#define OSName NEWS-OS 4.2.1C +#define OSName NEWS-OS 4.2.1R #endif #ifndef OSMajorVersion #define OSMajorVersion 4 Only in X11R6.4/xc/programs/Xserver/hw/xfree86/vga256/drivers/mga/util: Makefile diff -urP X11R6.4/xc/programs/xfwp/io.c X11R6.4-newsos6/xc/programs/xfwp/io.c --- X11R6.4/xc/programs/xfwp/io.c Mon Aug 24 17:53:27 1998 +++ X11R6.4-newsos6/xc/programs/xfwp/io.c Tue Aug 25 13:40:15 1998 @@ -408,7 +408,11 @@ * this is where we initialize the current time and timeout on this * pm_connection object */ +#if defined(__sony_news) && defined(__svr4) + (void) gettimeofday(&time_val); +#else (void) gettimeofday(&time_val, &time_zone); +#endif pm_conn_array[pm_idx]->creation_time = time_val.tv_sec; pm_conn_array[pm_idx]->time_to_close = config_info->pm_data_timeout; } @@ -669,7 +673,11 @@ * this is where we initialize the current time and timeout on this * client_data object */ +#if defined(__sony_news) && defined(__svr4) + gettimeofday(&time_val); +#else gettimeofday(&time_val, &time_zone); +#endif client_conn_array[temp_sock_fd]->creation_time = time_val.tv_sec; client_conn_array[temp_sock_fd]->time_to_close = config_info->client_data_timeout; diff -urP X11R6.4/xc/programs/xfwp/misc.c X11R6.4-newsos6/xc/programs/xfwp/misc.c --- X11R6.4/xc/programs/xfwp/misc.c Tue Feb 10 03:58:02 1998 +++ X11R6.4-newsos6/xc/programs/xfwp/misc.c Tue Aug 25 13:38:24 1998 @@ -821,7 +821,11 @@ /* * get current time */ +#if defined(__sony_news) && defined(__svr4) + gettimeofday(¤t_time); +#else gettimeofday(¤t_time, ¤t_zone); +#endif /* * start with the clients; we have to do them all, because a @@ -1117,8 +1121,12 @@ /* * generate time stamp for this event - */ + */ +#if defined(__sony_news) && defined(__svr4) + gettimeofday(¤t_time); +#else gettimeofday(¤t_time, ¤t_zone); +#endif time_stamp = ctime((time_t *) ¤t_time.tv_sec); time_length = strlen(time_stamp); diff -urP X11R6.4/xc/programs/xfwp/transport.c X11R6.4-newsos6/xc/programs/xfwp/transport.c --- X11R6.4/xc/programs/xfwp/transport.c Tue Feb 10 03:58:21 1998 +++ X11R6.4-newsos6/xc/programs/xfwp/transport.c Tue Aug 25 13:40:49 1998 @@ -105,7 +105,11 @@ * this is where we initialize the current time and timeout on this * client_listen object */ +#if defined(__sony_news) && defined(__svr4) + gettimeofday(&time_val); +#else gettimeofday(&time_val, &time_zone); +#endif server_array[this_server]->creation_time = time_val.tv_sec; server_array[this_server]->time_to_close = global_data.config_info->client_listen_timeout;