wok diff pekwm/receipt @ rev 25551

nfs-utils: make nfsd work on first start too
author Hans-G?nter Theisgen
date Thu Apr 06 10:52:37 2023 +0100 (19 months ago)
parents 35b57cb1532a
children 0262035dc1e7
line diff
     1.1 --- a/pekwm/receipt	Tue Jun 08 21:38:41 2021 +0000
     1.2 +++ b/pekwm/receipt	Thu Apr 06 10:52:37 2023 +0100
     1.3 @@ -1,20 +1,20 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="pekwm"
     1.7 -VERSION="0.1.17"
     1.8 +VERSION="0.2.1"
     1.9  CATEGORY="x-window"
    1.10  TAGS="window-manager"
    1.11  SHORT_DESC="Very light, configurable and themable window manager for X."
    1.12  MAINTAINER="jozee@slitaz.org"
    1.13  LICENSE="GPL2"
    1.14 -WEB_SITE="https://www.pekwm.org/"
    1.15 +WEB_SITE="https://www.pekwm.se/"
    1.16  
    1.17  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.18  WGET_URL="https://github.com/pekdon/$PACKAGE/archive/release-$VERSION.tar.gz"
    1.19  
    1.20 -SUGGESTED="hsetroot tint2 lxpanel wbar xorg-xprop xorg-xev xdotool wmctrl"
    1.21 -DEPENDS="xorg-libX11 xorg-libXinerama xorg-libXft xorg-libXrandr xorg-libXpm"
    1.22 -BUILD_DEPENDS="libtool xorg-dev xorg-dev-proto zlib-dev automake"
    1.23 +SUGGESTED="hsetroot lxpanel tint2 wbar wmctrl xdotool xorg-xev xorg-xprop"
    1.24 +DEPENDS="xorg-libX11 xorg-libXft xorg-libXinerama xorg-libXpm xorg-libXrandr"
    1.25 +BUILD_DEPENDS="cmake xorg-dev xorg-dev-proto zlib-dev"
    1.26  
    1.27  current_version()
    1.28  {
    1.29 @@ -25,35 +25,32 @@
    1.30  # Rules to configure and make the package.
    1.31  compile_rules()
    1.32  {
    1.33 -	./autogen.sh &&
    1.34 -	./configure			\
    1.35 -		--prefix=/usr		\
    1.36 -		--sysconfdir=/etc	\
    1.37 -		$CONFIGURE_ARGS &&
    1.38 +	mkdir	_build
    1.39 +	cd	_build
    1.40 +	cmake	..				\
    1.41 +		-D CMAKE_INSTALL_PREFIX=/usr &&
    1.42  	make &&
    1.43 -	make DESTDIR=$DESTDIR install
    1.44 +	make install DESTDIR=$DESTDIR
    1.45  }
    1.46  
    1.47  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.48  genpkg_rules()
    1.49  {
    1.50 -	mkdir -p $fs/usr/bin
    1.51 -	mkdir -p $fs/usr/share/pekwm
    1.52 -	mkdir -p $fs/etc
    1.53 +	mkdir -p $fs/usr/share
    1.54  
    1.55 +	cp -a $install/etc		$fs
    1.56  	cp -a $install/usr/bin		$fs/usr
    1.57  	cp -a $install/usr/share/pekwm	$fs/usr/share
    1.58 -	cp -a $install/etc		$fs
    1.59  
    1.60  	# Custom configuration files and scripts
    1.61  	cp -a $stuff/etc		$fs
    1.62  	cp -a $stuff/scripts		$fs/usr/share/pekwm
    1.63  
    1.64  	# Set permissions
    1.65 -	chown -R root.root $fs
    1.66 -	chmod +x $fs/etc/pekwm/start
    1.67 -	chmod +x $fs/usr/share/pekwm/scripts/*
    1.68 -	chmod 0755 $fs/usr/bin/pekwm
    1.69 +	chown -R root.root		$fs
    1.70 +	chmod +x			$fs/etc/pekwm/start
    1.71 +	chmod +x			$fs/usr/share/pekwm/scripts/*
    1.72 +	chmod 0755			$fs/usr/bin/pekwm
    1.73  }
    1.74  
    1.75  post_install()
    1.76 @@ -61,26 +58,30 @@
    1.77  	# Pekwm searches for default font path (100dpi folder) for xserver to render 
    1.78  	# menus; either manually set it in .xinitrc or fake 100dpi folder fonts 
    1.79  	# by linking to ttf-dejavu
    1.80 -	if [ ! -d "$1/usr/share/fonts/X11/100dpi/" ]; then
    1.81 +	if [ ! -d "$1/usr/share/fonts/X11/100dpi/" ]
    1.82 +	  then
    1.83  		mkdir -p "$1/usr/share/fonts/X11/100dpi"
    1.84  		cd "$1/usr/share/fonts/X11/100dpi"
    1.85  		ln -s ../../truetype/ttf-dejavu/* .
    1.86  	fi
    1.87 -	
    1.88 +
    1.89  	res=$(cat "$1/etc/slim.conf" | grep ^session | sed s/"sessions. *"//)
    1.90 -	# Adding WM to SLIM available sessions.
    1.91 -	if ! echo "$res" | grep -q $PACKAGE; then
    1.92 +	# Adding window manager to SLIM available sessions.
    1.93 +	if ! echo "$res" | grep -q $PACKAGE
    1.94 +	  then
    1.95  		echo
    1.96  		echo -n "Adding $PACKAGE to /etc/slim.conf..."
    1.97 -		sed -i "s/^sessions.*/sessions            ${res},$PACKAGE/" "$1/etc/slim.conf"
    1.98 +		sed -i	"s/^sessions.*/sessions            ${res},$PACKAGE/" \
    1.99 +			"$1/etc/slim.conf"
   1.100  		status
   1.101  	fi
   1.102  }
   1.103  
   1.104  post_remove()
   1.105  {
   1.106 -	# Remove WM from SLIM available sessions.
   1.107 -	if grep -q $PACKAGE "$1/etc/slim.conf"; then
   1.108 +	# Remove window manager from SLIM available sessions.
   1.109 +	if grep -q $PACKAGE "$1/etc/slim.conf"
   1.110 +	  then
   1.111  		sed -i s/,$PACKAGE// "$1/etc/slim.conf"
   1.112  	fi
   1.113  }