From 190638271a30552f700ecad5d465f5e124ecee69 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 4 Oct 2018 10:09:26 +0200 Subject: [PATCH] pkgconf: prepare for replacing pkg-config * libpkgconf is removed. * correctly conflicts with pkg-config * set a link from /usr/bin/pkg-config to pkgconf addresses #3391. --- srcpkgs/pkgconf-devel | 1 - srcpkgs/pkgconf/template | 18 ++++-------------- 2 files changed, 4 insertions(+), 15 deletions(-) delete mode 120000 srcpkgs/pkgconf-devel diff --git a/srcpkgs/pkgconf-devel b/srcpkgs/pkgconf-devel deleted file mode 120000 index 243cd47f2e6fdc..00000000000000 --- a/srcpkgs/pkgconf-devel +++ /dev/null @@ -1 +0,0 @@ -pkgconf \ No newline at end of file diff --git a/srcpkgs/pkgconf/template b/srcpkgs/pkgconf/template index af085af376711d..500fe287be6b8f 100644 --- a/srcpkgs/pkgconf/template +++ b/srcpkgs/pkgconf/template @@ -2,7 +2,7 @@ pkgname=pkgconf version=1.5.3 revision=1 -conflicts="pkg-config" +conflicts="pkg-config>=0" build_style=gnu-configure # cmake and meson also available hostmakedepends="libtool" checkdepends="kyua" @@ -13,20 +13,10 @@ homepage="https://git.dereferenced.org/pkgconf/pkgconf" changelog="https://git.dereferenced.org/pkgconf/pkgconf/raw/branch/master/NEWS" distfiles="https://distfiles.dereferenced.org/pkgconf/${pkgname}-${version}.tar.xz" checksum=d3468308553c94389dadfd10c4d1067269052b5364276a9d24a643c88485f715 +configure_args="--disable-shared --disable-static" post_install() { vlicense COPYING -} - -pkgconf-devel_package() { - depends="pkgconf-${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove usr/share/aclocal - vmove usr/share/man/man7 - vmove "usr/lib/*.so" - vmove "usr/lib/*.a" - } + rm $DESTDIR/usr/include + ln -sr $DESTDIR/usr/bin/pkgconf $DESTDIR/usr/bin/pkg-config }