[SM-Commit] GIT changes to master xorg-modular grimoire by Juuso Alasuutari (10c0d2ba8708e6c7f36b40a97df550b5f9f3d360)

Juuso Alasuutari scm at mail.sourcemage.org
Fri Oct 20 20:12:18 EDT 2006


GIT changes to master xorg-modular grimoire by Juuso Alasuutari <iuso at sourcemage.org>:

 xorg-app/xdm/HISTORY               |    3 +
 xorg-app/xdm/init.d/xdm            |    7 ++
 xorg-extras/xterm/CONFIGURE        |   69 +++++++++++++----------
 xorg-extras/xterm/DEPENDS          |   19 ++++--
 xorg-extras/xterm/HISTORY          |    4 +
 xorg-xserver/xorg-server/CONFIGURE |  107 +++++++++++++++++++------------------
 xorg-xserver/xorg-server/HISTORY   |    5 +
 7 files changed, 127 insertions(+), 87 deletions(-)

New commits:
commit 10c0d2ba8708e6c7f36b40a97df550b5f9f3d360
Author: Juuso Alasuutari <iuso at sourcemage.org>
Commit: Juuso Alasuutari <iuso at sourcemage.org>

    xterm: Added optional_depends freetype2 & luit.

commit 99bc6513d2b10e424824b7749bf87e294b9279b1
Author: Juuso Alasuutari <iuso at sourcemage.org>
Commit: Juuso Alasuutari <iuso at sourcemage.org>

    xdm: Added init script.

commit 93870e0189c086f0ca63eb620cb5f5671270e916
Author: Juuso Alasuutari <iuso at sourcemage.org>
Commit: Juuso Alasuutari <iuso at sourcemage.org>

    xorg-server: Changed xorgcfg option default to 'n', verbal polishing.

diff --git a/xorg-app/xdm/HISTORY b/xorg-app/xdm/HISTORY
index ee47e65..9ff081d 100644
--- a/xorg-app/xdm/HISTORY
+++ b/xorg-app/xdm/HISTORY
@@ -1,3 +1,6 @@
+2006-10-21 Juuso Alasuutari <iuso at sourcemage.org>
+	* init.d/xdm: Added, init script.
+
 2006-08-27 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: updated to 1.0.5
 
diff --git a/xorg-app/xdm/init.d/xdm b/xorg-app/xdm/init.d/xdm
new file mode 100755
index 0000000..4f9aca6
--- /dev/null
+++ b/xorg-app/xdm/init.d/xdm
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+PROGRAM=/usr/bin/xdm
+RUNLEVEL=5
+PROVIDES=display_manager
+
+. /etc/init.d/smgl_init
diff --git a/xorg-extras/xterm/CONFIGURE b/xorg-extras/xterm/CONFIGURE
index 8d6b79b..de933f9 100755
--- a/xorg-extras/xterm/CONFIGURE
+++ b/xorg-extras/xterm/CONFIGURE
@@ -1,30 +1,39 @@
-config_query_option XTERM_OPTS                                        \
-                    "Enable X11R6.3 active-icon feature" y            \
-                    "--enable-active-icon" "--disable-active-icon"    &&
-config_query_option XTERM_OPTS                                        \
-                    "Enable ANSI color support?" y                    \
-                    "--enable-ansi-color" "--disable-ansi-color"      &&
-config_query_option XTERM_OPTS                                     \
-                    "Enable 16 color support?" y                      \
-                    "--enable-16-color" "--disable-16-color"          &&
-config_query_option XTERM_OPTS                                    \
-                    "Enable 256 color support" n                      \
-                    "--enable-256-color" "--disable-256-color"        &&
-config_query_option XTERM_OPTS                                     \
-                    "Enable 88 color support" n                       \
-                    "--enable-88-color" "--disable-88-color"          &&
-config_query_option XTERM_OPTS                                       \
-                    "Enable support for blinking cursor" y            \
-                    "--enable-blink-cursor" "--disable-blink-cursor"  &&
-config_query_option XTERM_OPTS                                     \
-                    "Allow -k8 option for printable 128-159" y        \
-                    "--enable-c1-print" "--disable-c1-print"          &&
-config_query_option XTERM_OPTS                                        \
-                    "Enabled PC-style mapping of bold colors" y       \
-                    "--enable-bold-color" "--disable-bold-color"      &&
-config_query_option XTERM_OPTS                                      \
-                    "Enable separate color class resources" y         \
-                    "--enable-color-class" "--disable-color-class"    &&
-config_query_option XTERM_OPTS                                       \
-                    "Enable default colorMode resource" y             \
-                    "--enable-color-mode" "--disable-color-mode"      
+config_query_option  XTERM_OPTS                                       \
+                     "Enable X11R6.3 active-icon feature?"  y         \
+                     "--enable-active-icon"  "--disable-active-icon"  &&
+
+config_query_option  XTERM_OPTS                                     \
+                     "Enable ANSI color support?"  y                \
+                     "--enable-ansi-color"  "--disable-ansi-color"  &&
+
+config_query_option  XTERM_OPTS                                 \
+                     "Enable 16-color support?"  y              \
+                     "--enable-16-color"  "--disable-16-color"  &&
+
+config_query_option  XTERM_OPTS                                   \
+                     "Enable 256-color support?"  n               \
+                     "--enable-256-color"  "--disable-256-color"  &&
+
+config_query_option  XTERM_OPTS                                 \
+                     "Enable 88-color support?"  n              \
+                     "--enable-88-color"  "--disable-88-color"  &&
+
+config_query_option  XTERM_OPTS                                         \
+                     "Enable support for blinking cursor?"  y           \
+                     "--enable-blink-cursor"  "--disable-blink-cursor"  &&
+
+config_query_option  XTERM_OPTS                                    \
+                     "Allow -k8 option for printable 128-159?"  y  \
+                     "--enable-c1-print"  "--disable-c1-print"     &&
+
+config_query_option  XTERM_OPTS                                     \
+                     "Enable PC-style mapping of bold colors?"  y   \
+                     "--enable-bold-color"  "--disable-bold-color"  &&
+
+config_query_option  XTERM_OPTS                                       \
+                     "Enable separate color class resources?"  y      \
+                     "--enable-color-class"  "--disable-color-class"  &&
+
+config_query_option  XTERM_OPTS                                     \
+                     "Enable default colorMode resource?"  y        \
+                     "--enable-color-mode"  "--disable-color-mode"
diff --git a/xorg-extras/xterm/DEPENDS b/xorg-extras/xterm/DEPENDS
index cd73f72..4144a80 100755
--- a/xorg-extras/xterm/DEPENDS
+++ b/xorg-extras/xterm/DEPENDS
@@ -1,7 +1,16 @@
-depends xorg-server "--with-x"          &&
+depends  xorg-server  "--with-x"  &&
 
-optional_depends xaw3d                  \
-                 "--with-Xaw3d"         \
-                 "--without-Xaw3d"      \
-                 "compile with xaw3d?"  
+optional_depends  xaw3d                          \
+                  "--with-Xaw3d"                 \
+                  "--without-Xaw3d"              \
+                  "to link with Xaw 3d library"  &&
 
+optional_depends  freetype2                       \
+                  "--enable-freetype"             \
+                  "--disable-freetype"            \
+                  "for freetype library support"  &&
+
+optional_depends  luit              \
+                  "--enable-luit"   \
+                  "--disable-luit"  \
+                  "to enable Unicode translation"
diff --git a/xorg-extras/xterm/HISTORY b/xorg-extras/xterm/HISTORY
index e85f3c5..53b16d1 100644
--- a/xorg-extras/xterm/HISTORY
+++ b/xorg-extras/xterm/HISTORY
@@ -1,3 +1,7 @@
+2006-10-21 Juuso Alasuutari <iuso at sourcemage.org>
+	* CONFIGURE: Polished prompt wording & code style.
+	* DEPENDS: Added optional_depends freetype2 & luit.
+
 2006-08-28 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: updated to 218
 
diff --git a/xorg-xserver/xorg-server/CONFIGURE b/xorg-xserver/xorg-server/CONFIGURE
index b26aba9..3c348ce 100755
--- a/xorg-xserver/xorg-server/CONFIGURE
+++ b/xorg-xserver/xorg-server/CONFIGURE
@@ -1,162 +1,162 @@
 . $GRIMOIRE/config_query_multi.function
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build docs"                                            \
+                    "Build documentation?"                                  \
                     n                                                       \
                     "--enable-builddocs"                                    \
                     "--disable-builddocs"                                   &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build SHM extension"                                   \
+                    "Build SHM extension?"                                  \
                     y                                                       \
                     "--enable-shm"                                          \
                     "--disable-shm"                                         &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Install libxf86config"                                 \
+                    "Install libxf86config?"                                \
                     n                                                       \
                     "--enable-install-libxf86config"                        \
                     "--disable-install-libxf86config"                       &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build XRes extension"                                  \
+                    "Build XRes extension?"                                 \
                     y                                                       \
                     "--enable-xres"                                         \
                     "--disable-xres"                                        &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build Record extension"                                \
+                    "Build Record extension?"                               \
                     y                                                       \
                     "--enable-record"                                       \
                     "--disable-record"                                      &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build XDMCP extension"                                 \
+                    "Build XDMCP extension?"                                \
                     y                                                       \
                     "--enable-xdmcp"                                        \
                     "--disable-xdmcp"                                       &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build XDM_Auth_1 extension"                            \
+                    "Build XDM_Auth_1 extension?"                           \
                     y                                                       \
                     "--enable-xdm-auth-1"                                   \
                     "--disable-xdm-auth-1"                                  &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build GLX extension"                                   \
+                    "Build GLX extension?"                                  \
                     y                                                       \
                     "--enable-glx"                                          \
                     "--disable-glx"                                         &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build accelerated indirect GLX"                        \
+                    "Build accelerated indirect GLX?"                       \
                     y                                                       \
                     "--enable-aiglx"                                        \
                     "--disable-aiglx"                                       &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build GLX with TLS support"                            \
+                    "Build GLX with TLS support?"                           \
                     n                                                       \
                     "--enable-glx-tls"                                      \
                     "--disable-glx-tls"                                     &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build DRI extension"                                   \
+                    "Build DRI extension?"                                  \
                     y                                                       \
                     "--enable-dri"                                          \
                     "--disable-dri"                                         &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build XF86VidMode extension"                           \
+                    "Build XF86VidMode extension?"                          \
                     y                                                       \
                     "--enable-xf86vidmode"                                  \
                     "--disable-xf86vidmode"                                 &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build XF86Misc extension"                              \
+                    "Build XF86Misc extension?"                             \
                     y                                                       \
                     "--enable-xf86misc"                                     \
                     "--disable-xf86misc"                                    &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build Security extension"                              \
+                    "Build Security extension?"                             \
                     y                                                       \
                     "--enable-xcsecurity"                                   \
                     "--disable-xcsecurity"                                  &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build X-ACE extension"                                 \
+                    "Build X-ACE extension?"                                \
                     y                                                       \
                     "--enable-xace"                                         \
                     "--disable-xace"                                        &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build XC_APPGROUP extension"                           \
+                    "Build XC_APPGROUP extension?"                          \
                     y                                                       \
                     "--enable-appgroup"                                     \
                     "--disable-appgroup"                                    &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build XCalibrate extension"                            \
+                    "Build XCalibrate extension?"                           \
                     n                                                       \
                     "--enable-xcalibrate"                                   \
                     "--disable-xcalibrate"                                  &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build TOG_CUP extension"                               \
+                    "Build TOG_CUP extension?"                              \
                     y                                                       \
                     "--enable-cup"                                          \
                     "--disable-cup"                                         &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build Extended-Visual-Information extension"           \
+                    "Build Extended-Visual-Information extension?"          \
                     y                                                       \
                     "--enable-evi"                                          \
                     "--disable-evi"                                         &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build Multibuffer extension"                           \
+                    "Build Multibuffer extension?"                          \
                     y                                                       \
                     "--enable-multibuffer"                                  \
                     "--disable-multibuffer"                                 &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build DBE extension"                                   \
+                    "Build DBE extension?"                                  \
                     y                                                       \
                     "--enable-dbe"                                          \
                     "--disable-dbe"                                         &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build Xorg server"                                     \
+                    "Build Xorg server?"                                    \
                     y                                                       \
                     "--enable-xorg"                                         \
                     "--disable-xorg"                                        &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build Xvfb server"                                     \
+                    "Build Xvfb server?"                                    \
                     y                                                       \
                     "--enable-xvfb"                                         \
                     "--disable-xvfb"                                        &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build Xnest server"                                    \
+                    "Build Xnest server?"                                   \
                     n                                                       \
                     "--enable-xnest"                                        \
                     "--disable-xnest"                                       &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build XWin server"                                     \
+                    "Build XWin server?"                                    \
                     n                                                       \
                     "--enable-xwin"                                         \
                     "--disable-xwin"                                        &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build Xgl server EXPERIMENTAL"                         \
+                    "Build Xgl server (EXPERIMENTAL)?"                      \
                     n                                                       \
                     "--enable-xgl"                                          \
                     "--disable-xgl"                                         &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build Xglx xgl module EXPERIMENTAL"                    \
+                    "Build Xglx xgl module (EXPERIMENTAL)?"                 \
                     n                                                       \
                     "--enable-xglx"                                         \
                     "--disable-xglx"                                        &&
@@ -168,49 +168,52 @@ config_query_option XORG_SERVER_OPTS    
                     "--disable-xegl"                                        &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build kdrive servers EXPERIMENTAL"                     \
+                    "Build kdrive servers (EXPERIMENTAL)?"                  \
                     n                                                       \
                     "--enable-kdrive"                                       \
                     "--disable-kdrive"                                      &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build the kdrive Xephyr server EXPERIMENTAL"           \
+                    "Build the kdrive Xephyr server (EXPERIMENTAL)?"        \
                     n                                                       \
                     "--enable-xephyr"                                       \
                     "--disable-xephyr"                                      &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build the kdrive Xsdl server EXPERIMENTAL"             \
+                    "Build the kdrive Xsdl server (EXPERIMENTAL)?"          \
                     n                                                       \
                     "--enable-xsdl"                                         \
                     "--disable-xsdl"                                        &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Install Xorg server as owned by root with setuid bit"  \
+                    "Install Xorg server as owned by root with setuid bit?" \
                     y                                                       \
                     "--enable-install-setuid"                               \
                     "--disable-install-setuid"                              &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Enable Secure RPC"                                     \
+                    "Enable Secure RPC?"                                    \
                     y                                                       \
                     "--enable-secure-rpc"                                   \
                     "--disable-secure-rpc"                                  &&
 
+#
+## Broken at the moment (20061021)
+#
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build xorgcfg GUI configuration utility"               \
-                    y                                                       \
+                    "Build xorgcfg GUI configuration utility?"              \
+                    n                                                       \
                     "--enable-xorgcfg"                                      \
                     "--disable-xorgcfg"                                     &&
 
 config_query_option XORG_SERVER_OPTS                                        \
-                    "Build kbd_mode utility"                                \
+                    "Build kbd_mode utility?"                               \
                     y                                                       \
                     "--enable-kbd_mode"                                     \
                     "--disable-kbd_mode"                                    &&
 
-config_query_multi  XORG_SERVER_FONT_100DPI                            \
-                    "What fonts do you wish from 100dpi versions"           \
+config_query_multi  XORG_SERVER_FONT_100DPI                                 \
+                    "Which 100dpi fonts do you want?"                       \
                     all                                                     \
                     none                                                    \
                     font-bh-100dpi                                          \
@@ -219,8 +222,8 @@ config_query_multi  XORG_SERVER_FONT_100
                     font-adobe-utopia-100dpi                                \
                     font-bh-lucidatypewriter-100dpi                         &&
 
-config_query_multi  XORG_SERVER_FONT_75DPI                             \
-                    "What fonts do you wish from 75dpi versions"            \
+config_query_multi  XORG_SERVER_FONT_75DPI                                  \
+                    "Which 75dpi fonts do you want?"                        \
                     all                                                     \
                     none                                                    \
                     font-bh-75dpi                                           \
@@ -229,14 +232,14 @@ config_query_multi  XORG_SERVER_FONT_75D
                     font-adobe-utopia-75dpi                                 \
                     font-bh-lucidatypewriter-75dpi                          &&
 
-config_query_multi  XORG_SERVER_FONT_SPEEDO                            \
-                    "What fonts do you wish from speedo versions"           \
+config_query_multi  XORG_SERVER_FONT_SPEEDO                                 \
+                    "Which Speedo fonts do you want?"                       \
                     all                                                     \
                     none                                                    \
                     font-bitstream-speedo                                   &&
 
-config_query_multi  XORG_SERVER_FONT_TYPE1                             \
-                    "What fonts do you wish from type1 versions"            \
+config_query_multi  XORG_SERVER_FONT_TYPE1                                  \
+                    "Which Type1 fonts do you want?"                        \
                     all                                                     \
                     none                                                    \
                     font-bh-type1                                           \
@@ -245,16 +248,16 @@ config_query_multi  XORG_SERVER_FONT_TYP
                     font-bitstream-type1                                    \
                     font-adobe-utopia-type1                                 &&
 
-config_query_multi  XORG_SERVER_FONT_TTFOTF                            \
-                    "What fonts do you wish from TTF/OTF versions"          \
+config_query_multi  XORG_SERVER_FONT_TTFOTF                                 \
+                    "Which TTF/OTF fonts do you want?"                      \
                     all                                                     \
                     none                                                    \
                     font-bh-ttf                                             \
                     font-misc-meltho                                        \
                     font-misc-ethiopic                                      &&
 
-config_query_multi  XORG_SERVER_FONT_MISC                              \
-                    "What fonts do you wish from misc"                      \
+config_query_multi  XORG_SERVER_FONT_MISC                                   \
+                    "Which misc fonts do you want?"                         \
                     all                                                     \
                     none                                                    \
                     font-dec-misc                                           \
@@ -272,7 +275,7 @@ config_query_multi  XORG_SERVER_FONT_MIS
                     font-screen-cyrillic                                    \
                     font-winitzki-cyrillic
 
-#config_query_multi  XORG_SERVER_INPUT_DRIVER                           \
+#config_query_multi  XORG_SERVER_INPUT_DRIVER                                \
 #                    "What input drivers do you want"                        \
 #                    sane                                                    \
 #                    none                                                    \
@@ -284,7 +287,7 @@ #                    xf86-input-joystick
 #                    synaptics                                               \
 #                    linuxwacom                                              &&
 
-#config_query_multi  XORG_SERVER_INPUT_OBSCURE                          \
+#config_query_multi  XORG_SERVER_INPUT_OBSCURE                               \
 #                    "What special input drivers do you want"                \
 #                    none                                                    \
 #                    all                                                     \
@@ -312,7 +315,7 @@ #                    xf86-input-microtou
 #                    xf86-input-digitaledge                                  \
 #                    xf86-input-elographics                                  &&
 
-#config_query_multi  XORG_SERVER_VIDEO_DRIVER_COMMON                    \
+#config_query_multi  XORG_SERVER_VIDEO_DRIVER_COMMON                         \
 #                    "What common video drivers do you want"                 \
 #                    sane                                                    \
 #                    none                                                    \
@@ -334,7 +337,7 @@ #                    xf86-video-neomagic
 #                    ati_driver                                              \
 #                    nvidia_driver                                           &&
 
-#config_query_multi  XORG_SERVER_VIDEO_DRIVER_UNCOMMON                  \
+#config_query_multi  XORG_SERVER_VIDEO_DRIVER_UNCOMMON                       \
 #                    "What uncommon video drivers do you want"               \
 #                    none                                                    \
 #                    all                                                     \
@@ -352,7 +355,7 @@ #                    xf86-video-vmware  
 #                    xf86-video-voodoo                                       \
 #                    xf86-video-trident                                      &&
 
-#config_query_multi  XORG_SERVER_VIDEO_DRIVER_OBSCURE                   \
+#config_query_multi  XORG_SERVER_VIDEO_DRIVER_OBSCURE                        \
 #                    "What obscure video drivers do you want"                \
 #                    none                                                    \
 #                    all                                                     \
diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY
index 4d653b9..c8b6697 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,8 @@
+2006-10-21 Juuso Alasuutari <iuso at sourcemage.org>
+	* DEPENDS: Changed xorgcfg option default to 'n' (broken at 
+	  the moment), added question marks to prompts, other minor 
+	  verbal fixes.
+
 2006-10-18 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* INSTALL: minor fix
 



More information about the SM-Commit mailing list