Added xdg-utils to xorg

Discarded --docdir build option, double quotes and made minor changes to several xorg build files

xorg/at-spi2-core/at-spi2-core.SMBuild

@@ -17,7 +17,7 @@ prepbuilddir() {
 
 build() {
   mkdir -p smbuild && cd smbuild
-  meson .. --prefix="/" \
+  meson .. --prefix=/ \
     --sysconfdir=/etc
 
   ninja

xorg/bdftopcf/bdftopcf.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix=
 
   make
   make install DESTDIR=$pkg

xorg/dbus/dbus.SMBuild

@@ -20,7 +20,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --bindir=/bin \
     --sbindir=/bin \
     --sysconfdir=/etc \

xorg/dconf/dconf.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --sysconfdir=/etc \
     --localstatedir=/var \
     --disable-gtk-doc \

xorg/font-util/font-util.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --sysconfdir=/etc 
 
   make

xorg/fontconfig/fontconfig.SMBuild

@@ -20,7 +20,7 @@ build() {
   printf "all:\n\ttrue\n\ninstall:\n\ttrue\n\n" > test/Makefile.in
 
   ./configure \
-    --prefix="" \
+    --prefix= \
     --sysconfdir=/etc \
     --localstatedir=/var \
     --bindir=/bin \

xorg/gccmakedep/gccmakedep.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix=
 
   make
   make install DESTDIR=$pkg

xorg/glu/glu.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static 
 
   make

xorg/iceauth/iceauth.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --sysconfdir=/etc 
 
   make

xorg/imake/imake.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix=
 
   make
   make install DESTDIR=$pkg

xorg/imlib2/imlib2.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static 
 
   make

xorg/lcms2/lcms2.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --sysconfdir=/etc 
 
   make

xorg/libdrm/libdrm.SMBuild

@@ -19,7 +19,7 @@ prepbuilddir() {
 build() {
   mkdir -p smbuild && cd smbuild
   meson .. \
-   --prefix="/" \
+   --prefix=/ \
    -Dcairo-tests=disabled
 
   ninja

xorg/libepoxy/libepoxy.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   mkdir -p smbuild && cd smbuild
-  meson .. --prefix="/" 
+  meson .. --prefix=/
 
   ninja
   DESTDIR="$pkg" ninja install

xorg/libevdev/libevdev.SMBuild

@@ -19,7 +19,7 @@ prepbuilddir() {
 build() {
   mkdir -p smbuild && cd smbuild
   meson .. \
-    --prefix="/" \
+    --prefix=/ \
     -Dtests=disabled \
     -Ddocumentation=disabled 
 

xorg/libfontenc/libfontenc.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static 
 
   make

xorg/libgudev/libgudev.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static \
     --disable-umockdev 
 

xorg/libice/libice.SMBuild

@@ -18,8 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
-    --docdir="/share/doc/$app-$version" \
     --disable-static
 
   make

xorg/libinput/libinput.SMBuild

@@ -19,7 +19,7 @@ prepbuilddir() {
 build() {
   mkdir -p smbuild && cd smbuild
   meson .. \
-    --prefix="/" \
+    --prefix=/ \
     -Ddocumentation=false \
     -Dtests=false \
     -Ddebug-gui=false

xorg/libpciaccess/libpciaccess.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static \
     --disable-selective-werror \
     --disable-strict-compilation 

xorg/libraw/libraw.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static \
     --enable-openmp 
 

xorg/libsm/libsm.SMBuild

@@ -18,8 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
-    --docdir="/share/doc/$app-$version" \
     --disable-static
 
   make

xorg/libtiff/libtiff.SMBuild

@@ -18,8 +18,8 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
-    --libdir="/lib" \
+    --libdir=/lib \
     --with-pic \
     --enable-shared \
     --disable-static

xorg/libvdpau/libvdpau.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static 
 
   make

xorg/libwacom/libwacom.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static 
 
   make

xorg/libx11/libx11.SMBuild

@@ -18,8 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
-    --docdir="/share/doc/$app-$version" \
     --disable-static 
 
   make

xorg/libxau/libxau.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static 
 
   make

xorg/libxaw/libxaw.SMBuild

@@ -18,8 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
-    --docdir="/share/doc/$app-$version" \
     --disable-static 
 
   make

xorg/libxaw3d/libxaw3d.SMBuild

@@ -18,8 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
-    --docdir="/share/doc/$app-$version" \
     --disable-static
 
   make

xorg/libxaw3dxft/libxaw3dxft.SMBuild

@@ -18,8 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
-    --docdir="/share/doc/$app-$version" \
     --disable-static 
 
   make

xorg/libxcb/libxcb.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="/" \
+    --prefix=/ \
     --disable-static \
     --disable-devel-docs \
     --without-doxygen

xorg/libxcomposite/libxcomposite.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static
 
   make

xorg/libxcursor/libxcursor.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static 
 
   make

xorg/libxdamage/libxdamage.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static
 
   make
@@ -31,4 +31,4 @@ build() {
 
 sha512sums="
 0ec8a9250cbe8853bee05024e5fe7dbe8619e3f39894f47f9bbb16c3a3cd8a1c1921dfda14b4c2276d4034cdbe9dd2cc87513c37b55b5e55cbc6ce6318530016  libXdamage-1.1.6.tar.lz
-"
+"

xorg/libxdmcp/libxdmcp.SMBuild

@@ -18,8 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
-    --docdir="/share/doc/$app-$version" \
     --disable-static 
 
   make

xorg/libxext/libxext.SMBuild

@@ -19,8 +19,7 @@ prepbuilddir() {
 build() {
   ac_cv_func__XEatDataWords=yes \
   ./configure \
-    --prefix="" \
+    --prefix= \
-    --docdir="/share/doc/$app-$version" \
     --disable-static 
 
   make

xorg/libxfixes/libxfixes.SMBuild

@@ -17,9 +17,9 @@ prepbuilddir() {
 }
 
 build() {
-  CFLAGS="$CFLAGS -DHAVE__XEATDATAWORDS=1" \
+  CFLAGS+=" -DHAVE__XEATDATAWORDS=1" \
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static 
 
   make

xorg/libxfont2/libxfont2.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static 
 
   make

xorg/libxft/libxft.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static 
 
   make

xorg/libxi/libxi.SMBuild

@@ -18,8 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
-    --docdir="/share/doc/$app-$version" \
     --disable-static 
 
   make

xorg/libxinerama/libxinerama.SMBuild

@@ -17,9 +17,9 @@ prepbuilddir() {
 }
 
 build() {
-  CFLAGS="$CFLAGS -DHAVE__XEATDATAWORDS=1" \
+  CFLAGS+=" -DHAVE__XEATDATAWORDS=1" \
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static 
 
   make

xorg/libxkbfile/libxkbfile.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static 
 
   make

xorg/libxklavier/libxklavier.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static \
     --with-xkb-base=/etc/X11/xkb
 

xorg/libxmu/libxmu.SMBuild

@@ -18,8 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
-    --docdir="/share/doc/$app-$version" \
     --disable-static 
 
   make

xorg/libxpm/libxpm.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static 
 
   make

xorg/libxpresent/libxpresent.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static
 
   make

xorg/libxrandr/libxrandr.SMBuild

@@ -19,7 +19,7 @@ prepbuilddir() {
 build() {
   ac_cv_func__XEatDataWords=yes \
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static 
 
   make

xorg/libxrender/libxrender.SMBuild

@@ -17,10 +17,9 @@ prepbuilddir() {
 }
 
 build() {
-  CFLAGS="$CFLAGS -DHAVE__XEATDATAWORDS=1" \
+  CFLAGS+=" -DHAVE__XEATDATAWORDS=1" \
   ./configure \
-    --prefix="" \
+    --prefix= \
-    --docdir="/share/doc/$app-$version" \
     --disable-static 
 
   make

xorg/libxscrnsaver/libxscrnsaver.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static
 
   make

xorg/libxshmfence/libxshmfence.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static 
 
   make

xorg/libxt/libxt.SMBuild

@@ -18,8 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
-    --docdir="/share/doc/$app-$version" \
     --disable-static 
 
   make

xorg/libxtst/libxtst.SMBuild

@@ -17,10 +17,9 @@ prepbuilddir() {
 }
 
 build() {
-  CFLAGS="$CFLAGS -DHAVE__XEATDATAWORDS=1" \
+  CFLAGS+=" -DHAVE__XEATDATAWORDS=1" \
   ./configure \
-    --prefix="" \
+    --prefix= \
-    --docdir="/share/doc/$app-$version" \
     --disable-static
 
   make

xorg/libxxf86vm/libxxf86vm.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static 
 
   make

xorg/makedepend/makedepend.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix=
 
   make
   make install DESTDIR=$pkg

xorg/mesa-demos/mesa-demos.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-gles1 \
     --with-system-data-files=/share/mesa-demos
 

xorg/mesa/mesa.SMBuild

@@ -17,18 +17,18 @@ prepbuilddir() {
 }
 
 build() {
-  if [ "$arch" = "aarch64" ]; then
+  if [[ $arch = aarch64 ]]; then
     dridrivers=""
     galliumdrivers="swrast,v3d,vc4,kmsro"
 
-  elif [ "$arch" = "x86_64" ]; then
+  elif [[ $arch = x86_64 ]]; then
     dridrivers="i915,i965,nouveau,r100,r200,swrast"
     galliumdrivers="nouveau,radeonsi,r300,r600"
   fi
 
   mkdir -p smbuild && cd smbuild
   meson .. \
-    --prefix="/" \
+    --prefix=/ \
     --sysconfdir=/etc \
     --localstatedir=/var \
     -Dbuildtype=release \

xorg/mkfontscale/mkfontscale.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix=
 
   make
   make install DESTDIR=$pkg

xorg/mtdev/mtdev.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static \
     $builddist
 

xorg/numlockx/numlockx.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix=
 
   make
   make install DESTDIR=$pkg

xorg/pixman/pixman.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   mkdir -p smbuild && cd smbuild 
-  meson .. --prefix="/" 
+  meson .. --prefix=/
 
   ninja
   DESTDIR="$pkg" ninja install

xorg/setxkbmap/setxkbmap.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix=
 
   make
   make install DESTDIR=$pkg

xorg/spandsp/spandsp.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static \
     $builddist
 

xorg/startup-notification/startup-notification.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static \
     $builddist
 

xorg/twm/twm.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix=
 
   make
   make install DESTDIR=$pkg

xorg/vala/vala.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-valadoc
 
   make

xorg/xauth/xauth.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix=
 
   make
   make install DESTDIR=$pkg

xorg/xbitmaps/xbitmaps.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=""
+    --prefix=
 
   make
   make install DESTDIR=$pkg
@@ -30,4 +30,4 @@ build() {
 
 sha512sums="
 4cba1ab4602233963a4e3ca8dee8087bc8cf1aaf3f7131b776cb7661651990986e74e764004fef1c09b53a640fff1cec860b48a6d342b09716a7047145428651  xbitmaps-1.1.3.tar.lz
-"
+"

xorg/xcalc/xcalc.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix=
 
   make
   make install DESTDIR=$pkg

xorg/xcb-proto/xcb-proto.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="/" 
+    --prefix=/
 
   make
   make install DESTDIR=$pkg

xorg/xcb-util-cursor/xcb-util-cursor.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static
 
   make

xorg/xcb-util-image/xcb-util-image.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static
 
   make

xorg/xcb-util-keysyms/xcb-util-keysyms.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static 
 
   make

xorg/xcb-util-renderutil/xcb-util-renderutil.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static 
 
   make

xorg/xcb-util-wm/xcb-util-wm.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static 
 
   make

xorg/xcb-util/xcb-util.SMBuild

@@ -17,9 +17,8 @@ prepbuilddir() {
 }
 
 build() {
-
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-static
 
   make
@@ -32,4 +31,4 @@ build() {
 
 sha512sums="
 18278806f7fc354daafd2cd53d9743c6afe41a225b1e67a62654a7f779bbcb78a92e261d1553019e2c47150029262ac1f99ac2df1d4b95d2decc5fb3d7f52fed  xcb-util-0.4.0.tar.lz
-"
+"

xorg/xclipboard/xclipboard.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix=
 
   make
   make install DESTDIR=$pkg

xorg/xclock/xclock.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-   --prefix="" 
+   --prefix=
 
   make
   make install DESTDIR=$pkg

xorg/xdg-dbus-proxy/xdg-dbus-proxy.SMBuild

@@ -20,7 +20,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-man
 
   make

xorg/xdg-user-dirs/xdg-user-dirs.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --sysconfdir=/etc \
     --disable-documentation
 

xorg/xdg-utils/doinst.sh

@@ -0,0 +1,100 @@
+#!/bin/sh
+# Regarding xdg-open in /etc/mailcap:
+#
+# It turns out that xdg-open is not very smart about what it
+# passes off control to, leading to security problems where (for
+# example) a file could be provided on a web site as a PDF, but
+# rather than send it to a PDF viewer, xdg-open sends it to kfmclient
+# which uses a whole different set of criteria to determine what sort
+# of file it is.  It's trivial to make something that's detected as
+# a PDF at first, but then is executed as a .desktop file later,
+# resulting in the execution of arbitrary code as the user.
+#
+# This is not acceptable, and we see no way to fix it as long as
+# xdg-open passes off the resolution of the file type (again) to
+# something else.  In light of the potential security risks, we
+# will turn off the use of xdg-open if it appears to have been
+# added by a previous version of the xdg-utils package.
+#
+# Vulnerability code:  CVE-2009-0068
+
+# First, we will detect an automatically modified mailcap by
+# looking for the comment "# Sample xdg-open entries:"
+
+if [ -r etc/mailcap ]; then
+  if grep -q "^# Sample xdg-open entries:$" etc/mailcap ; then
+
+    COOKIE=$(usr/bin/mcookie)
+    if [ -z $COOKIE ]; then
+      exit 1
+    fi
+
+    # First, add a space to the end of the comment used to detect this
+    # junk so that we won't detect it again (in case the user decides
+    # to enable this themselves later on -- their call).  Add a warning
+    # about this type of xdg-open use being insecure.  Finally, comment
+    # out any lines like this.
+
+    echo "# Sample xdg-open entries: " > tmp/mailcap-$COOKIE
+    cat << EOF >> tmp/mailcap-$COOKIE
+#
+# NOTE:  Using xdg-open in /etc/mailcap in this way has been
+# shown to be insecure and is not recommended (CVE-2009-0068)!
+# A remote attacker can easily make a filetype such as a
+# .desktop script appear to xdg-open as a PDF file causing its
+# arbitrary contents to be executed.  Consider these to be
+# examples of what NOT to do.  The xdg-utils package no longer
+# adds any lines such as these to /etc/mailcap.
+#
+EOF
+    cat etc/mailcap \
+    | grep -v "# Sample xdg-open entries:" \
+    | sed -e 's/^audio\/\*; \/usr\/bin\/xdg-open %s/#audio\/\*; \/usr\/bin\/xdg-open %s/g' \
+    | sed -e 's/^image\/\*; \/usr\/bin\/xdg-open %s/#image\/\*; \/usr\/bin\/xdg-open %s/g' \
+    | sed -e 's/^application\/msword; \/usr\/bin\/xdg-open %s/#application\/msword; \/usr\/bin\/xdg-open %s/g' \
+    | sed -e 's/^application\/pdf; \/usr\/bin\/xdg-open %s/#application\/pdf; \/usr\/bin\/xdg-open %s/g' \
+    | sed -e 's/^application\/postscript ; \/usr\/bin\/xdg-open %s/#application\/postscript ; \/usr\/bin\/xdg-open %s/g' \
+    | sed -e 's/^text\/html; \/usr\/bin\/xdg-open %s ; copiousoutput/#text\/html; \/usr\/bin\/xdg-open %s ; copiousoutput/g' >> tmp/mailcap-$COOKIE
+
+    cat tmp/mailcap-$COOKIE > etc/mailcap
+    rm -f tmp/mailcap-$COOKIE
+
+  fi
+fi
+
+## BEGIN (HERE IS WHAT CAUSED THIS MESS):
+
+## Add some reasonable default values for xdg-open to /etc/mailcap,
+## since this is where many programs look for this information:
+#
+#if ! grep -q '# Sample xdg-open entries:' etc/mailcap 1> /dev/null 2> /dev/null ; then
+#  echo "# Sample xdg-open entries:" >> etc/mailcap
+#  echo >> etc/mailcap
+#fi
+#if ! grep -q 'audio/' etc/mailcap ; then
+#  echo 'audio/*; /usr/bin/xdg-open %s' >> etc/mailcap
+#  echo >> etc/mailcap
+#fi
+#if ! grep -q 'image/' etc/mailcap ; then
+#  echo 'image/*; /usr/bin/xdg-open %s' >> etc/mailcap
+#  echo >> etc/mailcap
+#fi
+#if ! grep -q 'application/msword' etc/mailcap ; then
+#  echo 'application/msword; /usr/bin/xdg-open %s' >> etc/mailcap
+#  echo >> etc/mailcap
+#fi
+#if ! grep -q 'application/pdf' etc/mailcap ; then
+#  echo 'application/pdf; /usr/bin/xdg-open %s' >> etc/mailcap
+#  echo >> etc/mailcap
+#fi
+#if ! grep -q 'application/postscript' etc/mailcap ; then
+#  echo 'application/postscript ; /usr/bin/xdg-open %s' >> etc/mailcap
+#  echo >> etc/mailcap
+#fi
+#if ! grep -q '#text/html' etc/mailcap ; then
+#  echo '#text/html; /usr/bin/xdg-open %s ; copiousoutput' >> etc/mailcap
+#  echo >> etc/mailcap
+#fi
+
+## END
+

xorg/xdg-utils/xdg-utils.SMBuild

@@ -0,0 +1,33 @@
+# Maintainer: PktSurf <smlinux@pktsurf.in>
+app=xdg-utils
+version=1.1.3
+build=1sml
+homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
+download="https://portland.freedesktop.org/download/xdg-utils-$version.tar.gz"
+desc="Command line tools that assist applications in desktop integration"
+requires="xmlto file docbook xset"
+
+prepbuilddir() {
+  mkandenterbuilddir
+  rm -rf $app-$version
+
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
+  fixbuilddirpermissions
+}
+
+build() {
+  ./configure \
+    --prefix=
+
+  make
+  make install DESTDIR=$pkg 
+
+  cp LICENSE $pkgdocs/
+
+  mkfinalpkg
+}
+
+sha512sums="
+8b4bcb4167b094ee5cc59d9f2f61062f6d69e4d1d3ec38b199eaa2f83e4e96b7f9b126e7a67054e929f7edb31f1c0778f59c7e113b7a766e3327bc6d894582c8  xdg-utils-1.1.3.tar.lz
+"

xorg/xev/xev.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix=
 
   make
   make install DESTDIR=$pkg

xorg/xf86-input-evdev/xf86-input-evdev.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-selective-werror 
 
   make

xorg/xf86-input-keyboard/xf86-input-keyboard.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --disable-selective-werror 
 
   make

xorg/xf86-input-libinput/xf86-input-libinput.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix=
 
   make
   make install DESTDIR=$pkg

xorg/xf86-input-mouse/xf86-input-mouse.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --sysconfdir=/etc 
 
   make

xorg/xf86-video-ati/xf86-video-ati.SMBuild

@@ -6,9 +6,9 @@ homepage="https://xorg.freedesktop.org/"
 download="https://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-$version.tar.bz2"
 desc="X.org ati video driver"
 requires="mesa xorg-server llvm"
+apparch="x86_64"
 
 prepbuilddir() {
-  compileonlyfor x86_64 
   mkandenterbuilddir
   rm -rf $app-$version
 
@@ -19,7 +19,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --sysconfdir=/etc \
     --enable-glamor 
 

xorg/xf86-video-dummy/xf86-video-dummy.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix=
 
   make
   make install DESTDIR=$pkg 

xorg/xf86-video-fbdev/xf86-video-fbdev.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --enable-pciaccess \
     --disable-selective-werror 
 

xorg/xf86-video-fbturbo/xf86-video-fbturbo.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --sysconfdir=/etc 
 
   make

xorg/xf86-video-intel/xf86-video-intel.SMBuild

@@ -7,9 +7,9 @@ download="https://xorg.freedesktop.org/releases/individual/driver/xf86-video-int
 desc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
 requires="pixman libxv libxinerama libxtst libxrandr libxcursor xorg-server"
 sm_noautoconfsite=1
+apparch="x86_64"
 
 prepbuilddir() {
-  compileonlyfor x86_64
   mkandenterbuilddir 
   rm -rf $app-$version
 
@@ -24,7 +24,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix= \
     --enable-xvmc \
     --disable-dga \
     --with-default-dri=3 \

xorg/xf86-video-vesa/xf86-video-vesa.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=""
+    --prefix=
 
   make
   make install DESTDIR=$pkg

xorg/xfontsel/xfontsel.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix=
 
   make
   make install DESTDIR=$pkg

xorg/xhost/xhost.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix=
 
   make
   make install DESTDIR=$pkg

xorg/xinit/xinit.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix=
 
   make
   make install DESTDIR=$pkg

xorg/xinput/xinput.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix=
 
   make
   make install DESTDIR=$pkg

xorg/xkbcomp/xkbcomp.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix=
 
   make
   make install DESTDIR=$pkg

xorg/xkeyboard-config/xkeyboard-config.SMBuild

@@ -19,7 +19,7 @@ prepbuilddir() {
 build() {
   mkdir -p smbuild && cd smbuild
   meson .. \
-    --prefix="/"
+    --prefix=/
 
   ninja
   DESTDIR="$pkg" ninja install

xorg/xmodmap/xmodmap.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix=
 
   make
   make install DESTDIR=$pkg

xorg/xorg-cf-files/xorg-cf-files.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix=
 
   make
   make install DESTDIR=$pkg