wok-next rev 20292

Up warzone2100; add pulse; tiny edits for fresh *-pam changes
author Aleksej Bobylev <al.bobylev@gmail.com>
date Wed Nov 08 19:39:57 2017 +0200 (2017-11-08)
parents 4c0950b913fd
children 55b6644290f8
files cups/receipt cyrus-sasl/receipt enlightenment/receipt libcap/receipt netatalk/receipt openssh/receipt partimage/receipt perdition/receipt polkit/receipt ppp/receipt pulse/receipt pulse/stuff/pulse.desktop pulse/stuff/pulse.png pure-ftpd/receipt screen/receipt slim/receipt warzone2100/receipt warzone2100/stuff/patches/fix-icon-path.patch warzone2100/stuff/patches/series
line diff
     1.1 --- a/cups/receipt	Wed Nov 08 18:13:10 2017 +0100
     1.2 +++ b/cups/receipt	Wed Nov 08 19:39:57 2017 +0200
     1.3 @@ -20,14 +20,14 @@
     1.4  {
     1.5  	# gid 19 suggested by the BLFS is in use in SliTaz (by cdrom group),
     1.6  	# using 23 instead
     1.7 -	addgroup -g 23 lpadmin &&
     1.8 +	addgroup -g 23 lpadmin
     1.9  
    1.10 -	sed -i 's:555:755:g;s:444:644:g' Makedefs.in &&
    1.11 -	sed -i '/MAN.EXT/s:.gz::g' configure config-scripts/cups-manpages.m4 &&
    1.12 -	sed -i '/LIBGCRYPTCONFIG/d' config-scripts/cups-ssl.m4 &&
    1.13 +	sed -i 's:555:755:g;s:444:644:g' Makedefs.in
    1.14 +	sed -i '/MAN.EXT/s:.gz::g' configure config-scripts/cups-manpages.m4
    1.15 +	sed -i '/LIBGCRYPTCONFIG/d' config-scripts/cups-ssl.m4
    1.16  
    1.17 -	aclocal  -I config-scripts &&
    1.18 -	autoconf -I config-scripts &&
    1.19 +	aclocal  -I config-scripts
    1.20 +	autoconf -I config-scripts
    1.21  
    1.22  	cp -a $src $src-pam
    1.23  
    1.24 @@ -43,9 +43,9 @@
    1.25  		--with-docdir=/usr/share/doc/cups-$VERSION \
    1.26  		$CONFIGURE_ARGS &&
    1.27  	make &&
    1.28 -	make BUILDROOT=$install install &&
    1.29 +	make BUILDROOT=$install install || return 1
    1.30  
    1.31 -	cd $src-pam &&
    1.32 +	cd $src-pam
    1.33  	CC=gcc \
    1.34  	./configure \
    1.35  		--sysconfdir=/etc \
    1.36 @@ -58,7 +58,7 @@
    1.37  		--with-docdir=/usr/share/doc/cups-$VERSION \
    1.38  		$CONFIGURE_ARGS &&
    1.39  	make &&
    1.40 -	make BUILDROOT=$install-pam install &&
    1.41 +	make BUILDROOT=$install-pam install || return 1
    1.42  
    1.43  	for inst in $install $install-pam ; do
    1.44  		rm -rf $inst/tmp &&
    1.45 @@ -109,16 +109,16 @@
    1.46  			DEPENDS="libgnutls zlib"
    1.47  			;;
    1.48  		cups)
    1.49 -			copy @std var/ # copy empty dirs in var/
    1.50 -			remove_already_packed
    1.51 +			copy @std @rm
    1.52  			DEPENDS="acl dbus libcups libgnutls libusb zlib"
    1.53  			CONFIG_FILES="/etc/cups/"
    1.54  			TAGS="printer printing"
    1.55  			;;
    1.56  		cups-pam)
    1.57  			install=$install-pam \
    1.58 -			copy @std var/ # copy empty dirs in var/
    1.59 +			copy @std
    1.60  			rm -f $fs/usr/lib/libcups.so*
    1.61 +			CAT="system-tools|with PAM support"
    1.62  			DEPENDS="acl dbus libcups libgnutls libusb zlib pam"
    1.63  			PROVIDE="cups:pam"
    1.64  			CONFIG_FILES="/etc/cups/"
     2.1 --- a/cyrus-sasl/receipt	Wed Nov 08 18:13:10 2017 +0100
     2.2 +++ b/cyrus-sasl/receipt	Wed Nov 08 19:39:57 2017 +0200
     2.3 @@ -18,7 +18,7 @@
     2.4  # Rules to configure and make the package.
     2.5  compile_rules()
     2.6  {
     2.7 -	autoreconf -fi &&
     2.8 +	autoreconf -fi || return 1
     2.9  
    2.10  	mkdir -p $src/saslauthd/cmulocal
    2.11  	cp -a $src $src-pam
    2.12 @@ -34,7 +34,7 @@
    2.13  		--with-ldap \
    2.14  		--with-openssl \
    2.15  		$CONFIGURE_ARGS &&
    2.16 -	make && make install &&
    2.17 +	make && make install || return 1
    2.18  
    2.19  	cd $src-pam
    2.20  	./configure \
    2.21 @@ -47,7 +47,7 @@
    2.22  		--with-ldap \
    2.23  		--with-openssl \
    2.24  		$CONFIGURE_ARGS &&
    2.25 -	make && make DESTDIR=$DESTDIR-pam install &&
    2.26 +	make && make DESTDIR=$DESTDIR-pam install || return 1
    2.27  
    2.28  	for inst in $install $install-pam; do
    2.29  		docdir="$inst/usr/share/doc/cyrus-sasl-$VERSION"
     3.1 --- a/enlightenment/receipt	Wed Nov 08 18:13:10 2017 +0100
     3.2 +++ b/enlightenment/receipt	Wed Nov 08 19:39:57 2017 +0200
     3.3 @@ -35,7 +35,7 @@
     3.4  		--disable-doc \
     3.5  		--build=${ARCH}-slitaz-gnulinux \
     3.6  		$CONFIGURE_ARGS &&
     3.7 -	make $MAKEFLAGS && make install
     3.8 +	make $MAKEFLAGS && make install || return 1
     3.9  
    3.10  	cd $src-pam
    3.11  	./configure \
    3.12 @@ -54,11 +54,13 @@
    3.13  	enlightenment|enlightenment-pam)
    3.14  		DEPENDS="eet evas ecore eeze emotion efreet edbus edje \
    3.15  			elementary alsa-lib xcb-util-keysyms"
    3.16 -		[ $PACKAGE == enlightenment-pam ] &&
    3.17 -			DEPENDS="$DEPENDS pam" && install=$install-pam &&
    3.18 -			CAT="x-window|with PAM, Bluez and connman support" &&
    3.19 -			SUGGESTED="bluez wpa_supplicant connman pm-utils" &&
    3.20 +		if [ $PACKAGE == 'enlightenment-pam' ]; then
    3.21 +			DEPENDS="$DEPENDS pam"
    3.22 +			install=$install-pam
    3.23 +			CAT="x-window|with PAM, Bluez and connman support"
    3.24 +			SUGGESTED="bluez wpa_supplicant connman pm-utils"
    3.25  			PROVIDE="enlightenment:pam"
    3.26 +		fi
    3.27  		mkdir -p $fs/usr/share/locale
    3.28  		# Use a modified sysactions.conf
    3.29  		cp -a $stuff/etc $fs
    3.30 @@ -82,7 +84,6 @@
    3.31  		;;
    3.32  	enlightenment-backgrounds)
    3.33  		CAT="x-window|additional backgrounds"
    3.34 -		DEPENDS=""
    3.35  		mkdir -p $fs/usr/share/enlightenment/data/backgrounds
    3.36  		cp -a $install/usr/share/enlightenment/data/backgrounds/* \
    3.37  			$fs/usr/share/enlightenment/data/backgrounds
     4.1 --- a/libcap/receipt	Wed Nov 08 18:13:10 2017 +0100
     4.2 +++ b/libcap/receipt	Wed Nov 08 19:39:57 2017 +0200
     4.3 @@ -27,7 +27,7 @@
     4.4  	sed -i '/install.*STALIBNAME/d' libcap/Makefile
     4.5  
     4.6  	make $ARCH_ARGS &&
     4.7 -	make RAISE_SETFCAP=no prefix=/usr install
     4.8 +	make RAISE_SETFCAP=no prefix=/usr install || return 1
     4.9  
    4.10  	chmod 755 $install/usr/lib/libcap.so
    4.11  	mkdir $install/lib
    4.12 @@ -45,7 +45,7 @@
    4.13  			DEPENDS="attr"
    4.14  			;;
    4.15  		libcap-pam)
    4.16 -			CAT="system-tools|pam module"
    4.17 +			CAT="system-tools|PAM module"
    4.18  			PROVIDE="libcap:pam"
    4.19  			DEPENDS="libcap pam"
    4.20  			copy pam_cap.so
     5.1 --- a/netatalk/receipt	Wed Nov 08 18:13:10 2017 +0100
     5.2 +++ b/netatalk/receipt	Wed Nov 08 19:39:57 2017 +0200
     5.3 @@ -22,7 +22,7 @@
     5.4  		--libexecdir=/usr/lib/netatalk \
     5.5  		--mandir=/usr/share/man $CONFIGURE_ARGS &&
     5.6  	make &&
     5.7 -	make DESTDIR=$DESTDIR install
     5.8 +	make DESTDIR=$DESTDIR install || return 1
     5.9  
    5.10  	cd $src-pam
    5.11  	./configure --with-pam --prefix=/usr --sysconfdir=/etc \
    5.12 @@ -37,16 +37,19 @@
    5.13  {
    5.14  	DEPENDS="perl libdb libcrypto cups gnutls libgcrypt libgpg-error  \
    5.15  		libwrap zlib libcomerr3"
    5.16 -	[ $PACKAGE == netatalk-pam ] && DEPENDS="$DEPENDS pam" &&
    5.17 -		PROVIDE="netatalk:pam" && CAT="system-tools|using PAM" &&
    5.18 +	if [ $PACKAGE == 'netatalk-pam' ]; then
    5.19 +		DEPENDS="$DEPENDS pam"
    5.20 +		PROVIDE="netatalk:pam"
    5.21 +		CAT="system-tools|using PAM"
    5.22  		install=$install-pam
    5.23 +	fi
    5.24  	mkdir -p $fs/usr/share $fs/usr/lib
    5.25  	cp -a $install/usr/bin $fs/usr
    5.26  	cp -a $install/usr/sbin $fs/usr
    5.27  	#cp -a $install/usr/lib/netatalk $fs/usr/lib
    5.28  	cp -a $install/etc $fs
    5.29  	cp -a $stuff/etc $fs
    5.30 -	[ $PACKAGE == netatalk-pam ] || rm -rf $fs/etc/pam.d
    5.31 +	[ $PACKAGE == 'netatalk-pam' ] || rm -rf $fs/etc/pam.d
    5.32  	rm -f $fs/etc/netatalk/uams/*a
    5.33  }
    5.34  
     6.1 --- a/openssh/receipt	Wed Nov 08 18:13:10 2017 +0100
     6.2 +++ b/openssh/receipt	Wed Nov 08 19:39:57 2017 +0200
     6.3 @@ -97,6 +97,7 @@
     6.4  		openssh-pam)
     6.5  			install=$install-pam copy @std sshd/
     6.6  			sed -i 's/.*UsePAM.*/UsePAM yes/' $fs/etc/ssh/sshd_config
     6.7 +			CAT="security|with PAM support"
     6.8  			DEPENDS="sftp-server libcrypto zlib pam"
     6.9  			CONFIG_FILES="/etc/ssh/moduli /etc/ssh/ssh_config /etc/ssh/sshd_config \
    6.10  			/etc/inetd.conf"
     7.1 --- a/partimage/receipt	Wed Nov 08 18:13:10 2017 +0100
     7.2 +++ b/partimage/receipt	Wed Nov 08 19:39:57 2017 +0200
     7.3 @@ -18,7 +18,9 @@
     7.4  {
     7.5  	sed -i 's/gzFile \*m_gzImageFile/gzFile m_gzImageFile/' src/client/imagefile.h
     7.6  	sed -i 's/(gzFile \*) gzdopen/gzdopen/' src/client/imagefile.cpp
     7.7 +
     7.8  	cp -a $src $src-pam
     7.9 +
    7.10  	./configure \
    7.11  		--prefix=/usr \
    7.12  		--disable-pam \
    7.13 @@ -26,7 +28,7 @@
    7.14  		--infodir=/usr/share/info \
    7.15  		--mandir=/usr/share/man $CONFIGURE_ARGS &&
    7.16  	make &&
    7.17 -	make DESTDIR=$DESTDIR install
    7.18 +	make DESTDIR=$DESTDIR install || return 1
    7.19  
    7.20  	cd $src-pam
    7.21  	./configure \
     8.1 --- a/perdition/receipt	Wed Nov 08 18:13:10 2017 +0100
     8.2 +++ b/perdition/receipt	Wed Nov 08 19:39:57 2017 +0200
     8.3 @@ -27,7 +27,7 @@
     8.4  		--sysconfdir=/etc --localstatedir=/var \
     8.5  		--mandir=/usr/share/man $CONFIGURE_ARGS &&
     8.6  	make &&
     8.7 -	make DESTDIR=$DESTDIR install
     8.8 +	make DESTDIR=$DESTDIR install || return 1
     8.9  
    8.10  	cd $src-pam
    8.11  	./configure --prefix=/usr --infodir=/usr/share/info \
    8.12 @@ -47,8 +47,12 @@
    8.13  	perdition|perdition-pam)
    8.14  		DEPENDS="vanessa_logger vanessa_adt vanessa_socket libldap \
    8.15  			openssl cyrus-sasl glibc-base libkrb5 libcomerr3 gdbm"
    8.16 -		[ $PACKAGE == perdition-pam ] && DEPENDS="$DEPENDS pam" &&
    8.17 -			PROVIDE="perdition:pam" && install=$install-pam
    8.18 +		if [ $PACKAGE == 'perdition-pam' ]; then
    8.19 +			CAT="network|with PAM support"
    8.20 +			DEPENDS="$DEPENDS pam"
    8.21 +			PROVIDE="perdition:pam"
    8.22 +			install=$install-pam
    8.23 +		fi
    8.24  		mkdir -p $fs/usr/lib $fs/etc/openldap/schema
    8.25  		cp -a $install/etc $fs
    8.26  		rm -f $fs/etc/perdition/perdition.conf
    8.27 @@ -61,7 +65,6 @@
    8.28  		cp $src/perdition/db/ldap/perdition.schema $fs/etc/openldap/schema
    8.29  		;;
    8.30  	perdition-dev)
    8.31 -		CAT="development|development files"
    8.32  		DEPENDS="perdition"
    8.33  		mkdir -p $fs/usr/lib
    8.34  		cp -a $install/usr/lib/*.a $fs/usr/lib
     9.1 --- a/polkit/receipt	Wed Nov 08 18:13:10 2017 +0100
     9.2 +++ b/polkit/receipt	Wed Nov 08 19:39:57 2017 +0200
     9.3 @@ -19,9 +19,9 @@
     9.4  # Rules to configure and make the package.
     9.5  compile_rules()
     9.6  {
     9.7 -	addgroup -g 27 polkitd &&
     9.8 +	addgroup -g 27 polkitd
     9.9  	adduser -g "PolicyKit Daemon Owner" -h /etc/polkit-1 -u 27 \
    9.10 -		-G polkitd -s /bin/false -D polkitd &&
    9.11 +		-G polkitd -s /bin/false -D polkitd
    9.12  
    9.13  	cp -a $src $src-pam
    9.14  	./configure \
    9.15 @@ -30,19 +30,19 @@
    9.16  		--enable-libsystemd-login=no \
    9.17  		--with-authfw=shadow \
    9.18  		$CONFIGURE_ARGS &&
    9.19 -	make && make install &&
    9.20 +	make && make install || return 1
    9.21  
    9.22 -	cd $src-pam &&
    9.23 +	cd $src-pam
    9.24  	./configure \
    9.25  		--sysconfdir=/etc \
    9.26  		--localstatedir=/var \
    9.27  		--enable-libsystemd-login=no \
    9.28  		--with-authfw=pam \
    9.29  		$CONFIGURE_ARGS &&
    9.30 -	make && make DESTDIR=$DESTDIR-pam install &&
    9.31 +	make && make DESTDIR=$DESTDIR-pam install || return 1
    9.32  
    9.33 -	mkdir -p $install-pam/etc/pam.d &&
    9.34 -	cp $stuff/polkit-1 $install-pam/etc/pam.d &&
    9.35 +	mkdir -p $install-pam/etc/pam.d
    9.36 +	cp $stuff/polkit-1 $install-pam/etc/pam.d
    9.37  	for inst in $install $install-pam ; do
    9.38  		# for access file in web interface, will be changed back in post-install to 700
    9.39  		chmod 755 "$inst/etc/polkit-1/rules.d/"
    9.40 @@ -61,6 +61,7 @@
    9.41  			;;
    9.42  		polkit-pam)
    9.43  			install=$install-pam copy @std
    9.44 +			CAT="base-system|using PAM"
    9.45  			DEPENDS="expat glib js pam"
    9.46  			PROVIDE="polkit:pam"
    9.47  			;;
    9.48 @@ -70,6 +71,7 @@
    9.49  			;;
    9.50  		polkit-pam-dev)
    9.51  			install=$install-pam copy @dev
    9.52 +			CAT="development|development files, using PAM"
    9.53  			DEPENDS="polkit expat-dev glib-dev js-dev pam-dev"
    9.54  			PROVIDE="polkit-dev:pam"
    9.55  			;;
    10.1 --- a/ppp/receipt	Wed Nov 08 18:13:10 2017 +0100
    10.2 +++ b/ppp/receipt	Wed Nov 08 19:39:57 2017 +0200
    10.3 @@ -27,7 +27,7 @@
    10.4  	cp -a $src $src-pam
    10.5  	./configure $CONFIGURE_ARGS &&
    10.6  	make &&
    10.7 -	make DESTDIR=$DESTDIR/usr install
    10.8 +	make DESTDIR=$DESTDIR/usr install || return 1
    10.9  
   10.10  	cd $src-pam
   10.11  	sed -i 's/#USE_PAM/USE_PAM/' pppd/Makefile.linux
   10.12 @@ -41,8 +41,12 @@
   10.13  {
   10.14  	case $PACKAGE in
   10.15  	ppp|ppp-pam)
   10.16 -		[ $PACKAGE == ppp-pam ] && DEPENDS="pam" && PROVIDE="ppp:pam" &&
   10.17 -			CAT="network|with PAM support" && install=$install-pam
   10.18 +		if [ $PACKAGE == 'ppp-pam' ]; then
   10.19 +			DEPENDS="pam"
   10.20 +			PROVIDE="ppp:pam"
   10.21 +			CAT="network|with PAM support"
   10.22 +			install=$install-pam
   10.23 +		fi
   10.24  		mkdir -p $fs/usr $fs/var/www/tazpanel/menu.d/network/VPN
   10.25  		cp -a $install/usr/sbin $fs/usr
   10.26  		[ -d "$install/usr/lib" ] && cp -a $install/usr/lib $fs/usr
   10.27 @@ -111,7 +115,6 @@
   10.28  		chmod 711 $fs/etc/ppp/scripts/*
   10.29  		;;
   10.30  	ppp-dev)
   10.31 -		CAT="development|development files"
   10.32  		copy include/
   10.33  		;;
   10.34  	esac
    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/pulse/receipt	Wed Nov 08 19:39:57 2017 +0200
    11.3 @@ -0,0 +1,27 @@
    11.4 +# SliTaz package receipt v2.
    11.5 +
    11.6 +PACKAGE="pulse"
    11.7 +VERSION="0.0.32" # releases are absent, there's 32th commit
    11.8 +COMMIT="77456be"
    11.9 +CATEGORY="system-tools"
   11.10 +SHORT_DESC="CPU monitor that can disable processors on the fly"
   11.11 +MAINTAINER="al.bobylev@gmail.com"
   11.12 +LICENSE="GPL3"
   11.13 +WEB_SITE="https://github.com/DoMiNeLa10/pulse"
   11.14 +
   11.15 +TARBALL="$PACKAGE-$VERSION.tar.gz"
   11.16 +WGET_URL="https://github.com/DoMiNeLa10/pulse/archive/$COMMIT.tar.gz"
   11.17 +
   11.18 +BUILD_DEPENDS="gtk+-dev"
   11.19 +
   11.20 +compile_rules() {
   11.21 +	make || return 1
   11.22 +
   11.23 +	mkdir -p $install/usr/bin
   11.24 +	cp -a pulse $install/usr/bin
   11.25 +}
   11.26 +
   11.27 +genpkg_rules() {
   11.28 +	copy @std
   11.29 +	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ pango"
   11.30 +}
    12.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.2 +++ b/pulse/stuff/pulse.desktop	Wed Nov 08 19:39:57 2017 +0200
    12.3 @@ -0,0 +1,7 @@
    12.4 +[Desktop Entry]
    12.5 +Type=Application
    12.6 +Name=Pulse
    12.7 +Comment=A CPU monitor that can disable processors on the fly
    12.8 +Exec=pulse
    12.9 +Icon=pulse
   12.10 +Categories=System;Monitor;
    13.1 Binary file pulse/stuff/pulse.png has changed
    14.1 --- a/pure-ftpd/receipt	Wed Nov 08 18:13:10 2017 +0100
    14.2 +++ b/pure-ftpd/receipt	Wed Nov 08 19:39:57 2017 +0200
    14.3 @@ -24,13 +24,13 @@
    14.4  		--with-puredb \
    14.5  		--with-extauth \
    14.6  		$CONFIGURE_ARGS &&
    14.7 -	make && make install
    14.8 +	make && make install || return 1
    14.9  
   14.10  	cd $src-pam
   14.11  	./configure \
   14.12  		--with-pam \
   14.13  		$CONFIGURE_ARGS &&
   14.14 -	make && make DESTDIR=$DESTDIR-pam install
   14.15 +	make && make DESTDIR=$DESTDIR-pam install || return 1
   14.16  
   14.17  	# daemon
   14.18  	mkdir -p $install/etc/init.d $install-pam/etc/init.d
    15.1 --- a/screen/receipt	Wed Nov 08 18:13:10 2017 +0100
    15.2 +++ b/screen/receipt	Wed Nov 08 19:39:57 2017 +0200
    15.3 @@ -17,19 +17,26 @@
    15.4  compile_rules()
    15.5  {
    15.6  	cp -a $src $src-pam
    15.7 -	./configure --with-sys-screenrc=/etc/screenrc \
    15.8 -		--disable-pam $CONFIGURE_ARGS &&
    15.9 +
   15.10 +	./configure \
   15.11 +		--with-sys-screenrc=/etc/screenrc \
   15.12 +		--disable-pam \
   15.13 +		$CONFIGURE_ARGS &&
   15.14  	make &&
   15.15 -	make -j1 DESTDIR=$DESTDIR install &&
   15.16 -	cd $src-pam &&
   15.17 -	./configure --with-sys-screenrc=/etc/screenrc \
   15.18 -		--enable-pam $CONFIGURE_ARGS &&
   15.19 +	make -j1 DESTDIR=$DESTDIR install || return 1
   15.20 +
   15.21 +	cd $src-pam
   15.22 +	./configure \
   15.23 +		--with-sys-screenrc=/etc/screenrc \
   15.24 +		--enable-pam \
   15.25 +		$CONFIGURE_ARGS &&
   15.26  	make &&
   15.27 -	make -j1 DESTDIR=$DESTDIR-pam install &&
   15.28 +	make -j1 DESTDIR=$DESTDIR-pam install || return 1
   15.29 +
   15.30  	for dir in $DESTDIR $DESTDIR-pam ; do
   15.31 -		mkdir -p $dir/usr/share/terminfo &&
   15.32 -		tic -o $dir/usr/share/terminfo terminfo/screeninfo.src &&
   15.33 -		mkdir -p $dir/etc &&
   15.34 +		mkdir -p $dir/usr/share/terminfo
   15.35 +		tic -o $dir/usr/share/terminfo terminfo/screeninfo.src
   15.36 +		mkdir -p $dir/etc
   15.37  		cp $src/etc/screenrc $dir/etc
   15.38  	done
   15.39  }
   15.40 @@ -42,9 +49,12 @@
   15.41  		CONFIG_FILES="/etc/screenrc"
   15.42  		SUGGESTED="screen-terminfo"
   15.43  		DEPENDS="elfutils"
   15.44 -		[ $PACKAGE == screen-pam] && DEPENDS="$DEPENDS pam" &&
   15.45 -			CAT="system-tools|with PAM support" &&
   15.46 -			PROVIDE="screen:pam" && install=$install-pam
   15.47 +		if [ $PACKAGE == 'screen-pam' ]; then
   15.48 +			DEPENDS="$DEPENDS pam"
   15.49 +			CAT="system-tools|with PAM support"
   15.50 +			PROVIDE="screen:pam"
   15.51 +			install=$install-pam
   15.52 +		fi
   15.53  		mkdir -p $fs/usr/bin $fs/usr/share
   15.54  		cp -a $install/etc $fs
   15.55  		cp -a $install/usr/bin/screen-$VERSION $fs/usr/bin/screen
    16.1 --- a/slim/receipt	Wed Nov 08 18:13:10 2017 +0100
    16.2 +++ b/slim/receipt	Wed Nov 08 19:39:57 2017 +0200
    16.3 @@ -94,7 +94,7 @@
    16.4  			CONFIG_FILES="/etc/slim.conf"
    16.5  			SUGGESTED="slim-theme-default slitaz-configs"
    16.6  			PROVIDE="slim:pam"
    16.7 -			CAT="x-window|(PAM enabled)"
    16.8 +			CAT="x-window|PAM enabled"
    16.9  			;;
   16.10  	esac
   16.11  }
    17.1 --- a/warzone2100/receipt	Wed Nov 08 18:13:10 2017 +0100
    17.2 +++ b/warzone2100/receipt	Wed Nov 08 19:39:57 2017 +0200
    17.3 @@ -1,4 +1,4 @@
    17.4 -# SliTaz package receipt.
    17.5 +# SliTaz package receipt v2.
    17.6  
    17.7  PACKAGE="warzone2100"
    17.8  VERSION="3.2.3"
    17.9 @@ -6,34 +6,34 @@
   17.10  SHORT_DESC="3D realtime strategy game on a future Earth"
   17.11  MAINTAINER="slaxemulator@gmail.com"
   17.12  LICENSE="GPL2"
   17.13 +WEB_SITE="http://wz2100.net/"
   17.14 +
   17.15  TARBALL="$PACKAGE-$VERSION.tar.xz"
   17.16 -WEB_SITE="http://wz2100.net/"
   17.17  WGET_URL="$SF_MIRROR/warzone2100/releases/$VERSION/$TARBALL"
   17.18  
   17.19 -DEPENDS="libsdl-net mesa openal jpeg libpng libvorbis libtheora libmad physfs \
   17.20 -quesoglc popt ttf-dejavu ttf-dejavu-extra"
   17.21 -BUILD_DEPENDS="automake perl zip gettext qt5-dev xorg-libX11-dev libsdl2-dev \
   17.22 -libpng16-dev libtheora-dev openal-dev libvorbis-dev glew-dev mesa17-dev \
   17.23 -libcrypto-dev physfs-dev xorg-libXrandr-dev fribidi-dev freetype-dev \
   17.24 -fontconfig-dev openssl-dev git"
   17.25 +BUILD_DEPENDS="automake perl zip unzip gettext qt5-dev xorg-libX11-dev \
   17.26 +libsdl2-dev libpng16-dev libtheora-dev openal-dev libvorbis-dev glew-dev \
   17.27 +mesa17-dev libcrypto-dev physfs-dev xorg-libXrandr-dev fribidi-dev \
   17.28 +freetype-dev fontconfig-dev openssl-dev git"
   17.29  
   17.30 -# Rules to configure and make the package.
   17.31 -compile_rules()
   17.32 -{
   17.33 -	autogen.sh &&
   17.34 +compile_rules() {
   17.35 +	# small improvements
   17.36 +	sed -i 's| = |=|' icons/warzone2100.desktop
   17.37 +	rm po/pt_BR.gmo; sed -i 's|\\v||' po/pt_BR.po; msgfmt po/pt_BR.po -o po/pt_BR.gmo
   17.38 +
   17.39 +	./autogen.sh &&
   17.40  	./configure \
   17.41  		--with-distributor="SliTaz" \
   17.42 +		--with-appdatadir=/usr/share/appdata \
   17.43  		$CONFIGURE_ARGS &&
   17.44 -	make && make DESTDIR=$DESTDIR install
   17.45 +	make -C src autorevision.h &&
   17.46 +	make &&
   17.47 +	make DESTDIR=$DESTDIR install
   17.48  }
   17.49  
   17.50 -# Rules to gen a SliTaz package suitable for Tazpkg.
   17.51 -genpkg_rules()
   17.52 -{
   17.53 -	copy @std
   17.54 -#	mkdir -p $fs/usr/share/pixmaps
   17.55 -#	cp -a $install/usr/bin $fs/usr
   17.56 -#	cp -a $install/usr/share/applications $fs/usr/share
   17.57 -#	cp -a $install/usr/share/icons/warzone2100.png $fs/usr/share/pixmaps
   17.58 -#	cp -a $install/usr/share/warzone2100 $fs/usr/share
   17.59 +genpkg_rules() {
   17.60 +	copy @std hicolor/ *.mo
   17.61 +	DEPENDS="fontconfig freetype fribidi glew glib libcrypto libglu-mesa \
   17.62 +	libharfbuzz libogg libpng16 libsdl2 libtheora libvorbis mesa17 openal \
   17.63 +	physfs qt5-base qt5-script xorg-libX11 xorg-libXrandr zlib   libsdl2-net"
   17.64  }
    18.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.2 +++ b/warzone2100/stuff/patches/fix-icon-path.patch	Wed Nov 08 19:39:57 2017 +0200
    18.3 @@ -0,0 +1,15 @@
    18.4 +--- a/icons/Makefile.am
    18.5 ++++ b/icons/Makefile.am
    18.6 +@@ -16,10 +16,10 @@
    18.7 + 	wz2100welcome.bmp
    18.8 + 
    18.9 + install-data-local:
   18.10 +-	$(MKDIR_P) $(DESTDIR)$(icondir)
   18.11 ++	$(MKDIR_P) $(DESTDIR)$(icondir)/hicolor/128x128/apps
   18.12 + 	$(MKDIR_P) $(DESTDIR)$(applicationdir)
   18.13 + 	$(MKDIR_P) $(DESTDIR)$(appdatadir)
   18.14 +-	$(INSTALL_DATA) $(srcdir)/warzone2100.png $(DESTDIR)$(icondir)/warzone2100.png
   18.15 ++	$(INSTALL_DATA) $(srcdir)/warzone2100.png $(DESTDIR)$(icondir)/hicolor/128x128/apps/warzone2100.png
   18.16 + 	$(INSTALL_DATA) $(srcdir)/warzone2100.desktop $(DESTDIR)$(applicationdir)/warzone2100.desktop
   18.17 + 	$(INSTALL_DATA) $(srcdir)/warzone2100.appdata.xml $(DESTDIR)$(appdatadir)/warzone2100.appdata.xml
   18.18 + 
    19.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.2 +++ b/warzone2100/stuff/patches/series	Wed Nov 08 19:39:57 2017 +0200
    19.3 @@ -0,0 +1,1 @@
    19.4 +fix-icon-path.patch