Merge branch '3.7-alpha0' into 3.7

6 files changed, 107 insertions, 0 deletions

diff --git a/pkgconf/.footprint b/pkgconf/.footprint
new file mode 100644
index 00000000..e2b60636
--- /dev/null
+++ b/pkgconf/.footprint
@@ -0,0 +1,36 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+lrwxrwxrwx	root/root	usr/bin/i686-pc-linux-gnu-pkg-config -> pkgconf
+lrwxrwxrwx	root/root	usr/bin/pkg-config -> pkgconf
+-rwxr-xr-x	root/root	usr/bin/pkgconf
+lrwxrwxrwx	root/root	usr/bin/x86_64-pc-linux-gnu-pkg-config -> pkgconf
+drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/pkgconf/
+drwxr-xr-x	root/root	usr/include/pkgconf/libpkgconf/
+-rw-r--r--	root/root	usr/include/pkgconf/libpkgconf/bsdstubs.h
+-rw-r--r--	root/root	usr/include/pkgconf/libpkgconf/iter.h
+-rw-r--r--	root/root	usr/include/pkgconf/libpkgconf/libpkgconf-api.h
+-rw-r--r--	root/root	usr/include/pkgconf/libpkgconf/libpkgconf.h
+-rw-r--r--	root/root	usr/include/pkgconf/libpkgconf/stdinc.h
+drwxr-xr-x	root/root	usr/lib/
+lrwxrwxrwx	root/root	usr/lib/libpkgconf.so -> libpkgconf.so.3
+lrwxrwxrwx	root/root	usr/lib/libpkgconf.so.3 -> libpkgconf.so.3.0.0
+-rwxr-xr-x	root/root	usr/lib/libpkgconf.so.3.0.0
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/libpkgconf.pc
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/aclocal/
+-rw-r--r--	root/root	usr/share/aclocal/pkg.m4
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+lrwxrwxrwx	root/root	usr/share/man/man1/pkg-config.1.gz -> pkgconf.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/pkgconf.1.gz
+drwxr-xr-x	root/root	usr/share/man/man5/
+-rw-r--r--	root/root	usr/share/man/man5/pc.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/pkgconf-personality.5.gz
+drwxr-xr-x	root/root	usr/share/man/man7/
+-rw-r--r--	root/root	usr/share/man/man7/pkg.m4.7.gz
+drwxr-xr-x	root/root	usr/share/pkgconfig/
+drwxr-xr-x	root/root	usr/share/pkgconfig/personality.d/
+-rw-r--r--	root/root	usr/share/pkgconfig/personality.d/i686-pc-linux-gnu.personality
+-rw-r--r--	root/root	usr/share/pkgconfig/personality.d/x86_64-pc-linux-gnu.personality
diff --git a/pkgconf/.signature b/pkgconf/.signature
new file mode 100644
index 00000000..045ca5ad
--- /dev/null
+++ b/pkgconf/.signature
@@ -0,0 +1,7 @@
+untrusted comment: verify with /etc/ports/core.pub
+RWRJc1FUaeVeqs0b3nRa4aiTgcaBYm41n2xcKf+Ysye+5TZEERAn3vg5GHh3TzzYokRXIw1gRhcklJMyngeqi6ievV6uOJGVWQo=
+SHA256 (Pkgfile) = e68ff71c500e1be6771584f6554b055c53be7aa2a4795d11d5f0023e4220ba55
+SHA256 (.footprint) = ca9261ea80b8374ac211e5a0e431e6f746aaaa06d7ea86376f0d50a45586a7f7
+SHA256 (pkgconf-1.8.0.tar.xz) = ef9c7e61822b7cb8356e6e9e1dca58d9556f3200d78acab35e4347e9d4c2bbaf
+SHA256 (i686-pc-linux-gnu.personality) = 6697c6db7deaae269ea75624a70e80949241f2cf59a537f31ecfcac726d90bc1
+SHA256 (x86_64-pc-linux-gnu.personality) = c8297817ba0b57d003878db247ff34b4c47a7594c9f67dcfe8ff8d6567956cd5
diff --git a/pkgconf/Pkgfile b/pkgconf/Pkgfile
new file mode 100644
index 00000000..f35d4aba
--- /dev/null
+++ b/pkgconf/Pkgfile
@@ -0,0 +1,32 @@
+# Description: A system for managing library compile/link flags.
+# URL: https://git.sr.ht/~kaniini/pkgconf
+# Maintainer: CRUX System Team, core-ports at crux dot nu
+
+name=pkgconf
+version=1.8.0
+release=1
+source=(https://distfiles.dereferenced.org/pkgconf/$name-$version.tar.xz
+  i686-pc-linux-gnu.personality x86_64-pc-linux-gnu.personality)
+
+build() {
+	meson $name-$version build \
+		--prefix=/usr \
+		--buildtype=plain \
+		--wrap-mode=nodownload \
+		-D b_lto=true \
+		-D b_pie=true \
+		-D tests=false
+	ninja -C build
+	DESTDIR=$PKG ninja -C build install
+
+	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
+
+	ln -s pkgconf.1 $PKG/usr/share/man/man1/pkg-config.1
+
+	rm -rf $PKG/usr/share/doc
+}
diff --git a/pkgconf/README b/pkgconf/README
new file mode 100644
index 00000000..b7ed0152
--- /dev/null
+++ b/pkgconf/README
@@ -0,0 +1,22 @@
+# Part 1:
+
+Please read up on the following ticket:
+https://todo.sr.ht/~kaniini/pkgconf/1
+
+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 00000000..b76226b6
--- /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 00000000..45788692
--- /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