font and other build fixes

2 files changed, 62 insertions, 49 deletions

diff --git a/xorg/X11R7.6/buildx.sh b/xorg/X11R7.6/buildx.sh
index 6f314320..e1996f25 100755
--- a/xorg/X11R7.6/buildx.sh
+++ b/xorg/X11R7.6/buildx.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# build.sh: a script for building X11R7.6 X server for use with xrdp
-#
+# build.sh: a script for building X11R7.6 X server for use with xrdp #
 # Copyright 2011 Jay Sorg Jay.Sorg@gmail.com
 #
 # Authors
@@ -20,6 +19,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# flex bison libxml2-dev intltool
+
 download_file()
 {
     file=$1
@@ -53,7 +54,12 @@ download_file()
         cd ..
         return $status
     elif [ "$file" = "xkeyboard-config-2.0.tar.bz2" ]; then
-        wget -cq http://server1.xrdp.org/xrdp/xkeyboard-config-2.0.tar.bz2
+        wget -cq http://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.0.tar.bz2
+        status=$?
+        cd ..
+        return $status
+    elif [ "$file" = "makedepend-1.0.3.tar.bz2" ]; then
+        wget -cq http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.3.tar.bz2
         status=$?
         cd ..
         return $status
@@ -196,11 +202,16 @@ fi
 export PREFIX_DIR=$1
 export PKG_CONFIG_PATH=$PREFIX_DIR/lib/pkgconfig:$PREFIX_DIR/share/pkgconfig
 
-# prefix dir must exist and be writable
+# prefix dir must exist...
 if [ ! -d $PREFIX_DIR ]; then
-    echo "directory $PREFIX_DIR does not exist - cannot continue"
-    exit 1
+    mkdir -p $PREFIX_DIR
+    if [ $? -ne 0 ]; then
+        echo "$PREFIX_DIR does not exist; failed to create it - cannot continue"
+        exit 1
+    fi
 fi
+
+# ...and be writable
 if [ ! -w $PREFIX_DIR ]; then
     echo "directory $PREFIX_DIR is not writable - cannot continue"
     exit 1
@@ -238,6 +249,7 @@ do
     mod_file=`echo $line | cut -d':' -f1`
     mod_dir=`echo $line | cut -d':' -f2`
     mod_args=`echo $line | cut -d':' -f3`
+    mod_args=`eval echo $mod_args`
 
     make_it $mod_file $mod_dir "$mod_args"
 
diff --git a/xorg/X11R7.6/x11_file_list.txt b/xorg/X11R7.6/x11_file_list.txt
index ded43d7b..f90d64d9 100644
--- a/xorg/X11R7.6/x11_file_list.txt
+++ b/xorg/X11R7.6/x11_file_list.txt
@@ -1,48 +1,52 @@
 util-macros-1.11.0.tar.bz2                      :  util-macros-1.11.0                       : 
-font-adobe-75dpi-1.0.3.tar.bz2                  :  font-adobe-75dpi-1.0.3                   :
-font-adobe-100dpi-1.0.3.tar.bz2                 :  font-adobe-100dpi-1.0.3                  :
-font-adobe-utopia-75dpi-1.0.4.tar.bz2           :  font-adobe-utopia-75dpi-1.0.4            :
-font-adobe-utopia-100dpi-1.0.4.tar.bz2          :  font-adobe-utopia-100dpi-1.0.4           :
-font-adobe-utopia-type1-1.0.4.tar.bz2           :  font-adobe-utopia-type1-1.0.4            :
-font-alias-1.0.3.tar.bz2                        :  font-alias-1.0.3                         :
-font-arabic-misc-1.0.3.tar.bz2                  :  font-arabic-misc-1.0.3                   :
-font-bh-75dpi-1.0.3.tar.bz2                     :  font-bh-75dpi-1.0.3                      :
-font-bh-100dpi-1.0.3.tar.bz2                    :  font-bh-100dpi-1.0.3                     :
-font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2    :  font-bh-lucidatypewriter-75dpi-1.0.3     :
-font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2   :  font-bh-lucidatypewriter-100dpi-1.0.3    :
-font-bh-ttf-1.0.3.tar.bz2                       :  font-bh-ttf-1.0.3                        :
-font-bh-type1-1.0.3.tar.bz2                     :  font-bh-type1-1.0.3                      :
-font-bitstream-75dpi-1.0.3.tar.bz2              :  font-bitstream-75dpi-1.0.3               :
-font-bitstream-100dpi-1.0.3.tar.bz2             :  font-bitstream-100dpi-1.0.3              :
-font-bitstream-type1-1.0.3.tar.bz2              :  font-bitstream-type1-1.0.3               :
-font-cronyx-cyrillic-1.0.3.tar.bz2              :  font-cronyx-cyrillic-1.0.3               :
-font-cursor-misc-1.0.3.tar.bz2                  :  font-cursor-misc-1.0.3                   :
-font-daewoo-misc-1.0.3.tar.bz2                  :  font-daewoo-misc-1.0.3                   :
-font-dec-misc-1.0.3.tar.bz2                     :  font-dec-misc-1.0.3                      :
-font-ibm-type1-1.0.3.tar.bz2                    :  font-ibm-type1-1.0.3                     :
-font-isas-misc-1.0.3.tar.bz2                    :  font-isas-misc-1.0.3                     :
-font-jis-misc-1.0.3.tar.bz2                     :  font-jis-misc-1.0.3                      :
-font-micro-misc-1.0.3.tar.bz2                   :  font-micro-misc-1.0.3                    :
-font-misc-cyrillic-1.0.3.tar.bz2                :  font-misc-cyrillic-1.0.3                 :
-font-misc-ethiopic-1.0.3.tar.bz2                :  font-misc-ethiopic-1.0.3                 :
-font-misc-meltho-1.0.3.tar.bz2                  :  font-misc-meltho-1.0.3                   :
-font-misc-misc-1.1.2.tar.bz2                    :  font-misc-misc-1.1.2                     :
-font-mutt-misc-1.0.3.tar.bz2                    :  font-mutt-misc-1.0.3                     :
-font-schumacher-misc-1.1.2.tar.bz2              :  font-schumacher-misc-1.1.2               :
-font-screen-cyrillic-1.0.4.tar.bz2              :  font-screen-cyrillic-1.0.4               :
-font-sony-misc-1.0.3.tar.bz2                    :  font-sony-misc-1.0.3                     :
-font-sun-misc-1.0.3.tar.bz2                     :  font-sun-misc-1.0.3                      :
-font-util-1.2.0.tar.bz2                         :  font-util-1.2.0                          :
-font-winitzki-cyrillic-1.0.3.tar.bz2            :  font-winitzki-cyrillic-1.0.3             :
-font-xfree86-type1-1.0.4.tar.bz2                :  font-xfree86-type1-1.0.4                 :
+font-adobe-75dpi-1.0.3.tar.bz2                  :  font-adobe-75dpi-1.0.3                   : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-adobe-100dpi-1.0.3.tar.bz2                 :  font-adobe-100dpi-1.0.3                  : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-adobe-utopia-75dpi-1.0.4.tar.bz2           :  font-adobe-utopia-75dpi-1.0.4            : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-adobe-utopia-100dpi-1.0.4.tar.bz2          :  font-adobe-utopia-100dpi-1.0.4           : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-adobe-utopia-type1-1.0.4.tar.bz2           :  font-adobe-utopia-type1-1.0.4            : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-alias-1.0.3.tar.bz2                        :  font-alias-1.0.3                         : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-arabic-misc-1.0.3.tar.bz2                  :  font-arabic-misc-1.0.3                   : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-bh-75dpi-1.0.3.tar.bz2                     :  font-bh-75dpi-1.0.3                      : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-bh-100dpi-1.0.3.tar.bz2                    :  font-bh-100dpi-1.0.3                     : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2    :  font-bh-lucidatypewriter-75dpi-1.0.3     : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2   :  font-bh-lucidatypewriter-100dpi-1.0.3    : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-bh-ttf-1.0.3.tar.bz2                       :  font-bh-ttf-1.0.3                        : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-bh-type1-1.0.3.tar.bz2                     :  font-bh-type1-1.0.3                      : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-bitstream-75dpi-1.0.3.tar.bz2              :  font-bitstream-75dpi-1.0.3               : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-bitstream-100dpi-1.0.3.tar.bz2             :  font-bitstream-100dpi-1.0.3              : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-bitstream-type1-1.0.3.tar.bz2              :  font-bitstream-type1-1.0.3               : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-cronyx-cyrillic-1.0.3.tar.bz2              :  font-cronyx-cyrillic-1.0.3               : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-cursor-misc-1.0.3.tar.bz2                  :  font-cursor-misc-1.0.3                   : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-daewoo-misc-1.0.3.tar.bz2                  :  font-daewoo-misc-1.0.3                   : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-dec-misc-1.0.3.tar.bz2                     :  font-dec-misc-1.0.3                      : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-ibm-type1-1.0.3.tar.bz2                    :  font-ibm-type1-1.0.3                     : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-isas-misc-1.0.3.tar.bz2                    :  font-isas-misc-1.0.3                     : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-jis-misc-1.0.3.tar.bz2                     :  font-jis-misc-1.0.3                      : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-micro-misc-1.0.3.tar.bz2                   :  font-micro-misc-1.0.3                    : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-misc-cyrillic-1.0.3.tar.bz2                :  font-misc-cyrillic-1.0.3                 : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-misc-ethiopic-1.0.3.tar.bz2                :  font-misc-ethiopic-1.0.3                 : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-misc-meltho-1.0.3.tar.bz2                  :  font-misc-meltho-1.0.3                   : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-misc-misc-1.1.2.tar.bz2                    :  font-misc-misc-1.1.2                     : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-mutt-misc-1.0.3.tar.bz2                    :  font-mutt-misc-1.0.3                     : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-schumacher-misc-1.1.2.tar.bz2              :  font-schumacher-misc-1.1.2               : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-screen-cyrillic-1.0.4.tar.bz2              :  font-screen-cyrillic-1.0.4               : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-sony-misc-1.0.3.tar.bz2                    :  font-sony-misc-1.0.3                     : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-sun-misc-1.0.3.tar.bz2                     :  font-sun-misc-1.0.3                      : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-util-1.2.0.tar.bz2                         :  font-util-1.2.0                          : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-winitzki-cyrillic-1.0.3.tar.bz2            :  font-winitzki-cyrillic-1.0.3             : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
+font-xfree86-type1-1.0.4.tar.bz2                :  font-xfree86-type1-1.0.4                 : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11
 xf86driproto-2.1.0.tar.bz2                      :  xf86driproto-2.1.0                       :
 dri2proto-2.3.tar.bz2                           :  dri2proto-2.3                            :
 glproto-1.4.12.tar.bz2                          :  glproto-1.4.12                           :
-xdriinfo-1.0.4.tar.bz2                          :  xdriinfo-1.0.4                           :
+libpciaccess-0.12.0.tar.bz2                     :  libpciaccess-0.12.0                      :
+libdrm-2.4.26.tar.bz2                           :  libdrm-2.4.26                            :
+damageproto-1.2.1.tar.bz2                       :  damageproto-1.2.1                        :
+libXdamage-1.1.3.tar.bz2                        :  libXdamage-1.1.3                         :
+makedepend-1.0.3.tar.bz2                        :  makedepend-1.0.3                         :
+MesaLib-7.10.3.tar.bz2                          :  Mesa-7.10.3                              :
 randrproto-1.3.2.tar.bz2                        :  randrproto-1.3.2                         :
 renderproto-0.11.1.tar.bz2                      :  renderproto-0.11.1                       :
 fixesproto-4.1.2.tar.bz2                        :  fixesproto-4.1.2                         :
-damageproto-1.2.1.tar.bz2                       :  damageproto-1.2.1                        :
 xcmiscproto-1.2.1.tar.bz2                       :  xcmiscproto-1.2.1                        :
 xextproto-7.1.2.tar.bz2                         :  xextproto-7.1.2                          :
 xproto-7.0.20.tar.bz2                           :  xproto-7.0.20                            :
@@ -74,15 +78,12 @@ libXmu-1.1.0.tar.bz2                            :  libXmu-1.1.0
 libXxf86vm-1.1.1.tar.bz2                        :  libXxf86vm-1.1.1                         :
 libXpm-3.5.9.tar.bz2                            :  libXpm-3.5.9                             :
 libXaw-1.0.8.tar.bz2                            :  libXaw-1.0.8                             :
-libpciaccess-0.12.0.tar.bz2                     :  libpciaccess-0.12.0                      :
-libXdamage-1.1.3.tar.bz2                        :  libXdamage-1.1.3                         :
 expat-2.0.1.tar.gz                              :  expat-2.0.1                              :
 pixman-0.15.20.tar.bz2                          :  pixman-0.15.20                           :
-libdrm-2.4.26.tar.bz2                           :  libdrm-2.4.26                            :
-MesaLib-7.10.3.tar.bz2                          :  Mesa-7.10.3                              :
-freetype-2.4.6.tar.bz2                          : freetype-2.4.6                            :
+freetype-2.4.6.tar.bz2                          :  freetype-2.4.6                           :
 mkfontdir-1.0.6.tar.bz2                         :  mkfontdir-1.0.6                          :
 xkbcomp-1.2.0.tar.bz2                           :  xkbcomp-1.2.0                            :
+xdriinfo-1.0.4.tar.bz2                          :  xdriinfo-1.0.4                           :
 xorg-server-1.9.3.tar.bz2                       :  xorg-server-1.9.3                        :
 applewmproto-1.4.1.tar.bz2                      :  applewmproto-1.4.1                       :
 bdftopcf-1.0.3.tar.bz2                          :  bdftopcf-1.0.3                           :