From 6f08b82b0bf3ae5d03a2cb6588a359e2a6382fdb Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:34:25 +0000 Subject: [PATCH] x11: automated code cleanup Signed-off-by: Ian Leonard --- packages/x11/app/setxkbmap/package.mk | 2 +- packages/x11/app/xkbcomp/package.mk | 4 +- packages/x11/app/xrandr/package.mk | 4 +- packages/x11/data/xkeyboard-config/package.mk | 2 +- .../x11/driver/xf86-input-evdev/package.mk | 4 +- .../x11/driver/xf86-input-libinput/package.mk | 8 +-- .../driver/xf86-input-synaptics/package.mk | 4 +- .../x11/driver/xf86-video-amdgpu/package.mk | 10 +-- packages/x11/driver/xf86-video-ati/package.mk | 8 +-- .../x11/driver/xf86-video-intel/package.mk | 6 +- .../xf86-video-nvidia-legacy/package.mk | 62 +++++++++---------- .../x11/driver/xf86-video-vmware/package.mk | 2 +- packages/x11/font/encodings/package.mk | 2 +- .../x11/font/font-bitstream-type1/package.mk | 6 +- packages/x11/font/font-cursor-misc/package.mk | 6 +- packages/x11/font/font-misc-misc/package.mk | 12 ++-- packages/x11/font/font-util/package.mk | 4 +- .../x11/font/font-xfree86-type1/package.mk | 6 +- .../x11/font/liberation-fonts-ttf/package.mk | 10 +-- packages/x11/lib/libICE/package.mk | 2 +- packages/x11/lib/libSM/package.mk | 2 +- packages/x11/lib/libX11/package.mk | 4 +- packages/x11/lib/libXau/package.mk | 2 +- packages/x11/lib/libXcomposite/package.mk | 2 +- packages/x11/lib/libXdamage/package.mk | 2 +- packages/x11/lib/libXext/package.mk | 2 +- packages/x11/lib/libXfixes/package.mk | 2 +- packages/x11/lib/libXfont2/package.mk | 2 +- packages/x11/lib/libXi/package.mk | 2 +- packages/x11/lib/libXinerama/package.mk | 2 +- packages/x11/lib/libXmu/package.mk | 2 +- packages/x11/lib/libXrandr/package.mk | 2 +- packages/x11/lib/libXrender/package.mk | 2 +- packages/x11/lib/libXt/package.mk | 8 +-- packages/x11/lib/libXtst/package.mk | 2 +- packages/x11/lib/libXxf86vm/package.mk | 2 +- packages/x11/lib/libfontenc/package.mk | 2 +- packages/x11/lib/libpciaccess/package.mk | 4 +- packages/x11/lib/libxcb/package.mk | 10 +-- packages/x11/lib/libxkbfile/package.mk | 2 +- packages/x11/lib/libxshmfence/package.mk | 2 +- packages/x11/lib/pixman/package.mk | 20 +++--- packages/x11/lib/xtrans/package.mk | 6 +- packages/x11/other/fluxbox/package.mk | 20 +++--- packages/x11/other/fontconfig/package.mk | 18 +++--- packages/x11/proto/xcb-proto/package.mk | 2 +- packages/x11/proto/xorgproto/package.mk | 2 +- packages/x11/util/util-macros/package.mk | 4 +- .../x11/util/xorg-launch-helper/package.mk | 6 +- packages/x11/xserver/xorg-server/package.mk | 48 +++++++------- 50 files changed, 175 insertions(+), 175 deletions(-) diff --git a/packages/x11/app/setxkbmap/package.mk b/packages/x11/app/setxkbmap/package.mk index 4e6b28e9ba..8c757e90fd 100644 --- a/packages/x11/app/setxkbmap/package.mk +++ b/packages/x11/app/setxkbmap/package.mk @@ -7,6 +7,6 @@ PKG_VERSION="1.3.2" PKG_SHA256="8ff27486442725e50b02d7049152f51d125ecad71b7ce503cfa09d5d8ceeb9f5" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/app/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/app/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain libX11 libxkbfile" PKG_LONGDESC="Setxkbmap sets the keyboard using the X Keyboard Extension." diff --git a/packages/x11/app/xkbcomp/package.mk b/packages/x11/app/xkbcomp/package.mk index a8aa91fa77..a0f943a840 100644 --- a/packages/x11/app/xkbcomp/package.mk +++ b/packages/x11/app/xkbcomp/package.mk @@ -7,8 +7,8 @@ PKG_VERSION="1.4.4" PKG_SHA256="59cce603a607a17722a0a1cf99010f4894e7812beb5d695abbc08474d59af27e" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/app/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/app/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libX11 libxkbfile" PKG_LONGDESC="The xkbcomp keymap compiler converts a description of an XKB keymap into one of several output formats." -PKG_CONFIGURE_OPTS_TARGET="--with-xkb-config-root=$XORG_PATH_XKB" +PKG_CONFIGURE_OPTS_TARGET="--with-xkb-config-root=${XORG_PATH_XKB}" diff --git a/packages/x11/app/xrandr/package.mk b/packages/x11/app/xrandr/package.mk index 027eec7743..375dd67e14 100644 --- a/packages/x11/app/xrandr/package.mk +++ b/packages/x11/app/xrandr/package.mk @@ -7,10 +7,10 @@ PKG_VERSION="1.5.1" PKG_SHA256="7bc76daf9d72f8aff885efad04ce06b90488a1a169d118dea8a2b661832e8762" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/app/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://xorg.freedesktop.org/archive/individual/app/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain util-macros libXrandr" PKG_LONGDESC="Xrandr is a primitive command line interface to the RandR extension and used to set the screen size, orientation and/or reflection." post_makeinstall_target() { - rm -rf $INSTALL/usr/bin/xkeystone + rm -rf ${INSTALL}/usr/bin/xkeystone } diff --git a/packages/x11/data/xkeyboard-config/package.mk b/packages/x11/data/xkeyboard-config/package.mk index 2a1fcedad3..7abe99ae4f 100644 --- a/packages/x11/data/xkeyboard-config/package.mk +++ b/packages/x11/data/xkeyboard-config/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.31" PKG_SHA256="da44181f2c8828789c720decf7d13acb3c3950e2a040af5132f50f04bb6aada3" PKG_LICENSE="MIT" PKG_SITE="http://www.X.org" -PKG_URL="http://www.x.org/releases/individual/data/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://www.x.org/releases/individual/data/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros" PKG_LONGDESC="X keyboard extension data files." PKG_TOOLCHAIN="autotools" diff --git a/packages/x11/driver/xf86-input-evdev/package.mk b/packages/x11/driver/xf86-input-evdev/package.mk index 05e61d4294..eacc3dfa6b 100644 --- a/packages/x11/driver/xf86-input-evdev/package.mk +++ b/packages/x11/driver/xf86-input-evdev/package.mk @@ -7,11 +7,11 @@ PKG_VERSION="2.10.6" PKG_SHA256="8726073e81861bc7b2321e76272cbdbd33c7e1a121535a9827977265b9033ec0" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain xorg-server util-macros libevdev mtdev systemd" PKG_LONGDESC="Evdev is an Xorg input driver for Linux's generic event devices." PKG_TOOLCHAIN="autotools" PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \ - --with-xorg-module-dir=$XORG_PATH_MODULES \ + --with-xorg-module-dir=${XORG_PATH_MODULES} \ --with-gnu-ld" diff --git a/packages/x11/driver/xf86-input-libinput/package.mk b/packages/x11/driver/xf86-input-libinput/package.mk index e05bca7736..454e737eac 100644 --- a/packages/x11/driver/xf86-input-libinput/package.mk +++ b/packages/x11/driver/xf86-input-libinput/package.mk @@ -7,14 +7,14 @@ PKG_VERSION="0.30.0" PKG_SHA256="f9c7f9fd41ae14061e0e9c3bd45fa170e5e21027a2bc5810034e1e748db996c0" PKG_LICENSE="GPL" PKG_SITE="http://www.freedesktop.org/wiki/Software/libinput/" -PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain libinput" PKG_LONGDESC="This is an X driver based on libinput." PKG_TOOLCHAIN="autotools" -PKG_CONFIGURE_OPTS_TARGET="--with-xorg-module-dir=$XORG_PATH_MODULES" +PKG_CONFIGURE_OPTS_TARGET="--with-xorg-module-dir=${XORG_PATH_MODULES}" post_makeinstall_target() { - mkdir -p $INSTALL/usr/share/X11/xorg.conf.d - cp $PKG_BUILD/conf/*-libinput.conf $INSTALL/usr/share/X11/xorg.conf.d + mkdir -p ${INSTALL}/usr/share/X11/xorg.conf.d + cp ${PKG_BUILD}/conf/*-libinput.conf ${INSTALL}/usr/share/X11/xorg.conf.d } diff --git a/packages/x11/driver/xf86-input-synaptics/package.mk b/packages/x11/driver/xf86-input-synaptics/package.mk index 9966a0bd2c..cf98ea8f3b 100644 --- a/packages/x11/driver/xf86-input-synaptics/package.mk +++ b/packages/x11/driver/xf86-input-synaptics/package.mk @@ -6,9 +6,9 @@ PKG_VERSION="1.9.1" PKG_SHA256="7af83526eff1c76e8b9e1553b34245c203d029028d8044dd9dcf71eef1001576" PKG_LICENSE="GPL" PKG_SITE="http://lists.freedesktop.org/mailman/listinfo/xorg" -PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain xorg-server libXi libXext libevdev" PKG_LONGDESC="Synaptics touchpad driver for X.Org." PKG_TOOLCHAIN="autotools" -PKG_CONFIGURE_OPTS_TARGET="--with-xorg-module-dir=$XORG_PATH_MODULES" +PKG_CONFIGURE_OPTS_TARGET="--with-xorg-module-dir=${XORG_PATH_MODULES}" diff --git a/packages/x11/driver/xf86-video-amdgpu/package.mk b/packages/x11/driver/xf86-video-amdgpu/package.mk index f7516cd357..2e896eb925 100644 --- a/packages/x11/driver/xf86-video-amdgpu/package.mk +++ b/packages/x11/driver/xf86-video-amdgpu/package.mk @@ -8,17 +8,17 @@ PKG_SHA256="4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d" PKG_ARCH="x86_64" PKG_LICENSE="OSS" PKG_SITE="http://www.x.org/" -PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain xorg-server" PKG_LONGDESC="AMD Radeon video driver for the Xorg X server." PKG_TOOLCHAIN="autotools" PKG_CONFIGURE_OPTS_TARGET="--enable-udev \ --enable-glamor \ - --with-xorg-module-dir=$XORG_PATH_MODULES" + --with-xorg-module-dir=${XORG_PATH_MODULES}" post_makeinstall_target() { - rm -r $INSTALL/usr/share - mkdir -p $INSTALL/etc/X11 - cp $PKG_BUILD/conf/10-amdgpu.conf $INSTALL/etc/X11/xorg-amdgpu.conf + rm -r ${INSTALL}/usr/share + mkdir -p ${INSTALL}/etc/X11 + cp ${PKG_BUILD}/conf/10-amdgpu.conf ${INSTALL}/etc/X11/xorg-amdgpu.conf } diff --git a/packages/x11/driver/xf86-video-ati/package.mk b/packages/x11/driver/xf86-video-ati/package.mk index 0330cc16ed..9631f6dec0 100644 --- a/packages/x11/driver/xf86-video-ati/package.mk +++ b/packages/x11/driver/xf86-video-ati/package.mk @@ -8,14 +8,14 @@ PKG_SHA256="659f5a1629eea5f5334d9b39b18e6807a63aa1efa33c1236d9cc53acbb223c49" PKG_ARCH="x86_64" PKG_LICENSE="OSS" PKG_SITE="http://www.x.org/" -PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain xorg-server" PKG_LONGDESC="The ati driver supports various ATi, know AMD, video chips." PKG_TOOLCHAIN="autotools" -PKG_CONFIGURE_OPTS_TARGET="--enable-glamor --with-xorg-module-dir=$XORG_PATH_MODULES" +PKG_CONFIGURE_OPTS_TARGET="--enable-glamor --with-xorg-module-dir=${XORG_PATH_MODULES}" post_makeinstall_target() { - mkdir -p $INSTALL/etc/X11 - cp $PKG_DIR/config/*.conf $INSTALL/etc/X11 + mkdir -p ${INSTALL}/etc/X11 + cp ${PKG_DIR}/config/*.conf ${INSTALL}/etc/X11 } diff --git a/packages/x11/driver/xf86-video-intel/package.mk b/packages/x11/driver/xf86-video-intel/package.mk index 60561456cb..e90c7b38bf 100644 --- a/packages/x11/driver/xf86-video-intel/package.mk +++ b/packages/x11/driver/xf86-video-intel/package.mk @@ -8,7 +8,7 @@ PKG_SHA256="ea41bbab7d2720a4bcd3b083800b8226f217c6af3e8bace4310063a7c5b56c25" PKG_ARCH="x86_64" PKG_LICENSE="OSS" PKG_SITE="http://intellinuxgraphics.org/" -PKG_URL="https://gitlab.freedesktop.org/xorg/driver/$PKG_NAME/-/archive/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="https://gitlab.freedesktop.org/xorg/driver/${PKG_NAME}/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain libXcomposite libXxf86vm libXdamage libdrm util-macros systemd xorg-server" PKG_LONGDESC="The Xorg driver for Intel i810, i815, 830M, 845G, 852GM, 855GM, 865G, 915G, 915GM and 965G." PKG_TOOLCHAIN="autotools" @@ -34,8 +34,8 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-backlight \ --disable-create2 \ --disable-async-swap \ --with-default-dri=2 \ - --with-xorg-module-dir=$XORG_PATH_MODULES" + --with-xorg-module-dir=${XORG_PATH_MODULES}" post_makeinstall_target() { - rm -rf $INSTALL/usr/share/polkit-1 + rm -rf ${INSTALL}/usr/share/polkit-1 } diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/package.mk b/packages/x11/driver/xf86-video-nvidia-legacy/package.mk index 9b99530e5e..4371f70486 100644 --- a/packages/x11/driver/xf86-video-nvidia-legacy/package.mk +++ b/packages/x11/driver/xf86-video-nvidia-legacy/package.mk @@ -8,18 +8,18 @@ PKG_SHA256="995d44fef587ff5284497a47a95d71adbee0c13020d615e940ac928f180f5b77" PKG_ARCH="x86_64" PKG_LICENSE="nonfree" PKG_SITE="http://www.nvidia.com/" -PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86_64/$PKG_VERSION/NVIDIA-Linux-x86_64-$PKG_VERSION-no-compat32.run" +PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86_64/${PKG_VERSION}/NVIDIA-Linux-x86_64-${PKG_VERSION}-no-compat32.run" PKG_DEPENDS_TARGET="util-macros xorg-server libvdpau" -PKG_NEED_UNPACK="$LINUX_DEPENDS" +PKG_NEED_UNPACK="${LINUX_DEPENDS}" PKG_LONGDESC="The Xorg driver for NVIDIA video chips supporting Geforce 6 and Geforce 7 devices." PKG_TOOLCHAIN="manual" PKG_IS_KERNEL_PKG="yes" unpack() { - [ -d $PKG_BUILD ] && rm -rf $PKG_BUILD + [ -d ${PKG_BUILD} ] && rm -rf ${PKG_BUILD} - sh $SOURCES/$PKG_NAME/$PKG_SOURCE_NAME --extract-only --target $PKG_BUILD + sh ${SOURCES}/${PKG_NAME}/${PKG_SOURCE_NAME} --extract-only --target ${PKG_BUILD} } make_target() { @@ -27,44 +27,44 @@ make_target() { cd kernel make module CC=${CC} LD=${LD} SYSSRC=$(kernel_path) SYSOUT=$(kernel_path) - $STRIP --strip-debug nvidia.ko + ${STRIP} --strip-debug nvidia.ko cd .. } makeinstall_target() { - mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers - cp -P nvidia_drv.so $INSTALL/$XORG_PATH_MODULES/drivers/nvidia-legacy_drv.so - ln -sf /var/lib/nvidia_drv.so $INSTALL/$XORG_PATH_MODULES/drivers/nvidia_drv.so + mkdir -p ${INSTALL}/${XORG_PATH_MODULES}/drivers + cp -P nvidia_drv.so ${INSTALL}/${XORG_PATH_MODULES}/drivers/nvidia-legacy_drv.so + ln -sf /var/lib/nvidia_drv.so ${INSTALL}/${XORG_PATH_MODULES}/drivers/nvidia_drv.so - mkdir -p $INSTALL/$XORG_PATH_MODULES/extensions + mkdir -p ${INSTALL}/${XORG_PATH_MODULES}/extensions # rename to not conflicting with Mesa libGL.so - cp -P libglx.so* $INSTALL/$XORG_PATH_MODULES/extensions/libglx_nvidia-legacy.so + cp -P libglx.so* ${INSTALL}/${XORG_PATH_MODULES}/extensions/libglx_nvidia-legacy.so - mkdir -p $INSTALL/etc/X11 - cp $PKG_DIR/config/*.conf $INSTALL/etc/X11 + mkdir -p ${INSTALL}/etc/X11 + cp ${PKG_DIR}/config/*.conf ${INSTALL}/etc/X11 - mkdir -p $INSTALL/usr/lib - cp -P libnvidia-glcore.so.$PKG_VERSION $INSTALL/usr/lib - cp -P libnvidia-ml.so.$PKG_VERSION $INSTALL/usr/lib - ln -sf /var/lib/libnvidia-ml.so.1 $INSTALL/usr/lib/libnvidia-ml.so.1 - cp -P tls/libnvidia-tls.so.$PKG_VERSION $INSTALL/usr/lib + mkdir -p ${INSTALL}/usr/lib + cp -P libnvidia-glcore.so.${PKG_VERSION} ${INSTALL}/usr/lib + cp -P libnvidia-ml.so.${PKG_VERSION} ${INSTALL}/usr/lib + ln -sf /var/lib/libnvidia-ml.so.1 ${INSTALL}/usr/lib/libnvidia-ml.so.1 + cp -P tls/libnvidia-tls.so.${PKG_VERSION} ${INSTALL}/usr/lib # rename to not conflicting with Mesa libGL.so - cp -P libGL.so* $INSTALL/usr/lib/libGL_nvidia-legacy.so.1 + cp -P libGL.so* ${INSTALL}/usr/lib/libGL_nvidia-legacy.so.1 - mkdir -p $INSTALL/$(get_full_module_dir)/nvidia - ln -sf /var/lib/nvidia.ko $INSTALL/$(get_full_module_dir)/nvidia/nvidia.ko + mkdir -p ${INSTALL}/$(get_full_module_dir)/nvidia + ln -sf /var/lib/nvidia.ko ${INSTALL}/$(get_full_module_dir)/nvidia/nvidia.ko - mkdir -p $INSTALL/usr/lib/nvidia-legacy - cp kernel/nvidia.ko $INSTALL/usr/lib/nvidia-legacy + mkdir -p ${INSTALL}/usr/lib/nvidia-legacy + cp kernel/nvidia.ko ${INSTALL}/usr/lib/nvidia-legacy - mkdir -p $INSTALL/usr/bin - ln -s /var/lib/nvidia-smi $INSTALL/usr/bin/nvidia-smi - cp nvidia-smi $INSTALL/usr/bin/nvidia-legacy-smi - ln -s /var/lib/nvidia-xconfig $INSTALL/usr/bin/nvidia-xconfig - cp nvidia-xconfig $INSTALL/usr/bin/nvidia-legacy-xconfig + mkdir -p ${INSTALL}/usr/bin + ln -s /var/lib/nvidia-smi ${INSTALL}/usr/bin/nvidia-smi + cp nvidia-smi ${INSTALL}/usr/bin/nvidia-legacy-smi + ln -s /var/lib/nvidia-xconfig ${INSTALL}/usr/bin/nvidia-xconfig + cp nvidia-xconfig ${INSTALL}/usr/bin/nvidia-legacy-xconfig - mkdir -p $INSTALL/usr/lib/vdpau - cp libvdpau_nvidia.so* $INSTALL/usr/lib/vdpau/libvdpau_nvidia-legacy.so.1 - ln -sf /var/lib/libvdpau_nvidia.so $INSTALL/usr/lib/vdpau/libvdpau_nvidia.so - ln -sf /var/lib/libvdpau_nvidia.so.1 $INSTALL/usr/lib/vdpau/libvdpau_nvidia.so.1 + mkdir -p ${INSTALL}/usr/lib/vdpau + cp libvdpau_nvidia.so* ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia-legacy.so.1 + ln -sf /var/lib/libvdpau_nvidia.so ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia.so + ln -sf /var/lib/libvdpau_nvidia.so.1 ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia.so.1 } diff --git a/packages/x11/driver/xf86-video-vmware/package.mk b/packages/x11/driver/xf86-video-vmware/package.mk index 215fd086bb..001e226055 100644 --- a/packages/x11/driver/xf86-video-vmware/package.mk +++ b/packages/x11/driver/xf86-video-vmware/package.mk @@ -14,4 +14,4 @@ PKG_LONGDESC="xf86-video-vmware: The Xorg driver for vmware video" PKG_TOOLCHAIN="autotools" PKG_CONFIGURE_OPTS_TARGET="--enable-vmwarectrl-client \ - --with-xorg-module-dir=$XORG_PATH_MODULES" + --with-xorg-module-dir=${XORG_PATH_MODULES}" diff --git a/packages/x11/font/encodings/package.mk b/packages/x11/font/encodings/package.mk index bca211007d..a8722acdc7 100644 --- a/packages/x11/font/encodings/package.mk +++ b/packages/x11/font/encodings/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.0.5" PKG_SHA256="bd96e16143a044b19e87f217cf6a3763a70c561d1076aad6f6d862ec41774a31" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/font/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/font/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros font-util:host" PKG_LONGDESC="X font encoding meta files." diff --git a/packages/x11/font/font-bitstream-type1/package.mk b/packages/x11/font/font-bitstream-type1/package.mk index a0e4695506..7d9dc612fa 100644 --- a/packages/x11/font/font-bitstream-type1/package.mk +++ b/packages/x11/font/font-bitstream-type1/package.mk @@ -7,13 +7,13 @@ PKG_VERSION="1.0.3" PKG_SHA256="c6ea0569adad2c577f140328dc3302e729cb1b1ea90cd0025caf380625f8a688" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/font/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/font/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros font-xfree86-type1" PKG_LONGDESC="Bitstream font family." PKG_CONFIGURE_OPTS_TARGET="--with-fontrootdir=/usr/share/fonts" post_install() { - mkfontdir $INSTALL/usr/share/fonts/Type1 - mkfontscale $INSTALL/usr/share/fonts/Type1 + mkfontdir ${INSTALL}/usr/share/fonts/Type1 + mkfontscale ${INSTALL}/usr/share/fonts/Type1 } diff --git a/packages/x11/font/font-cursor-misc/package.mk b/packages/x11/font/font-cursor-misc/package.mk index ae7dce292e..144e7e77a3 100644 --- a/packages/x11/font/font-cursor-misc/package.mk +++ b/packages/x11/font/font-cursor-misc/package.mk @@ -6,13 +6,13 @@ PKG_VERSION="1.0.3" PKG_SHA256="17363eb35eece2e08144da5f060c70103b59d0972b4f4d77fd84c9a7a2dba635" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/font/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/font/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros font-util:host" PKG_LONGDESC="X11 cursor fonts." PKG_CONFIGURE_OPTS_TARGET="--with-fontrootdir=/usr/share/fonts" post_install() { - mkfontdir $INSTALL/usr/share/fonts/misc - mkfontscale $INSTALL/usr/share/fonts/misc + mkfontdir ${INSTALL}/usr/share/fonts/misc + mkfontscale ${INSTALL}/usr/share/fonts/misc } diff --git a/packages/x11/font/font-misc-misc/package.mk b/packages/x11/font/font-misc-misc/package.mk index d134791bb3..623552ae8c 100644 --- a/packages/x11/font/font-misc-misc/package.mk +++ b/packages/x11/font/font-misc-misc/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.1.2" PKG_SHA256="b8e77940e4e1769dc47ef1805918d8c9be37c708735832a07204258bacc11794" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/font/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/font/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros font-util font-cursor-misc" PKG_LONGDESC="A misc. public domain font." @@ -29,14 +29,14 @@ PKG_CONFIGURE_OPTS_TARGET="--with-fontrootdir=/usr/share/fonts \ --disable-koi8-r \ --disable-jisx0201" -PKG_MAKE_OPTS_TARGET="UTIL_DIR=$SYSROOT_PREFIX/usr/share/fonts/util/" +PKG_MAKE_OPTS_TARGET="UTIL_DIR=${SYSROOT_PREFIX}/usr/share/fonts/util/" makeinstall_target() { - mkdir -p $INSTALL/usr/share/fonts/misc - cp 6x13-ISO8859-1.pcf.gz $INSTALL/usr/share/fonts/misc + mkdir -p ${INSTALL}/usr/share/fonts/misc + cp 6x13-ISO8859-1.pcf.gz ${INSTALL}/usr/share/fonts/misc } post_install() { - mkfontdir $INSTALL/usr/share/fonts/misc - mkfontscale $INSTALL/usr/share/fonts/misc + mkfontdir ${INSTALL}/usr/share/fonts/misc + mkfontscale ${INSTALL}/usr/share/fonts/misc } diff --git a/packages/x11/font/font-util/package.mk b/packages/x11/font/font-util/package.mk index 2967168b7e..6d1a2558b6 100644 --- a/packages/x11/font/font-util/package.mk +++ b/packages/x11/font/font-util/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.3.2" PKG_SHA256="3ad880444123ac06a7238546fa38a2a6ad7f7e0cc3614de7e103863616522282" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/font/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/font/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros" PKG_DEPENDS_HOST="util-macros" PKG_LONGDESC="X.org font utilities." @@ -15,5 +15,5 @@ PKG_LONGDESC="X.org font utilities." PKG_CONFIGURE_OPTS_TARGET="--with-mapdir=/usr/share/fonts/util" post_makeinstall_target() { - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin } diff --git a/packages/x11/font/font-xfree86-type1/package.mk b/packages/x11/font/font-xfree86-type1/package.mk index 30b1fbe2d5..9a2df9ec4b 100644 --- a/packages/x11/font/font-xfree86-type1/package.mk +++ b/packages/x11/font/font-xfree86-type1/package.mk @@ -6,13 +6,13 @@ PKG_VERSION="1.0.4" PKG_SHA256="caebf42aec7be7f3bd40e0f232d6f34881b853dc84acfcdf7458358701fbe34a" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/releases/individual/font/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/releases/individual/font/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros" PKG_LONGDESC="A Xfree86 Inc. Type1 font." PKG_CONFIGURE_OPTS_TARGET="--with-fontrootdir=/usr/share/fonts" post_install() { - mkfontdir $INSTALL/usr/share/fonts/Type1 - mkfontscale $INSTALL/usr/share/fonts/Type1 + mkfontdir ${INSTALL}/usr/share/fonts/Type1 + mkfontscale ${INSTALL}/usr/share/fonts/Type1 } diff --git a/packages/x11/font/liberation-fonts-ttf/package.mk b/packages/x11/font/liberation-fonts-ttf/package.mk index 8133f4c58f..243c4f0b43 100644 --- a/packages/x11/font/liberation-fonts-ttf/package.mk +++ b/packages/x11/font/liberation-fonts-ttf/package.mk @@ -7,17 +7,17 @@ PKG_VERSION="2.1.2" PKG_SHA256="14694930f28391675008c67b18889d1a7dfea74b16adf50394f8057b57eaf8e0" PKG_LICENSE="OFL1_1" PKG_SITE="https://github.com/liberationfonts/liberation-fonts" -PKG_URL="https://github.com/liberationfonts/liberation-fonts/files/5722233/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/liberationfonts/liberation-fonts/files/5722233/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain util-macros" PKG_LONGDESC="This packages included the high-quality and open-sourced TrueType vector fonts." PKG_TOOLCHAIN="manual" makeinstall_target() { - mkdir -p $INSTALL/usr/share/fonts/liberation - cp *.ttf $INSTALL/usr/share/fonts/liberation + mkdir -p ${INSTALL}/usr/share/fonts/liberation + cp *.ttf ${INSTALL}/usr/share/fonts/liberation } post_install() { - mkfontdir $INSTALL/usr/share/fonts/liberation - mkfontscale $INSTALL/usr/share/fonts/liberation + mkfontdir ${INSTALL}/usr/share/fonts/liberation + mkfontscale ${INSTALL}/usr/share/fonts/liberation } diff --git a/packages/x11/lib/libICE/package.mk b/packages/x11/lib/libICE/package.mk index 4cdef247ca..acfa60613b 100644 --- a/packages/x11/lib/libICE/package.mk +++ b/packages/x11/lib/libICE/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.0.10" PKG_SHA256="6f86dce12cf4bcaf5c37dddd8b1b64ed2ddf1ef7b218f22b9942595fb747c348" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros xtrans" PKG_LONGDESC="X Inter-Client Exchange (ICE) protocol library." diff --git a/packages/x11/lib/libSM/package.mk b/packages/x11/lib/libSM/package.mk index 9793a56e07..a2b16ef523 100644 --- a/packages/x11/lib/libSM/package.mk +++ b/packages/x11/lib/libSM/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.2.3" PKG_SHA256="2d264499dcb05f56438dee12a1b4b71d76736ce7ba7aa6efbf15ebb113769cbb" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros util-linux libICE" PKG_LONGDESC="This package provides the main interface to the X11 Session Management library." diff --git a/packages/x11/lib/libX11/package.mk b/packages/x11/lib/libX11/package.mk index 6590dee495..f971ce8d18 100644 --- a/packages/x11/lib/libX11/package.mk +++ b/packages/x11/lib/libX11/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.7.0" PKG_SHA256="36c8f93b6595437c8cfbc9f08618bcb3041cbd303e140a0013f88e4c2977cb54" PKG_LICENSE="OSS" PKG_SITE="http://www.x.org/" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros xtrans libXau libxcb xorgproto" PKG_LONGDESC="LibX11 is the main X11 library containing all the client-side code to access the X11 windowing system." PKG_TOOLCHAIN="autotools" @@ -19,7 +19,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-loadable-i18n \ --enable-xlocale \ --disable-xlocaledir \ --enable-xkb \ - --with-keysymdefdir=$SYSROOT_PREFIX/usr/include/X11 \ + --with-keysymdefdir=${SYSROOT_PREFIX}/usr/include/X11 \ --disable-xf86bigfont \ --enable-malloc0returnsnull \ --disable-specs \ diff --git a/packages/x11/lib/libXau/package.mk b/packages/x11/lib/libXau/package.mk index 7df01cc97a..8753221c26 100644 --- a/packages/x11/lib/libXau/package.mk +++ b/packages/x11/lib/libXau/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.0.9" PKG_SHA256="ccf8cbf0dbf676faa2ea0a6d64bcc3b6746064722b606c8c52917ed00dcb73ec" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros xorgproto" PKG_LONGDESC="X authorization file management libary" PKG_BUILD_FLAGS="+pic" diff --git a/packages/x11/lib/libXcomposite/package.mk b/packages/x11/lib/libXcomposite/package.mk index 8c6320c355..8dbc06068f 100644 --- a/packages/x11/lib/libXcomposite/package.mk +++ b/packages/x11/lib/libXcomposite/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="0.4.5" PKG_SHA256="b3218a2c15bab8035d16810df5b8251ffc7132ff3aa70651a1fba0bfe9634e8f" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libXfixes libXext libX11" PKG_LONGDESC="X Composite Library" PKG_BUILD_FLAGS="+pic" diff --git a/packages/x11/lib/libXdamage/package.mk b/packages/x11/lib/libXdamage/package.mk index 05d9df6b86..b077f3d75f 100644 --- a/packages/x11/lib/libXdamage/package.mk +++ b/packages/x11/lib/libXdamage/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.1.5" PKG_SHA256="b734068643cac3b5f3d2c8279dd366b5bf28c7219d9e9d8717e1383995e0ea45" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libX11 libXfixes" PKG_LONGDESC="LibXdamage provides an X Window System client interface to the DAMAGE extension to the X protocol." PKG_BUILD_FLAGS="+pic" diff --git a/packages/x11/lib/libXext/package.mk b/packages/x11/lib/libXext/package.mk index 32e22a406d..9433d1d4ad 100644 --- a/packages/x11/lib/libXext/package.mk +++ b/packages/x11/lib/libXext/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.3.4" PKG_SHA256="59ad6fcce98deaecc14d39a672cf218ca37aba617c9a0f691cac3bcd28edf82b" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libX11" PKG_LONGDESC="LibXext provides an X Window System client interface to several extensions to the X protocol." diff --git a/packages/x11/lib/libXfixes/package.mk b/packages/x11/lib/libXfixes/package.mk index 5cb1060e69..83247f819a 100644 --- a/packages/x11/lib/libXfixes/package.mk +++ b/packages/x11/lib/libXfixes/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="5.0.3" PKG_SHA256="de1cd33aff226e08cefd0e6759341c2c8e8c9faf8ce9ac6ec38d43e287b22ad6" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libX11" PKG_LONGDESC="X Fixes Library" PKG_BUILD_FLAGS="+pic" diff --git a/packages/x11/lib/libXfont2/package.mk b/packages/x11/lib/libXfont2/package.mk index dc84636af0..387513746c 100644 --- a/packages/x11/lib/libXfont2/package.mk +++ b/packages/x11/lib/libXfont2/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.0.4" PKG_SHA256="6d151b3368e5035efede4b6264c0fdc6662c1c99dbc2de425e3480cababc69e6" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros xtrans freetype libfontenc" PKG_LONGDESC="X font Library" diff --git a/packages/x11/lib/libXi/package.mk b/packages/x11/lib/libXi/package.mk index 35a1b9746c..6122125042 100644 --- a/packages/x11/lib/libXi/package.mk +++ b/packages/x11/lib/libXi/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.7.10" PKG_SHA256="36a30d8f6383a72e7ce060298b4b181fd298bc3a135c8e201b7ca847f5f81061" PKG_LICENSE="OSS" PKG_SITE="http://www.x.org/" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libX11 libXfixes libXext" PKG_LONGDESC="LibXi provides an X Window System client interface to the XINPUT extension to the X protocol." PKG_BUILD_FLAGS="+pic" diff --git a/packages/x11/lib/libXinerama/package.mk b/packages/x11/lib/libXinerama/package.mk index 05cec4a5a9..a07df82192 100644 --- a/packages/x11/lib/libXinerama/package.mk +++ b/packages/x11/lib/libXinerama/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.1.4" PKG_SHA256="0008dbd7ecf717e1e507eed1856ab0d9cf946d03201b85d5dcf61489bb02d720" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libXext" PKG_LONGDESC="libXinerama is the Xinerama library." diff --git a/packages/x11/lib/libXmu/package.mk b/packages/x11/lib/libXmu/package.mk index ed61419991..8e08bdfd5e 100644 --- a/packages/x11/lib/libXmu/package.mk +++ b/packages/x11/lib/libXmu/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.1.3" PKG_SHA256="9c343225e7c3dc0904f2122b562278da5fed639b1b5e880d25111561bac5b731" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libXext libX11 libXt" PKG_LONGDESC="LibXmu provides a set of miscellaneous utility convenience functions for X libraries to use." PKG_BUILD_FLAGS="+pic" diff --git a/packages/x11/lib/libXrandr/package.mk b/packages/x11/lib/libXrandr/package.mk index 21a71ab930..2d9683f11d 100644 --- a/packages/x11/lib/libXrandr/package.mk +++ b/packages/x11/lib/libXrandr/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.5.2" PKG_SHA256="8aea0ebe403d62330bb741ed595b53741acf45033d3bda1792f1d4cc3daee023" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libX11 libXrender libXext" PKG_LONGDESC="Xrandr is a simple library designed to interface the X Resize and Rotate Extension." diff --git a/packages/x11/lib/libXrender/package.mk b/packages/x11/lib/libXrender/package.mk index 32ceedb8a2..4f23c859dc 100644 --- a/packages/x11/lib/libXrender/package.mk +++ b/packages/x11/lib/libXrender/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="0.9.10" PKG_SHA256="c06d5979f86e64cabbde57c223938db0b939dff49fdb5a793a1d3d0396650949" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libX11" PKG_LONGDESC="The X Rendering Extension introduces digital image composition within the X Window System." PKG_BUILD_FLAGS="+pic" diff --git a/packages/x11/lib/libXt/package.mk b/packages/x11/lib/libXt/package.mk index 0444277cd7..78fa454d6d 100644 --- a/packages/x11/lib/libXt/package.mk +++ b/packages/x11/lib/libXt/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.2.0" PKG_SHA256="b31df531dabed9f4611fc8980bc51d7782967e2aff44c4105251a1acb5a77831" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libX11 libSM" PKG_LONGDESC="LibXt provides the X Toolkit Intrinsics, an abstract widget library upon which other toolkits are based." @@ -17,8 +17,8 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --enable-malloc0returnsnull" pre_make_target() { - make -C util CC=$HOST_CC \ - CFLAGS="$HOST_CFLAGS " \ - LDFLAGS="$HOST_LDFLAGS" \ + make -C util CC=${HOST_CC} \ + CFLAGS="${HOST_CFLAGS} " \ + LDFLAGS="${HOST_LDFLAGS}" \ makestrs } diff --git a/packages/x11/lib/libXtst/package.mk b/packages/x11/lib/libXtst/package.mk index 60d94c2561..177207d5ff 100644 --- a/packages/x11/lib/libXtst/package.mk +++ b/packages/x11/lib/libXtst/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.2.3" PKG_SHA256="4655498a1b8e844e3d6f21f3b2c4e2b571effb5fd83199d428a6ba7ea4bf5204" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libXext libXi libX11" PKG_LONGDESC="The Xtst Library" diff --git a/packages/x11/lib/libXxf86vm/package.mk b/packages/x11/lib/libXxf86vm/package.mk index 9b6060ef17..5aacc56225 100644 --- a/packages/x11/lib/libXxf86vm/package.mk +++ b/packages/x11/lib/libXxf86vm/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.1.4" PKG_SHA256="afee27f93c5f31c0ad582852c0fb36d50e4de7cd585fcf655e278a633d85cd57" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libX11 libXext" PKG_LONGDESC="The libxxf86vm provides an interface to the server extension XFree86-VidModeExtension." PKG_BUILD_FLAGS="+pic" diff --git a/packages/x11/lib/libfontenc/package.mk b/packages/x11/lib/libfontenc/package.mk index 5bfa9ed7de..42cc822e95 100644 --- a/packages/x11/lib/libfontenc/package.mk +++ b/packages/x11/lib/libfontenc/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.1.4" PKG_SHA256="2cfcce810ddd48f2e5dc658d28c1808e86dcf303eaff16728b9aa3dbc0092079" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros zlib font-util xorgproto" PKG_LONGDESC="Libfontenc is a library which helps font libraries portably determine and deal with different encodings of fonts." PKG_BUILD_FLAGS="+pic" diff --git a/packages/x11/lib/libpciaccess/package.mk b/packages/x11/lib/libpciaccess/package.mk index 605d3e0e83..1e4cacf3a0 100644 --- a/packages/x11/lib/libpciaccess/package.mk +++ b/packages/x11/lib/libpciaccess/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="0.16" PKG_SHA256="214c9d0d884fdd7375ec8da8dcb91a8d3169f263294c9a90c575bf1938b9f489" PKG_LICENSE="OSS" PKG_SITE="http://freedesktop.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros zlib" PKG_LONGDESC="X.org libpciaccess library." @@ -16,5 +16,5 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_asm_mtrr_h=set \ --with-zlib " pre_configure_target() { - CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE" + CFLAGS+=" -D_LARGEFILE64_SOURCE" } diff --git a/packages/x11/lib/libxcb/package.mk b/packages/x11/lib/libxcb/package.mk index b760d0ba9a..a62dbe7976 100644 --- a/packages/x11/lib/libxcb/package.mk +++ b/packages/x11/lib/libxcb/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.14" PKG_SHA256="a55ed6db98d43469801262d81dc2572ed124edc3db31059d4e9916eb9f844c34" PKG_LICENSE="OSS" PKG_SITE="http://xcb.freedesktop.org" -PKG_URL="http://xcb.freedesktop.org/dist/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://xcb.freedesktop.org/dist/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain util-macros Python3:host xcb-proto libpthread-stubs libXau" PKG_LONGDESC="X C-language Bindings library." PKG_BUILD_FLAGS="+pic" @@ -20,9 +20,9 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --disable-xvmc" pre_configure_target() { - PYTHON_LIBDIR=$SYSROOT_PREFIX/usr/lib/$PKG_PYTHON_VERSION - PYTHON_TOOLCHAIN_PATH=$PYTHON_LIBDIR/site-packages + PYTHON_LIBDIR=${SYSROOT_PREFIX}/usr/lib/${PKG_PYTHON_VERSION} + PYTHON_TOOLCHAIN_PATH=${PYTHON_LIBDIR}/site-packages - PKG_CONFIG="$PKG_CONFIG --define-variable=pythondir=$PYTHON_TOOLCHAIN_PATH" - PKG_CONFIG="$PKG_CONFIG --define-variable=xcbincludedir=$SYSROOT_PREFIX/usr/share/xcb" + PKG_CONFIG+=" --define-variable=pythondir=${PYTHON_TOOLCHAIN_PATH}" + PKG_CONFIG+=" --define-variable=xcbincludedir=${SYSROOT_PREFIX}/usr/share/xcb" } diff --git a/packages/x11/lib/libxkbfile/package.mk b/packages/x11/lib/libxkbfile/package.mk index b8625de30e..ced64b060c 100644 --- a/packages/x11/lib/libxkbfile/package.mk +++ b/packages/x11/lib/libxkbfile/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.1.0" PKG_SHA256="758dbdaa20add2db4902df0b1b7c936564b7376c02a0acd1f2a331bd334b38c7" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libX11" PKG_LONGDESC="Libxkbfile provides an interface to read and manipulate description files for XKB, the X11 keyboard configuration extension." diff --git a/packages/x11/lib/libxshmfence/package.mk b/packages/x11/lib/libxshmfence/package.mk index 63d48f66aa..aaef332882 100644 --- a/packages/x11/lib/libxshmfence/package.mk +++ b/packages/x11/lib/libxshmfence/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.3" PKG_SHA256="b884300d26a14961a076fbebc762a39831cb75f92bed5ccf9836345b459220c7" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros xorgproto" PKG_LONGDESC="libxshmfence is the Shared memory 'SyncFence' synchronization primitive." PKG_TOOLCHAIN="autotools" diff --git a/packages/x11/lib/pixman/package.mk b/packages/x11/lib/pixman/package.mk index 25e38fdb7a..19ddcbfbe6 100644 --- a/packages/x11/lib/pixman/package.mk +++ b/packages/x11/lib/pixman/package.mk @@ -7,28 +7,28 @@ PKG_VERSION="0.40.0" PKG_SHA256="da8ed9fe2d1c5ef8ce5d1207992db959226bd4e37e3f88acf908fd9a71e2704e" PKG_LICENSE="OSS" PKG_SITE="http://www.x.org/" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="toolchain:host" PKG_DEPENDS_TARGET="toolchain util-macros" PKG_LONGDESC="Pixman is a generic library for manipulating pixel regions, contains low-level pixel manipulation routines." PKG_TOOLCHAIN="configure" -if [ "$TARGET_ARCH" = arm ]; then +if [ "${TARGET_ARCH}" = arm ]; then if target_has_feature neon; then PIXMAN_NEON="--enable-arm-neon" else PIXMAN_NEON="--disable-arm-neon" fi - PIXMAN_CONFIG="--disable-mmx --disable-sse2 --disable-vmx --enable-arm-simd $PIXMAN_NEON --disable-arm-iwmmxt" -elif [ "$TARGET_ARCH" = aarch64 ]; then + PIXMAN_CONFIG="--disable-mmx --disable-sse2 --disable-vmx --enable-arm-simd ${PIXMAN_NEON} --disable-arm-iwmmxt" +elif [ "${TARGET_ARCH}" = aarch64 ]; then PIXMAN_CONFIG="--disable-mmx --disable-sse2 --disable-vmx --disable-arm-simd --disable-arm-neon --disable-arm-iwmmxt" -elif [ "$TARGET_ARCH" = x86_64 ]; then +elif [ "${TARGET_ARCH}" = x86_64 ]; then PIXMAN_CONFIG="--enable-mmx --enable-sse2 --disable-ssse3 --disable-vmx --disable-arm-simd --disable-arm-neon" fi PKG_CONFIGURE_OPTS_TARGET="--disable-openmp \ --disable-loongson-mmi \ - $PIXMAN_CONFIG \ + ${PIXMAN_CONFIG} \ --disable-mips-dspr2 \ --enable-gcc-inline-asm \ --disable-timers \ @@ -37,8 +37,8 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-openmp \ --with-gnu-ld" post_makeinstall_target() { - cp $SYSROOT_PREFIX/usr/lib/pkgconfig/pixman-1.pc \ - $SYSROOT_PREFIX/usr/lib/pkgconfig/pixman.pc - cp -rf $SYSROOT_PREFIX/usr/include/pixman-1 \ - $SYSROOT_PREFIX/usr/include/pixman + cp ${SYSROOT_PREFIX}/usr/lib/pkgconfig/pixman-1.pc \ + ${SYSROOT_PREFIX}/usr/lib/pkgconfig/pixman.pc + cp -rf ${SYSROOT_PREFIX}/usr/include/pixman-1 \ + ${SYSROOT_PREFIX}/usr/include/pixman } diff --git a/packages/x11/lib/xtrans/package.mk b/packages/x11/lib/xtrans/package.mk index abd8dff183..a5c43997bb 100644 --- a/packages/x11/lib/xtrans/package.mk +++ b/packages/x11/lib/xtrans/package.mk @@ -7,13 +7,13 @@ PKG_VERSION="1.4.0" PKG_SHA256="377c4491593c417946efcd2c7600d1e62639f7a8bbca391887e2c4679807d773" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros" PKG_LONGDESC="Abstract network code for X." PKG_CONFIGURE_OPTS_TARGET="--without-xmlto" post_makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig - cp xtrans.pc $SYSROOT_PREFIX/usr/lib/pkgconfig + mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig + cp xtrans.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig } diff --git a/packages/x11/other/fluxbox/package.mk b/packages/x11/other/fluxbox/package.mk index caae72af0b..cfc1381b76 100644 --- a/packages/x11/other/fluxbox/package.mk +++ b/packages/x11/other/fluxbox/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.3.7" PKG_SHA256="fc8c75fe94c54ed5a5dd3fd4a752109f8949d6df67a48e5b11a261403c382ec0" PKG_LICENSE="OSS" PKG_SITE="http://fluxbox.org/" -PKG_URL="http://sourceforge.net/projects/fluxbox/files/fluxbox/${PKG_VERSION}/$PKG_NAME-${PKG_VERSION}.tar.xz" +PKG_URL="http://sourceforge.net/projects/fluxbox/files/fluxbox/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain libX11 libXrandr libXext libXrender" PKG_LONGDESC="Fluxbox is a windowmanager for X that was based on the Blackbox 0.61.1 code." PKG_TOOLCHAIN="autotools" @@ -31,15 +31,15 @@ post_install() { } post_makeinstall_target() { - rm -rf $INSTALL/usr/bin/fbrun - rm -rf $INSTALL/usr/bin/fbsetbg - rm -rf $INSTALL/usr/bin/fluxbox-generate_menu - rm -rf $INSTALL/usr/bin/fluxbox-remote - rm -rf $INSTALL/usr/bin/startfluxbox + rm -rf ${INSTALL}/usr/bin/fbrun + rm -rf ${INSTALL}/usr/bin/fbsetbg + rm -rf ${INSTALL}/usr/bin/fluxbox-generate_menu + rm -rf ${INSTALL}/usr/bin/fluxbox-remote + rm -rf ${INSTALL}/usr/bin/startfluxbox - rm -rf $INSTALL/usr/share/fluxbox/styles + rm -rf ${INSTALL}/usr/share/fluxbox/styles - cp $PKG_DIR/config/apps $INSTALL/usr/share/fluxbox/ - cp $PKG_DIR/config/init $INSTALL/usr/share/fluxbox/ - cp $PKG_DIR/config/keys $INSTALL/usr/share/fluxbox/ + cp ${PKG_DIR}/config/apps ${INSTALL}/usr/share/fluxbox/ + cp ${PKG_DIR}/config/init ${INSTALL}/usr/share/fluxbox/ + cp ${PKG_DIR}/config/keys ${INSTALL}/usr/share/fluxbox/ } diff --git a/packages/x11/other/fontconfig/package.mk b/packages/x11/other/fontconfig/package.mk index 6b0000b5f1..c9824dbc1b 100644 --- a/packages/x11/other/fontconfig/package.mk +++ b/packages/x11/other/fontconfig/package.mk @@ -7,11 +7,11 @@ PKG_VERSION="2.13.1" PKG_SHA256="9f0d852b39d75fc655f9f53850eb32555394f36104a044bb2b2fc9e66dbbfa7f" PKG_LICENSE="OSS" PKG_SITE="http://www.fontconfig.org" -PKG_URL="http://www.freedesktop.org/software/fontconfig/release/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://www.freedesktop.org/software/fontconfig/release/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain util-linux util-macros freetype libxml2 zlib expat" PKG_LONGDESC="Fontconfig is a library for font customization and configuration." -PKG_CONFIGURE_OPTS_TARGET="--with-arch=$TARGET_ARCH \ +PKG_CONFIGURE_OPTS_TARGET="--with-arch=${TARGET_ARCH} \ --with-cache-dir=/storage/.cache/fontconfig \ --with-default-fonts=/usr/share/fonts \ --without-add-fonts \ @@ -20,15 +20,15 @@ PKG_CONFIGURE_OPTS_TARGET="--with-arch=$TARGET_ARCH \ pre_configure_target() { # ensure we dont use '-O3' optimization. - CFLAGS=`echo $CFLAGS | sed -e "s|-O3|-O2|"` - CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-O3|-O2|"` - CFLAGS="$CFLAGS -I$PKG_BUILD" - CXXFLAGS="$CXXFLAGS -I$PKG_BUILD" + CFLAGS=$(echo ${CFLAGS} | sed -e "s|-O3|-O2|") + CXXFLAGS=$(echo ${CXXFLAGS} | sed -e "s|-O3|-O2|") + CFLAGS+=" -I${PKG_BUILD}" + CXXFLAGS+=" -I${PKG_BUILD}" } post_makeinstall_target() { - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin - mkdir -p $INSTALL/etc/fonts/conf.d - cp $PKG_DIR/conf.d/*.conf $INSTALL/etc/fonts/conf.d + mkdir -p ${INSTALL}/etc/fonts/conf.d + cp ${PKG_DIR}/conf.d/*.conf ${INSTALL}/etc/fonts/conf.d } diff --git a/packages/x11/proto/xcb-proto/package.mk b/packages/x11/proto/xcb-proto/package.mk index a445306b70..4874f2ac9e 100644 --- a/packages/x11/proto/xcb-proto/package.mk +++ b/packages/x11/proto/xcb-proto/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.14" PKG_SHA256="186a3ceb26f9b4a015f5a44dcc814c93033a5fc39684f36f1ecc79834416a605" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xcb.freedesktop.org/dist/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://xcb.freedesktop.org/dist/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain util-macros Python3:host" PKG_LONGDESC="X C-language Bindings protocol headers." diff --git a/packages/x11/proto/xorgproto/package.mk b/packages/x11/proto/xorgproto/package.mk index 24c693ad42..e84f56a06e 100644 --- a/packages/x11/proto/xorgproto/package.mk +++ b/packages/x11/proto/xorgproto/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="2020.1" PKG_SHA256="54a153f139035a376c075845dd058049177212da94d7a9707cf9468367b699d2" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="https://xorg.freedesktop.org/archive/individual/proto/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="https://xorg.freedesktop.org/archive/individual/proto/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros" PKG_LONGDESC="combined X.Org X11 Protocol headers" PKG_TOOLCHAIN="meson" diff --git a/packages/x11/util/util-macros/package.mk b/packages/x11/util/util-macros/package.mk index 37ebeb6276..138e3b0dc9 100644 --- a/packages/x11/util/util-macros/package.mk +++ b/packages/x11/util/util-macros/package.mk @@ -6,10 +6,10 @@ PKG_VERSION="1.19.2" PKG_SHA256="d7e43376ad220411499a79735020f9d145fdc159284867e99467e0d771f3e712" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/util/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/util/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="X.org autoconf utilities such as M4 macros." post_makeinstall_target() { - rm -rf $INSTALL/usr + rm -rf ${INSTALL}/usr } diff --git a/packages/x11/util/xorg-launch-helper/package.mk b/packages/x11/util/xorg-launch-helper/package.mk index 34242dfc18..efa10705a4 100644 --- a/packages/x11/util/xorg-launch-helper/package.mk +++ b/packages/x11/util/xorg-launch-helper/package.mk @@ -17,7 +17,7 @@ pre_configure_target() { post_makeinstall_target() { # do not install systemd services - rm -rf $INSTALL/usr/lib - mkdir -p $INSTALL/usr/bin - cp -P $PKG_DIR/scripts/xorg-launch $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/lib + mkdir -p ${INSTALL}/usr/bin + cp -P ${PKG_DIR}/scripts/xorg-launch ${INSTALL}/usr/bin } diff --git a/packages/x11/xserver/xorg-server/package.mk b/packages/x11/xserver/xorg-server/package.mk index 8f0e62116d..840dadedb9 100644 --- a/packages/x11/xserver/xorg-server/package.mk +++ b/packages/x11/xserver/xorg-server/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.20.10" PKG_SHA256="977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/xserver/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/xserver/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros font-util xorgproto libpciaccess libX11 libXfont2 libXinerama libxshmfence libxkbfile libdrm openssl freetype pixman systemd xorg-launch-helper" PKG_NEED_UNPACK="$(get_pkg_directory xf86-video-nvidia) $(get_pkg_directory xf86-video-nvidia-legacy)" PKG_LONGDESC="Xorg is a full featured X server running on Intel x86 hardware." @@ -15,15 +15,15 @@ PKG_TOOLCHAIN="autotools" get_graphicdrivers -if [ "$COMPOSITE_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libXcomposite" +if [ "${COMPOSITE_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" libXcomposite" XORG_COMPOSITE="--enable-composite" else XORG_COMPOSITE="--disable-composite" fi -if [ ! "$OPENGL" = "no" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGL libepoxy" +if [ ! "${OPENGL}" = "no" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGL} libepoxy" XORG_MESA="--enable-glx --enable-dri --enable-glamor" else XORG_MESA="--disable-glx --disable-dri --disable-glamor" @@ -37,7 +37,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-debug \ --disable-unit-tests \ --disable-sparkle \ --disable-xselinux \ - $XORG_COMPOSITE \ + ${XORG_COMPOSITE} \ --enable-mitshm \ --enable-xres \ --enable-record \ @@ -47,7 +47,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-debug \ --disable-screensaver \ --disable-xdmcp \ --disable-xdm-auth-1 \ - $XORG_MESA \ + ${XORG_MESA} \ --enable-dri2 \ --enable-dri3 \ --enable-present \ @@ -100,8 +100,8 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-debug \ --with-sha1=libcrypto \ --without-systemd-daemon \ --with-os-vendor=LibreELEC.tv \ - --with-module-dir=$XORG_PATH_MODULES \ - --with-xkb-path=$XORG_PATH_XKB \ + --with-module-dir=${XORG_PATH_MODULES} \ + --with-xkb-path=${XORG_PATH_XKB} \ --with-xkb-output=/var/cache/xkb \ --with-log-dir=/var/log \ --with-fontrootdir=/usr/share/fonts \ @@ -112,29 +112,29 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-debug \ pre_configure_target() { # hack to prevent a build error - CFLAGS=`echo $CFLAGS | sed -e "s|-O3|-O2|" -e "s|-Ofast|-O2|"` - LDFLAGS=`echo $LDFLAGS | sed -e "s|-O3|-O2|" -e "s|-Ofast|-O2|"` + CFLAGS=$(echo ${CFLAGS} | sed -e "s|-O3|-O2|" -e "s|-Ofast|-O2|") + LDFLAGS=$(echo ${LDFLAGS} | sed -e "s|-O3|-O2|" -e "s|-Ofast|-O2|") } post_makeinstall_target() { - rm -rf $INSTALL/var/cache/xkb + rm -rf ${INSTALL}/var/cache/xkb - mkdir -p $INSTALL/usr/lib/xorg - cp -P $PKG_DIR/scripts/xorg-configure $INSTALL/usr/lib/xorg - sed -i -e "s|@NVIDIA_VERSION@|$(get_pkg_version xf86-video-nvidia)|g" $INSTALL/usr/lib/xorg/xorg-configure - sed -i -e "s|@NVIDIA_LEGACY_VERSION@|$(get_pkg_version xf86-video-nvidia-legacy)|g" $INSTALL/usr/lib/xorg/xorg-configure + mkdir -p ${INSTALL}/usr/lib/xorg + cp -P ${PKG_DIR}/scripts/xorg-configure ${INSTALL}/usr/lib/xorg + sed -i -e "s|@NVIDIA_VERSION@|$(get_pkg_version xf86-video-nvidia)|g" ${INSTALL}/usr/lib/xorg/xorg-configure + sed -i -e "s|@NVIDIA_LEGACY_VERSION@|$(get_pkg_version xf86-video-nvidia-legacy)|g" ${INSTALL}/usr/lib/xorg/xorg-configure - if [ ! "$OPENGL" = "no" ]; then - if [ -f $INSTALL/usr/lib/xorg/modules/extensions/libglx.so ]; then - mv $INSTALL/usr/lib/xorg/modules/extensions/libglx.so \ - $INSTALL/usr/lib/xorg/modules/extensions/libglx_mesa.so # rename for cooperate with nvidia drivers - ln -sf /var/lib/libglx.so $INSTALL/usr/lib/xorg/modules/extensions/libglx.so + if [ ! "${OPENGL}" = "no" ]; then + if [ -f ${INSTALL}/usr/lib/xorg/modules/extensions/libglx.so ]; then + mv ${INSTALL}/usr/lib/xorg/modules/extensions/libglx.so \ + ${INSTALL}/usr/lib/xorg/modules/extensions/libglx_mesa.so # rename for cooperate with nvidia drivers + ln -sf /var/lib/libglx.so ${INSTALL}/usr/lib/xorg/modules/extensions/libglx.so fi fi - mkdir -p $INSTALL/etc/X11 - if find_file_path config/xorg.conf ; then - cp $FOUND_PATH $INSTALL/etc/X11 + mkdir -p ${INSTALL}/etc/X11 + if find_file_path config/xorg.conf; then + cp ${FOUND_PATH} ${INSTALL}/etc/X11 fi }