---- XFree86-4.3.99.14/xc/lib/GL/mesa/src/math/Imakefile.inc.orig 2003-10-10 13:02:44.000000000 +0200
-+++ XFree86-4.3.99.14/xc/lib/GL/mesa/src/math/Imakefile.inc 2003-10-12 14:33:09.000000000 +0200
-@@ -26,20 +23,14 @@
- LinkSourceFile(m_xform.c, $(MESASRCDIR)/src/math)
- #endif
-
-- MESA_MATH_OBJS = $(MESAMATHBUILDDIR)m_debug_clip.o \
-- $(MESAMATHBUILDDIR)m_debug_norm.o \
-- $(MESAMATHBUILDDIR)m_debug_xform.o \
-- $(MESAMATHBUILDDIR)m_eval.o \
-+ MESA_MATH_OBJS = $(MESAMATHBUILDDIR)m_eval.o \
- $(MESAMATHBUILDDIR)m_matrix.o \
- $(MESAMATHBUILDDIR)m_translate.o \
- $(MESAMATHBUILDDIR)m_vector.o \
- $(MESAMATHBUILDDIR)m_xform.o
-
- #if defined(DoSharedLib) && DoSharedLib
-- MESA_MATH_UOBJS = $(MESAMATHBUILDDIR)unshared/m_debug_clip.o \
-- $(MESAMATHBUILDDIR)unshared/m_debug_norm.o \
-- $(MESAMATHBUILDDIR)unshared/m_debug_xform.o \
-- $(MESAMATHBUILDDIR)unshared/m_eval.o \
-+ MESA_MATH_UOBJS = $(MESAMATHBUILDDIR)unshared/m_eval.o \
- $(MESAMATHBUILDDIR)unshared/m_matrix.o \
- $(MESAMATHBUILDDIR)unshared/m_translate.o \
- $(MESAMATHBUILDDIR)unshared/m_vector.o \
-@@ -48,19 +39,13 @@
+--- xc/lib/GL/mesa/math/Imakefile.inc.orig 2004-04-22 15:58:40.000000000 +0200
++++ xc/lib/GL/mesa/math/Imakefile.inc 2006-06-11 03:29:48.922144072 +0200
+@@ -71,19 +71,13 @@
MATH_MESA_UOBJS = $(MESA_MATH_OBJS)
#endif
---- XFree86-4.0.1/xc/config/cf/xf86site.def~ Wed Nov 8 18:24:28 2000
-+++ XFree86-4.0.1/xc/config/cf/xf86site.def Wed Nov 8 18:37:12 2000
-@@ -555,8 +555,8 @@
+--- xc/config/cf/xf86site.def.orig 2006-06-11 02:28:39.436990608 +0200
++++ xc/config/cf/xf86site.def 2006-06-11 02:34:18.669419440 +0200
+@@ -579,8 +579,8 @@
/*
- * If you want XDMAUTH support (if you have Wraphelp.c), uncomment this.
+ * If you want to disable XDMAUTH support, uncomment this.
*
--#define HasXdmAuth YES
+-#define HasXdmAuth NO
*/
+#define HasXdmAuth YES
/*
* If you have Linux DECnet support, and want to build XFree86 with support
---- /dev/null Tue May 27 20:49:58 1997
-+++ XFree86-4.0.1/xc/lib/Xdmcp/Wraphelp.c Sat Feb 26 02:04:11 2000
-@@ -0,0 +1,401 @@
-+/*
-+ * This program implements the
-+ * Proposed Federal Information Processing
-+ * Data Encryption Standard.
-+ * See Federal Register, March 17, 1975 (40FR12134)
-+ */
-+
-+/*
-+ * Initial permutation,
-+ */
-+static char IP[] = {
-+ 58,50,42,34,26,18,10, 2,
-+ 60,52,44,36,28,20,12, 4,
-+ 62,54,46,38,30,22,14, 6,
-+ 64,56,48,40,32,24,16, 8,
-+ 57,49,41,33,25,17, 9, 1,
-+ 59,51,43,35,27,19,11, 3,
-+ 61,53,45,37,29,21,13, 5,
-+ 63,55,47,39,31,23,15, 7,
-+};
-+
-+/*
-+ * Final permutation, FP = IP^(-1)
-+ */
-+static char FP[] = {
-+ 40, 8,48,16,56,24,64,32,
-+ 39, 7,47,15,55,23,63,31,
-+ 38, 6,46,14,54,22,62,30,
-+ 37, 5,45,13,53,21,61,29,
-+ 36, 4,44,12,52,20,60,28,
-+ 35, 3,43,11,51,19,59,27,
-+ 34, 2,42,10,50,18,58,26,
-+ 33, 1,41, 9,49,17,57,25,
-+};
-+
-+/*
-+ * Permuted-choice 1 from the key bits
-+ * to yield C and D.
-+ * Note that bits 8,16... are left out:
-+ * They are intended for a parity check.
-+ */
-+static char PC1_C[] = {
-+ 57,49,41,33,25,17, 9,
-+ 1,58,50,42,34,26,18,
-+ 10, 2,59,51,43,35,27,
-+ 19,11, 3,60,52,44,36,
-+};
-+
-+static char PC1_D[] = {
-+ 63,55,47,39,31,23,15,
-+ 7,62,54,46,38,30,22,
-+ 14, 6,61,53,45,37,29,
-+ 21,13, 5,28,20,12, 4,
-+};
-+
-+/*
-+ * Sequence of shifts used for the key schedule.
-+*/
-+static char shifts[] = {
-+ 1,1,2,2,2,2,2,2,1,2,2,2,2,2,2,1,
-+};
-+
-+/*
-+ * Permuted-choice 2, to pick out the bits from
-+ * the CD array that generate the key schedule.
-+ */
-+static char PC2_C[] = {
-+ 14,17,11,24, 1, 5,
-+ 3,28,15, 6,21,10,
-+ 23,19,12, 4,26, 8,
-+ 16, 7,27,20,13, 2,
-+};
-+
-+static char PC2_D[] = {
-+ 41,52,31,37,47,55,
-+ 30,40,51,45,33,48,
-+ 44,49,39,56,34,53,
-+ 46,42,50,36,29,32,
-+};
-+
-+/*
-+ * The C and D arrays used to calculate the key schedule.
-+ */
-+
-+static char C[28];
-+static char D[28];
-+
-+/*
-+ * The key schedule.
-+ * Generated from the key.
-+ */
-+static char KS[16][48];
-+
-+/*
-+ * The E bit-selection table.
-+ */
-+static char E[48];
-+static char e[] = {
-+ 32, 1, 2, 3, 4, 5,
-+ 4, 5, 6, 7, 8, 9,
-+ 8, 9,10,11,12,13,
-+ 12,13,14,15,16,17,
-+ 16,17,18,19,20,21,
-+ 20,21,22,23,24,25,
-+ 24,25,26,27,28,29,
-+ 28,29,30,31,32, 1,
-+};
-+
-+/*
-+ * Set up the key schedule from the key.
-+ */
-+
-+static
-+setkey(key)
-+char *key;
-+{
-+ int i, j, k;
-+ int t;
-+ char *ptr;
-+
-+ /*
-+ * First, generate C and D by permuting
-+ * the key. The low order bit of each
-+ * 8-bit char is not used, so C and D are only 28
-+ * bits apiece.
-+ */
-+ for (i=0; i<28; i++) {
-+ C[i] = key[PC1_C[i]-1];
-+ D[i] = key[PC1_D[i]-1];
-+ }
-+ /*
-+ * To generate Ki, rotate C and D according
-+ * to schedule and pick up a permutation
-+ * using PC2.
-+ */
-+ for (i=0; i<16; i++) {
-+ /*
-+ * rotate.
-+ */
-+ for (k=0; k<shifts[i]; k++) {
-+ t = C[0];
-+ ptr = C;
-+ for (j=0; j<28-1; j++)
-+ {
-+ *ptr = ptr[1];
-+ ptr++;
-+ }
-+ C[27] = t;
-+ t = D[0];
-+ ptr = D;
-+ for (j=0; j<28-1; j++)
-+ {
-+ *ptr = ptr[1];
-+ ptr++;
-+ }
-+ D[27] = t;
-+ }
-+ /*
-+ * get Ki. Note C and D are concatenated.
-+ */
-+ ptr = &KS[i][0];
-+ for (j=0; j<24; j++) {
-+ ptr[j] = C[PC2_C[j]-1];
-+ ptr[j+24] = D[PC2_D[j]-28-1];
-+ }
-+ }
-+
-+ for(i=0;i<48;i++)
-+ E[i] = e[i];
-+}
-+
-+/*
-+ * The 8 selection functions.
-+ * For some reason, they give a 0-origin
-+ * index, unlike everything else.
-+ */
-+static char S[8][64] = {
-+ 14, 4,13, 1, 2,15,11, 8, 3,10, 6,12, 5, 9, 0, 7,
-+ 0,15, 7, 4,14, 2,13, 1,10, 6,12,11, 9, 5, 3, 8,
-+ 4, 1,14, 8,13, 6, 2,11,15,12, 9, 7, 3,10, 5, 0,
-+ 15,12, 8, 2, 4, 9, 1, 7, 5,11, 3,14,10, 0, 6,13,
-+
-+ 15, 1, 8,14, 6,11, 3, 4, 9, 7, 2,13,12, 0, 5,10,
-+ 3,13, 4, 7,15, 2, 8,14,12, 0, 1,10, 6, 9,11, 5,
-+ 0,14, 7,11,10, 4,13, 1, 5, 8,12, 6, 9, 3, 2,15,
-+ 13, 8,10, 1, 3,15, 4, 2,11, 6, 7,12, 0, 5,14, 9,
-+
-+ 10, 0, 9,14, 6, 3,15, 5, 1,13,12, 7,11, 4, 2, 8,
-+ 13, 7, 0, 9, 3, 4, 6,10, 2, 8, 5,14,12,11,15, 1,
-+ 13, 6, 4, 9, 8,15, 3, 0,11, 1, 2,12, 5,10,14, 7,
-+ 1,10,13, 0, 6, 9, 8, 7, 4,15,14, 3,11, 5, 2,12,
-+
-+ 7,13,14, 3, 0, 6, 9,10, 1, 2, 8, 5,11,12, 4,15,
-+ 13, 8,11, 5, 6,15, 0, 3, 4, 7, 2,12, 1,10,14, 9,
-+ 10, 6, 9, 0,12,11, 7,13,15, 1, 3,14, 5, 2, 8, 4,
-+ 3,15, 0, 6,10, 1,13, 8, 9, 4, 5,11,12, 7, 2,14,
-+
-+ 2,12, 4, 1, 7,10,11, 6, 8, 5, 3,15,13, 0,14, 9,
-+ 14,11, 2,12, 4, 7,13, 1, 5, 0,15,10, 3, 9, 8, 6,
-+ 4, 2, 1,11,10,13, 7, 8,15, 9,12, 5, 6, 3, 0,14,
-+ 11, 8,12, 7, 1,14, 2,13, 6,15, 0, 9,10, 4, 5, 3,
-+
-+ 12, 1,10,15, 9, 2, 6, 8, 0,13, 3, 4,14, 7, 5,11,
-+ 10,15, 4, 2, 7,12, 9, 5, 6, 1,13,14, 0,11, 3, 8,
-+ 9,14,15, 5, 2, 8,12, 3, 7, 0, 4,10, 1,13,11, 6,
-+ 4, 3, 2,12, 9, 5,15,10,11,14, 1, 7, 6, 0, 8,13,
-+
-+ 4,11, 2,14,15, 0, 8,13, 3,12, 9, 7, 5,10, 6, 1,
-+ 13, 0,11, 7, 4, 9, 1,10,14, 3, 5,12, 2,15, 8, 6,
-+ 1, 4,11,13,12, 3, 7,14,10,15, 6, 8, 0, 5, 9, 2,
-+ 6,11,13, 8, 1, 4,10, 7, 9, 5, 0,15,14, 2, 3,12,
-+
-+ 13, 2, 8, 4, 6,15,11, 1,10, 9, 3,14, 5, 0,12, 7,
-+ 1,15,13, 8,10, 3, 7, 4,12, 5, 6,11, 0,14, 9, 2,
-+ 7,11, 4, 1, 9,12,14, 2, 0, 6,10,13,15, 3, 5, 8,
-+ 2, 1,14, 7, 4,10, 8,13,15,12, 9, 0, 3, 5, 6,11,
-+};
-+
-+/*
-+ * P is a permutation on the selected combination
-+ * of the current L and key.
-+ */
-+static char P[] = {
-+ 16, 7,20,21,
-+ 29,12,28,17,
-+ 1,15,23,26,
-+ 5,18,31,10,
-+ 2, 8,24,14,
-+ 32,27, 3, 9,
-+ 19,13,30, 6,
-+ 22,11, 4,25,
-+};
-+
-+/*
-+ * The current block, divided into 2 halves.
-+ */
-+
-+static char L[64];
-+#define R (L + 32)
-+static char tempL[32];
-+static char f[32];
-+
-+/*
-+ * The combination of the key and the input, before selection.
-+ */
-+static char preS[48];
-+
-+/*
-+ * The payoff: encrypt a block.
-+ */
-+
-+static
-+encrypt (block, edflag)
-+char *block;
-+{
-+ int i, ii;
-+ register t, j, k;
-+
-+ /*
-+ * First, permute the bits in the input
-+ */
-+ for (j=0; j<64; j++)
-+ L[j] = block[IP[j]-1];
-+ /*
-+ * Perform an encryption operation 16 times.
-+ */
-+ for (ii=0; ii<16; ii++) {
-+/* print_bits ("L R", L); */
-+ /*
-+ * Set direction
-+ */
-+ if (edflag)
-+ i = 15-ii;
-+ else
-+ i = ii;
-+ /*
-+ * Save the R array,
-+ * which will be the new L.
-+ */
-+ for (j=0; j<32; j++)
-+ tempL[j] = R[j];
-+ /*
-+ * Expand R to 48 bits using the E selector;
-+ * exclusive-or with the current key bits.
-+ */
-+ for (j=0; j<48; j++)
-+ preS[j] = R[E[j]-1] ^ KS[i][j];
-+ /*
-+ * The pre-select bits are now considered
-+ * in 8 groups of 6 bits each.
-+ * The 8 selection functions map these
-+ * 6-bit quantities into 4-bit quantities
-+ * and the results permuted
-+ * to make an f(R, K).
-+ * The indexing into the selection functions
-+ * is peculiar; it could be simplified by
-+ * rewriting the tables.
-+ */
-+ for (j=0; j<8; j++) {
-+ t = 6*j;
-+ k = S[j][(preS[t+0]<<5)+
-+ (preS[t+1]<<3)+
-+ (preS[t+2]<<2)+
-+ (preS[t+3]<<1)+
-+ (preS[t+4]<<0)+
-+ (preS[t+5]<<4)];
-+ t = 4*j;
-+ f[t+0] = (k>>3)&01;
-+ f[t+1] = (k>>2)&01;
-+ f[t+2] = (k>>1)&01;
-+ f[t+3] = (k>>0)&01;
-+ }
-+ /*
-+ * The new R is L ^ f(R, K).
-+ * The f here has to be permuted first, though.
-+ */
-+ for (j=0; j<32; j++)
-+ R[j] = L[j] ^ f[P[j]-1];
-+ /*
-+ * Finally, the new L (the original R)
-+ * is copied back.
-+ */
-+ for (j=0; j<32; j++)
-+ L[j] = tempL[j];
-+ }
-+ /*
-+ * The output L and R are reversed.
-+ */
-+ for (j=0; j<32; j++) {
-+ t = L[j];
-+ L[j] = R[j];
-+ R[j] = t;
-+ }
-+ /*
-+ * The final output
-+ * gets the inverse permutation of the very original.
-+ */
-+ for (j=0; j<64; j++)
-+ block[j] = L[FP[j]-1];
-+}
-+
-+static
-+bytes_to_bits (bytes, bits)
-+ unsigned char *bytes;
-+ char *bits;
-+{
-+ int bit, byte, value;
-+
-+ for (byte = 0; byte < 8; byte++)
-+ {
-+ value = *bytes++;
-+ for (bit = 0; bit < 8; bit++)
-+ *bits++ = (value >> (7-bit)) & 1;
-+ }
-+}
-+
-+static
-+bits_to_bytes (bits, bytes)
-+ char *bits;
-+ unsigned char *bytes;
-+{
-+ int bit, byte, value;
-+
-+ for (byte = 0; byte < 8; byte++)
-+ {
-+ value = 0;
-+ for (bit = 0; bit < 8; bit++)
-+ value |= *bits++ << (7-bit);
-+ *bytes++ = value;
-+ }
-+}
-+
-+/*
-+ * Interface compatible with Kerberos DES implementation
-+ */
-+
-+# include "Wrap.h"
-+
-+/*ARGSUSED*/
-+_XdmcpAuthSetup (key, schedule)
-+ auth_cblock key;
-+ auth_wrapper_schedule schedule;
-+{
-+ char expand_key[64];
-+
-+ bytes_to_bits ((unsigned char *) key, expand_key);
-+ setkey (expand_key);
-+}
-+
-+/*ARGSUSED*/
-+_XdmcpAuthDoIt (input, output, schedule, edflag)
-+ auth_cblock input, output;
-+ auth_wrapper_schedule schedule;
-+ int edflag;
-+{
-+ char expand_input[64];
-+
-+ bytes_to_bits ((unsigned char *) input, expand_input);
-+ encrypt (expand_input, !edflag);
-+ bits_to_bytes (expand_input, (unsigned char *) output);
-+}
---- xc/programs/xterm/XTerm-col.ad.orig 2003-09-25 13:06:59.000000000 +0200
-+++ xc/programs/xterm/XTerm-col.ad 2003-10-01 20:48:30.453913496 +0200
-@@ -11,8 +11,8 @@
- !*VT100*background: black
-
- ! Uncomment this to use color for underline attribute
--!*VT100*colorULMode: on
--!*VT100*underLine: off
-+*VT100*colorULMode: on
-+*VT100*underLine: on
-
- ! Uncomment this to use color for the bold attribute
- !*VT100*colorBDMode: on
---- xc/programs/xterm/XTerm.ad.orig 2003-09-25 13:06:59.000000000 +0200
-+++ xc/programs/xterm/XTerm.ad 2003-10-01 20:49:35.565015104 +0200
-@@ -110,3 +110,180 @@
- *tek4014*font2: 8x13
+--- xc/programs/xterm/XTerm.ad.orig 2006-04-10 02:34:36.000000000 +0200
++++ xc/programs/xterm/XTerm.ad 2006-06-11 03:08:24.065471976 +0200
+@@ -115,6 +115,183 @@
*tek4014*font3: 6x13
*tek4014*fontSmall: 6x10
-+
+
+! This file causes when loaded using xrdb correct behaviour of xterm
+! if you are using enclosed xterm.tcap and xterm.ti.
+! Some keys would never normally work if they weren't here (like Alt
+! On some systems you may want to replace the a (alt) modifiers with
+! m (meta) modifier in front of some <Key> events.
+*vt100.translations: #override \
-+ Alt Ctrl<Btn4Down>: string(0x1b) string("OA")\n\
-+ Alt Ctrl<Btn5Down>: string(0x1b) string("OB")\n\
-+ Alt<Btn4Down>: string(0x1b) string("OA") string(0x1b) string("OA") string(0x1b) string("OA") string(0x1b) string("OA") string(0x1b) string("OA")\n\
-+ Alt<Btn5Down>: string(0x1b) string("OB") string(0x1b) string("OB") string(0x1b) string("OB") string(0x1b) string("OB") string(0x1b) string("OB")\n\
-+ Shift<Btn4Down>: scroll-back(1,page)\n\
-+ Shift<Btn5Down>: scroll-forw(1,page)\n\
-+ Ctrl<Btn4Down>: scroll-back(1,line)\n\
-+ Ctrl<Btn5Down>: scroll-forw(1,line)\n\
-+ <Btn4Down>: scroll-back(5,line)\n\
-+ <Btn5Down>: scroll-forw(5,line)\n\
-+ @Num_Lock<Key>KP_0: string(0)\n\
-+ @Num_Lock<Key>KP_1: string(1)\n\
-+ @Num_Lock<Key>KP_2: string(2)\n\
-+ @Num_Lock<Key>KP_3: string(3)\n\
-+ @Num_Lock<Key>KP_4: string(4)\n\
-+ @Num_Lock<Key>KP_5: string(5)\n\
-+ @Num_Lock<Key>KP_6: string(6)\n\
-+ @Num_Lock<Key>KP_7: string(7)\n\
-+ @Num_Lock<Key>KP_8: string(8)\n\
-+ @Num_Lock<Key>KP_9: string(9)\n\
-+ @Num_Lock<Key>KP_Add: string(+)\n\
-+ @Num_Lock<Key>KP_Decimal: string(.)\n\
-+ @Num_Lock<Key>KP_Divide: string(/)\n\
-+ @Num_Lock<Key>KP_Enter: string(\015)\n\
-+ @Num_Lock<Key>KP_Equal: string(=)\n\
-+ @Num_Lock<Key>KP_Multiply: string(*)\n\
-+ @Num_Lock<Key>KP_Subtract: string(-)\n\
-+ <Key>KP_Add: string(+)\n\
-+ <Key>KP_Divide: string(/)\n\
-+ <Key>KP_Enter: string(\015)\n\
-+ <Key>KP_Equal: string(=)\n\
-+ <Key>KP_Multiply: string(*)\n\
-+ <Key>KP_Subtract: string(-)\n\
-+ Shift<Key>KP_Home: scroll-back(100,page)\n\
-+ Shift<Key>KP_End: scroll-forw(100,page)\n\
-+ Shift<Key>Prior:scroll-back(1,page)\n\
-+ Shift<Key>Next:scroll-forw(1,page)\n\
-+ <Key>F16: start-extend() select-end(PRIMARY, CUT_BUFFER0, CLIPBOARD)\n\
-+ <Key>F18: insert-selection(PRIMARY, CLIPBOARD)\n\
-+ <Key>F27: scroll-back(100,page)\n\
-+ <Key>R13: scroll-forw(100,page)\n\
-+ Ctrl<Key>Home: string(0x1b) string("[1;5H")\n\
-+ Shift<Key>Home: string(0x1b) string("[1;2H")\n\
-+ Ctrl<Key>End: string(0x1b) string("[1;5F")\n\
-+ Shift<Key>End: string(0x1b) string("[1;2F")\n\
-+ Ctrl<Key>Insert: string(0x1b) string("[2;5~")\n\
-+ Shift<Key>Insert: string(0x1b) string("[2;2~")\n\
-+ ~Meta<Key>Insert: string(0x1b) string("[2~")\n\
-+ Meta<Key>Insert: string(0x1b) string(0x1b) string("[2~")\n\
-+ Ctrl<Key>Delete: string(0x1b) string("[3;5~")\n\
-+ Shift<Key>Delete: string(0x1b) string("[3;2~")\n\
-+ ~Meta<Key>Delete: string(0x1b) string("[3~")\n\
-+ Meta<Key>Delete: string(0x1b) string(0x1b) string("[3~")\n\
-+ Ctrl<Key>Page_Up: string(0x1b) string("[5;5~")\n\
-+ ~Meta<Key>Page_Up: string(0x1b) string("[5~")\n\
-+ Meta<Key>Page_Up: string(0x1b) string(0x1b) string("[5~")\n\
-+ Ctrl<Key>Page_Down: string(0x1b) string("[6;5~")\n\
-+ ~Meta<Key>Page_Down: string(0x1b) string("[6~")\n\
-+ Meta<Key>Page_Down: string(0x1b) string(0x1b) string("[6~")\n\
-+ ~Meta<Key>BackSpace: string(0x08)\n\
-+ Meta<Key>BackSpace: string(0x1b) string(0x08)\n\
-+ Ctrl Shift<Key>Up: string(0x1b) string("[1;6A")\n\
-+ Ctrl<Key>Up: string(0x1b) string("[1;5A")\n\
-+ Shift<Key>Up: string(0x1b) string("O2A")\n\
-+ ~Meta<Key>Up: string(0x1b) string("OA")\n\
-+ Meta<Key>Up: string(0x1b) string(0x1b) string("OA")\n\
-+ Ctrl Shift<Key>Down: string(0x1b) string("[1;6B")\n\
-+ Ctrl<Key>Down: string(0x1b) string("[1;5B")\n\
-+ Shift<Key>Down: string(0x1b) string("O2B")\n\
-+ ~Meta<Key>Down: string(0x1b) string("OB")\n\
-+ Meta<Key>Down: string(0x1b) string(0x1b) string("OB")\n\
-+ Ctrl Shift<Key>Left: string(0x1b) string("[1;6D")\n\
-+ Ctrl<Key>Left: string(0x1b) string("[1;5D")\n\
-+ Shift<Key>Left: string(0x1b) string("O2D")\n\
-+ Mod5<Key>Left: string(0x1b) string("b")\n\
-+ ~Meta<Key>Left: string(0x1b) string("OD")\n\
-+ Meta<Key>Left: string(0x1b) string(0x1b) string("OD")\n\
-+ Ctrl Shift<Key>Right: string(0x1b) string("[1;6C")\n\
-+ Ctrl<Key>Right: string(0x1b) string("[1;5C")\n\
-+ Shift<Key>Right: string(0x1b) string("O2C")\n\
-+ Mod5<Key>Right: string(0x1b) string("f")\n\
-+ ~Meta<Key>Right: string(0x1b) string("OC")\n\
-+ Meta<Key>Right: string(0x1b) string(0x1b) string("OC")\n\
-+ ~Meta<Key>Return: string(0x0d)\n\
-+ Meta<Key>Return: string(0x1b) string(0x0d)\n\
-+ Ctrl<Key>Tab: string(0x1b) string(0x09)\n\
-+ Mod5<Key>Tab: string(0x1b) string(0x09)\n\
-+ ~Meta<Key>Tab: string(0x09)\n\
-+ Meta<Key>Tab: string(0x1b) string(0x09)\n\
-+ ~s<Key>F1: string(0x1b) string("[11~")\n\
-+ ~s<Key>F2: string(0x1b) string("[12~")\n\
-+ ~s<Key>F3: string(0x1b) string("[13~")\n\
-+ ~s<Key>F4: string(0x1b) string("[14~")\n\
-+ ~s<Key>F5: string(0x1b) string("[15~")\n\
-+ ~s<Key>F6: string(0x1b) string("[17~")\n\
-+ ~s<Key>F7: string(0x1b) string("[18~")\n\
-+ ~s<Key>F8: string(0x1b) string("[19~")\n\
-+ ~s<Key>F9: string(0x1b) string("[20~")\n\
-+ ~s<Key>F10: string(0x1b) string("[21~")\n\
-+ <Key>F11: string(0x1b) string("[23~")\n\
-+ <Key>F12: string(0x1b) string("[24~")\n\
-+ <Key>F13: string(0x1b) string("[25~")\n\
-+ <Key>F14: string(0x1b) string("[26~")\n\
-+ <Key>F15: string(0x1b) string("[28~")\n\
-+ <Key>F16: string(0x1b) string("[29~")\n\
-+ <Key>F17: string(0x1b) string("[31~")\n\
-+ <Key>F18: string(0x1b) string("[32~")\n\
-+ <Key>F19: string(0x1b) string("[33~")\n\
-+ <Key>F20: string(0x1b) string("[34~")\n\
-+ s<Key>F1: string(0x1b) string("[23~")\n\
-+ s<Key>F2: string(0x1b) string("[24~")\n\
-+ s<Key>F3: string(0x1b) string("[25~")\n\
-+ s<Key>F4: string(0x1b) string("[26~")\n\
-+ s<Key>F5: string(0x1b) string("[28~")\n\
-+ s<Key>F6: string(0x1b) string("[29~")\n\
-+ s<Key>F7: string(0x1b) string("[31~")\n\
-+ s<Key>F8: string(0x1b) string("[32~")\n\
-+ s<Key>F9: string(0x1b) string("[33~")\n\
-+ s<Key>F10: string(0x1b) string("[34~")\n\
-+ a<Key>Return: string(0x1b) string(0x0d)\n\
-+ a<Key>Tab: string(0x1b) string(0x09)\n\
-+ a<Key>space: string(0x1b) string(" ")\n\
-+ a s<Key>question: string(0x1b) string("?")\n\
-+ a s<Key>exclam: string(0x1b) string("!")\n\
-+ a <Key>period: string(0x1b) string(".")\n\
-+ a<Key>`: string(0x1b) string("`")\n\
-+ a<Key>1: string(0x1b) string("1")\n\
-+ a<Key>2: string(0x1b) string("2")\n\
-+ a<Key>3: string(0x1b) string("3")\n\
-+ a<Key>4: string(0x1b) string("4")\n\
-+ a<Key>5: string(0x1b) string("5")\n\
-+ a<Key>6: string(0x1b) string("6")\n\
-+ a<Key>7: string(0x1b) string("7")\n\
-+ a<Key>8: string(0x1b) string("8")\n\
-+ a<Key>9: string(0x1b) string("9")\n\
-+ a<Key>0: string(0x1b) string("0")\n\
-+ a<Key>a: string(0x1b) string("a")\n\
-+ a<Key>b: string(0x1b) string("b")\n\
-+ a<Key>c: string(0x1b) string("c")\n\
-+ a<Key>d: string(0x1b) string("d")\n\
-+ a<Key>e: string(0x1b) string("e")\n\
-+ a<Key>f: string(0x1b) string("f")\n\
-+ a<Key>g: string(0x1b) string("g")\n\
-+ a s<Key>h: string(0x1b) string("H")\n\
-+ a<Key>h: string(0x1b) string("h")\n\
-+ a<Key>i: string(0x1b) string("i")\n\
-+ a<Key>j: string(0x1b) string("j")\n\
-+ a<Key>k: string(0x1b) string("k")\n\
-+ a<Key>l: string(0x1b) string("l")\n\
-+ a<Key>m: string(0x1b) string("m")\n\
-+ a<Key>n: string(0x1b) string("n")\n\
-+ a<Key>o: string(0x1b) string("o")\n\
-+ a<Key>p: string(0x1b) string("p")\n\
-+ a<Key>q: string(0x1b) string("q")\n\
-+ a<Key>r: string(0x1b) string("r")\n\
-+ a<Key>s: string(0x1b) string("s")\n\
-+ a<Key>t: string(0x1b) string("t")\n\
-+ a<Key>u: string(0x1b) string("u")\n\
-+ a<Key>v: string(0x1b) string("v")\n\
-+ a<Key>w: string(0x1b) string("w")\n\
-+ a<Key>x: string(0x1b) string("x")\n\
-+ a<Key>y: string(0x1b) string("y")\n\
-+ a<Key>z: string(0x1b) string("z")
++ Alt Ctrl<Btn4Down>: string(0x1b) string("OA")\n\
++ Alt Ctrl<Btn5Down>: string(0x1b) string("OB")\n\
++ Alt<Btn4Down>: string(0x1b) string("OA") string(0x1b) string("OA") string(0x1b) string("OA") string(0x1b) string("OA") string(0x1b) string("OA")\n\
++ Alt<Btn5Down>: string(0x1b) string("OB") string(0x1b) string("OB") string(0x1b) string("OB") string(0x1b) string("OB") string(0x1b) string("OB")\n\
++ Shift<Btn4Down>: scroll-back(1,page)\n\
++ Shift<Btn5Down>: scroll-forw(1,page)\n\
++ Ctrl<Btn4Down>: scroll-back(1,line)\n\
++ Ctrl<Btn5Down>: scroll-forw(1,line)\n\
++ <Btn4Down>: scroll-back(5,line)\n\
++ <Btn5Down>: scroll-forw(5,line)\n\
++ @Num_Lock<Key>KP_0: string(0)\n\
++ @Num_Lock<Key>KP_1: string(1)\n\
++ @Num_Lock<Key>KP_2: string(2)\n\
++ @Num_Lock<Key>KP_3: string(3)\n\
++ @Num_Lock<Key>KP_4: string(4)\n\
++ @Num_Lock<Key>KP_5: string(5)\n\
++ @Num_Lock<Key>KP_6: string(6)\n\
++ @Num_Lock<Key>KP_7: string(7)\n\
++ @Num_Lock<Key>KP_8: string(8)\n\
++ @Num_Lock<Key>KP_9: string(9)\n\
++ @Num_Lock<Key>KP_Add: string(+)\n\
++ @Num_Lock<Key>KP_Decimal: string(.)\n\
++ @Num_Lock<Key>KP_Divide: string(/)\n\
++ @Num_Lock<Key>KP_Enter: string(\015)\n\
++ @Num_Lock<Key>KP_Equal: string(=)\n\
++ @Num_Lock<Key>KP_Multiply: string(*)\n\
++ @Num_Lock<Key>KP_Subtract: string(-)\n\
++ <Key>KP_Add: string(+)\n\
++ <Key>KP_Divide: string(/)\n\
++ <Key>KP_Enter: string(\015)\n\
++ <Key>KP_Equal: string(=)\n\
++ <Key>KP_Multiply: string(*)\n\
++ <Key>KP_Subtract: string(-)\n\
++ Shift<Key>KP_Home: scroll-back(100,page)\n\
++ Shift<Key>KP_End: scroll-forw(100,page)\n\
++ Shift<Key>Prior:scroll-back(1,page)\n\
++ Shift<Key>Next:scroll-forw(1,page)\n\
++ <Key>F16: start-extend() select-end(PRIMARY, CUT_BUFFER0, CLIPBOARD)\n\
++ <Key>F18: insert-selection(PRIMARY, CLIPBOARD)\n\
++ <Key>F27: scroll-back(100,page)\n\
++ <Key>R13: scroll-forw(100,page)\n\
++ Ctrl<Key>Home: string(0x1b) string("[1;5H")\n\
++ Shift<Key>Home: string(0x1b) string("[1;2H")\n\
++ Ctrl<Key>End: string(0x1b) string("[1;5F")\n\
++ Shift<Key>End: string(0x1b) string("[1;2F")\n\
++ Ctrl<Key>Insert: string(0x1b) string("[2;5~")\n\
++ Shift<Key>Insert: string(0x1b) string("[2;2~")\n\
++ ~Meta<Key>Insert: string(0x1b) string("[2~")\n\
++ Meta<Key>Insert: string(0x1b) string(0x1b) string("[2~")\n\
++ Ctrl<Key>Delete: string(0x1b) string("[3;5~")\n\
++ Shift<Key>Delete: string(0x1b) string("[3;2~")\n\
++ ~Meta<Key>Delete: string(0x1b) string("[3~")\n\
++ Meta<Key>Delete: string(0x1b) string(0x1b) string("[3~")\n\
++ Ctrl<Key>Page_Up: string(0x1b) string("[5;5~")\n\
++ ~Meta<Key>Page_Up: string(0x1b) string("[5~")\n\
++ Meta<Key>Page_Up: string(0x1b) string(0x1b) string("[5~")\n\
++ Ctrl<Key>Page_Down: string(0x1b) string("[6;5~")\n\
++ ~Meta<Key>Page_Down: string(0x1b) string("[6~")\n\
++ Meta<Key>Page_Down: string(0x1b) string(0x1b) string("[6~")\n\
++ ~Meta<Key>BackSpace: string(0x08)\n\
++ Meta<Key>BackSpace: string(0x1b) string(0x08)\n\
++ Ctrl Shift<Key>Up: string(0x1b) string("[1;6A")\n\
++ Ctrl<Key>Up: string(0x1b) string("[1;5A")\n\
++ Shift<Key>Up: string(0x1b) string("O2A")\n\
++ ~Meta<Key>Up: string(0x1b) string("OA")\n\
++ Meta<Key>Up: string(0x1b) string(0x1b) string("OA")\n\
++ Ctrl Shift<Key>Down: string(0x1b) string("[1;6B")\n\
++ Ctrl<Key>Down: string(0x1b) string("[1;5B")\n\
++ Shift<Key>Down: string(0x1b) string("O2B")\n\
++ ~Meta<Key>Down: string(0x1b) string("OB")\n\
++ Meta<Key>Down: string(0x1b) string(0x1b) string("OB")\n\
++ Ctrl Shift<Key>Left: string(0x1b) string("[1;6D")\n\
++ Ctrl<Key>Left: string(0x1b) string("[1;5D")\n\
++ Shift<Key>Left: string(0x1b) string("O2D")\n\
++ Mod5<Key>Left: string(0x1b) string("b")\n\
++ ~Meta<Key>Left: string(0x1b) string("OD")\n\
++ Meta<Key>Left: string(0x1b) string(0x1b) string("OD")\n\
++ Ctrl Shift<Key>Right: string(0x1b) string("[1;6C")\n\
++ Ctrl<Key>Right: string(0x1b) string("[1;5C")\n\
++ Shift<Key>Right: string(0x1b) string("O2C")\n\
++ Mod5<Key>Right: string(0x1b) string("f")\n\
++ ~Meta<Key>Right: string(0x1b) string("OC")\n\
++ Meta<Key>Right: string(0x1b) string(0x1b) string("OC")\n\
++ ~Meta<Key>Return: string(0x0d)\n\
++ Meta<Key>Return: string(0x1b) string(0x0d)\n\
++ Ctrl<Key>Tab: string(0x1b) string(0x09)\n\
++ Mod5<Key>Tab: string(0x1b) string(0x09)\n\
++ ~Meta<Key>Tab: string(0x09)\n\
++ Meta<Key>Tab: string(0x1b) string(0x09)\n\
++ ~s<Key>F1: string(0x1b) string("[11~")\n\
++ ~s<Key>F2: string(0x1b) string("[12~")\n\
++ ~s<Key>F3: string(0x1b) string("[13~")\n\
++ ~s<Key>F4: string(0x1b) string("[14~")\n\
++ ~s<Key>F5: string(0x1b) string("[15~")\n\
++ ~s<Key>F6: string(0x1b) string("[17~")\n\
++ ~s<Key>F7: string(0x1b) string("[18~")\n\
++ ~s<Key>F8: string(0x1b) string("[19~")\n\
++ ~s<Key>F9: string(0x1b) string("[20~")\n\
++ ~s<Key>F10: string(0x1b) string("[21~")\n\
++ <Key>F11: string(0x1b) string("[23~")\n\
++ <Key>F12: string(0x1b) string("[24~")\n\
++ <Key>F13: string(0x1b) string("[25~")\n\
++ <Key>F14: string(0x1b) string("[26~")\n\
++ <Key>F15: string(0x1b) string("[28~")\n\
++ <Key>F16: string(0x1b) string("[29~")\n\
++ <Key>F17: string(0x1b) string("[31~")\n\
++ <Key>F18: string(0x1b) string("[32~")\n\
++ <Key>F19: string(0x1b) string("[33~")\n\
++ <Key>F20: string(0x1b) string("[34~")\n\
++ s<Key>F1: string(0x1b) string("[23~")\n\
++ s<Key>F2: string(0x1b) string("[24~")\n\
++ s<Key>F3: string(0x1b) string("[25~")\n\
++ s<Key>F4: string(0x1b) string("[26~")\n\
++ s<Key>F5: string(0x1b) string("[28~")\n\
++ s<Key>F6: string(0x1b) string("[29~")\n\
++ s<Key>F7: string(0x1b) string("[31~")\n\
++ s<Key>F8: string(0x1b) string("[32~")\n\
++ s<Key>F9: string(0x1b) string("[33~")\n\
++ s<Key>F10: string(0x1b) string("[34~")\n\
++ a<Key>Return: string(0x1b) string(0x0d)\n\
++ a<Key>Tab: string(0x1b) string(0x09)\n\
++ a<Key>space: string(0x1b) string(" ")\n\
++ a s<Key>question: string(0x1b) string("?")\n\
++ a s<Key>exclam: string(0x1b) string("!")\n\
++ a <Key>period: string(0x1b) string(".")\n\
++ a<Key>`: string(0x1b) string("`")\n\
++ a<Key>1: string(0x1b) string("1")\n\
++ a<Key>2: string(0x1b) string("2")\n\
++ a<Key>3: string(0x1b) string("3")\n\
++ a<Key>4: string(0x1b) string("4")\n\
++ a<Key>5: string(0x1b) string("5")\n\
++ a<Key>6: string(0x1b) string("6")\n\
++ a<Key>7: string(0x1b) string("7")\n\
++ a<Key>8: string(0x1b) string("8")\n\
++ a<Key>9: string(0x1b) string("9")\n\
++ a<Key>0: string(0x1b) string("0")\n\
++ a<Key>a: string(0x1b) string("a")\n\
++ a<Key>b: string(0x1b) string("b")\n\
++ a<Key>c: string(0x1b) string("c")\n\
++ a<Key>d: string(0x1b) string("d")\n\
++ a<Key>e: string(0x1b) string("e")\n\
++ a<Key>f: string(0x1b) string("f")\n\
++ a<Key>g: string(0x1b) string("g")\n\
++ a s<Key>h: string(0x1b) string("H")\n\
++ a<Key>h: string(0x1b) string("h")\n\
++ a<Key>i: string(0x1b) string("i")\n\
++ a<Key>j: string(0x1b) string("j")\n\
++ a<Key>k: string(0x1b) string("k")\n\
++ a<Key>l: string(0x1b) string("l")\n\
++ a<Key>m: string(0x1b) string("m")\n\
++ a<Key>n: string(0x1b) string("n")\n\
++ a<Key>o: string(0x1b) string("o")\n\
++ a<Key>p: string(0x1b) string("p")\n\
++ a<Key>q: string(0x1b) string("q")\n\
++ a<Key>r: string(0x1b) string("r")\n\
++ a<Key>s: string(0x1b) string("s")\n\
++ a<Key>t: string(0x1b) string("t")\n\
++ a<Key>u: string(0x1b) string("u")\n\
++ a<Key>v: string(0x1b) string("v")\n\
++ a<Key>w: string(0x1b) string("w")\n\
++ a<Key>x: string(0x1b) string("x")\n\
++ a<Key>y: string(0x1b) string("y")\n\
++ a<Key>z: string(0x1b) string("z")
++
+ ! If xterm is built with a toolbar, the widget hierarchy looks like this,
+ ! showing widget name / class names. The complete menu hierarchy is built
+ ! at startup because it is needed to make the layout work for the menubar:
include/fonts/font.h
-lib/GL/dri/xf86dri.h
-lib/GL/dri/xf86dristr.h
+lib/GL/glx/xf86dri.h
+lib/GL/glx/xf86dristr.h
programs/Xserver/GL/dri/dri.h
programs/Xserver/GL/dri/sarea.h
programs/Xserver/Xext/dgaproc.h
diff -urN xc.orig/programs/Xserver/os/Imakefile xc/programs/Xserver/os/Imakefile
--- xc.orig/programs/Xserver/os/Imakefile Mon Dec 30 15:53:58 2002
+++ xc/programs/Xserver/os/Imakefile Mon Dec 30 17:31:52 2002
-@@ -120,6 +120,7 @@
- INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
- -I$(SERVERSRC)/Xext -I$(FONTINCSRC) -I$(SERVERSRC)/render \
- -I$(TOP)/lib/Xau -I../lbx Krb5Includes
-+ EXTRA_DEFINES = -DUSE_PAM
- DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) \
- $(TRANS_INCLUDES) $(CONNECTION_FLAGS) DependDefines
- LINTLIBS = ../dix/llib-ldix.ln
@@ -166,6 +167,14 @@
SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES))
#endif
#else
(**argv != '/' && **argv != '\\' && **argv != '.' &&
!(isalpha(**argv) && (*argv)[1]==':'))) {
+
-This patch by Brian Paul.
-
---- XFree86-4.1.0/xc/lib/GL/glx/Imakefile~ Wed Jun 20 16:32:13 2001
-+++ XFree86-4.1.0/xc/lib/GL/glx/Imakefile Wed Jun 20 16:33:55 2001
-@@ -87,7 +87,11 @@
- vertarr.o \
- xfont.o
+--- xc/lib/GL/glx/Imakefile 2006-02-20 01:14:35.000000000 +0100
++++ xc/lib/GL/glx/Imakefile-new 2006-06-11 03:21:31.564753888 +0200
+@@ -149,8 +149,13 @@
+ glx_query.o \
+ glx_texture_compression.o
+- GLX_DEFS = GlxDefines VidModeExtensionDefines \
+- -DDEFAULT_DRIVER_DIR=\"$(MODULEDIR)/dri\"
+#if defined(AlphaArchitecture)
-+ GLX_DEFS = GlxDefines VidModeExtensionDefines -D__GLX_ALIGN64
++ GLX_DEFS = GlxDefines VidModeExtensionDefines -D__GLX_ALIGN64 \
++ -DDEFAULT_DRIVER_DIR=\"$(MODULEDIR)/dri\"
+#else
- GLX_DEFS = GlxDefines VidModeExtensionDefines
++ GLX_DEFS = GlxDefines VidModeExtensionDefines \
++ -DDEFAULT_DRIVER_DIR=\"$(MODULEDIR)/dri\"
+#endif
- #if BuildXF86DRI
- DRI_INCS = -I$(GLXLIBSRC)/dri
+ #ifdef i386Architecture
+ ASM_DIR = x86
-diff -Nru xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf
---- xc.orig/config/cf/xfree86.cf 2003-09-25 13:00:04.000000000 +0200
-+++ xc/config/cf/xfree86.cf 2003-09-26 10:57:00.626294344 +0200
-@@ -374,7 +374,7 @@
- # define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \
+--- xc/config/cf/xfree86.cf.orig 2006-06-11 03:41:40.289999720 +0200
++++ xc/config/cf/xfree86.cf 2006-06-11 03:42:54.989643648 +0200
+@@ -393,7 +393,7 @@
+ # define XF86CardDrivers mga glint nv tga s3 s3virge sis xgi rendition \
neomagic i740 tdfx savage \
- cirrus vmware tseng trident chips apm \
+ cirrus vmware tseng trident chips aspeed apm \
- GlideDriver i128 NscDriver \
+ i128 NscDriver \
ati i810 AgpGartDrivers DevelDrivers ark \
cyrix siliconmotion via \
fbdev vesa vga \
+
---- xc/lib/Xcursor/Imakefile~ Thu Sep 26 09:52:01 2002
-+++ xc/lib/Xcursor/Imakefile Tue Jan 14 01:38:12 2003
-@@ -69,7 +69,7 @@
+--- xc/lib/Xcursor/Imakefile.orig 2005-10-25 18:58:48.000000000 +0200
++++ xc/lib/Xcursor/Imakefile 2006-06-11 03:46:50.029912096 +0200
+@@ -72,7 +72,7 @@
RemoveFile($@)
sh config-subst $(SUBSTVARS) < xcursor.pc.in > $@
--InstallNonExecFile(xcursor.pc,$(USRLIBDIR)/pkgconfig)
+-InstallNonExecFile(xcursor.pc,$(PKGCONFIGDIR))
+InstallNonExecFile(xcursor.pc,/usr/lib/pkgconfig)
clean::
RemoveFile(xcursor.pc)
---- xc/lib/Xft/Imakefile~ Thu Nov 14 22:01:18 2002
-+++ xc/lib/Xft/Imakefile Tue Jan 14 03:09:43 2003
-@@ -132,7 +132,7 @@
+--- xc/lib/Xft/Imakefile.orig 2005-10-25 18:58:48.000000000 +0200
++++ xc/lib/Xft/Imakefile 2006-06-11 03:47:20.687251472 +0200
+@@ -135,7 +135,7 @@
RemoveFile($@)
sh config/config-subst $(SUBSTVARS) < xft.pc.in > $@
--InstallNonExecFile(xft.pc,$(USRLIBDIR)/pkgconfig)
+-InstallNonExecFile(xft.pc,$(PKGCONFIGDIR))
+InstallNonExecFile(xft.pc,/usr/lib/pkgconfig)
clean::
InstallAppDefaults(Chooser)
#endif
#if BuildBoth
-diff -urN xc.orig/programs/xdm/config/Imakefile xc/programs/xdm/config/Imakefile
---- xc.orig/programs/xdm/config/Imakefile Mon Dec 30 15:54:07 2002
-+++ xc/programs/xdm/config/Imakefile Mon Dec 30 18:38:58 2002
-@@ -9,13 +9,7 @@
+diff -urN xc.org/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
+--- xc.org/programs/xdm/config/Xres.cpp 2003-11-23 23:32:35.000000000 +0100
++++ xc/programs/xdm/config/Xres.cpp 2003-11-23 23:33:41.000000000 +0100
+@@ -41,9 +41,7 @@
+ XHASHendif
+ #endif /* XPM */
+ XHASHifdef COLOR
+-#ifndef XPM
+-xlogin*greetColor: CadetBlue
+-#else
++#ifdef XPM
+ xlogin*borderWidth: 1
+ xlogin*frameWidth: 5
+ xlogin*innerFramesWidth: 2
+@@ -52,6 +50,8 @@
+ xlogin*background: grey
+ !xlogin*foreground: darkgreen
+ xlogin*greetColor: Blue3
++#else
++login*greetColor: CadetBlue
+ #endif /* XPM */
+ xlogin*failColor: red
+ *Foreground: black
+--- xc/programs/xdm/config/Imakefile.orig 2006-01-09 16:01:05.000000000 +0100
++++ xc/programs/xdm/config/Imakefile 2006-06-11 02:49:16.806881792 +0200
+@@ -4,13 +4,7 @@
all:: Xservers.ws xdm-config Xservers Xresources
--#if defined(i386Architecture) && (defined(KNetBSDArchitecture) || defined(KOpenBSDArchitecture))
+-#if (defined(i386Architecture) || defined(AMD64Architecture)) && (defined(KNetBSDArchitecture) || defined(KOpenBSDArchitecture))
-DEFAULTVT=vt05
-#endif
-
#ifndef XdmPixmap
# define XdmPixmap XFree86.xpm
-@@ -39,7 +33,11 @@
+@@ -36,7 +30,11 @@
#endif
CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT),NullParameter)
--CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH),NullParameter)
+-CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMAUTHDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH),NullParameter)
+#ifdef LinuxArchitecture
+CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DLINUX=1 -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DXDMVARDIR=$(XDMVARDIR) -DCHOOSERPATH="$(BINDIR)/chooser",NullParameter)
+#else
CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter)
LinkFile(Xservers,Xservers.$(SERVERSTYPE))
-diff -urN xc.org/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
---- xc.org/programs/xdm/config/Xres.cpp 2003-11-23 23:32:35.000000000 +0100
-+++ xc/programs/xdm/config/Xres.cpp 2003-11-23 23:33:41.000000000 +0100
-@@ -41,9 +41,7 @@
- XHASHendif
- #endif /* XPM */
- XHASHifdef COLOR
--#ifndef XPM
--xlogin*greetColor: CadetBlue
--#else
-+#ifdef XPM
- xlogin*borderWidth: 1
- xlogin*frameWidth: 5
- xlogin*innerFramesWidth: 2
-@@ -52,6 +50,8 @@
- xlogin*background: grey
- !xlogin*foreground: darkgreen
- xlogin*greetColor: Blue3
-+#else
-+login*greetColor: CadetBlue
- #endif /* XPM */
- xlogin*failColor: red
- *Foreground: black
---- XFree86-4.2.99.901/xc/programs/xman/vendor.h.orig Sun Mar 17 01:50:17 2002
-+++ XFree86-4.2.99.901/xc/programs/xman/vendor.h Sun Mar 17 01:54:57 2002
-@@ -77,7 +77,7 @@
+--- xc/programs/xman/vendor.h 2006-01-09 16:01:38.000000000 +0100
++++ xc/programs/xman/vendor.h-new 2006-06-11 03:25:03.629515144 +0200
+@@ -70,7 +70,7 @@
# define SYSMANPATH "/usr/catman/u_man:/usr/catman/a_man"
#elif defined(__bsdi__)
# define SYSMANPATH "/usr/share/man:/usr/contrib/man:/usr/contrib/isode/man:/usr/local/man"
# endif
#elif defined(OpenBSDArchitecture) || defined(NetBSDArchitecture) || \
defined(DarwinArchitecture)
-diff -urN xc.orig/programs/xman/xman.man xc/programs/xman/xman.man
---- xc.orig/programs/xman/xman.man Mon Dec 30 15:54:14 2002
-+++ xc/programs/xman/xman.man Mon Dec 30 18:12:17 2002
-@@ -93,8 +93,8 @@
- .SH "BSD AND LINUX SYSTEMS"
- .PP
- In newer BSD and Linux systems, \fIXman\fP will search for a file named
--\fI/etc/man.conf\fP which will contain the list of directories containing
--manual pages. See \fIman.conf\fP(5) for a complete description of the file
-+\fI/etc/man.config\fP which will contain the list of directories containing
-+manual pages. See \fIman.config\fP(5) for a complete description of the file
- format.
- .SH "THE MANDESC FILE"
- .PP
projects / packages / X11.git / commitdiff