From fd539d0663c8c1427e126221a5afc1b368491a74 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Mon, 13 Jan 2020 20:34:24 +0000 Subject: [PATCH] packages: use $(get_pkg_version_maj_min) --- packages/addons/service/mpd/package.mk | 2 +- packages/devel/cmake/package.mk | 2 +- packages/devel/glib/package.mk | 2 +- packages/devel/libfstrcmp/package.mk | 2 +- packages/network/libssh/package.mk | 2 +- packages/python/devel/pygobject/package.mk | 2 +- packages/sysutils/util-linux/package.mk | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/addons/service/mpd/package.mk b/packages/addons/service/mpd/package.mk index 048a9f3d96..1350d9f782 100644 --- a/packages/addons/service/mpd/package.mk +++ b/packages/addons/service/mpd/package.mk @@ -9,7 +9,7 @@ PKG_REV="107" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://www.musicpd.org" -PKG_URL="http://www.musicpd.org/download/mpd/${PKG_VERSION%.*}/mpd-${PKG_VERSION}.tar.xz" +PKG_URL="http://www.musicpd.org/download/mpd/$(get_pkg_version_maj_min)/mpd-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain alsa-lib avahi boost curl faad2 ffmpeg flac glib lame libcdio libiconv libid3tag \ libmad libmpdclient libsamplerate libvorbis libnfs libogg mpd-mpc opus pulseaudio samba yajl libgcrypt" PKG_SECTION="service.multimedia" diff --git a/packages/devel/cmake/package.mk b/packages/devel/cmake/package.mk index 4ff3ad9281..a939e72b2f 100644 --- a/packages/devel/cmake/package.mk +++ b/packages/devel/cmake/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="3.16.0" PKG_SHA256="6da56556c63cab6e9a3e1656e8763ed4a841ac9859fefb63cbe79472e67e8c5f" PKG_LICENSE="BSD" PKG_SITE="http://www.cmake.org/" -PKG_URL="http://www.cmake.org/files/v${PKG_VERSION%.*}/cmake-${PKG_VERSION}.tar.gz" +PKG_URL="http://www.cmake.org/files/v$(get_pkg_version_maj_min)/cmake-${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="ccache:host openssl:host pkg-config:host" PKG_LONGDESC="A cross-platform, open-source make system." PKG_TOOLCHAIN="configure" diff --git a/packages/devel/glib/package.mk b/packages/devel/glib/package.mk index 2c7d256b76..b6c62d99f7 100644 --- a/packages/devel/glib/package.mk +++ b/packages/devel/glib/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.61.1" PKG_SHA256="f8d827955f0d8e197ff5c2105dd6ac4f6b63d15cd021eb1de66534c92a762161" PKG_LICENSE="LGPL" PKG_SITE="http://www.gtk.org/" -PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_VERSION%.*}/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/$(get_pkg_version_maj_min)/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS_HOST="libffi:host Python3:host meson:host ninja:host" PKG_DEPENDS_TARGET="toolchain pcre zlib libffi Python3:host util-linux" PKG_LONGDESC="A library which includes support routines for C such as lists, trees, hashes, memory allocation." diff --git a/packages/devel/libfstrcmp/package.mk b/packages/devel/libfstrcmp/package.mk index 0a2ae0753f..abddec9c5e 100644 --- a/packages/devel/libfstrcmp/package.mk +++ b/packages/devel/libfstrcmp/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="0.7.D001" PKG_SHA256="e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476" PKG_LICENSE="GPL" PKG_SITE="http://fstrcmp.sourceforge.net/" -PKG_URL="https://downloads.sourceforge.net/project/fstrcmp/fstrcmp/0.7/fstrcmp-$PKG_VERSION.tar.gz" +PKG_URL="https://downloads.sourceforge.net/project/fstrcmp/fstrcmp/$(get_pkg_version_maj_min)/fstrcmp-$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="The fstrcmp project provides a library that is used to make fuzzy comparisons of strings and byte arrays, including multi-byte character strings." diff --git a/packages/network/libssh/package.mk b/packages/network/libssh/package.mk index 3475c8ee76..5400b57843 100644 --- a/packages/network/libssh/package.mk +++ b/packages/network/libssh/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="0.8.7" PKG_SHA256="43304ca22f0ba0b654e14b574a39816bc70212fdea5858a6637cc26cade3d592" PKG_LICENSE="LGPL" PKG_SITE="http://www.libssh.org/" -PKG_URL="https://www.libssh.org/files/${PKG_VERSION%.*}/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="https://www.libssh.org/files/$(get_pkg_version_maj_min)/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS_TARGET="toolchain zlib openssl" PKG_LONGDESC="Library for accessing ssh client services through C libraries." diff --git a/packages/python/devel/pygobject/package.mk b/packages/python/devel/pygobject/package.mk index 6c79fd9a81..62e919d673 100644 --- a/packages/python/devel/pygobject/package.mk +++ b/packages/python/devel/pygobject/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.28.7" PKG_SHA256="bb9d25a3442ca7511385a7c01b057492095c263784ef31231ffe589d83a96a5a" PKG_LICENSE="LGPL" PKG_SITE="http://www.pygtk.org/" -PKG_URL="http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://ftp.gnome.org/pub/GNOME/sources/pygobject/$(get_pkg_version_maj_min)/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS_TARGET="toolchain Python3 glib libffi" PKG_LONGDESC="A convenient wrapper for the GObject+ library for use in Python programs." PKG_TOOLCHAIN="autotools" diff --git a/packages/sysutils/util-linux/package.mk b/packages/sysutils/util-linux/package.mk index cfe7158be4..330a628c05 100644 --- a/packages/sysutils/util-linux/package.mk +++ b/packages/sysutils/util-linux/package.mk @@ -6,7 +6,7 @@ PKG_NAME="util-linux" PKG_VERSION="2.33.2" PKG_SHA256="631be8eac6cf6230ba478de211941d526808dba3cd436380793334496013ce97" PKG_LICENSE="GPL" -PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v${PKG_VERSION%.*}/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v$(get_pkg_version_maj_min)/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS_HOST="ccache:host autoconf:host automake:host intltool:host libtool:host pkg-config:host" PKG_DEPENDS_TARGET="toolchain" PKG_DEPENDS_INIT="toolchain"