X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=X11-PLD.patch;h=73598d15799fdba50ac68fb58e509ef56a2e4131;hb=7603ea68d06439b17804cdd4b333e78fc2929375;hp=5c63fc0e292d1f71eec90431b37fd77b1cc45b39;hpb=c0b1fd53487c344570c46c9caa4111e433f41f26;p=packages%2FX11.git diff --git a/X11-PLD.patch b/X11-PLD.patch index 5c63fc0..73598d1 100644 --- a/X11-PLD.patch +++ b/X11-PLD.patch @@ -1,19 +1,7 @@ -diff -Nru xc.orig/Makefile xc/Makefile ---- xc.orig/Makefile 2003-11-02 05:38:01.000000000 +0100 -+++ xc/Makefile 2003-12-23 12:09:12.071230112 +0100 -@@ -8,7 +8,7 @@ - # or add "MAKE = make" to this file. - - RELEASE = "Release 6.7" --SHELL = /bin/sh -+SHELL = /bin/sh -e - RM = rm -f - MV = mv - WORLDOPTS = -diff -Nru xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf ---- xc.orig/config/cf/Imake.cf 2003-12-19 05:40:33.000000000 +0100 -+++ xc/config/cf/Imake.cf 2003-12-23 12:09:11.983243488 +0100 -@@ -784,6 +784,10 @@ +diff -ur X11-6.9.0.org/xc/config/cf/Imake.cf X11-6.9.0/xc/config/cf/Imake.cf +--- X11-6.9.0.org/xc/config/cf/Imake.cf 2005-11-08 07:33:24.000000000 +0100 ++++ X11-6.9.0/xc/config/cf/Imake.cf 2005-12-22 10:27:11.890963000 +0100 +@@ -888,6 +888,10 @@ # define s390Architecture # undef __s390__ # endif /* s390 */ @@ -24,10 +12,10 @@ diff -Nru xc.orig/config/cf/Imake.cf xc/config/cf/Imake.cf # ifdef __alpha # define AlphaArchitecture # undef __alpha -diff -Nru xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl ---- xc.orig/config/cf/Imake.tmpl 2003-11-21 06:55:02.000000000 +0100 -+++ xc/config/cf/Imake.tmpl 2003-12-23 12:09:11.992242120 +0100 -@@ -261,7 +261,7 @@ +diff -ur X11-6.9.0.org/xc/config/cf/Imake.tmpl X11-6.9.0/xc/config/cf/Imake.tmpl +--- X11-6.9.0.org/xc/config/cf/Imake.tmpl 2005-11-08 07:33:24.000000000 +0100 ++++ X11-6.9.0/xc/config/cf/Imake.tmpl 2005-12-22 10:28:07.490963000 +0100 +@@ -266,7 +266,7 @@ #ifndef BuildHtmlManPages #ifdef RmanCmd @@ -36,7 +24,7 @@ diff -Nru xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl #else #define BuildHtmlManPages NO #endif -@@ -854,11 +854,7 @@ +@@ -882,11 +882,7 @@ #define LintlibDir $(USRLIBDIR)/lint #endif #ifndef SystemManDirectory @@ -48,16 +36,7 @@ diff -Nru xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl #endif #ifndef ManDirectoryRoot #ifdef ProjectRoot -@@ -998,7 +994,7 @@ - #define NoRConst NO /* YES if const for structs of funcs is bad */ - #endif - #ifndef InstPgmFlags --#define InstPgmFlags -s -+#define InstPgmFlags - #endif - #ifndef InstBinFlags - #define InstBinFlags -m 0755 -@@ -1140,7 +1136,7 @@ +@@ -1196,7 +1192,7 @@ #define CppCmd /LibDirName/cpp #endif #ifndef RawCppCmd @@ -66,10 +45,87 @@ diff -Nru xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl #endif #ifndef CppNoLineInfoOption #define CppNoLineInfoOption /**/ -diff -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl ---- xc.orig/config/cf/X11.tmpl 2003-12-19 05:41:17.000000000 +0100 -+++ xc/config/cf/X11.tmpl 2003-12-23 12:09:12.042234520 +0100 -@@ -1262,8 +1262,12 @@ +diff -ur X11-6.9.0.org/xc/config/cf/linux.cf X11-6.9.0/xc/config/cf/linux.cf +--- X11-6.9.0.org/xc/config/cf/linux.cf 2005-10-21 21:10:27.000000000 +0200 ++++ X11-6.9.0/xc/config/cf/linux.cf 2005-12-22 10:40:10.100963000 +0100 +@@ -394,7 +394,7 @@ + #ifndef BuildLibGlxWithoutPIC + # if BuildXF86DRI + # if defined(i386Architecture) +-# define BuildLibGlxWithoutPIC YES ++# define BuildLibGlxWithoutPIC NO + # endif + # endif + #endif +@@ -539,6 +539,10 @@ + # define HasExpat YES + #endif + ++#ifndef HasFontconfig ++# define HasFontconfig YES ++#endif ++ + #ifndef HasFreetype2 + # define HasFreetype2 YES + #endif +@@ -792,7 +796,7 @@ + + #define HasVarRun YES + #ifndef VarDbDirectory +-# define VarDbDirectory $(VARDIR)/lib ++# define VarDbDirectory /var/lib + #endif + + #ifndef XF86OSCardDrivers +diff -ur X11-6.9.0.org/xc/config/cf/site.def X11-6.9.0/xc/config/cf/site.def +--- X11-6.9.0.org/xc/config/cf/site.def 2004-05-06 17:08:25.000000000 +0200 ++++ X11-6.9.0/xc/config/cf/site.def 2005-12-22 10:29:12.390963000 +0100 +@@ -124,6 +124,14 @@ + #define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin + */ + ++#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 */ + /* You MAY need SetUID if users run the server by hand or under xinit */ +diff -ur X11-6.9.0.org/xc/config/cf/X11.tmpl X11-6.9.0/xc/config/cf/X11.tmpl +--- X11-6.9.0.org/xc/config/cf/X11.tmpl 2005-12-15 00:41:52.000000000 +0100 ++++ X11-6.9.0/xc/config/cf/X11.tmpl 2005-12-22 10:32:25.830963000 +0100 +@@ -597,7 +597,7 @@ + #define BuildXF86RushLibrary (BuildXF86RushExt && !BuildServersOnly) + #endif + #ifndef BuildDPSLibraries +-#define BuildDPSLibraries NO ++#define BuildDPSLibraries YES + #endif + #ifndef BuildDPSLibrary + #define BuildDPSLibrary BuildDPSLibraries +@@ -693,7 +693,7 @@ + #endif + + #ifndef BuildXterm +-#define BuildXterm NO ++#define BuildXterm YES + #endif + + #ifndef BuildXkbcomp +@@ -731,7 +731,7 @@ + #endif + + #ifndef InstallHardcopyDocs +-#define InstallHardcopyDocs YES ++#define InstallHardcopyDocs NO + #endif + + #ifndef InstallMiscManPages +@@ -1395,8 +1395,12 @@ # define UsbMouseSupport NO #endif @@ -82,8 +138,8 @@ diff -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl +#define DefaultFSConfigFile $(ETCX11DIR)/fs/config #endif - /* X-TrueType settings */ -@@ -1389,7 +1393,7 @@ + #ifndef BinDir +@@ -1483,7 +1487,7 @@ #define ConfigDir $(LIBDIR)/config #endif #ifndef DocDir @@ -92,12 +148,16 @@ diff -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl #endif #ifndef DocHtmlDir #define DocHtmlDir $(DOCDIR)/html -@@ -1401,31 +1405,31 @@ +@@ -1495,34 +1499,34 @@ #define DocPdfDir $(DOCDIR)/PDF #endif #ifndef FontDir -#define FontDir $(LIBDIR)/fonts +#define FontDir /usr/share/fonts + #endif + #ifndef FontEncDir +-#define FontEncDir $(LIBDIR)/fonts/encodings ++#define FontEncDir /usr/share/fonts/encodings #endif #ifndef AdmDir -#define AdmDir /usr/adm @@ -131,7 +191,7 @@ diff -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl #endif #ifndef NlsDir #define NlsDir $(LIBDIR)/nls -@@ -1434,23 +1438,20 @@ +@@ -1531,23 +1535,20 @@ #define XLocaleDir $(LIBDIR)/locale #endif #ifndef LbxproxyDir @@ -158,7 +218,7 @@ diff -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl #ifndef InstallSecurityConfig #define InstallSecurityConfig YES /* Install sample security policy */ #endif -@@ -1482,10 +1483,10 @@ +@@ -1579,10 +1580,10 @@ #define OsNameDefines /* as nothing */ #endif #ifndef DefaultUserPath /* for xdm */ @@ -171,7 +231,7 @@ diff -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl #endif #ifndef DefaultSystemShell /* for xdm to set in SHELL */ #define DefaultSystemShell BourneShell -@@ -1614,7 +1615,7 @@ +@@ -1719,7 +1720,7 @@ HTMLINDEXCMD = HtmlIndexCmd @@ -180,7 +240,7 @@ diff -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl CLIENTSRC = $(TOP)/clients DEMOSRC = $(TOP)/demos XDOCMACROS = $(DOCUTILSRC)/macros.t -@@ -1628,7 +1629,7 @@ +@@ -1733,7 +1734,7 @@ SERVERSRC = $(XTOP)/programs/Xserver CONTRIBSRC = ContribDir UNSUPPORTEDSRC = UnsupportedDir @@ -189,74 +249,31 @@ diff -Nru xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl RGBSRC = $(XTOP)/programs/rgb BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir -diff -Nru xc.orig/config/cf/linux.cf xc/config/cf/linux.cf ---- xc.orig/config/cf/linux.cf 2003-12-19 05:41:59.000000000 +0100 -+++ xc/config/cf/linux.cf 2003-12-23 12:09:12.008239688 +0100 -@@ -333,7 +333,7 @@ - */ - #if BuildXF86DRI - # if defined(i386Architecture) --# define BuildLibGlxWithoutPIC YES -+# define BuildLibGlxWithoutPIC NO - # endif +diff -ur X11-6.9.0.org/xc/config/cf/xorg.cf X11-6.9.0/xc/config/cf/xorg.cf +--- X11-6.9.0.org/xc/config/cf/xorg.cf 2005-10-03 18:08:44.000000000 +0200 ++++ X11-6.9.0/xc/config/cf/xorg.cf 2005-12-22 10:32:59.590963000 +0100 +@@ -136,7 +136,7 @@ + #define XConfigFile xorg.conf #endif - -@@ -720,7 +720,7 @@ - - #define HasVarRun YES - #ifndef VarDbDirectory --# define VarDbDirectory $(VARDIR)/lib -+# define VarDbDirectory /var/lib + #ifndef XConfigDir +-#define XConfigDir $(LIBDIR) ++#define XConfigDir $(ETCX11DIR) #endif - - #ifndef XF86OSCardDrivers -diff -Nru xc.orig/config/cf/site.def xc/config/cf/site.def ---- xc.orig/config/cf/site.def 2002-02-27 01:51:12.000000000 +0100 -+++ xc/config/cf/site.def 2003-12-23 12:09:12.014238776 +0100 -@@ -119,10 +119,14 @@ - #define HasSentinel YES - */ - --/* - #undef DefaultUserPath --#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin --*/ -+#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.org/config/cf/xorgsite.def xc/config/cf/xorgsite.def ---- xc.org/config/cf/xorgsite.def 2004-04-02 23:47:10.000000000 +0200 -+++ xc/config/cf/xorgsite.def 2004-04-19 01:01:24.744961760 +0200 -@@ -69,14 +69,15 @@ - */ - - /* -- * If you only run the X server under xdm the X servers don't need to be -- * installed SetUID, and you may comment out the lines below. If you run -- * the servers by hand (with xinit or startx), then they do need to be -- * installed SetUID on most platforms. -+ * The X servers need to run as root on most OSs. We're now using a -+ * wrapper in that case, but we still need to make it known that the -+ * servers need SetUID. When only using xdm, this (and the wrapper) -+ * are not required. Disabling this automatically disables use of the -+ * wrapper. - * -- * Consult your system administrator before making the X server setuid. -+ * If you're only starting the Xservers with xdm set this to NO - * --#define InstallXserverSetUID NO -+#define XserverNeedsSetUID NO - */ - - -@@ -260,8 +261,8 @@ + #ifndef XLogFile + #define XLogFile Xorg +@@ -408,7 +408,7 @@ + neomagic i740 tdfx savage \ + cirrus vmware tseng trident chips apm \ + GlideDriver i128 i386Drivers \ +- ati DevelDrivers ark \ ++ ati DevelDrivers ark fbdev \ + cyrix siliconmotion via \ + vesa vga \ + dummy XF86OSCardDrivers XF86ExtraCardDrivers +diff -ur X11-6.9.0.org/xc/config/cf/xorgsite.def X11-6.9.0/xc/config/cf/xorgsite.def +--- X11-6.9.0.org/xc/config/cf/xorgsite.def 2005-07-16 09:59:50.000000000 +0200 ++++ X11-6.9.0/xc/config/cf/xorgsite.def 2005-12-22 10:33:48.940963000 +0100 +@@ -266,8 +266,8 @@ /* * To not build/install the Cyrillic fonts, uncomment the following * @@ -266,31 +283,7 @@ diff -urN xc.org/config/cf/xorgsite.def xc/config/cf/xorgsite.def /* * To not install the local font directory, uncomment the following -@@ -307,20 +308,20 @@ - * 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. -@@ -429,8 +430,8 @@ +@@ -435,8 +435,8 @@ * Some Linux releases don't have a libtermcap. In this case you may need * to uncomment the following * @@ -300,17 +293,7 @@ diff -urN xc.org/config/cf/xorgsite.def xc/config/cf/xorgsite.def /* * Build a server that dynamically loads the modules by setting -@@ -582,8 +583,8 @@ - /* - * If you want XDMAUTH support (if you have Wraphelp.c), uncomment this. - * --#define HasXdmAuth YES - */ -+#define HasXdmAuth YES - - /* - * If you have Linux DECnet support, and want to build XFree86 with support -@@ -605,8 +606,8 @@ +@@ -610,8 +610,8 @@ * To forceably build static libraries in addition to shared libraries, * uncomment this. * @@ -320,31 +303,10 @@ diff -urN xc.org/config/cf/xorgsite.def xc/config/cf/xorgsite.def /* * Uncomment this if your default tools (eg, gcc, ld, as, etc) are -diff -Nru xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf ---- xc.orig/config/cf/xfree86.cf 2003-11-21 06:55:07.000000000 +0100 -+++ xc/config/cf/xfree86.cf 2003-12-23 12:09:12.055232544 +0100 -@@ -128,7 +128,7 @@ - #define XConfigFile XF86Config - #endif - #ifndef XConfigDir --#define XConfigDir $(LIBDIR) -+#define XConfigDir $(ETCX11DIR) - #endif - #ifndef XLogFile - #define XLogFile XFree86 -@@ -760,7 +760,7 @@ - - # ifndef XF86CardDrivers - # define XF86CardDrivers mga glint nv s3 s3virge sis savage \ -- trident chips tdfx fbdev ati \ -+ trident chips fbdev ati \ - DevelDrivers newport \ - XF86OSCardDrivers XF86ExtraCardDrivers - # endif -diff -Nru xc.orig/config/imake/imake.c xc/config/imake/imake.c ---- xc.orig/config/imake/imake.c 2003-04-10 13:00:03.000000000 +0200 -+++ xc/config/imake/imake.c 2003-12-23 12:09:12.060231784 +0100 -@@ -1057,6 +1057,7 @@ +diff -ur X11-6.9.0.org/xc/config/imake/imake.c X11-6.9.0/xc/config/imake/imake.c +--- X11-6.9.0.org/xc/config/imake/imake.c 2005-11-08 07:33:24.000000000 +0100 ++++ X11-6.9.0/xc/config/imake/imake.c 2005-12-22 10:34:57.200963000 +0100 +@@ -1061,6 +1061,7 @@ static char* suse = "/etc/SuSE-release"; static char* redhat = "/etc/redhat-release"; static char* debian = "/etc/debian_version"; @@ -352,7 +314,7 @@ diff -Nru 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 @@ +@@ -1075,6 +1076,7 @@ fprintf (inFile, "%s\n", "#define LinuxTurbo 10"); fprintf (inFile, "%s\n", "#define LinuxWare 11"); fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12"); @@ -360,7 +322,7 @@ diff -Nru xc.orig/config/imake/imake.c xc/config/imake/imake.c #ifdef CROSSCOMPILE if (CrossCompiling) { -@@ -1097,6 +1099,11 @@ +@@ -1101,6 +1103,12 @@ * at the content of /etc/debian_version */ return; } @@ -369,25 +331,27 @@ diff -Nru xc.orig/config/imake/imake.c xc/config/imake/imake.c + fprintf (inFile, "%s\n", "#define DefaultLinuxDistName PLD"); + return; + } ++ /* what's the definitive way to tell what any particular distribution is? */ fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown"); -diff -Nru xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile ---- xc.orig/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-12-19 05:48:39.000000000 +0100 -+++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2003-12-23 12:09:12.000000000 +0100 -@@ -107,7 +107,7 @@ - - #if HasNCurses - CURSESLIB = NCursesLibName --CURSESDEFINES = -DHAS_NCURSES -+CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses - #endif +diff -ur X11-6.9.0.org/xc/Makefile X11-6.9.0/xc/Makefile +--- X11-6.9.0.org/xc/Makefile 2005-12-15 00:41:52.000000000 +0100 ++++ X11-6.9.0/xc/Makefile 2005-12-22 10:39:28.160963000 +0100 +@@ -9,7 +9,7 @@ + # or add "MAKE = make" to this file. - XF86CONFIGFILE = XConfigFile -diff -Nru xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp ---- xc.orig/programs/xdm/config/Xres.cpp 2003-11-21 07:01:06.000000000 +0100 -+++ xc/programs/xdm/config/Xres.cpp 2003-12-23 12:09:12.000000000 +0100 -@@ -71,9 +71,9 @@ + RELEASE = "Release 6.9" +-SHELL = /bin/sh ++SHELL = /bin/sh -e + RM = rm -f + MV = mv + WORLDOPTS = +diff -ur X11-6.9.0.org/xc/programs/xdm/config/Xres.cpp X11-6.9.0/xc/programs/xdm/config/Xres.cpp +--- X11-6.9.0.org/xc/programs/xdm/config/Xres.cpp 2004-04-23 21:54:43.000000000 +0200 ++++ X11-6.9.0/xc/programs/xdm/config/Xres.cpp 2005-12-22 10:35:32.500963000 +0100 +@@ -70,10 +70,10 @@ + #endif /* XPM */ XHASHendif #ifdef XPM -XHASHif PLANES >= 8 @@ -400,10 +364,10 @@ diff -Nru xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp XHASHendif xlogin*useShape: true xlogin*logoPadding: 10 -diff -Nru xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c ---- xc.orig/programs/xdm/resource.c 2003-09-25 13:06:32.000000000 +0200 -+++ xc/programs/xdm/resource.c 2003-12-23 12:09:12.000000000 +0100 -@@ -84,31 +84,31 @@ +diff -ur X11-6.9.0.org/xc/programs/xdm/resource.c X11-6.9.0/xc/programs/xdm/resource.c +--- X11-6.9.0.org/xc/programs/xdm/resource.c 2005-11-08 07:33:31.000000000 +0100 ++++ X11-6.9.0/xc/programs/xdm/resource.c 2005-12-22 10:36:59.580963000 +0100 +@@ -85,31 +85,31 @@ */ #ifndef __EMX__ #ifndef DEF_SERVER_LINE @@ -443,7 +407,7 @@ diff -Nru xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c #endif #ifndef DEF_AUTH_NAME #ifdef HASXDMAUTH -@@ -118,7 +118,7 @@ +@@ -119,7 +119,7 @@ #endif #endif #ifndef DEF_AUTH_DIR @@ -452,10 +416,19 @@ diff -Nru xc.orig/programs/xdm/resource.c xc/programs/xdm/resource.c #endif #ifndef DEF_USER_AUTH_DIR #define DEF_USER_AUTH_DIR "/tmp" -diff -Nru xc.orig/programs/xinit/Imakefile xc/programs/xinit/Imakefile ---- xc.orig/programs/xinit/Imakefile 2003-11-21 07:01:12.000000000 +0100 -+++ xc/programs/xinit/Imakefile 2003-12-23 12:09:12.000000000 +0100 -@@ -46,11 +46,12 @@ +diff -ur X11-6.9.0.org/xc/programs/xinit/Imakefile X11-6.9.0/xc/programs/xinit/Imakefile +--- X11-6.9.0.org/xc/programs/xinit/Imakefile 2005-11-15 05:03:10.000000000 +0100 ++++ X11-6.9.0/xc/programs/xinit/Imakefile 2005-12-22 10:37:39.740963000 +0100 +@@ -72,7 +72,7 @@ + + MakeScriptFromCpp(xinitrc, -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) -DSHELL_CMD=$(SHELL_CMD) -DLIBDIR=$(LIBDIR)) + +-MakeScriptFromCpp(startx, -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) $(COOKIEDEFS) -DSHELL_CMD=$(SHELL_CMD) -DLIBDIR=$(LIBDIR)) ++MakeScriptFromCpp(startx, -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) $(COOKIEDEFS) -DSHELL_CMD=$(SHELL_CMD) -DBINDIR=$(BINDIR) -DLIBDIR=$(LIBDIR)) + + #if defined(SCOArchitecture) || defined(USLArchitecture) + ARCHMANDEFS=-D__SCOMAN__ +@@ -88,11 +88,12 @@ #endif InstallManPage(startx,$(MANDIR)) @@ -473,11 +446,23 @@ diff -Nru xc.orig/programs/xinit/Imakefile xc/programs/xinit/Imakefile LinkConfDirectory(xinit,.,xinit,.) -diff -Nru xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile ---- xc.orig/programs/xterm/Imakefile 2003-12-19 05:51:51.000000000 +0100 -+++ xc/programs/xterm/Imakefile 2003-12-23 12:11:05.000000000 +0100 -@@ -36,6 +36,10 @@ - #define XkbClientLibs /**/ +diff -ur X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile X11-6.9.0/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile +--- X11-6.9.0.org/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2005-08-23 03:14:35.000000000 +0200 ++++ X11-6.9.0/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2005-12-22 10:39:11.440963000 +0100 +@@ -110,7 +110,7 @@ + + #if HasNCurses + CURSESLIB = NCursesLibName +-CURSESDEFINES = -DHAS_NCURSES ++CURSESDEFINES = -DHAS_NCURSES -I/usr/include/ncurses + #endif + + XF86CONFIGFILE = XConfigFile +diff -ur X11-6.9.0.org/xc/programs/xterm/Imakefile X11-6.9.0/xc/programs/xterm/Imakefile +--- X11-6.9.0.org/xc/programs/xterm/Imakefile 2005-12-15 00:28:27.000000000 +0100 ++++ X11-6.9.0/xc/programs/xterm/Imakefile 2005-12-22 10:38:51.510963000 +0100 +@@ -68,6 +68,10 @@ + # endif #endif +#if InstallXtermSetUID @@ -487,33 +472,20 @@ diff -Nru 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 @@ +@@ -88,6 +92,7 @@ + PUCCPTYDDEF = -DPUCC_PTYD /* does not need to be setuid */ PTYLIB = -lpucc #endif ++ PTYLIB = -lutil -+ PTYLIB = -lutil -+ - #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \ - (defined(LinuxArchitecture) && \ - (LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1)) -@@ -116,7 +122,7 @@ + #if defined(NetBSDArchitecture) || \ + defined(OpenBSDArchitecture) || \ +@@ -153,7 +158,7 @@ XKB_DEFINES = XkbClientDefines PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT) - DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(TRACEDEF) $(XVERSIONDEFS) $(VENDORDEFINES) + DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) $(IMAKEDEFINES) $(TRACEDEF) - INCLUDES = -I. $(XRFINCLUDES) + INCLUDES = -I. -I/usr/include/ncurses $(XRFINCLUDES) #ifdef OS2Architecture MAINSRC = os2main.c -diff -Nru xc.orig/programs/xterm/xterm.h xc/programs/xterm/xterm.h ---- xc.orig/programs/xterm/xterm.h 2003-12-19 05:51:52.000000000 +0100 -+++ xc/programs/xterm/xterm.h 2003-12-23 12:09:12.000000000 +0100 -@@ -73,7 +73,7 @@ - #endif - - #ifndef DFT_TERMTYPE --#define DFT_TERMTYPE "xterm" -+#define DFT_TERMTYPE "xterm-color" - #endif - - #ifndef X_NOT_POSIX