Removed redundant paths in base/pkgconf

Replaced single quotes with double quotes in some base and xorg pkg files

base/libtirpc/libtirpc.SMBuild

@@ -1,8 +1,8 @@
 app=libtirpc
 version=1.2.6
 build=1sml
-homepage='http://sourceforge.net/projects/libtirpc/'
+homepage="http://sourceforge.net/projects/libtirpc/"
-download='https://downloads.sourceforge.net/libtirpc/libtirpc-1.2.6.tar.bz2'
+download="https://downloads.sourceforge.net/libtirpc/libtirpc-$version.tar.bz2"
 desc="Transport-Independent RPC library"
 requires="musl"
 

base/libvncserver/libvncserver.SMBuild

@@ -1,8 +1,8 @@
 app=libvncserver
 version=0.9.11
 build=1sml
-homepage='https://libvnc.github.io/'
+homepage="https://libvnc.github.io/"
-download='https://github.com/LibVNC/libvncserver/archive/refs/tags/LibVNCServer-0.9.11.tar.gz'
+download="https://github.com/LibVNC/libvncserver/archive/refs/tags/LibVNCServer-$version.tar.gz"
 desc="VNC server library for easy implementation of the VNC server"
 requires="zlib gmp libgcrypt libpng nettle gnutls libidn libtasn1 libjpeg-turbo"
 

base/m4/m4.SMBuild

@@ -1,8 +1,8 @@
 app=m4
 version=1.4.18
 build=1sml
-homepage='http://gnu.org/software/m4'
+homepage="http://gnu.org/software/m4"
-download='https://ftp.gnu.org/gnu/m4/m4-1.4.18.tar.xz'
+download="https://ftp.gnu.org/gnu/m4/m4-$version.tar.xz"
 desc="implementation of the UNIX macro processor"
 requires="musl"
 

base/pkgconf/pkgconf.SMBuild

@@ -1,6 +1,6 @@
 app=pkgconf
 version=1.7.3
-build=1sml
+build=2sml
 homepage="https://git.sr.ht/~kaniini/pkgconf"
 download="https://distfiles.dereferenced.org/pkgconf/pkgconf-$version.tar.xz"
 desc="Drop-in replacement for the bloated pkg-config utility"
@@ -16,7 +16,8 @@ build() {
 
   ./configure \
     --prefix="" \
-    --with-pkg-config-dir=/usr/lib/pkgconfig:/usr/share/pkgconfig:/lib/pkgconfig
+    --disable-static \
+    --with-pkg-config-dir=/lib/pkgconfig
 
   make
   make install DESTDIR=$pkg

base/readline/readline.SMBuild

@@ -1,9 +1,9 @@
 app=readline
 version=6.3
 build=1sml
-homepage='https://tiswww.case.edu/php/chet/readline/rltop.html'
+homepage="https://tiswww.case.edu/php/chet/readline/rltop.html"
-download='ftp://ftp.cwru.edu/pub/bash/readline-6.3.tar.gz'
+download="ftp://ftp.cwru.edu/pub/bash/readline-$version.tar.gz"
-desc="line input library with editing features"
+desc="Line input library with editing features"
 requires="netbsd-curses"
 
 build() {

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

@@ -1,9 +1,9 @@
 app=at-spi2-core
 version=2.34.0
 build=1sml
+homepage="https://gitlab.gnome.org/GNOME/at-spi2-core"
 requires="libffi glib pcre dbus libx11 libxau libxdmcp "
 desc="Protocol definitions and daemon for D-Bus at-spi"
-homepage="https://gitlab.gnome.org/GNOME/at-spi2-core"
 
 build() {
   mkandenterbuilddir

xorg/bdftopcf/bdftopcf.SMBuild

@@ -2,7 +2,7 @@ app=bdftopcf
 version=1.1
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/archive/individual/app/bdftopcf-1.1.tar.gz"
+download="https://xorg.freedesktop.org/archive/individual/app/bdftopcf-$version.tar.gz"
 requires="xorgproto xorg-macros"
 desc="Convert X font from Bitmap Distribution Format to Portable Compiled Format"
 

xorg/dbus/dbus.SMBuild

@@ -2,9 +2,9 @@ app=dbus
 version=1.12.20
 build=1sml
 homepage="https://wiki.freedesktop.org/www/Software/dbus/"
+download="https://dbus.freedesktop.org/releases/dbus/dbus-$version.tar.gz"
 desc="Freedesktop.org message bus system"
 requires="netbsd-curses util-linux expat python3 xmlto"
-download="https://dbus.freedesktop.org/releases/dbus/dbus-1.12.20.tar.gz"
 
 build() {
   mkandenterbuilddir

xorg/dconf/dconf.SMBuild

@@ -2,7 +2,7 @@ app=dconf
 version=0.24.0
 build=1sml
 homepage="http://live.gnome.org/dconf"
-download="https://gitlab.gnome.org/GNOME/dconf/-/archive/0.24.0/dconf-0.24.0.tar.gz"
+download="https://gitlab.gnome.org/GNOME/dconf/-/archive/$version/dconf-$version.tar.gz"
 requires="glib libffi python3 vala dbus "
 desc="low-level configuration system that serves as a backend for GLib"
 

xorg/dejavu-fonts-ttf/dejavu-fonts-ttf.SMBuild

@@ -1,8 +1,9 @@
 app=dejavu-fonts-ttf
 version=2.37
+mversion="$(echo $version | sed 's@.@_@')"
 build=1sml
 homepage="http://dejavu-fonts.github.io"
-download="https://github.com/dejavu-fonts/dejavu-fonts/archive/refs/tags/version_2_37.tar.gz"
+download="https://github.com/dejavu-fonts/dejavu-fonts/archive/refs/tags/version_$version.tar.gz"
 requires="fontconfig mkfontscale "
 desc="Font family based on the Bitstream Vera Fonts with a wider range of characters"
 

xorg/font-util/font-util.SMBuild

@@ -1,8 +1,8 @@
 app=font-util
 version=1.3.2
 build=1sml
-download="https://xorg.freedesktop.org/releases/individual/font/font-util-1.3.2.tar.gz"
 homepage="https://xorg.freedesktop.org/wiki/"
+download="https://xorg.freedesktop.org/releases/individual/font/font-util-$version.tar.gz"
 requires="musl"
 desc="Xorg font utilities"
 

xorg/fontconfig/fontconfig.SMBuild

@@ -2,9 +2,9 @@ app=fontconfig
 version=2.13.1
 build=1sml
 homepage="https://www.freedesktop.org/wiki/Software/fontconfig/"
-download="https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.1.tar.gz"
+download="https://www.freedesktop.org/software/fontconfig/release/fontconfig-$version.tar.gz"
 desc="Library for configuring and customizing font access"
-requires="expat json-c freetype "
+requires="expat json-c freetype"
 
 build() {
   mkandenterbuilddir

xorg/freeglut/freeglut.SMBuild

@@ -2,9 +2,9 @@ app=freeglut
 version=3.0.0
 build=1sml
 homepage="http://freeglut.sourceforge.net/"
-download="http://prdownloads.sourceforge.net/freeglut/freeglut-3.0.0.tar.gz"
+download="http://prdownloads.sourceforge.net/freeglut/freeglut-$version.tar.gz"
 desc="Provides functionality for small OpenGL programs"
-requires="glu "
+requires="glu"
 
 build() {
   mkandenterbuilddir

xorg/freetype/freetype.SMBuild

@@ -2,7 +2,7 @@ app=freetype
 version=2.9
 build=1sml
 homepage="https://www.freetype.org/"
-download="https://downloads.sourceforge.net/freetype/freetype-2.9.tar.bz2"
+download="https://downloads.sourceforge.net/freetype/freetype-$version.tar.bz2"
 desc="Font rasterization library"
 requires="bzip2 zlib libpng "
 

xorg/gccmakedep/gccmakedep.SMBuild

@@ -2,8 +2,8 @@ app=gccmakedep
 version=1.0.3
 build=1sml
 homepage="https://www.x.org/wiki/"
-download="https://www.x.org/releases/individual/util/gccmakedep-1.0.3.tar.gz"
+download="https://www.x.org/releases/individual/util/gccmakedep-$version.tar.gz"
-desc="program to create dependencies in makefiles"
+desc="Program to create dependencies in makefiles"
 requires="make"
 
 build() {

xorg/glew/glew.SMBuild

@@ -2,7 +2,7 @@ app=glew
 version=2.1.0
 build=1sml
 homepage="https://github.com/nigels-com/glew"
-download="https://github.com/nigels-com/glew/archive/refs/tags/glew-2.1.0.tar.gz"
+download="https://github.com/nigels-com/glew/archive/refs/tags/glew-$version.tar.gz"
 desc="The OpenGL Extension Wrangler Library"
 requires="mesa"
 

xorg/glu/glu.SMBuild

@@ -2,7 +2,7 @@ app=glu
 version=9.0.1
 build=1sml
 homepage="https://cgit.freedesktop.org/mesa/glu/"
-download="https://archive.mesa3d.org/glu/glu-9.0.1.tar.xz"
+download="https://archive.mesa3d.org/glu/glu-$version.tar.xz"
 desc="Mesa OpenGL Utility library"
 requires="mesa glew"
 

xorg/iceauth/iceauth.SMBuild

@@ -2,7 +2,7 @@ app=iceauth
 version=1.0.8
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/archive/individual/app/iceauth-1.0.8.tar.gz"
+download="https://xorg.freedesktop.org/archive/individual/app/iceauth-$version.tar.gz"
 desc="ICE authority file utility"
 requires="libice"
 

xorg/imake/imake.SMBuild

@@ -2,9 +2,9 @@ app=imake
 version=1.0.8
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/archive/individual/util/imake-1.0.8.tar.gz"
+download="https://xorg.freedesktop.org/archive/individual/util/imake-$version.tar.gz"
 desc="X.Org imake program and related utilities"
-requires="perl xorgproto xorg-macros "
+requires="perl xorgproto xorg-macros"
 
 build() {
   mkandenterbuilddir

xorg/imlib2/imlib2.SMBuild

@@ -2,7 +2,7 @@ app=imlib2
 version=1.5.1
 build=1sml
 homepage="https://sourceforge.net/projects/enlightenment/"
-download="https://sourceforge.net/projects/enlightenment/files/imlib2-src/1.5.0/imlib2-1.5.0.tar.bz2"
+download="https://sourceforge.net/projects/enlightenment/files/imlib2-src/$version/imlib2-$version.tar.bz2"
 desc="General image handling library for X11 and Gtk"
 requires="bzip2 zlib libpng giflib libjpeg-turbo libxcb libxau freetype libxext libtiff"
 

xorg/jasper/jasper.SMBuild

@@ -2,7 +2,7 @@ app=jasper
 version=2.0.16
 build=1sml
 homepage="http://www.ece.uvic.ca/~mdadams/jasper/"
-download="https://github.com/jasper-software/jasper/archive/refs/tags/version-2.0.16.tar.gz"
+download="https://github.com/jasper-software/jasper/archive/refs/tags/version-$version.tar.gz"
 requires="cmake libjpeg-turbo libxmu glew freeglut"
 desc="free implementation of the JPEG-2000 standard"
 

xorg/lcms2/lcms2.SMBuild

@@ -2,7 +2,7 @@ app=lcms2
 version=2.9
 build=1sml
 homepage="http://www.littlecms.com/"
-download="https://github.com/mm2/Little-CMS/archive/refs/tags/lcms2.9.tar.gz"
+download="https://github.com/mm2/Little-CMS/archive/refs/tags/lcms$version.tar.gz"
 desc="Small-footprint color management engine, version 2"
 requires="libtiff"
 

xorg/libdrm/libdrm.SMBuild

@@ -2,9 +2,9 @@ app=libdrm
 version=2.4.102
 build=1sml
 homepage="https://dri.freedesktop.org/"
-download="https://dri.freedesktop.org/libdrm/libdrm-2.4.102.tar.xz"
+download="https://dri.freedesktop.org/libdrm/libdrm-$version.tar.xz"
 desc="Userspace interface to kernel DRM services"
-requires="libxslt libpciaccess "
+requires="libxslt libpciaccess"
 
 build() {
   mkandenterbuilddir

xorg/libepoxy/libepoxy.SMBuild

@@ -2,7 +2,7 @@ app=libepoxy
 version=1.5.4
 build=1sml
 homepage="https://github.com/anholt/libepoxy"
-download="https://github.com/anholt/libepoxy/archive/refs/tags/1.5.4.tar.gz"
+download="https://github.com/anholt/libepoxy/archive/refs/tags/$version.tar.gz"
 desc="Library handling OpenGL function pointer management"
 requires="mesa"
 

xorg/liberation-fonts-ttf/liberation-fonts-ttf.SMBuild

@@ -2,9 +2,9 @@ app=liberation-fonts-ttf
 version=2.1.0
 build=1sml
 homepage="https://github.com/liberationfonts/liberation-fonts"
-download="https://github.com/liberationfonts/liberation-fonts/archive/refs/tags/2.1.0.tar.gz"
+download="https://github.com/liberationfonts/liberation-fonts/archive/refs/tags/$version.tar.gz"
 desc="Font family which aims at metric compatibility with Arial, Times New Roman, and Courier New"
-requires="fontconfig mkfontscale "
+requires="fontconfig mkfontscale"
 
 build() {
   mkandenterbuilddir

xorg/libevdev/libevdev.SMBuild

@@ -2,7 +2,7 @@ app=libevdev
 version=1.9.1
 build=1sml
 homepage="https://www.freedesktop.org/wiki/Software/libevdev/"
-download="https://freedesktop.org/software/libevdev/libevdev-1.9.1.tar.xz"
+download="https://freedesktop.org/software/libevdev/libevdev-$version.tar.xz"
 desc="Wrapper library for evdev devices"
 requires="python3"
 

xorg/libice/libice.SMBuild

@@ -2,7 +2,7 @@ app=libice
 version=1.0.10
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/releases/individual/lib/libICE-1.0.10.tar.bz2"
+download="https://xorg.freedesktop.org/releases/individual/lib/libICE-$version.tar.bz2"
 desc="X11 Inter-Client Exchange library"
 requires="xorgproto xorg-macros xtrans"
 

xorg/libinput/libinput.SMBuild

@@ -2,7 +2,7 @@ app=libinput
 version=1.19.3
 build=1sml
 homepage="https://www.freedesktop.org/wiki/Software/libinput/"
-download="https://freedesktop.org/software/libinput/libinput-1.19.3.tar.xz"
+download="https://freedesktop.org/software/libinput/libinput-$version.tar.xz"
 desc="Input device management and event handling library"
 requires="libevdev mtdev libwacom"
 
@@ -30,4 +30,4 @@ build() {
 
 sha512sums="
 f4b776d0da78c687ba21b430a04941ac6b43f68970c82ec9f7360358fdea5ed6a873948ce66a25bcdd64d4b95fa4bf705cc24dbc25c7c0f5fd2d0efbd763f298  libinput-1.19.3.tar.xz
-"
+"

xorg/libomxil-bellagio/libomxil-bellagio.SMBuild

@@ -2,7 +2,7 @@ app=libomxil-bellagio
 version=0.9.3
 build=1sml
 homepage="http://omxil.sourceforge.net/"
-download="http://sourceforge.net/projects/omxil/files/omxil/Bellagio%200.9.3/libomxil-bellagio-0.9.3.tar.gz"
+download="http://sourceforge.net/projects/omxil/files/omxil/Bellagio%20$version/libomxil-bellagio-$version.tar.gz"
 desc="opensource implementation of the OpenMAX Integration Layer API"
 requires="musl"