From 5b585188334b900fe55fa01bbd1cb511f55ab4de Mon Sep 17 00:00:00 2001
From: sulincix <parduscix@yandex.ru>
Date: Tue, 6 Dec 2022 20:28:13 +0000
Subject: [PATCH] pkgconfig fixes

---
 app/arch/libarchive/ympbuild | 1 +
 app/arch/lz4/ympbuild        | 1 +
 app/arch/lzo/ympbuild        | 1 +
 app/arch/xz-utils/ympbuild   | 1 +
 dev/db/sqlite/ympbuild       | 1 +
 dev/libs/elfutils/ympbuild   | 1 +
 dev/libs/expat/ympbuild      | 2 ++
 dev/libs/glib/ympbuild       | 1 +
 dev/libs/gmp/ympbuild        | 1 +
 dev/libs/libpcre2/ympbuild   | 1 +
 dev/libs/libtasn1/ympbuild   | 1 +
 dev/libs/libxml2/ympbuild    | 1 +
 dev/libs/mpfr/ympbuild       | 1 +
 dev/libs/nettle/ympbuild     | 1 +
 dev/libs/openssl/ympbuild    | 1 +
 dev/util/pkgconf/ympbuild    | 1 +
 net/dns/libidn2/ympbuild     | 1 +
 net/libs/gnutls/ympbuild     | 1 +
 net/libs/libnghttp2/ympbuild | 1 +
 net/libs/libnsl/ympbuild     | 1 +
 net/libs/libpsl/ympbuild     | 1 +
 net/libs/libseccomp/ympbuild | 1 +
 net/libs/libssh/ympbuild     | 1 +
 net/libs/libtirpc/ympbuild   | 1 +
 net/misc/curl/ympbuild       | 1 +
 sys/apps/acl/ympbuild        | 3 ++-
 sys/apps/attr/ympbuild       | 1 +
 sys/apps/file/ympbuild       | 1 +
 sys/apps/util-linux/ympbuild | 1 +
 sys/libs/libcap-ng/ympbuild  | 1 +
 sys/libs/libcap/ympbuild     | 1 +
 sys/libs/libxcrypt/ympbuild  | 2 +-
 sys/process/audit/ympbuild   | 1 +
 33 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/app/arch/libarchive/ympbuild b/app/arch/libarchive/ympbuild
index 76061b42..0ed70407 100644
--- a/app/arch/libarchive/ympbuild
+++ b/app/arch/libarchive/ympbuild
@@ -51,4 +51,5 @@ package() {
     make -j$(nproc) install
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/libarchive/" > ${DESTDIR}/etc/ld.so.conf.d/libarchive.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
diff --git a/app/arch/lz4/ympbuild b/app/arch/lz4/ympbuild
index 2aea8424..21ee4d7f 100644
--- a/app/arch/lz4/ympbuild
+++ b/app/arch/lz4/ympbuild
@@ -26,5 +26,6 @@ package(){
     mv ${DESTDIR}/usr/{lib,lib64/lz4}
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/lz4/" > ${DESTDIR}/etc/ld.so.conf.d/lz4.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/app/arch/lzo/ympbuild b/app/arch/lzo/ympbuild
index c5e6966c..7e934d9b 100644
--- a/app/arch/lzo/ympbuild
+++ b/app/arch/lzo/ympbuild
@@ -34,5 +34,6 @@ package(){
     ln -s libminilzo.so.0 "${DESTDIR}"/usr/lib64/lzo/libminilzo.so
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/lzo/" > ${DESTDIR}/etc/ld.so.conf.d/lzo.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/app/arch/xz-utils/ympbuild b/app/arch/xz-utils/ympbuild
index b86b90b6..8f5ae569 100644
--- a/app/arch/xz-utils/ympbuild
+++ b/app/arch/xz-utils/ympbuild
@@ -30,4 +30,5 @@ package(){
     make install -j$(nproc)
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/xz-utils/" > ${DESTDIR}/etc/ld.so.conf.d/xz-utils.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
diff --git a/dev/db/sqlite/ympbuild b/dev/db/sqlite/ympbuild
index aa983e3c..3423581d 100644
--- a/dev/db/sqlite/ympbuild
+++ b/dev/db/sqlite/ympbuild
@@ -42,5 +42,6 @@ package(){
     make install -j`nproc`
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/sqlite/" > ${DESTDIR}/etc/ld.so.conf.d/sqlite.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/dev/libs/elfutils/ympbuild b/dev/libs/elfutils/ympbuild
index 6ca57f6b..17d78e89 100644
--- a/dev/libs/elfutils/ympbuild
+++ b/dev/libs/elfutils/ympbuild
@@ -45,5 +45,6 @@ package(){
     make install -j`nproc`
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/elfutils/" > ${DESTDIR}/etc/ld.so.conf.d/elfutils.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/dev/libs/expat/ympbuild b/dev/libs/expat/ympbuild
index d85c8045..668e8746 100644
--- a/dev/libs/expat/ympbuild
+++ b/dev/libs/expat/ympbuild
@@ -34,5 +34,7 @@ package(){
     make install -C build
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/expat/" > ${DESTDIR}/etc/ld.so.conf.d/expat.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
+    mv ${DESTDIR}/usr/lib64/{$name/cmake,}
 }
 
diff --git a/dev/libs/glib/ympbuild b/dev/libs/glib/ympbuild
index 80e0c5be..dfafc4f6 100644
--- a/dev/libs/glib/ympbuild
+++ b/dev/libs/glib/ympbuild
@@ -37,5 +37,6 @@ package(){
     install ../glib.sysconf ${DESTDIR}/etc/sysconf.d/glib
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/glib2.0/" > ${DESTDIR}/etc/ld.so.conf.d/glib.conf
+    mv ${DESTDIR}/usr/lib64/{glib2.0/pkgconfig,}
 }
 
diff --git a/dev/libs/gmp/ympbuild b/dev/libs/gmp/ympbuild
index c7f5ab85..fcdcbf1d 100644
--- a/dev/libs/gmp/ympbuild
+++ b/dev/libs/gmp/ympbuild
@@ -30,5 +30,6 @@ package(){
     make install -j`nproc`
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/gmp/" > ${DESTDIR}/etc/ld.so.conf.d/gmp.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/dev/libs/libpcre2/ympbuild b/dev/libs/libpcre2/ympbuild
index a13b16fb..736c42f9 100644
--- a/dev/libs/libpcre2/ympbuild
+++ b/dev/libs/libpcre2/ympbuild
@@ -34,5 +34,6 @@ package(){
     make install -j`nproc`
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/libpcre2/" > ${DESTDIR}/etc/ld.so.conf.d/libpcre2.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/dev/libs/libtasn1/ympbuild b/dev/libs/libtasn1/ympbuild
index 067db577..80ce98ef 100644
--- a/dev/libs/libtasn1/ympbuild
+++ b/dev/libs/libtasn1/ympbuild
@@ -25,4 +25,5 @@ package(){
     make -j`nproc` install
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/libtasn1/" > ${DESTDIR}/etc/ld.so.conf.d/libtasn1.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
diff --git a/dev/libs/libxml2/ympbuild b/dev/libs/libxml2/ympbuild
index e41d4cb3..6ae3b742 100644
--- a/dev/libs/libxml2/ympbuild
+++ b/dev/libs/libxml2/ympbuild
@@ -40,5 +40,6 @@ package(){
     fi
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/libxml2/" > ${DESTDIR}/etc/ld.so.conf.d/libxml2.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/dev/libs/mpfr/ympbuild b/dev/libs/mpfr/ympbuild
index 0add94c5..bba05583 100644
--- a/dev/libs/mpfr/ympbuild
+++ b/dev/libs/mpfr/ympbuild
@@ -33,4 +33,5 @@ package(){
     make install -j`nproc`
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/mpfr/" > ${DESTDIR}/etc/ld.so.conf.d/mpfr.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
diff --git a/dev/libs/nettle/ympbuild b/dev/libs/nettle/ympbuild
index 21cd36f5..543106b6 100644
--- a/dev/libs/nettle/ympbuild
+++ b/dev/libs/nettle/ympbuild
@@ -29,5 +29,6 @@ package(){
     make install -j`nproc`
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/nettle/" > ${DESTDIR}/etc/ld.so.conf.d/nettle.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/dev/libs/openssl/ympbuild b/dev/libs/openssl/ympbuild
index 51b9f903..1fd724f2 100644
--- a/dev/libs/openssl/ympbuild
+++ b/dev/libs/openssl/ympbuild
@@ -42,5 +42,6 @@ package(){
     install_man_docs  -j`nproc`
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/openssl/" > ${DESTDIR}/etc/ld.so.conf.d/openssl.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/dev/util/pkgconf/ympbuild b/dev/util/pkgconf/ympbuild
index 37ea11de..b53f3b2f 100644
--- a/dev/util/pkgconf/ympbuild
+++ b/dev/util/pkgconf/ympbuild
@@ -40,5 +40,6 @@ package(){
     ../x86_64-pc-linux-gnu.personality
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/pkgconf/" > ${DESTDIR}/etc/ld.so.conf.d/pkgconf.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/net/dns/libidn2/ympbuild b/net/dns/libidn2/ympbuild
index dd21bba8..3bcbe4da 100644
--- a/net/dns/libidn2/ympbuild
+++ b/net/dns/libidn2/ympbuild
@@ -29,5 +29,6 @@ package(){
     make install -j`nproc`
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/libidn2/" > ${DESTDIR}/etc/ld.so.conf.d/libidn2.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/net/libs/gnutls/ympbuild b/net/libs/gnutls/ympbuild
index bb3eec76..8a00f816 100644
--- a/net/libs/gnutls/ympbuild
+++ b/net/libs/gnutls/ympbuild
@@ -43,5 +43,6 @@ package(){
     make install -j`nproc`
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/gnutls/" > ${DESTDIR}/etc/ld.so.conf.d/gnutls.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/net/libs/libnghttp2/ympbuild b/net/libs/libnghttp2/ympbuild
index 222bdcc2..edf5c6e4 100644
--- a/net/libs/libnghttp2/ympbuild
+++ b/net/libs/libnghttp2/ympbuild
@@ -37,5 +37,6 @@ package(){
     make install -j`nproc`
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/libnghttp2/" > ${DESTDIR}/etc/ld.so.conf.d/libnghttp2.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/net/libs/libnsl/ympbuild b/net/libs/libnsl/ympbuild
index acd75757..975e9d8d 100644
--- a/net/libs/libnsl/ympbuild
+++ b/net/libs/libnsl/ympbuild
@@ -30,5 +30,6 @@ package(){
     make install -j`nproc`
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/libnsl/" > ${DESTDIR}/etc/ld.so.conf.d/libnsl.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/net/libs/libpsl/ympbuild b/net/libs/libpsl/ympbuild
index 590322eb..9cce83d2 100644
--- a/net/libs/libpsl/ympbuild
+++ b/net/libs/libpsl/ympbuild
@@ -29,5 +29,6 @@ package(){
     make install -j`nproc`
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/libpsl/" > ${DESTDIR}/etc/ld.so.conf.d/libpsl.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/net/libs/libseccomp/ympbuild b/net/libs/libseccomp/ympbuild
index e7b71593..a1d8f610 100644
--- a/net/libs/libseccomp/ympbuild
+++ b/net/libs/libseccomp/ympbuild
@@ -29,4 +29,5 @@ package(){
     make install -j$(nproc)
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/libseccomp/" > ${DESTDIR}/etc/ld.so.conf.d/libseccomp.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
diff --git a/net/libs/libssh/ympbuild b/net/libs/libssh/ympbuild
index c66f874c..a9655f32 100644
--- a/net/libs/libssh/ympbuild
+++ b/net/libs/libssh/ympbuild
@@ -40,4 +40,5 @@ package() {
     install build/src/libssh.a ${DESTDIR}/usr/lib64/libssh/
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/libssh/" > ${DESTDIR}/etc/ld.so.conf.d/libssh.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
diff --git a/net/libs/libtirpc/ympbuild b/net/libs/libtirpc/ympbuild
index 740ba18b..6360eb54 100644
--- a/net/libs/libtirpc/ympbuild
+++ b/net/libs/libtirpc/ympbuild
@@ -31,5 +31,6 @@ package(){
     make install -j`nproc`
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/libtirpc/" > ${DESTDIR}/etc/ld.so.conf.d/libtirpc.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/net/misc/curl/ympbuild b/net/misc/curl/ympbuild
index 612503d4..e3dc3d53 100644
--- a/net/misc/curl/ympbuild
+++ b/net/misc/curl/ympbuild
@@ -88,5 +88,6 @@ package(){
     done
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/curl/" > ${DESTDIR}/etc/ld.so.conf.d/curl.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/sys/apps/acl/ympbuild b/sys/apps/acl/ympbuild
index b081d6b4..22cbb124 100644
--- a/sys/apps/acl/ympbuild
+++ b/sys/apps/acl/ympbuild
@@ -20,7 +20,7 @@ setup(){
     ./configure --prefix=/usr \
         --libdir=/usr/lib64/acl
 }
-
+https://gitlab.com/sulix/packages/binary-repo
 build(){
     make -j`nproc`
 }
@@ -29,4 +29,5 @@ package(){
     make install -j`nproc`
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/acl/" > ${DESTDIR}/etc/ld.so.conf.d/acl.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
diff --git a/sys/apps/attr/ympbuild b/sys/apps/attr/ympbuild
index 38c44701..7e221017 100644
--- a/sys/apps/attr/ympbuild
+++ b/sys/apps/attr/ympbuild
@@ -29,5 +29,6 @@ package(){
     make install -j`nproc`
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/attr/" > ${DESTDIR}/etc/ld.so.conf.d/attr.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/sys/apps/file/ympbuild b/sys/apps/file/ympbuild
index 914a5846..08bff351 100644
--- a/sys/apps/file/ympbuild
+++ b/sys/apps/file/ympbuild
@@ -42,4 +42,5 @@ package(){
     make install -j`nproc`
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/magic/" > ${DESTDIR}/etc/ld.so.conf.d/magic.conf
+    mv ${DESTDIR}/usr/lib64/{magic/pkgconfig,}
 }
diff --git a/sys/apps/util-linux/ympbuild b/sys/apps/util-linux/ympbuild
index 5a807397..bb8861e4 100644
--- a/sys/apps/util-linux/ympbuild
+++ b/sys/apps/util-linux/ympbuild
@@ -49,5 +49,6 @@ package(){
     make install -j`nproc`
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/util-linux/" > ${DESTDIR}/etc/ld.so.conf.d/util-linux.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/sys/libs/libcap-ng/ympbuild b/sys/libs/libcap-ng/ympbuild
index b176f297..5ff390d9 100644
--- a/sys/libs/libcap-ng/ympbuild
+++ b/sys/libs/libcap-ng/ympbuild
@@ -35,5 +35,6 @@ package(){
     make install -j`nproc`
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/libcap-ng/" > ${DESTDIR}/etc/ld.so.conf.d/libcap-ng.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/sys/libs/libcap/ympbuild b/sys/libs/libcap/ympbuild
index 94ab34bf..8b7655fe 100644
--- a/sys/libs/libcap/ympbuild
+++ b/sys/libs/libcap/ympbuild
@@ -25,5 +25,6 @@ package(){
     make RAISE_SETFCAP=no lib=lib64/libcap prefix=/usr install
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/libcap/" > ${DESTDIR}/etc/ld.so.conf.d/libcap.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/sys/libs/libxcrypt/ympbuild b/sys/libs/libxcrypt/ympbuild
index 2070e438..df29d9cb 100644
--- a/sys/libs/libxcrypt/ympbuild
+++ b/sys/libs/libxcrypt/ympbuild
@@ -47,6 +47,6 @@ package(){
     make install -j`nproc`
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/libxcrypt/" > ${DESTDIR}/etc/ld.so.conf.d/libxcrypt.conf
-
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }
 
diff --git a/sys/process/audit/ympbuild b/sys/process/audit/ympbuild
index eceb54a5..406120a1 100644
--- a/sys/process/audit/ympbuild
+++ b/sys/process/audit/ympbuild
@@ -40,5 +40,6 @@ package(){
     make install -j`nproc`
     mkdir -p ${DESTDIR}/etc/ld.so.conf.d/
     echo "/usr/lib64/audit/" > ${DESTDIR}/etc/ld.so.conf.d/audit.conf
+    mv ${DESTDIR}/usr/lib64/{$name/pkgconfig,}
 }