changeset 766:e91fbcb3d1ef

vanilla: consolidate FHS
author David Demelier <markand@malikania.fr>
date Fri, 09 Aug 2019 20:10:00 +0200
parents 859f76ffb512
children 730c7a3e5056
files Templates/meson.sh accessibility/at-spi2-atk/at-spi2-atk.sh accessibility/at-spi2-core/at-spi2-core.sh accessibility/atk/atk.sh compression/lz4/lz4.sh compression/zstd/zstd.sh core/libcap/libcap.sh desktop/dconf/dconf.sh dev/binutils/binutils.sh dev/clang/clang.sh dev/clang/patch-musl.patch dev/cmake/cmake.sh dev/cmake/patch-fhs.patch dev/gobject-introspection/gobject-introspection.sh fonts/pango/pango.sh graphics/gdk-pixbuf/gdk-pixbuf.sh graphics/libepoxy/libepoxy.sh graphics/mesa/mesa.sh lib/glib/glib.sh lib/isl/isl.sh lib/jsoncpp/jsoncpp.sh lib/libinput/libinput.sh multimedia/ffmpeg/ffmpeg.sh multimedia/gst-plugins-bad/gst-plugins-bad.sh multimedia/gst-plugins-base/gst-plugins-base.sh multimedia/gst-plugins-good/gst-plugins-good.sh multimedia/gstreamer/gstreamer.sh network/libsoup/libsoup.sh network/libssh/libssh.sh network/libssh2/libssh2.sh qt/qtbase/patch-fhs.patch qt/qtbase/qtbase.sh system/accountsservice/accountsservice.sh text/json-glib/json-glib.sh
diffstat 34 files changed, 226 insertions(+), 85 deletions(-) [+]
line wrap: on
line diff
--- a/Templates/meson.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/Templates/meson.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -41,15 +41,14 @@
 	CXX="$CXX" \
 	CXXFLAGS="$CXXFLAGS" \
 	LDFLAGS="$LDFLAGS" \
-	meson \
+	meson . build \
 		--prefix / \
 		--buildtype release \
-		--default-library shared \
-		. build
+		--default-library shared
 	ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
+	# sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
-
--- a/accessibility/at-spi2-atk/at-spi2-atk.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/accessibility/at-spi2-atk/at-spi2-atk.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -40,15 +40,14 @@
 	CXX="$CXX" \
 	CXXFLAGS="$CXXFLAGS" \
 	LDFLAGS="$LDFLAGS" \
-	meson \
+	meson . build \
 		--prefix / \
 		--buildtype release \
-		--default-library shared \
-		. build
+		--default-library shared
 	ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
+	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
-
--- a/accessibility/at-spi2-core/at-spi2-core.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/accessibility/at-spi2-core/at-spi2-core.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -51,16 +51,15 @@
 	CXX="$CXX" \
 	CXXFLAGS="$CXXFLAGS" \
 	LDFLAGS="$LDFLAGS" \
-	meson \
+	meson . build \
 		--prefix / \
 		--buildtype release \
 		--default-library shared \
-		-D libdir=lib \
-		. build
+		-D libdir=lib
 	CC="$CC" ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
+	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
-
--- a/accessibility/atk/atk.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/accessibility/atk/atk.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -40,15 +40,14 @@
 	CXX="$CXX" \
 	CXXFLAGS="$CXXFLAGS" \
 	LDFLAGS="$LDFLAGS" \
-	meson \
+	meson . build \
 		--prefix / \
 		--buildtype release \
-		--default-library shared \
-		. build
+		--default-library shared
 	CC="$CC" ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
+	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
-
--- a/compression/lz4/lz4.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/compression/lz4/lz4.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -31,8 +31,8 @@
 	tar xvf v$PKGVERSION.tar.gz
 	cd $PKGNAME-$PKGVERSION
 
-	make CC="$CC" CFLAGS="$CFLAGS" PREFIX=/
-	make DESTDIR=$DESTDIR PREFIX=/ install
+	make CC="$CC" CFLAGS="$CFLAGS" PREFIX=
+	make DESTDIR=$DESTDIR PREFIX= install
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/compression/zstd/zstd.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/compression/zstd/zstd.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -32,7 +32,7 @@
 	cd $PKGNAME-$PKGVERSION
 
 	make CC="$CC" CFLAGS="$CFLAGS"
-	make PREFIX=/ LIBDIR=/lib DESTDIR=$DESTDIR install
+	make PREFIX= LIBDIR=/lib DESTDIR=$DESTDIR install
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/core/libcap/libcap.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/core/libcap/libcap.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -33,8 +33,17 @@
 	tar xvf $PKGNAME-$PKGVERSION.tar.xz
 	cd $PKGNAME-$PKGVERSION
 
-	make BUILD_CC="$CC" CC="$CC" CFLAGS="$CFLAGS"
-	make install RAISE_SETFCAP=no SBINDIR=/bin DESTDIR=$DESTDIR prefix= lib=/lib
+	make \
+		BUILD_CC="$CC" \
+		CC="$CC" \
+		CFLAGS="$CFLAGS" \
+		RAISE_SETFCAP=no \
+		SBINDIR=/bin \
+		DESTDIR=$DESTDIR \
+		LIBDIR=/lib \
+		lib=/lib \
+		prefix= \
+		all install
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/desktop/dconf/dconf.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/desktop/dconf/dconf.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -48,18 +48,17 @@
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
-	meson \
+	meson . build \
 		--prefix / \
 		--buildtype release \
 		--default-library shared \
 		-D man=false \
 		-D gtk_doc=false \
-		$with_vala \
-		. build
+		$with_vala
 	ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
+	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
-
--- a/dev/binutils/binutils.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/dev/binutils/binutils.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -65,6 +65,7 @@
 		--host=$CHOST \
 		--target=$CTARGET \
 		--prefix= \
+		--exec-prefix=/libexec/binutils \
 		--sbindir=/bin \
 		--disable-werror \
 		--enable-shared \
--- a/dev/clang/clang.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/dev/clang/clang.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -60,6 +60,7 @@
 		mv tools/clang-tools-extra-$PKGVERSION.src tools/extra
 	fi
 
+	patch -p0 < ../patch-musl.patch
 	mkdir build && cd build
 	cmake .. -Wno-dev \
 		-DCMAKE_BUILD_TYPE=Release \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/clang/patch-musl.patch	Fri Aug 09 20:10:00 2019 +0200
@@ -0,0 +1,29 @@
+--- lib/Driver/ToolChains/Linux.cpp.orig	2019-08-08 15:11:01.916922289 +0200
++++ lib/Driver/ToolChains/Linux.cpp	2019-08-08 15:12:53.132925706 +0200
+@@ -659,11 +659,11 @@
+   if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
+     addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/local/include");
+ 
+-  if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
+-    SmallString<128> P(D.ResourceDir);
+-    llvm::sys::path::append(P, "include");
+-    addSystemInclude(DriverArgs, CC1Args, P);
+-  }
++  SmallString<128> ResourceDirInclude(D.ResourceDir);
++  llvm::sys::path::append(ResourceDirInclude, "include");
++  if (!DriverArgs.hasArg(options::OPT_nobuiltininc) &&
++      (!getTriple().isMusl() || DriverArgs.hasArg(options::OPT_nostdlibinc)))
++    addSystemInclude(DriverArgs, CC1Args, ResourceDirInclude);
+ 
+   if (DriverArgs.hasArg(options::OPT_nostdlibinc))
+     return;
+@@ -861,6 +861,9 @@
+   addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/include");
+ 
+   addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include");
++
++  if (!DriverArgs.hasArg(options::OPT_nobuiltininc) && getTriple().isMusl())
++    addSystemInclude(DriverArgs, CC1Args, ResourceDirInclude);
+ }
+ 
+ static std::string DetectLibcxxIncludePath(StringRef base) {
--- a/dev/cmake/cmake.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/dev/cmake/cmake.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -52,6 +52,7 @@
 	tar xvf $PKGNAME-$PKGVERSION.tar.gz
 	cd $PKGNAME-$PKGVERSION
 
+	patch -p0 < ../patch-fhs.patch
 	./configure \
 		CC="$CC" \
 		CFLAGS="$CFLAGS" \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/cmake/patch-fhs.patch	Fri Aug 09 20:10:00 2019 +0200
@@ -0,0 +1,60 @@
+--- Modules/Platform/UnixPaths.cmake.orig	2019-08-09 10:02:27.447007587 +0200
++++ Modules/Platform/UnixPaths.cmake	2019-08-09 10:04:02.843010517 +0200
+@@ -23,7 +23,7 @@
+ # search types.
+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+   # Standard
+-  /usr/local /usr /
++  /local /
+ 
+   # CMake install location
+   "${_CMAKE_INSTALL_DIR}"
+@@ -41,39 +41,32 @@
+   endif()
+ endif()
+ 
+-# Non "standard" but common install prefixes
+-list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+-  /usr/X11R6
+-  /usr/pkg
+-  /opt
+-  )
+-
+ # List common include file locations not under the common prefixes.
+ list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+   # X11
+-  /usr/include/X11
++  /include/X11
+   )
+ 
+ list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+   # X11
+-  /usr/lib/X11
++  /lib/X11
+   )
+ 
+ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+-  /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
++  /lib
+   )
+ 
+ list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
+-  /usr/include
++  /include
+   )
+ list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
+-  /usr/include
++  /include
+   )
+ list(APPEND CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES
+-  /usr/include
++  /include
+   )
+ 
+ # Enable use of lib32 and lib64 search path variants by default.
+-set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS TRUE)
+-set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)
+-set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIBX32_PATHS TRUE)
++set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS FALSE)
++set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
++set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIBX32_PATHS FALSE)
--- a/dev/gobject-introspection/gobject-introspection.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/dev/gobject-introspection/gobject-introspection.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -38,15 +38,14 @@
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
-	meson \
+	meson . build \
 		--prefix / \
 		--buildtype release \
-		--default-library shared \
-		. build
+		--default-library shared
 	CC="$CC" ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
+	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
-
--- a/fonts/pango/pango.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/fonts/pango/pango.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -57,15 +57,14 @@
 	CXX="$CXX" \
 	CXXFLAGS="$CXXFLAGS" \
 	LDFLAGS="$LDFLAGS" \
-	meson \
+	meson . build \
 		--prefix / \
 		--buildtype release \
-		--default-library shared \
-		. build
+		--default-library shared
 	CC="$CC" CXX="$CXX" ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
+	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
-
--- a/graphics/gdk-pixbuf/gdk-pixbuf.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/graphics/gdk-pixbuf/gdk-pixbuf.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -82,7 +82,7 @@
 	CXX="$CXX" \
 	CXXFLAGS="$CXXFLAGS" \
 	LDFLAGS="$LDFLAGS" \
-	meson \
+	meson . build \
 		--prefix / \
 		--buildtype release \
 		--default-library shared \
@@ -93,12 +93,11 @@
 		$with_jpeg \
 		$with_png \
 		$with_tiff \
-		$with_x \
-		. build
+		$with_x
 	CC="$CC" ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
+	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
-
--- a/graphics/libepoxy/libepoxy.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/graphics/libepoxy/libepoxy.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -49,16 +49,16 @@
 	CXX="$CXX" \
 	CXXFLAGS="$CXXFLAGS" \
 	LDFLAGS="$LDFLAGS" \
-	meson \
+	meson . build \
 		--prefix / \
 		--buildtype release \
 		--default-library shared \
 		-D libdir=lib \
 		-D tests=false \
-		$with_x \
-		. build
+		$with_x
 	ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
+	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/mesa/mesa.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/graphics/mesa/mesa.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -117,10 +117,10 @@
 	CXX="$CXX" \
 	CXXFLAGS="$CXXFLAGS" \
 	LDFLAGS="$LDFLAGS" \
-	meson \
+	meson . build \
 		--prefix / \
 		--buildtype release \
-		--default-library shared \
+		--default-library shared
 		-D libdir=lib \
 		-D bpm=true \
 		-D platforms="$with_platforms" \
@@ -131,11 +131,10 @@
 		$with_egl \
 		$with_glvnd \
 		$with_glx \
-		$with_llvm \
-		. build
+		$with_llvm
 	ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
+	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
-}
--- a/lib/glib/glib.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/lib/glib/glib.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -59,19 +59,18 @@
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
-	meson \
+	meson . build \
 		--prefix / \
 		--buildtype release \
 		--default-library shared \
 		-D libdir=lib \
 		$with_mount \
 		$with_nls \
-		$with_selinux \
-		. build
+		$with_selinux
 	ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
+	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
-
--- a/lib/isl/isl.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/lib/isl/isl.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -38,6 +38,7 @@
 	tar xvf $PKGNAME-$PKGVERSION.tar.xz
 	cd $PKGNAME-$PKGVERSION
 
+	# --prefix=/.: complains if prefix is empty.
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
 	CXX="$CXX" \
@@ -53,6 +54,7 @@
 	make
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libisl.la
+	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/lib/jsoncpp/jsoncpp.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/lib/jsoncpp/jsoncpp.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -40,15 +40,15 @@
 	CXX="$CXX" \
 	CXXFLAGS="$CXXFLAGS" \
 	LDFLAGS="$LDFLAGS" \
-	meson \
+	meson . build \
 		--prefix / \
 		--buildtype release \
-		--default-library shared \
-		. build
+		--default-library shared
 	# https://github.com/open-source-parsers/jsoncpp/issues/910
 	rm -f version
 	ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
+	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/lib/libinput/libinput.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/lib/libinput/libinput.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -28,7 +28,7 @@
 : ${CFLAGS:=-O2}
 : ${LDFLAGS:=}
 : ${LIBS:=}
-: ${DOXYGEN:=yes}
+: ${DOXYGEN:=no}        # TODO: set to yes once graphics is fixed.
 : ${WACOM:=yes}
 
 if [ "$DOXYGEN" = "yes" ]; then
@@ -54,7 +54,7 @@
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
-	meson \
+	meson . build \
 		--prefix / \
 		--buildtype release \
 		--default-library shared \
@@ -62,10 +62,10 @@
 		-D tests=false \
 		-D libdir=lib \
 		$with_doxygen \
-		$with_wacom \
-		. build
+		$with_wacom
 	ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
+	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/multimedia/ffmpeg/ffmpeg.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/multimedia/ffmpeg/ffmpeg.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -309,7 +309,7 @@
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \
 	./configure \
-		--prefix=/. \
+		--prefix= \
 		--enable-shared \
 		$with_alsa \
 		$with_bluray \
@@ -338,6 +338,7 @@
 		$with_zlib
 	make
 	make install DESTDIR=$DESTDIR
+	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/multimedia/gst-plugins-bad/gst-plugins-bad.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/multimedia/gst-plugins-bad/gst-plugins-bad.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -123,11 +123,10 @@
 	CXX="$CXX" \
 	CXXFLAGS="$CXXFLAGS" \
 	LDFLAGS="$LDFLAGS" \
-	meson \
+	meson . build \
 		--prefix / \
 		--buildtype release \
 		--default-library shared \
-		. build \
 		-D tests=disabled \
 		$with_bluetooth \
 		$with_bzip2 \
@@ -141,8 +140,8 @@
 		$with_x
 	CC="$CC" ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
+	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
-
--- a/multimedia/gst-plugins-base/gst-plugins-base.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/multimedia/gst-plugins-base/gst-plugins-base.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -107,11 +107,10 @@
 	CXX="$CXX" \
 	CXXFLAGS="$CXXFLAGS" \
 	LDFLAGS="$LDFLAGS" \
-	meson \
+	meson . build \
 		--prefix / \
 		--buildtype release \
 		--default-library shared \
-		. build \
 		-D tests=disabled \
 		$with_alsa \
 		$with_cdparanoia \
@@ -123,8 +122,8 @@
 		$with_x
 	CC="$CC" ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
+	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
-
--- a/multimedia/gst-plugins-good/gst-plugins-good.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/multimedia/gst-plugins-good/gst-plugins-good.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -156,7 +156,7 @@
 	CXX="$CXX" \
 	CXXFLAGS="$CXXFLAGS" \
 	LDFLAGS="$LDFLAGS" \
-	meson \
+	meson . build \
 		--prefix / \
 		--buildtype release \
 		--default-library shared \
@@ -177,8 +177,8 @@
 		. build
 	CC="$CC" ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
+	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
-
--- a/multimedia/gstreamer/gstreamer.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/multimedia/gstreamer/gstreamer.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -53,18 +53,17 @@
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
-	meson \
+	meson . build \
 		--prefix / \
 		--buildtype release \
 		--default-library shared \
 		-D tests=disabled \
 		$with_introspection \
-		$with_nls \
-		. build
+		$with_nls
 	CC="$CC" ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
+	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
-
--- a/network/libsoup/libsoup.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/network/libsoup/libsoup.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -60,18 +60,17 @@
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
-	meson \
+	meson . build \
 		--prefix / \
 		--buildtype release \
 		--default-library shared \
 		$with_gnome \
 		$with_kerberos \
-		$with_vala \
-		. build
+		$with_vala
 	CC="$CC" ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
+	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
-
--- a/network/libssh/libssh.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/network/libssh/libssh.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -43,7 +43,7 @@
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_C_COMPILER="$CC" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX=/ \
+		-DCMAKE_INSTALL_PREFIX= \
 		-DCMAKE_INSTALL_DIR=/lib/cmake \
 		-DINCLUDE_INSTALL_DIR=/include \
 		-DLIB_INSTALL_DIR=/lib \
--- a/network/libssh2/libssh2.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/network/libssh2/libssh2.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -38,11 +38,11 @@
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_C_COMPILER="$CC" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX=/ \
-		-DCMAKE_INSTALL_INCLUDEDIR=/include \
-		-DCMAKE_INSTALL_LIBDIR=/lib \
-		-DCMAKE_INSTALL_MANDIR=/share/man \
-		-DCMAKE_INSTALL_DOCDIR=/share/doc/libssh \
+		-DCMAKE_INSTALL_PREFIX= \
+		-DCMAKE_INSTALL_INCLUDEDIR=include \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DCMAKE_INSTALL_MANDIR=share/man \
+		-DCMAKE_INSTALL_DOCDIR=share/doc/libssh \
 		-DCRYPTO_BACKEND=OpenSSL \
 		-DENABLE_ZLIB_COMPRESSION=On \
 		-DBUILD_TESTING=Off
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qt/qtbase/patch-fhs.patch	Fri Aug 09 20:10:00 2019 +0200
@@ -0,0 +1,50 @@
+--- ./mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in.orig	2019-08-09 09:56:10.122995996 +0200
++++ ./mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in	2019-08-09 09:56:42.942997004 +0200
+@@ -3,30 +3,6 @@
+     message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\")
+ endif()
+ 
+-!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
+-!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
+-!!ELSE
+-get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH)
+-# Use original install prefix when loaded through a
+-# cross-prefix symbolic link such as /lib -> /usr/lib.
+-get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH)
+-get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH)
+-if(_realCurr STREQUAL _realOrig)
+-    get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE)
+-else()
+-    get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
+-endif()
+-unset(_realOrig)
+-unset(_realCurr)
+-unset(_IMPORT_PREFIX)
+-!!ENDIF
+-!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+-get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
+-!!ELSE
+-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
+-!!ENDIF
+-
+ !!IF !equals(TEMPLATE, aux)
+ # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
+ set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)")
+--- qmake/generators/makefile.cpp.orig	2019-08-09 09:58:25.371000151 +0200
++++ qmake/generators/makefile.cpp	2019-08-09 10:00:19.407003654 +0200
+@@ -3298,10 +3298,10 @@
+     if(includeDir.isEmpty())
+         includeDir = prefix + "/include";
+ 
+-    t << "prefix=" << prefix << endl;
+-    t << "exec_prefix=${prefix}\n"
+-      << "libdir=" << pkgConfigFixPath(libDir) << "\n"
+-      << "includedir=" << pkgConfigFixPath(includeDir) << endl;
++    t << "prefix=" << endl;
++    t << "exec_prefix=\n"
++      << "libdir=/lib\n"
++      << "includedir=/include\n";
+     t << endl;
+ 
+     //extra PKGCONFIG variables
--- a/qt/qtbase/qtbase.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/qt/qtbase/qtbase.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -255,10 +255,11 @@
 	# https://github.com/void-linux/void-packages/tree/master/srcpkgs/qt5/patches
 	patch -p0 < ../patch-libressl.patch
 	patch -p0 < ../patch-musl.patch
+	pathc -p0 < ../patch-fhs.patch
 	PKG_CONFIG_PATH=/lib/pkgconfig \
 	./configure \
 		-opensource \
-		-prefix / \
+		-prefix \"\" \
 		-archdatadir /lib/qt \
 		-datadir /share/qt \
 		-docdir /share/doc/qt \
--- a/system/accountsservice/accountsservice.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/system/accountsservice/accountsservice.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -39,19 +39,18 @@
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
-	meson \
+	meson . build \
 		--prefix / \
 		--buildtype release \
 		--default-library shared \
 		-D admin_group=wheel \
 		-D systemd=false \
 		-D elogind=false \
-		-D systemdsystemunitdir=no \
-		. build
+		-D systemdsystemunitdir=no
 	CC="$CC" ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
+	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
-
--- a/text/json-glib/json-glib.sh	Thu Aug 08 17:10:50 2019 +0200
+++ b/text/json-glib/json-glib.sh	Fri Aug 09 20:10:00 2019 +0200
@@ -18,7 +18,7 @@
 PKGNAME=json-glib
 PKGVERSION=1.4.4
 PKGREVISION=1
-PKGLICENSE="??"
+PKGLICENSE="LGPLv21"
 PKGSUMMARY="JSON library based on glib"
 PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/${PKGVERSION%.*}/$PKGNAME-$PKGVERSION.tar.xz"
 PKGDEPENDS="dev/meson:build lib/glib text/libxslt"
@@ -55,6 +55,7 @@
 		$with_introspection
 	CC="$CC" ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
+	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION