Mercurial > vanilla

changeset 639:9de04ddc6f6d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vanilla: be more POSIX
author David Demelier <markand@malikania.fr>
date Thu, 25 Jul 2019 20:38:04 +0200
parents ed041b0e3c83
children 84da1d96604c
files audio/libvorbis/libvorbis.sh core/elfutils/elfutils.sh core/filesystem/filesystem.sh core/gettext/gettext.sh core/kmod/kmod.sh core/texinfo/texinfo.sh core/util-linux/util-linux.sh databases/db/db.sh dev/gcc/gcc.sh fonts/harfbuzz/harfbuzz.sh graphics/cairo/cairo.sh graphics/gtk/gtk.sh graphics/gtk2/gtk2.sh graphics/libdrm/libdrm.sh graphics/libpng/libpng.sh graphics/libtiff/libtiff.sh graphics/wayland/wayland.sh graphics/weston/weston.sh lib/gmp/gmp.sh lib/libevent/libevent.sh lib/libxkbcommon/libxkbcommon.sh lib/pcre/pcre.sh python/python2/python2.sh security/linux-pam/linux-pam.sh security/shadow/shadow.sh x11/libx11/libx11.sh x11/libxaw/libxaw.sh x11/libxcb/libxcb.sh x11/libxmu/libxmu.sh x11/libxvmc/libxvmc.sh x11/xcb-util-wm/xcb-util-wm.sh
diffstat 31 files changed, 52 insertions(+), 44 deletions(-) [+]
line wrap: on
line diff
--- a/audio/libvorbis/libvorbis.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/audio/libvorbis/libvorbis.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -49,7 +49,7 @@
 		--prefix=
 	make
 	make install DESTDIR=$DESTDIR docdir=/share/doc/$PKGNAME
-	rm -f $DESTDIR/lib/libvorbis{,file,enc}.la
+	rm -f $DESTDIR/lib/libvorbis*.la
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/core/elfutils/elfutils.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/core/elfutils/elfutils.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -55,7 +55,10 @@
 		--disable-nls
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/lib/lib{asm,dw,ebl,elf}.a
+	rm -f $DESTDIR/lib/libasm.a
+	rm -f $DESTDIR/lib/libdw.a
+	rm -f $DESTDIR/lib/libebl.a
+	rm -f $DESTDIR/lib/libelf.a
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/core/filesystem/filesystem.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/core/filesystem/filesystem.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -42,10 +42,10 @@
 
 	install -d $DESTDIR/src
 	install -d $DESTDIR/sys
+	install -d $DESTDIR/var/lib/vpk
 	install -d $DESTDIR/var/log
 	install -d $DESTDIR/var/empty
 	install -d $DESTDIR/var/spool
-	install -d $DESTDIR/var/lib/vpk
 	install -dm 1777 $DESTDIR/tmp
 	install -dm 1777 $DESTDIR/var/run
 	install -dm 1777 $DESTDIR/var/tmp
--- a/core/gettext/gettext.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/core/gettext/gettext.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -48,7 +48,9 @@
 		--enable-nls
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/lib/lib{gettextpo,gettextsrc,gettextlib,intl,asprintf}.la
+	for i in gettextpo gettextsrc gettextlib intl asprintf; do
+		rm -f $DESTDIR/lib/lib$i.la
+	done
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/core/kmod/kmod.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/core/kmod/kmod.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -75,7 +75,7 @@
 	rm -f $DESTDIR/lib/libkmod.la
 
 	# compatibility symlinks like lsmod, rmmod are installed as well.
-	for tool in {ls,ins,rm,dep}mod mod{info,probe}; do
+	for tool in lsmod insmod rmmod depmod modinfo modprove; do
 		ln -sf kmod $DESTDIR/bin/$tool
 	done
 
--- a/core/texinfo/texinfo.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/core/texinfo/texinfo.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -56,7 +56,7 @@
 		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/lib/texinfo/{Parsetexi,MiscXS,XSParagraph}.la
+	rm -f $DESTDIR/lib/texinfo/*.la
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/core/util-linux/util-linux.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/core/util-linux/util-linux.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -114,7 +114,9 @@
 		$with_selinux
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/lib/lib{fdisk,smartcols,mount,blkid,uuid}.la
+	for i in fdisk smartcols mount blkid uuid; do
+		rm -f $DESTDIR/lib/lib$i.la
+	done
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/databases/db/db.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/databases/db/db.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -43,7 +43,7 @@
 	../dist/configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/lib/libdb{_stl-5.3,_cxx-5.3,-5.3}.la
+	rm -f $DESTDIR/lib/libdb*.la
 	cd ..
 
 	cd ..
--- a/dev/gcc/gcc.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/dev/gcc/gcc.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -82,12 +82,11 @@
 		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f usr/lib/lib{atomic,cc1,itm,mpx,mpxwrappers,quadmath}.la
-	rm -f usr/lib/lib{ssp,ssp_nonshared}.la
-	rm -f usr/lib/libstdc++{,fs}.la
-	rm -f usr/lib/libsupc++.la
-	rm -f usr/lib/gcc/x86_64-linux-musl/8.3.0/plugin/libcc1plugin.la
-	rm -f usr/lib/gcc/x86_64-linux-musl/8.3.0/plugin/libcp1plugin.la
+	for l in atomic cc1 itm mpx mpxwrappers quadmath ssp ssp_nonshared stdc++ stdc++fs supc++; do
+		rm -f $DESTDIR/lib/lib$l.la
+	done
+	rm -f $DESTDIR/lib/gcc/x86_64-linux-musl/8.3.0/plugin/libcc1plugin.la
+	rm -f $DESTDIR/lib/gcc/x86_64-linux-musl/8.3.0/plugin/libcp1plugin.la
 	cd ..
 
 	cd ..
--- a/fonts/harfbuzz/harfbuzz.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/fonts/harfbuzz/harfbuzz.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -95,7 +95,7 @@
 		$with_icu
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/lib/libharfbuzz{,-gobject,-subset}.la
+	rm -f $DESTDIR/lib/libharfbuzz*.la
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/cairo/cairo.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/graphics/cairo/cairo.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -161,8 +161,7 @@
 	make
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/cairo/libcairo-trace.la
-	rm -f $DESTDIR/lib/libcairo-script-interpreter.la
-	rm -f $DESTDIR/lib/libcairo{,-gobject}.la
+	rm -f $DESTDIR/lib/libcairo*.la
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/gtk/gtk.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/graphics/gtk/gtk.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -96,7 +96,8 @@
 		$with_x
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/lib/{gtk,gdk}-3.la
+	rm -f $DESTDIR/lib/libgtk.la
+	rm -f $DESTDIR/lib/libgdk.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
 
--- a/graphics/gtk2/gtk2.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/graphics/gtk2/gtk2.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -85,7 +85,8 @@
 	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
+	rm -f $DESTDIR/lib/libgdk*.la
+	rm -f $DESTDIR/lib/libgtk*.la
 
 	cd ..
 	rm -rf gtk+-$PKGVERSION
--- a/graphics/libdrm/libdrm.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/graphics/libdrm/libdrm.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -64,7 +64,7 @@
 	make
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libkms.la
-	rm -f $DESTDIR/graphics/libdrm{,_amdgpu,_intel,_nouveau,_radeon}.la
+	rm -f $DESTDIR/graphics/libdrm*.la
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/libpng/libpng.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/graphics/libpng/libpng.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -47,7 +47,7 @@
 		--disable-static
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/lib/libpng{,16}.la
+	rm -f $DESTDIR/lib/libpng*.la
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/libtiff/libtiff.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/graphics/libtiff/libtiff.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -89,7 +89,7 @@
 		$with_zstd
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/lib/libtiff{,xx}.la
+	rm -f $DESTDIR/lib/libtiff*.la
 
 	cd ..
 	rm -rf tiff-$PKGVERSION
--- a/graphics/wayland/wayland.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/graphics/wayland/wayland.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -66,7 +66,7 @@
 		$with_doxygen
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/lib/libwayland-{egl,server,client,cursor}.la
+	rm -f $DESTDIR/lib/libwayland-*.la
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/weston/weston.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/graphics/weston/weston.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -78,7 +78,7 @@
 	make
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libweston-5/*.la
-	rm -f $DESTDIR/lib/libweston{,-desktop}-5.la
+	rm -f $DESTDIR/lib/libweston*.la
 	rm -f $DESTDIR/lib/weston/*.la
 
 	cd ..
--- a/lib/gmp/gmp.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/lib/gmp/gmp.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -49,7 +49,7 @@
 		--disable-static
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/lib/libgmp{,xx}.la
+	rm -f $DESTDIR/lib/libgmp*.la
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/lib/libevent/libevent.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/lib/libevent/libevent.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -57,7 +57,7 @@
 		$with_ssl
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/lib/libevent{_openssl,_extra,_pthreads,_core,}.la
+	rm -f $DESTDIR/lib/libevent*.la
 
 	cd ..
 	rm -rf $PKGNAME-${PKGVERSION}-stable
--- a/lib/libxkbcommon/libxkbcommon.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/lib/libxkbcommon/libxkbcommon.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -76,7 +76,7 @@
 		$with_wayland
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/lib/libxkbcommon{,-x11}.la
+	rm -f $DESTDIR/lib/libxkbcommon*.la
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/lib/pcre/pcre.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/lib/pcre/pcre.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -58,7 +58,7 @@
 		--with-pic
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/lib/libpcre{,cpp,posix}.la
+	rm -f $DESTDIR/lib/libpcre*.la
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/python/python2/python2.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/python/python2/python2.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -64,9 +64,9 @@
 
 	# Avoid conflicts with Python 3.
 	rm -f $DESTDIR/bin/2to3
-	mv $DESTDIR/bin/smtpd.py{,2.7}
-	mv $DESTDIR/bin/idle{,2.7}
-	mv $DESTDIR/bin/pydoc{,2.7}
+	mv $DESTDIR/bin/smtpd.py $DESTDIR/bin/smtpd.py2.7
+	mv $DESTDIR/bin/idle $DESTDIR/bin/idle2.7
+	mv $DESTDIR/bin/pydoc $DESTDIR/bin/pydoc2.7
 
 	cd ..
 	rm -rf Python-$PKGVERSION
--- a/security/linux-pam/linux-pam.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/security/linux-pam/linux-pam.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -94,7 +94,7 @@
 	install -Dm0600 ../system-auth $DESTDIR/etc/pam.d/system-auth
 	install -Dm0600 ../system-password $DESTDIR/etc/pam.d/system-password
 	install -Dm0600 ../system-session $DESTDIR/etc/pam.d/system-session
-	rm -f $DESTDIR/lib/libpam{,c,_misc}.la
+	rm -f $DESTDIR/lib/libpam*.la
 	rm -f $DESTDIR/lib/security/pam*.la
 
 	cd ..
--- a/security/shadow/shadow.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/security/shadow/shadow.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -76,7 +76,10 @@
 	tar xvf $PKGNAME-$PKGVERSION.tar.xz
 	cd $PKGNAME-$PKGVERSION
 
-	# disable groups, it's provided by coreutils and documentation by man-pages.
+	#
+	# disable groups, it's provided by busybox/coreutils and documentation
+	# by man-pages.
+	#
 	sed -i 's/groups$(EXEEXT) //' src/Makefile.in
 	find man -name Makefile.in -exec sed -i 's/groups\.1 / /'   {} \;
 	find man -name Makefile.in -exec sed -i 's/getspnam\.3 / /' {} \;
@@ -105,7 +108,9 @@
 	if [ "$PAM" = "yes" ]; then
 		# --disable-selinux does not update pam.d files
 		if [ "$SELINUX" = "no" ]; then
-			sed -i -e "/pam_selinux.so/d" $DESTDIR/etc/pam.d/{login,su}
+			sed -i -e "/pam_selinux.so/d"           \
+				$DESTDIR/etc/pam.d/login        \
+				$DESTDIR/etc/pam.d/su
 		fi
 
 		# pam_console.so isn't shipped with linux-pam.
--- a/x11/libx11/libx11.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/x11/libx11/libx11.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -51,7 +51,7 @@
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/lib/libX11{,-xcb}.la
+	rm -f $DESTDIR/lib/libX11*.la
 
 	cd ..
 	rm -rf libX11-$PKGVERSION
--- a/x11/libxaw/libxaw.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/x11/libxaw/libxaw.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -54,7 +54,7 @@
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/lib/libXaw{6,7}.la
+	rm -f $DESTDIR/lib/libXaw*.la
 
 	cd ..
 	rm -rf libXaw-$PKGVERSION
--- a/x11/libxcb/libxcb.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/x11/libxcb/libxcb.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -52,11 +52,7 @@
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/lib/libxcb.la
-	rm -f $DESTDIR/lib/libxcb-{composite,damage,dpms,dri2,dri3,glx}.la
-	rm -f $DESTDIR/lib/libxcb-{present,randr,record,render,res}.la
-	rm -f $DESTDIR/lib/libxcb-{screensaver,shape,shm,sync,xf86dri,xv}.la
-	rm -f $DESTDIR/lib/libxcb-{xfixes,xinerama,xinput,xkb,xtest,xvmc}.la
+	rm -f $DESTDIR/lib/libxcb*.la
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/x11/libxmu/libxmu.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/x11/libxmu/libxmu.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -52,7 +52,7 @@
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/lib/libXmu{,u}.la
+	rm -f $DESTDIR/lib/libXmu*.la
 
 	cd ..
 	rm -rf libXmu-$PKGVERSION
--- a/x11/libxvmc/libxvmc.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/x11/libxvmc/libxvmc.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -52,7 +52,7 @@
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/lib/libXvMC{,W}.la
+	rm -f $DESTDIR/lib/libXvMC*.la
 
 	cd ..
 	rm -rf libXvMC-$PKGVERSION
--- a/x11/xcb-util-wm/xcb-util-wm.sh	Sun Jul 21 20:09:09 2019 +0200
+++ b/x11/xcb-util-wm/xcb-util-wm.sh	Thu Jul 25 20:38:04 2019 +0200
@@ -48,7 +48,7 @@
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/lib/libxcb-{ewmh,icccm}.la
+	rm -f $DESTDIR/lib/libxcb-*.la
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION