From 2800c9576c71005e778279b693f934df74db4347 Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@opensde.org>
Date: Tue, 31 Jan 2006 03:16:00 +0000
Subject: [PATCH] 	* added the whole modular Xorg to X=minimal on
 sdever=2.2, to be splitted later

---
 pkgsel/Console/X.conf           |  11 ++
 pkgsel/Console/X.minimal.choice | 271 +++++++++++++++++++++++++++++++-
 2 files changed, 281 insertions(+), 1 deletion(-)
 create mode 100644 pkgsel/Console/X.conf

diff --git a/pkgsel/Console/X.conf b/pkgsel/Console/X.conf
new file mode 100644
index 0000000..2732ea2
--- /dev/null
+++ b/pkgsel/Console/X.conf
@@ -0,0 +1,11 @@
+case "$sdever" in
+	2.1*)	;;
+	2.2*)	if [ "$SDECFG_TRG_MNEMOSYNE_X" != none ]; then
+			cat<<-EOT  >> $cfgtmpdir/mnemosyne.postpkgfilter.in
+			# these were part of x11-modular at 2.1, and we don't want
+			# to enable them there
+			pkgenable xproto xtrans xrandr
+		EOT
+		fi
+		;;
+esac
diff --git a/pkgsel/Console/X.minimal.choice b/pkgsel/Console/X.minimal.choice
index 58a92f3..3608bd2 100644
--- a/pkgsel/Console/X.minimal.choice
+++ b/pkgsel/Console/X.minimal.choice
@@ -1,6 +1,5 @@
 #Description: Minimal X.org Suppport
 
-X xorg
 X ed
 X expat
 
@@ -9,3 +8,273 @@ X libpng
 X libtiff
 
 X freetype
+
+# joined at 2.1
+X xorg
+
+# and splitted X.org at 2.2
+X appres
+X bdftopcf
+X beforelight
+X bigreqsproto
+X bitmap
+X cf
+X compositeproto
+X damageproto
+X dmxproto
+X editres
+X encodings
+X evieext
+X fdclock
+X fixesproto
+X font-adobe
+X font-adobe-utopia
+X font-adobe-utopia-type1
+X font-alias
+X font-arabic-misc
+X font-bh
+X font-bh-lucidatypewriter
+X font-bh-ttf
+X font-bh-type1
+X font-bitstream
+X font-bitstream-type1
+X font-cronyx-cyrillic
+X font-cursor-misc
+X font-daewoo-misc
+X font-dec-misc
+X font-ibm-type1
+X font-isas-misc
+X font-jis-misc
+X font-micro-misc
+X font-misc-cyrillic
+X font-misc-misc
+X font-mutt-misc
+X font-schumacher-misc
+X font-screen-cyrillic
+X font-sony-misc
+X font-sun-misc
+X font-util
+X font-winitzki-cyrillic
+X font-xfree86-type1
+X fontcacheproto
+X fontconfig
+X fontsproto
+X fonttosfnt
+X fslsfonts
+X fstobdf
+X gccmakedep
+X glproto
+X iceauth
+X ico
+X imake
+X inputproto
+X kbproto
+X lbxproxy
+X libdmx
+X libdrm
+X libfontenc
+X libfs
+X libice
+X liblbxutil
+X liboldx
+X libsm
+X libx11
+X libxau
+X libxaw
+X libxcomposite
+X libxcursor
+X libxdamage
+X libxdmcp
+X libxevie
+X libxext
+X libxfixes
+X libxfont
+X libxfontcache
+X libxft
+X libxi
+X libxinerama
+X libxkbfile
+X libxkbui
+X libxmu
+X libxp
+X libxpm
+X libxprintapputil
+X libxprintutil
+X libxrandr
+X libxrender
+X libxres
+X libxscrnsaver
+X libxt
+X libxtrap
+X libxtst
+X libxv
+X libxvmc
+X libxxf86dga
+X libxxf86misc
+X libxxf86vm
+X listres
+X luit
+X makedepend
+X mkfontdir
+X mkfontscale
+X oclock
+X panoramixproto
+X pclcomp
+X printproto
+X proxymngr
+X randrproto
+X recordproto
+X renderproto
+X resourceproto
+X rgb
+X rstart
+X scripts
+X scrnsaverproto
+X setxkbmap
+X showfont
+X smproxy
+X trapproto
+X twm
+X util-macros
+X videoproto
+X viewres
+X x11perf
+X xauth
+X xbiff
+X xbitmaps
+X xcalc
+X xclipboard
+X xclock
+X xcmiscproto
+X xcmsdb
+X xconsole
+X xcursor-themes
+X xcursorgen
+X xdbedizzy
+X xditview
+X xdm
+X xdpyinfo
+X xedit
+X xev
+X xextproto
+X xeyes
+X xf86-input-acecad
+X xf86-input-aiptek
+X xf86-input-calcomp
+X xf86-input-citron
+X xf86-input-digitaledge
+X xf86-input-dmc
+X xf86-input-dynapro
+X xf86-input-elo2300
+X xf86-input-elographics
+X xf86-input-evdev
+X xf86-input-fpit
+X xf86-input-hyperpen
+X xf86-input-jamstudio
+X xf86-input-joystick
+X xf86-input-keyboard
+X xf86-input-magellan
+X xf86-input-magictouch
+X xf86-input-microtouch
+X xf86-input-mouse
+X xf86-input-mutouch
+X xf86-input-palmax
+X xf86-input-penmount
+X xf86-input-sample
+X xf86-input-spaceorb
+X xf86-input-summa
+X xf86-input-tek4957
+X xf86-input-ur98
+X xf86-input-void
+X xf86-video-apm
+X xf86-video-ark
+X xf86-video-ati
+X xf86-video-chips
+X xf86-video-cirrus
+X xf86-video-cyrix
+X xf86-video-dummy
+X xf86-video-fbdev
+X xf86-video-glint
+X xf86-video-i128
+X xf86-video-i740
+X xf86-video-i810
+X xf86-video-imstt
+X xf86-video-mga
+X xf86-video-neomagic
+X xf86-video-newport
+X xf86-video-nsc
+X xf86-video-nv
+X xf86-video-rendition
+X xf86-video-s3
+X xf86-video-s3virge
+X xf86-video-savage
+X xf86-video-siliconmotion
+X xf86-video-sis
+X xf86-video-sisusb
+X xf86-video-tdfx
+X xf86-video-tga
+X xf86-video-trident
+X xf86-video-tseng
+X xf86-video-vesa
+X xf86-video-vga
+X xf86-video-via
+X xf86-video-vmware
+X xf86-video-voodoo
+X xf86bigfontproto
+X xf86dga
+X xf86dgaproto
+X xf86driproto
+X xf86miscproto
+X xf86rushproto
+X xf86vidmodeproto
+X xfd
+X xfontsel
+X xfs
+X xfsinfo
+X xfwp
+X xgamma
+X xgc
+X xhost
+X xineramaproto
+X xinit
+X xkbcomp
+X xkbdata
+X xkbevd
+X xkbprint
+X xkbutils
+X xkill
+X xload
+X xlogo
+X xlsatoms
+X xlsclients
+X xlsfonts
+X xmag
+X xman
+X xmessage
+X xmh
+X xmodmap
+X xmore
+X xorg-server
+X xphelloworld
+X xplsprinters
+X xpr
+X xprehashprinterlist
+X xprop
+#X xproto	# enabled only for 2.2
+X xproxymanagementprotocol
+#X xrandr	# enabled only for 2.2
+X xrdb
+X xrefresh
+X xset
+X xsetmode
+X xsetpointer
+X xsetroot
+X xsm
+X xstdcmap
+#X xtrans	# enalbed only for 2.2
+X xtrap
+X xvidtune
+X xvinfo
+X xwd
+X xwininfo
+X xwud