Mercurial > vanilla

changeset 523:b1690d766bdb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graphics: use new FHS
author David Demelier <markand@malikania.fr>
date Tue, 09 Apr 2019 20:04:48 +0200
parents 574e733aebf8
children b27125e29f82
files graphics/cairo/cairo.sh graphics/gdk-pixbuf/gdk-pixbuf-post.sh graphics/gdk-pixbuf/gdk-pixbuf.sh graphics/graphviz/graphviz.sh graphics/gtk/gtk.sh graphics/gtk2/gtk2.sh graphics/libepoxy/libepoxy.sh graphics/libgd/libgd.sh graphics/libjpeg-turbo/libjpeg-turbo.sh graphics/libpng/libpng.sh graphics/librsvg/librsvg-post.sh graphics/librsvg/librsvg.sh graphics/libtiff/libtiff.sh graphics/mesa/mesa.sh graphics/pixman/pixman.sh graphics/wayland-protocols/wayland-protocols.sh graphics/wayland/wayland.sh graphics/weston/weston.sh
diffstat 18 files changed, 53 insertions(+), 53 deletions(-) [+]
line wrap: on
line diff
--- a/graphics/cairo/cairo.sh	Tue Apr 09 19:50:31 2019 +0200
+++ b/graphics/cairo/cairo.sh	Tue Apr 09 20:04:48 2019 +0200
@@ -143,7 +143,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--disable-valgrind \
 		--enable-shared \
@@ -160,9 +160,9 @@
 		$with_x
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/cairo/libcairo-trace.la
-	rm -f $DESTDIR/usr/lib/libcairo-script-interpreter.la
-	rm -f $DESTDIR/usr/lib/libcairo{,-gobject}.la
+	rm -f $DESTDIR/lib/cairo/libcairo-trace.la
+	rm -f $DESTDIR/lib/libcairo-script-interpreter.la
+	rm -f $DESTDIR/lib/libcairo{,-gobject}.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/gdk-pixbuf/gdk-pixbuf-post.sh	Tue Apr 09 19:50:31 2019 +0200
+++ b/graphics/gdk-pixbuf/gdk-pixbuf-post.sh	Tue Apr 09 20:04:48 2019 +0200
@@ -16,7 +16,7 @@
 #
 
 if [ "$1" = "install" ]; then
-	chroot $DESTDIR /usr/bin/gdk-pixbuf-query-loaders --update-cache
+	chroot $DESTDIR /bin/gdk-pixbuf-query-loaders --update-cache
 elif [ "$1" = "uninstall" ]; then
-	rm -f $DESTDIR/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
+	rm -f $DESTDIR/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
 fi
--- a/graphics/gdk-pixbuf/gdk-pixbuf.sh	Tue Apr 09 19:50:31 2019 +0200
+++ b/graphics/gdk-pixbuf/gdk-pixbuf.sh	Tue Apr 09 20:04:48 2019 +0200
@@ -83,7 +83,7 @@
 	CXXFLAGS="$CXXFLAGS" \
 	LDFLAGS="$LDFLAGS" \
 	meson \
-		--prefix /usr \
+		--prefix / \
 		--buildtype release \
 		--default-library shared \
 		-D docs=false \
--- a/graphics/graphviz/graphviz.sh	Tue Apr 09 19:50:31 2019 +0200
+++ b/graphics/graphviz/graphviz.sh	Tue Apr 09 20:04:48 2019 +0200
@@ -117,7 +117,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-ltdl-install \
 		--without-included-ltdl \
 		--without-qt \
@@ -153,15 +153,15 @@
 		$with_xml
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/graphviz/*.la
-	rm -f $DESTDIR/usr/lib/graphviz/perl/*.la
-	rm -f $DESTDIR/usr/lib/libcdt.la
-	rm -f $DESTDIR/usr/lib/libcgraph.la
-	rm -f $DESTDIR/usr/lib/libgvc.la
-	rm -f $DESTDIR/usr/lib/libgvpr.la
-	rm -f $DESTDIR/usr/lib/liblab_gamut.la
-	rm -f $DESTDIR/usr/lib/libpathplan.la
-	rm -f $DESTDIR/usr/lib/libxdot.la
+	rm -f $DESTDIR/lib/graphviz/*.la
+	rm -f $DESTDIR/lib/graphviz/perl/*.la
+	rm -f $DESTDIR/lib/libcdt.la
+	rm -f $DESTDIR/lib/libcgraph.la
+	rm -f $DESTDIR/lib/libgvc.la
+	rm -f $DESTDIR/lib/libgvpr.la
+	rm -f $DESTDIR/lib/liblab_gamut.la
+	rm -f $DESTDIR/lib/libpathplan.la
+	rm -f $DESTDIR/lib/libxdot.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/gtk/gtk.sh	Tue Apr 09 19:50:31 2019 +0200
+++ b/graphics/gtk/gtk.sh	Tue Apr 09 20:04:48 2019 +0200
@@ -90,15 +90,15 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		$with_nls \
 		$with_wayland \
 		$with_x
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/{gtk,gdk}-3.la
-	rm -f $DESTDIR/usr/lib/gtk-3.0/3.0.0/immodules/*.la
-	rm -f $DESTDIR/usr/lib/gtk-3.0/3.0.0/printbackends/*.la
+	rm -f $DESTDIR/lib/{gtk,gdk}-3.la
+	rm -f $DESTDIR/lib/gtk-3.0/3.0.0/immodules/*.la
+	rm -f $DESTDIR/lib/gtk-3.0/3.0.0/printbackends/*.la
 
 	popd
 	rm -rf gtk+-$PKGVERSION
--- a/graphics/gtk2/gtk2.sh	Tue Apr 09 19:50:31 2019 +0200
+++ b/graphics/gtk2/gtk2.sh	Tue Apr 09 20:04:48 2019 +0200
@@ -73,18 +73,18 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		$with_cups \
 		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/bin/gtk-update-icon-cache
-	rm -f $DESTDIR/usr/lib/gtk-2.0/2.10.0/engines/*.la
-	rm -f $DESTDIR/usr/lib/gtk-2.0/2.10.0/immodules/*.la
-	rm -f $DESTDIR/usr/lib/gtk-2.0/2.10.0/printbackends/*.la
-	rm -f $DESTDIR/usr/lib/gtk-2.0/modules/*.la
-	rm -f $DESTDIR/usr/lib/libgailutil.la
-	rm -f $DESTDIR/usr/lib/lib{gdk,gtk}-x11-2.0.la
+	rm -f $DESTDIR/bin/gtk-update-icon-cache
+	rm -f $DESTDIR/lib/gtk-2.0/2.10.0/engines/*.la
+	rm -f $DESTDIR/lib/gtk-2.0/2.10.0/immodules/*.la
+	rm -f $DESTDIR/lib/gtk-2.0/2.10.0/printbackends/*.la
+	rm -f $DESTDIR/lib/gtk-2.0/modules/*.la
+	rm -f $DESTDIR/lib/libgailutil.la
+	rm -f $DESTDIR/lib/lib{gdk,gtk}-x11-2.0.la
 
 	popd
 	rm -rf gtk+-$PKGVERSION
--- a/graphics/libepoxy/libepoxy.sh	Tue Apr 09 19:50:31 2019 +0200
+++ b/graphics/libepoxy/libepoxy.sh	Tue Apr 09 20:04:48 2019 +0200
@@ -50,7 +50,7 @@
 	CXXFLAGS="$CXXFLAGS" \
 	LDFLAGS="$LDFLAGS" \
 	meson \
-		--prefix /usr \
+		--prefix / \
 		--buildtype release \
 		--default-library shared \
 		$with_x \
--- a/graphics/libgd/libgd.sh	Tue Apr 09 19:50:31 2019 +0200
+++ b/graphics/libgd/libgd.sh	Tue Apr 09 20:04:48 2019 +0200
@@ -115,7 +115,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared \
 		$with_fontconfig \
@@ -129,7 +129,7 @@
 		$with_zlib
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libgd.la
+	rm -f $DESTDIR/lib/libgd.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/libjpeg-turbo/libjpeg-turbo.sh	Tue Apr 09 19:50:31 2019 +0200
+++ b/graphics/libjpeg-turbo/libjpeg-turbo.sh	Tue Apr 09 20:04:48 2019 +0200
@@ -38,8 +38,8 @@
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_C_COMPILER="$CC" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
+		-DCMAKE_INSTALL_PREFIX=/ \
+		-DCMAKE_INSTALL_LIBDIR=/lib \
 		-DENABLE_STATIC=Off
 	make
 	make install DESTDIR=$DESTDIR
--- a/graphics/libpng/libpng.sh	Tue Apr 09 19:50:31 2019 +0200
+++ b/graphics/libpng/libpng.sh	Tue Apr 09 20:04:48 2019 +0200
@@ -42,12 +42,12 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--enable-shared \
 		--disable-static
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libpng{,16}.la
+	rm -f $DESTDIR/lib/libpng{,16}.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/librsvg/librsvg-post.sh	Tue Apr 09 19:50:31 2019 +0200
+++ b/graphics/librsvg/librsvg-post.sh	Tue Apr 09 20:04:48 2019 +0200
@@ -15,4 +15,4 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-chroot $DESTDIR /usr/bin/gdk-pixbuf-query-loaders --update-cache
+chroot $DESTDIR /bin/gdk-pixbuf-query-loaders --update-cache
--- a/graphics/librsvg/librsvg.sh	Tue Apr 09 19:50:31 2019 +0200
+++ b/graphics/librsvg/librsvg.sh	Tue Apr 09 20:04:48 2019 +0200
@@ -58,14 +58,14 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		--enable-shared \
 		$with_vala
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.la
-	rm -f $DESTDIR/usr/lib/librsvg-2.la
+	rm -f $DESTDIR/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.la
+	rm -f $DESTDIR/lib/librsvg-2.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/libtiff/libtiff.sh	Tue Apr 09 19:50:31 2019 +0200
+++ b/graphics/libtiff/libtiff.sh	Tue Apr 09 20:04:48 2019 +0200
@@ -79,8 +79,8 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--with-docdir=/usr/share/doc/libtiff \
+		--prefix=/ \
+		--with-docdir=/share/doc/libtiff \
 		--disable-static \
 		--enable-shared \
 		$with_jpeg \
@@ -89,7 +89,7 @@
 		$with_zstd
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libtiff{,xx}.la
+	rm -f $DESTDIR/lib/libtiff{,xx}.la
 
 	popd
 	rm -rf tiff-$PKGVERSION
--- a/graphics/mesa/mesa.sh	Tue Apr 09 19:50:31 2019 +0200
+++ b/graphics/mesa/mesa.sh	Tue Apr 09 20:04:48 2019 +0200
@@ -79,7 +79,7 @@
 	CXXFLAGS="$CXXFLAGS" \
 	LDFLAGS="$LDFLAGS" \
 	meson \
-		--prefix /usr \
+		--prefix / \
 		--buildtype release \
 		--default-library shared \
 		-D egl=true \
--- a/graphics/pixman/pixman.sh	Tue Apr 09 19:50:31 2019 +0200
+++ b/graphics/pixman/pixman.sh	Tue Apr 09 20:04:48 2019 +0200
@@ -59,7 +59,7 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-gnuplot \
 		--disable-gtk \
 		--disable-static \
@@ -68,7 +68,7 @@
 		$with_png
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libpixman-1.la
+	rm -f $DESTDIR/lib/libpixman-1.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/wayland-protocols/wayland-protocols.sh	Tue Apr 09 19:50:31 2019 +0200
+++ b/graphics/wayland-protocols/wayland-protocols.sh	Tue Apr 09 20:04:48 2019 +0200
@@ -28,7 +28,7 @@
 	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
 	pushd $PKGNAME-$PKGVERSION
 
-	./configure --prefix=/usr
+	./configure --prefix=/
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/graphics/wayland/wayland.sh	Tue Apr 09 19:50:31 2019 +0200
+++ b/graphics/wayland/wayland.sh	Tue Apr 09 20:04:48 2019 +0200
@@ -60,13 +60,13 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--disable-static \
 		$with_dtd \
 		$with_doxygen
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libwayland-{egl,server,client,cursor}.la
+	rm -f $DESTDIR/lib/libwayland-{egl,server,client,cursor}.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/weston/weston.sh	Tue Apr 09 19:50:31 2019 +0200
+++ b/graphics/weston/weston.sh	Tue Apr 09 20:04:48 2019 +0200
@@ -71,15 +71,15 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		$with_dbus \
 		$with_pam \
 		$with_x
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/usr/lib/libweston-5/*.la
-	rm -f $DESTDIR/usr/lib/libweston{,-desktop}-5.la
-	rm -f $DESTDIR/usr/lib/weston/*.la
+	rm -f $DESTDIR/lib/libweston-5/*.la
+	rm -f $DESTDIR/lib/libweston{,-desktop}-5.la
+	rm -f $DESTDIR/lib/weston/*.la
 
 	popd
 	rm -rf $PKGNAME-$PKGVERSION