X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=XFree86-PLD.patch;h=2a27a7182407ebbd465597e1aaa632e773397194;hb=HEAD;hp=a6dded40c0207e283147f35e219678df9f264d5f;hpb=2452d5b736af910a5940673c8eb1004a07c5e5f7;p=packages%2FXFree86.git diff --git a/XFree86-PLD.patch b/XFree86-PLD.patch index a6dded4..2a27a71 100644 --- a/XFree86-PLD.patch +++ b/XFree86-PLD.patch @@ -1,23 +1,17 @@ -diff -urN xc.orig/Makefile xc/Makefile ---- xc.orig/Makefile Mon Dec 30 15:54:17 2002 -+++ xc/Makefile Mon Dec 30 16:02:13 2002 -@@ -8,10 +8,10 @@ +--- xc/Makefile 2006-06-11 00:28:00.305505872 +0200 ++++ xc/Makefile-new 2006-06-11 00:31:06.181248464 +0200 +@@ -3,7 +3,7 @@ + # Luna users will need to either run make as "make MAKE=make" # or add "MAKE = make" to this file. - RELEASE = "Release 6.6" -SHELL = /bin/sh +SHELL = /bin/sh -e RM = rm -f MV = mv --WORLDOPTS = -k -+WORLDOPTS = - WIN32WORLDOPTS = -i - TOP = . - CURRENT_DIR = . -diff -urN xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf ---- xc.orig/config/cf/Imake.cf Mon Dec 30 15:52:30 2002 -+++ xc/config/cf/Imake.cf Mon Dec 30 16:02:13 2002 -@@ -723,6 +723,10 @@ + WORLDOPTS = +--- xc/config/cf/Imake.cf.orig 2006-01-09 15:56:12.000000000 +0100 ++++ xc/config/cf/Imake.cf 2006-06-11 00:28:00.321503440 +0200 +@@ -800,6 +800,10 @@ # define s390Architecture # undef __s390__ # endif /* s390 */ @@ -28,10 +22,9 @@ diff -urN xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf # ifdef __alpha # define AlphaArchitecture # undef __alpha -diff -urN xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl ---- xc.orig/config/cf/Imake.tmpl Mon Dec 30 15:52:30 2002 -+++ xc/config/cf/Imake.tmpl Mon Dec 30 16:02:13 2002 -@@ -253,7 +253,7 @@ +--- xc/config/cf/Imake.tmpl.orig 2006-04-03 01:12:46.000000000 +0200 ++++ xc/config/cf/Imake.tmpl 2006-06-11 00:28:00.323503136 +0200 +@@ -308,7 +308,7 @@ #ifndef BuildHtmlManPages #ifdef RmanCmd @@ -40,7 +33,7 @@ diff -urN xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl #else #define BuildHtmlManPages NO #endif -@@ -833,11 +833,7 @@ +@@ -904,11 +904,7 @@ #define LintlibDir $(USRLIBDIR)/lint #endif #ifndef SystemManDirectory @@ -52,7 +45,7 @@ diff -urN xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl #endif #ifndef ManDirectoryRoot #ifdef ProjectRoot -@@ -974,7 +970,7 @@ +@@ -1055,7 +1051,7 @@ #define NoRConst NO /* YES if const for structs of funcs is bad */ #endif #ifndef InstPgmFlags @@ -61,7 +54,7 @@ diff -urN xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl #endif #ifndef InstBinFlags #define InstBinFlags -m 0755 -@@ -1112,7 +1108,7 @@ +@@ -1212,7 +1208,7 @@ #define CppCmd /LibDirName/cpp #endif #ifndef RawCppCmd @@ -70,10 +63,9 @@ diff -urN xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl #endif #ifndef CppNoLineInfoOption #define CppNoLineInfoOption /**/ -diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl ---- xc.orig/config/cf/X11.tmpl Mon Dec 30 15:52:30 2002 -+++ xc/config/cf/X11.tmpl Mon Dec 30 16:02:13 2002 -@@ -1256,8 +1256,12 @@ +--- xc/config/cf/X11.tmpl.orig 2006-04-18 17:57:25.000000000 +0200 ++++ xc/config/cf/X11.tmpl 2006-06-11 00:28:00.327502528 +0200 +@@ -1649,8 +1649,12 @@ # define UsbMouseSupport NO #endif @@ -87,7 +79,7 @@ diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl #endif /* X-TrueType settings */ -@@ -1380,7 +1384,7 @@ +@@ -1783,7 +1787,7 @@ #define ConfigDir $(LIBDIR)/config #endif #ifndef DocDir @@ -96,8 +88,8 @@ diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl #endif #ifndef DocHtmlDir #define DocHtmlDir $(DOCDIR)/html -@@ -1389,31 +1393,31 @@ - #define DocPsDir $(DOCDIR)/PostScript +@@ -1795,31 +1799,31 @@ + #define DocPdfDir $(DOCDIR)/PDF #endif #ifndef FontDir -#define FontDir $(LIBDIR)/fonts @@ -135,8 +127,8 @@ diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl #endif #ifndef NlsDir #define NlsDir $(LIBDIR)/nls -@@ -1425,23 +1429,20 @@ - #define PexApiDir $(LIBDIR)/PEX +@@ -1828,23 +1832,20 @@ + #define XLocaleDir $(LIBDIR)/locale #endif #ifndef LbxproxyDir -#define LbxproxyDir $(LIBDIR)/lbxproxy @@ -162,7 +154,7 @@ diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl #ifndef InstallSecurityConfig #define InstallSecurityConfig YES /* Install sample security policy */ #endif -@@ -1473,10 +1474,10 @@ +@@ -1876,10 +1877,10 @@ #define OsNameDefines /* as nothing */ #endif #ifndef DefaultUserPath /* for xdm */ @@ -175,7 +167,7 @@ diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl #endif #ifndef DefaultSystemShell /* for xdm to set in SHELL */ #define DefaultSystemShell BourneShell -@@ -1603,7 +1604,7 @@ +@@ -2014,7 +2015,7 @@ HTMLINDEXCMD = HtmlIndexCmd @@ -184,7 +176,7 @@ diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl CLIENTSRC = $(TOP)/clients DEMOSRC = $(TOP)/demos XDOCMACROS = $(DOCUTILSRC)/macros.t -@@ -1617,7 +1618,7 @@ +@@ -2028,7 +2029,7 @@ SERVERSRC = $(XTOP)/programs/Xserver CONTRIBSRC = ContribDir UNSUPPORTEDSRC = UnsupportedDir @@ -193,10 +185,9 @@ diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl RGBSRC = $(XTOP)/programs/rgb BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir -diff -urN xc.orig/config/cf/linux.cf xc/config/cf/linux.cf ---- xc.orig/config/cf/linux.cf Mon Dec 30 15:52:31 2002 -+++ xc/config/cf/linux.cf Mon Dec 30 16:20:00 2002 -@@ -320,7 +320,7 @@ +--- xc/config/cf/linux.cf.orig 2006-04-03 01:12:46.000000000 +0200 ++++ xc/config/cf/linux.cf 2006-06-11 00:28:00.329502224 +0200 +@@ -335,7 +335,7 @@ */ #if BuildXF86DRI # if defined(i386Architecture) @@ -205,16 +196,7 @@ diff -urN xc.orig/config/cf/linux.cf xc/config/cf/linux.cf # endif #endif -@@ -333,7 +333,7 @@ - # if defined(i386Architecture) || defined(ia64Architecture) || defined(SparcArchitecture) || defined(AlphaArchitecture) || defined(x86_64Architecture) - # if OSMajorVersion == 2 - /* Only tested for Linux 2.2.0 through 2.2.12 */ --# if OSMinorVersion == 2 && OSTeenyVersion <= 12 -+# if OSMinorVersion == 2 - # define BuildXF86DRM YES - # else - /* Only tested for Linux 2.3.0 through 2.3.18 */ -@@ -721,7 +721,7 @@ +@@ -749,7 +749,7 @@ #define HasVarRun YES #ifndef VarDbDirectory @@ -223,23 +205,9 @@ diff -urN xc.orig/config/cf/linux.cf xc/config/cf/linux.cf #endif #ifndef XF86OSCardDrivers -@@ -936,10 +936,10 @@ - #endif - - #ifndef LinkGLToUsrLib --# define LinkGLToUsrLib YES -+# define LinkGLToUsrLib NO - #endif - # ifndef LinkGLToUsrInclude --# define LinkGLToUsrInclude YES -+# define LinkGLToUsrInclude NO - #endif - - -diff -urN xc.orig/config/cf/site.def xc/config/cf/site.def ---- xc.orig/config/cf/site.def Mon Dec 30 15:52:31 2002 -+++ xc/config/cf/site.def Mon Dec 30 16:02:13 2002 -@@ -119,10 +119,14 @@ +--- xc/config/cf/site.def.orig 2006-01-09 15:56:13.000000000 +0100 ++++ xc/config/cf/site.def 2006-06-11 00:28:00.330502072 +0200 +@@ -104,10 +104,10 @@ #define HasSentinel YES */ @@ -250,17 +218,12 @@ diff -urN xc.orig/config/cf/site.def xc/config/cf/site.def +#define DefaultUserPath /usr/local/bin:/bin:/usr/bin:$(BINDIR) +#undef DefaultSystemPath +#define DefaultSystemPath /sbin:/bin:/usr/sbin:/usr/bin:$(BINDIR) -+ -+ -+#define HasPam YES -+#define HasPamMisc YES /* You do NOT need SetUID if you only run the server under xdm */ -diff -urN xc.orig/config/cf/xf86site.def xc/config/cf/xf86site.def ---- xc.orig/config/cf/xf86site.def Mon Dec 30 15:52:31 2002 -+++ xc/config/cf/xf86site.def Mon Dec 30 16:28:24 2002 -@@ -234,8 +234,8 @@ +--- xc/config/cf/xf86site.def.orig 2006-04-08 20:33:00.000000000 +0200 ++++ xc/config/cf/xf86site.def 2006-06-11 00:28:00.335501312 +0200 +@@ -257,8 +257,8 @@ /* * To not build/install the Cyrillic fonts, uncomment the following * @@ -270,112 +233,17 @@ diff -urN xc.orig/config/cf/xf86site.def xc/config/cf/xf86site.def /* * To not install the local font directory, uncomment the following -@@ -281,27 +281,26 @@ - * HasGlide2 to YES and set the Glide2IncDir variable. - * HasGlide2 is per default NO. - * --#define HasGlide2 YES - */ -+#define HasGlide2 YES - - /* - * Set the path to your Glide include files. - * --#define Glide2IncDir /usr/include/glide - */ -+#define Glide2IncDir /usr/include/glide - - /* - * Have glide 3? - * --#define HasGlide3 YES - */ -+#define HasGlide3 YES - - /* - * Set the path to your Glide 3 include files. - * --#define Glide3IncDir /usr/include/glide3 - */ -- -+#define Glide3IncDir /usr/include/glide3 - - - /* -@@ -403,8 +402,8 @@ +@@ -426,8 +425,8 @@ * Some Linux releases don't have a libtermcap. In this case you may need * to uncomment the following * -#define TermcapLibrary -lncurses */ -+#define TermcapLibrary -lncurses - - /* - * If you have Tk (which is required to build XF86Setup), uncomment this -@@ -413,8 +412,8 @@ - * default. - * - XF86Setup is not built or supported with XFree86 4.x - * --#define HasTk YES - */ -+#define HasTk YES - - /* - * Set the paths and names for your Tk library if they don't match the -@@ -427,25 +426,25 @@ - * - * Some Linux releases need TkLibDir set to /usr/X11R6/lib - * --#define TkLibDir /usr/local/lib --#define TkIncDir /usr/local/include --#define TkLibName tk - */ -+#define TkLibDir /usr/lib -+#define TkIncDir /usr/include -+#define TkLibName tk - - /* - * By default, XF86Setup is linked with a static Tk library. To change - * that, uncomment the following line. - * --#define XF86SetupUsesStaticTk NO - */ -+#define XF86SetupUsesStaticTk NO - - /* - * If you have Tcl (which is required to build XF86Setup), uncomment this - * Note: version 7.4 or 7.5 is required, and XF86Setup links it statically by - * default. - * --#define HasTcl YES - */ -+#define HasTcl YES - - /* - * Set the paths and names for your Tcl library if they don't match the -@@ -455,17 +454,17 @@ - * - * Some Linux releases need TclIncDir set to /usr/include/tcl. - * --#define TclLibDir /usr/local/lib --#define TclIncDir /usr/local/include --#define TclLibName tcl - */ -+#define TclLibDir /usr/lib -+#define TclIncDir /usr/include -+#define TclLibName tcl - - /* - * By default, XF86Setup is linked with a static Tcl library. To change - * that, uncomment the following line. - * --#define XF86SetupUsesStaticTcl NO - */ -+#define XF86SetupUsesStaticTcl NO ++#define TermcapLibrary -ltinfo /* * Build a server that dynamically loads the modules by setting -@@ -677,8 +676,8 @@ +@@ -602,8 +601,8 @@ * To forceably build static libraries in addition to shared libraries, * uncomment this. * @@ -385,10 +253,19 @@ diff -urN xc.orig/config/cf/xf86site.def xc/config/cf/xf86site.def /* * Uncomment this if your default tools (eg, gcc, ld, as, etc) are -diff -urN xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf ---- xc.orig/config/cf/xfree86.cf Mon Dec 30 15:52:31 2002 -+++ xc/config/cf/xfree86.cf Mon Dec 30 16:02:13 2002 -@@ -107,7 +107,7 @@ +@@ -691,4 +691,8 @@ + #define X86EMU_LIBPATH /usr/local/lib + */ + +- ++/* these must be before linux.cf is included */ ++#define UsePam YES ++#define HasPam YES ++#define HasPamMisc YES ++#define HasFontconfig YES +--- xc/config/cf/xfree86.cf.orig 2006-04-26 02:28:16.000000000 +0200 ++++ xc/config/cf/xfree86.cf 2006-06-11 00:28:00.337501008 +0200 +@@ -148,7 +148,7 @@ #define XConfigFile XF86Config #endif #ifndef XConfigDir @@ -397,19 +274,18 @@ diff -urN xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf #endif #ifndef XLogFile #define XLogFile XFree86 -@@ -877,7 +877,7 @@ - /* Pure PCI drivers should go first */ +@@ -788,7 +788,7 @@ + # ifndef XF86CardDrivers - # define XF86CardDrivers ati mga glint s3 s3virge sis savage\ -- trident chips tdfx fbdev \ -+ trident chips fbdev \ - DevelDrivers vga \ + # define XF86CardDrivers mga glint nv s3 s3virge sis savage \ +- trident chips tdfx fbdev ati \ ++ trident chips fbdev ati \ + DevelDrivers newport \ XF86OSCardDrivers XF86ExtraCardDrivers # endif -diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c ---- xc.orig/config/imake/imake.c Mon Dec 30 15:52:31 2002 -+++ xc/config/imake/imake.c Mon Dec 30 16:02:13 2002 -@@ -1057,6 +1057,7 @@ +--- xc/config/imake/imake.c.orig 2006-01-09 15:56:14.000000000 +0100 ++++ xc/config/imake/imake.c 2006-06-11 00:28:00.339500704 +0200 +@@ -1056,6 +1056,7 @@ static char* suse = "/etc/SuSE-release"; static char* redhat = "/etc/redhat-release"; static char* debian = "/etc/debian_version"; @@ -417,7 +293,7 @@ diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c fprintf (inFile, "%s\n", "#define LinuxUnknown 0"); fprintf (inFile, "%s\n", "#define LinuxSuSE 1"); -@@ -1071,6 +1072,7 @@ +@@ -1070,6 +1071,7 @@ fprintf (inFile, "%s\n", "#define LinuxTurbo 10"); fprintf (inFile, "%s\n", "#define LinuxWare 11"); fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12"); @@ -425,7 +301,7 @@ diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c #ifdef CROSSCOMPILE if (CrossCompiling) { -@@ -1097,6 +1099,11 @@ +@@ -1096,6 +1098,11 @@ * at the content of /etc/debian_version */ return; } @@ -437,43 +313,9 @@ diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c /* what's the definitive way to tell what any particular distribution is? */ fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown"); -diff -urN xc.orig/programs/Xserver/hw/xfree86/XF86Setup/Imakefile xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile ---- xc.orig/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Mon Dec 30 15:53:38 2002 -+++ xc/programs/Xserver/hw/xfree86/XF86Setup/Imakefile Mon Dec 30 16:02:13 2002 -@@ -118,7 +118,7 @@ - - XCONFIG_DEFINES = $(EXT_DEFINES) -DXF86SETUP \ - '-DPROJECTROOT="$(PROJECTROOT)"' \ -- '-DSERVER_CONFIG_FILE="$(LIBDIR)/$(XCONFIGFILE)"' \ -+ '-DSERVER_CONFIG_FILE="/etc/X11/$(XCONFIGFILE)"' \ - $(SITE_FONT_PATH) $(SITE_RGB_DB) \ - -DNO_WRAPPERS - -diff -urN xc.orig/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl ---- xc.orig/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Mon Dec 30 15:53:38 2002 -+++ xc/programs/Xserver/hw/xfree86/XF86Setup/phase5.tcl Mon Dec 30 16:02:13 2002 -@@ -38,7 +38,7 @@ - set devid [lindex $DeviceIDs $idx] - global Device_$devid - set server [set Device_${devid}(Server)] -- set linkname $Xwinhome/bin/X -+ set linkname /etc/X11/X - set lastlink $linkname - for {set nlinks 0} \ - {[file exists $linkname] && [file type $linkname]=="link" \ -@@ -74,7 +74,7 @@ - set CWD [pwd] - cd $linkdir - catch "unlink X" ret -- if [catch "link $Xwinhome/bin/XF86_$server X" ret] { -+ if [catch "link ../../usr/X11R6/bin/XF86_$server X" ret] { - mesg $messages(phase5.4) okay - } else { - mesg $messages(phase5.5) okay -diff -urN xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile ---- xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile Mon Dec 30 15:53:56 2002 -+++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile Mon Dec 30 16:02:13 2002 -@@ -93,7 +93,7 @@ +--- xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig 2006-03-11 18:36:50.000000000 +0100 ++++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2006-06-11 00:28:00.340500552 +0200 +@@ -108,7 +108,7 @@ #if HasNCurses CURSESLIB = NCursesLibName @@ -482,29 +324,27 @@ diff -urN xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xser #endif XF86CONFIGFILE = XConfigFile -diff -urN xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp ---- xc.orig/programs/xdm/config/Xres.cpp Mon Dec 30 15:54:07 2002 -+++ xc/programs/xdm/config/Xres.cpp Mon Dec 30 16:02:13 2002 -@@ -70,10 +70,10 @@ +--- xc/programs/xdm/config/Xres.cpp.orig 2006-01-09 16:01:06.000000000 +0100 ++++ xc/programs/xdm/config/Xres.cpp 2006-06-11 00:28:00.341500400 +0200 +@@ -65,10 +65,10 @@ #endif /* XPM */ - /**/#endif + XHASHendif #ifdef XPM --/**/#if PLANES >= 8 +-XHASHif PLANES >= 8 -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP -+/**/#if PLANES >= 15 ++XHASHif PLANES > 8 +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo.xpm - /**/#else + XHASHelse -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP +xlogin*logoFileName: BITMAPDIR/**//xdm-pld-logo-bw.xpm - /**/#endif + XHASHendif xlogin*useShape: true xlogin*logoPadding: 10 -diff -urN xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c ---- xc.orig/programs/xdm/resource.c Mon Dec 30 15:54:06 2002 -+++ xc/programs/xdm/resource.c Mon Dec 30 16:02:13 2002 -@@ -73,31 +73,31 @@ - * if it is server-specific). DO NOT CHANGE THESE DEFINITIONS! +--- xc/programs/xdm/resource.c.orig 2006-01-09 16:01:04.000000000 +0100 ++++ xc/programs/xdm/resource.c 2006-06-11 00:28:00.342500248 +0200 +@@ -83,31 +83,31 @@ */ + #ifndef __EMX__ #ifndef DEF_SERVER_LINE -#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0" +#define DEF_SERVER_LINE ":0 local /usr/X11R6/bin/X :0" @@ -542,7 +382,7 @@ diff -urN xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c #endif #ifndef DEF_AUTH_NAME #ifdef HASXDMAUTH -@@ -107,7 +107,7 @@ +@@ -117,7 +117,7 @@ #endif #endif #ifndef DEF_AUTH_DIR @@ -551,11 +391,10 @@ diff -urN xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c #endif #ifndef DEF_USER_AUTH_DIR #define DEF_USER_AUTH_DIR "/tmp" -diff -urN xc.orig/programs/xinit/Imakefile xc/programs/xinit/Imakefile ---- xc.orig/programs/xinit/Imakefile Mon Dec 30 15:54:10 2002 -+++ xc/programs/xinit/Imakefile Mon Dec 30 16:31:27 2002 -@@ -39,11 +39,12 @@ - InstallNamedProg(startx,startx,$(BINDIR)) +--- xc/programs/xinit/Imakefile.orig 2006-03-06 17:06:23.000000000 +0100 ++++ xc/programs/xinit/Imakefile 2006-06-11 00:28:00.342500248 +0200 +@@ -41,11 +41,12 @@ + #endif InstallManPage(startx,$(MANDIR)) -#if InstallXinitConfig @@ -563,7 +402,7 @@ diff -urN xc.orig/programs/xinit/Imakefile xc/programs/xinit/Imakefile -#else -InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR)) -#endif -+XCOMM Red Hat gets this from a different package ++XCOMM PLD gets this from a different package +XCOMM #if InstallXinitConfig +XCOMM InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR)) +XCOMM #else @@ -572,11 +411,10 @@ diff -urN xc.orig/programs/xinit/Imakefile xc/programs/xinit/Imakefile LinkConfDirectory(xinit,.,xinit,.) -diff -urN xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile ---- xc.orig/programs/xterm/Imakefile Mon Dec 30 15:54:16 2002 -+++ xc/programs/xterm/Imakefile Mon Dec 30 16:35:55 2002 -@@ -36,6 +36,10 @@ - #define XkbClientLibs /**/ +--- xc/programs/xterm/Imakefile.orig 2008-11-01 20:57:39.000000000 +0100 ++++ xc/programs/xterm/Imakefile 2013-02-15 18:39:33.885210018 +0100 +@@ -102,6 +102,10 @@ + # endif #endif +#if InstallXtermSetUID @@ -586,33 +424,12 @@ diff -urN xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile #ifndef SpecialCObjectRule #define SpecialCObjectRule(module,ignore,defines) \ module.o: ; $(CC) -c defines $(CFLAGS) module.c -@@ -57,6 +61,8 @@ - PTYLIB = -lpucc - #endif - -+ PTYLIB = -lutil -+ - #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \ - (defined(LinuxArchitecture) && \ - (LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1)) -@@ -110,7 +116,7 @@ - MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */ - XKB_DEFINES = XkbClientDefines - PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT) -- DEFINES = -I. $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF) -+ DEFINES = -I. -I/usr/include/ncurses $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF) - INCLUDES = $(XRFINCLUDES) +@@ -209,7 +213,7 @@ + $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) \ + $(XTERM_FEATURE_OPTIONS) $(PUTENVDEF) \ + $(IMAKEDEFINES) $(TRACEDEF) +- INCLUDES = $(OBSOLETE_INCLUDES) $(XRFINCLUDES) ++ INCLUDES = $(OBSOLETE_INCLUDES) $(XRFINCLUDES) -I/usr/include/ncurses #ifdef OS2Architecture -diff -urN xc.orig/programs/xterm/xterm.h xc/programs/xterm/xterm.h ---- xc.orig/programs/xterm/xterm.h Mon Dec 30 15:54:16 2002 -+++ xc/programs/xterm/xterm.h Mon Dec 30 16:02:13 2002 -@@ -73,7 +73,7 @@ - #endif - - #ifndef DFT_TERMTYPE --#define DFT_TERMTYPE "xterm" -+#define DFT_TERMTYPE "xterm-color" - #endif - - #ifndef X_NOT_POSIX + MAINSRC = os2main.c