[crux-commits] ports/contrib (3.6): pkgconf: adopted port

crux at crux.nu crux at crux.nu
Wed Feb 24 11:15:04 UTC 2021


commit 5ad78f9aa3079651c1db1d922265a9c89fbfca43
Author: Tim Biermann <tbier at posteo.de>
Date:   Wed Feb 24 10:33:54 2021 +0000

    pkgconf: adopted port

diff --git a/pkgconf/.signature b/pkgconf/.signature
index f55af1e3e..e0cc3959d 100644
--- a/pkgconf/.signature
+++ b/pkgconf/.signature
@@ -1,5 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3xRZhZsXlRC6IGZ8vq+3dJv6cjtfsXY0m/qRnywRKx5BsRbngRkkjM8ryTGkhCGaW4UqlLkK7b7wxceSYbZaLAA=
-SHA256 (Pkgfile) = 3f716cd0c7d75f3310e0df6e805ea23f1d2fb0aaf7fb75e06ca49fa5702c8774
+RWSagIOpLGJF32V0RiI1NjWWLWhDX2iEsz8r9Nx6+5TWQlXmm5XohVTQUAA6xjlMU+kN0p5kyqi7cI7RJ9zqzDh+PE/PFSz1lgs=
+SHA256 (Pkgfile) = f3323a3a8ae9f7d89d9c53bb54f070cfd0ebe3544736e4e894c9956741f4afa3
 SHA256 (.footprint) = 1c0b2e1bcba00f63ef857ef0033e0305ff1ef4b5130eb350222e049db86b79a0
 SHA256 (pkgconf-1.7.3.tar.xz) = b846aea51cf696c3392a0ae58bef93e2e72f8e7073ca6ad1ed8b01c85871f9c0
+SHA256 (i686-pc-linux-gnu.personality) = 6697c6db7deaae269ea75624a70e80949241f2cf59a537f31ecfcac726d90bc1
+SHA256 (x86_64-pc-linux-gnu.personality) = c8297817ba0b57d003878db247ff34b4c47a7594c9f67dcfe8ff8d6567956cd5
diff --git a/pkgconf/Pkgfile b/pkgconf/Pkgfile
index 4fd528ddc..cb69c095c 100644
--- a/pkgconf/Pkgfile
+++ b/pkgconf/Pkgfile
@@ -1,21 +1,30 @@
-# Description: A system for managing library compile/link flags
-# URL:         http://pkgconf.org
-# Maintainer:  John Vogel, jvogel4 at stny dot rr dot com
+# Description: A system for managing library compile/link flags.
+# URL: https://git.sr.ht/~kaniini/pkgconf
+# Maintainer: Tim Biermann, tbier at posteo dot de
+# Depends on: meson ninja
 
 name=pkgconf
 version=1.7.3
 release=1
-source=(http://distfiles.dereferenced.org/$name/$name-$version.tar.xz)
+source=(https://distfiles.dereferenced.org/pkgconf/$name-$version.tar.xz
+  i686-pc-linux-gnu.personality x86_64-pc-linux-gnu.personality)
 
 build() {
-	cd $name-$version
+  meson $name-$version build \
+    --prefix=/usr \
+    --buildtype=plain \
+    -D tests=false
+  ninja -C build
+  DESTDIR=$PKG ninja -C build install
 
-	./configure \
-		--prefix=/usr \
-		--with-system-libdir=/lib:/usr/lib
+  install -Dt $PKG/usr/share/pkgconfig/personality.d -m644 \
+    i686-pc-linux-gnu.personality \
+    x86_64-pc-linux-gnu.personality
+  ln -s pkgconf $PKG/usr/bin/i686-pc-linux-gnu-pkg-config
+  ln -s pkgconf $PKG/usr/bin/x86_64-pc-linux-gnu-pkg-config
+  ln -s pkgconf $PKG/usr/bin/pkg-config
 
-	make
-	make install MANDIR=/usr/share/man/man1 DESTDIR=$PKG
+  ln -s pkgconf.1 $PKG/usr/share/man/man1/pkg-config.1
 
-	rm -fr $PKG/usr/share/doc
+  rm -rf $PKG/usr/share/doc
 }
diff --git a/pkgconf/README b/pkgconf/README
index 6dfdc1ef4..b7ed01522 100644
--- a/pkgconf/README
+++ b/pkgconf/README
@@ -1,7 +1,22 @@
-This port, pkgconf, can be used as a replacement for pkg-config.
-To accomplish that, you will need a symlink:
+# Part 1:
 
-# ln -s pkgconf /usr/bin/pkg-config
+Please read up on the following ticket:
+https://todo.sr.ht/~kaniini/pkgconf/1
 
-You should be aware that is conflicts with the core/pkg-config
-package, so the link is not automatically created.
+The gist: since we exchange pkg-config for pkgconf here, this should not be a
+problem, still, this is not 'nice'.
+
+# Part 2:
+
+#!/bin/sh
+#
+# This was originally my post-install for this port!
+# pkgconf and pkg-config are not meant to co-exist, but
+# the decision to swap them out is only yours to make! 
+# Please review the consequences of this script!
+
+alias="pkgconf: pkg-config"
+
+if [ -z "$(grep "$alias" /var/lib/pkg/prt-get.aliases)" ]; then
+	echo "$alias" >> /var/lib/pkg/prt-get.aliases
+fi
diff --git a/pkgconf/i686-pc-linux-gnu.personality b/pkgconf/i686-pc-linux-gnu.personality
new file mode 100644
index 000000000..b76226b66
--- /dev/null
+++ b/pkgconf/i686-pc-linux-gnu.personality
@@ -0,0 +1,5 @@
+Triplet: i686-pc-linux-gnu
+SysrootDir: /
+DefaultSearchPaths: /usr/lib32/pkgconfig:/usr/share/pkgconfig
+SystemIncludePaths: /usr/include
+SystemLibraryPaths: /usr/lib32
diff --git a/pkgconf/x86_64-pc-linux-gnu.personality b/pkgconf/x86_64-pc-linux-gnu.personality
new file mode 100644
index 000000000..45788692f
--- /dev/null
+++ b/pkgconf/x86_64-pc-linux-gnu.personality
@@ -0,0 +1,5 @@
+Triplet: x86_64-pc-linux-gnu
+SysrootDir: /
+DefaultSearchPaths: /usr/lib/pkgconfig:/usr/share/pkgconfig
+SystemIncludePaths: /usr/include
+SystemLibraryPaths: /usr/lib


More information about the crux-commits mailing list