wok-next rev 20498

Unsuccessful fixings (just to totally synchronize wok-hg with wok): assaultcube, astromenace, chocolate-doom, dmraid, enigma, gpm, zsnes.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Wed Mar 14 17:27:57 2018 +0200 (2018-03-14)
parents 96912f5312d8
children da6f77539069
files assaultcube/receipt astromenace/receipt chocolate-doom/receipt dmraid/receipt enigma/receipt gpm/receipt zsnes/receipt
line diff
     1.1 --- a/assaultcube/receipt	Wed Mar 14 17:22:06 2018 +0200
     1.2 +++ b/assaultcube/receipt	Wed Mar 14 17:27:57 2018 +0200
     1.3 @@ -12,8 +12,8 @@
     1.4  WEB_SITE="http://assault.cubers.net/"
     1.5  WGET_URL="$SF_MIRROR/actiongame/$TARBALL"
     1.6  
     1.7 -DEPENDS="openal libsdl-image libsdl-mixer mesa libglu-mesa assaultcube-data"
     1.8 -BUILD_DEPENDS="openal-dev libsdl-image-dev libsdl-mixer-dev mesa-dev \
     1.9 +DEPENDS="openal libsdl-image libsdl-mixer mesa17 libglu-mesa assaultcube-data"
    1.10 +BUILD_DEPENDS="openal-dev libsdl-image-dev libsdl-mixer-dev mesa17-dev \
    1.11  libglu-mesa-dev zlib-dev"
    1.12  
    1.13  # Rules to configure and make the package.
    1.14 @@ -39,4 +39,3 @@
    1.15  	chmod +x $fs/usr/bin/assaultcube
    1.16  	chmod +x $fs/usr/bin/assaultcube-server
    1.17  }
    1.18 -
     2.1 --- a/astromenace/receipt	Wed Mar 14 17:22:06 2018 +0200
     2.2 +++ b/astromenace/receipt	Wed Mar 14 17:27:57 2018 +0200
     2.3 @@ -17,7 +17,7 @@
     2.4  xorg-libXinerama freetype"
     2.5  
     2.6  BUILD_DEPENDS="gcc cmake make libsdl-dev libogg-dev libvorbis-dev libglu-mesa-dev \
     2.7 -openal-dev freealut-dev xorg-libXinerama-dev freetype-dev mesa-dev"
     2.8 +openal-dev freealut-dev xorg-libXinerama-dev freetype-dev mesa17-dev"
     2.9  
    2.10  # Rules to configure and make the package.
    2.11  compile_rules()
     3.1 --- a/chocolate-doom/receipt	Wed Mar 14 17:22:06 2018 +0200
     3.2 +++ b/chocolate-doom/receipt	Wed Mar 14 17:27:57 2018 +0200
     3.3 @@ -1,32 +1,34 @@
     3.4 -# SliTaz package receipt.
     3.5 +# SliTaz package receipt v2.
     3.6  
     3.7  PACKAGE="chocolate-doom"
     3.8  VERSION="1.4.0"
     3.9  CATEGORY="games"
    3.10 -SHORT_DESC="Doom source port as close as possible to vanilla Doom."
    3.11 +SHORT_DESC="Doom source port as close as possible to vanilla Doom"
    3.12  MAINTAINER="pascal.bellard@slitaz.org"
    3.13  LICENSE="GPL2"
    3.14  WEB_SITE="http://$PACKAGE.sourceforge.net/"
    3.15 +
    3.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
    3.17  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    3.18  
    3.19  DEPENDS="libsdl libsdl-mixer libsdl-net libsamplerate"
    3.20 -BUILD_DEPENDS="libsdl-mixer-dev  libsdl-net-dev libsdl-dev"
    3.21 +BUILD_DEPENDS="libsdl-mixer-dev  libsdl-net-dev libsdl-dev libsamplerate-dev"
    3.22  
    3.23 -# Rules to configure and make the package.
    3.24 -compile_rules()
    3.25 -{
    3.26 +compile_rules() {
    3.27  	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lm"
    3.28 -	./configure --prefix=/usr --infodir=/usr/share/info \
    3.29 -	--mandir=/usr/share/man $CONFIGURE_ARGS &&
    3.30 -	make $MAKEFLAGS
    3.31 +	./configure \
    3.32 +		--prefix=/usr \
    3.33 +		--infodir=/usr/share/info \
    3.34 +		--mandir=/usr/share/man \
    3.35 +		$CONFIGURE_ARGS &&
    3.36 +	make $MAKEFLAGS || return 1
    3.37 +
    3.38 +	mkdir -p $install/usr/bin $install/usr/share/games/doom
    3.39 +	cp $src/src/chocolate-doom $install/usr/bin
    3.40  
    3.41  	cook_pick_manpages man/*.5 man/*.6
    3.42  }
    3.43  
    3.44 -# Rules to gen a SliTaz package suitable for Tazpkg.
    3.45 -genpkg_rules()
    3.46 -{
    3.47 -	mkdir -p $fs/usr/bin $fs/usr/share/games/doom
    3.48 -	cp $src/src/chocolate-doom $fs/usr/bin
    3.49 +genpkg_rules() {
    3.50 +	copy @std
    3.51  }
     4.1 --- a/dmraid/receipt	Wed Mar 14 17:22:06 2018 +0200
     4.2 +++ b/dmraid/receipt	Wed Mar 14 17:27:57 2018 +0200
     4.3 @@ -25,8 +25,8 @@
     4.4  	mkdir -p $install/usr/sbin  $install/usr/lib
     4.5  	cp -a $src/lib/libdmraid.so $install/usr/lib/libdmraid.so.1
     4.6  	cp -a $src/tools/dmraid     $install/usr/sbin
     4.7 -	cp -a stuff/grub-dmraid     $install/usr/sbin
     4.8 -	cp -a stuff/dmraid-start    $install/usr/sbin
     4.9 +	cp -a $stuff/grub-dmraid    $install/usr/sbin
    4.10 +	cp -a $stuff/dmraid-start   $install/usr/sbin
    4.11  }
    4.12  
    4.13  genpkg_rules() {
     5.1 --- a/enigma/receipt	Wed Mar 14 17:22:06 2018 +0200
     5.2 +++ b/enigma/receipt	Wed Mar 14 17:27:57 2018 +0200
     5.3 @@ -1,38 +1,34 @@
     5.4  # SliTaz package receipt.
     5.5  
     5.6  PACKAGE="enigma"
     5.7 -VERSION="1.01"
     5.8 -REVISION="r1914"
     5.9 +VERSION="1.21"
    5.10 +REVISION="r2513"
    5.11  CATEGORY="games"
    5.12 -SHORT_DESC="puzzle game similar to Oxyd"
    5.13 +SHORT_DESC="Puzzle game similar to Oxyd"
    5.14  MAINTAINER="devl547@gmail.com"
    5.15  LICENSE="GPL2"
    5.16 -TARBALL="$PACKAGE-$VERSION-$REVISION.tar.gz"
    5.17  WEB_SITE="http://www.nongnu.org/enigma/"
    5.18 -WGET_URL="http://download.berlios.de/enigma-game/$TARBALL"
    5.19  
    5.20 -DEPENDS="libsdl libsdl-ttf libsdl-mixer libsdl-image xerces-c"
    5.21 -BUILD_DEPENDS="gettext libsdl-ttf-dev libsdl-mixer-dev libsdl-image-dev libsdl-dev xerces-c-dev"
    5.22 +#TARBALL="$PACKAGE-$VERSION-$REVISION.tar.gz"
    5.23 +#WGET_URL="http://download.berlios.de/enigma-game/$TARBALL"
    5.24 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    5.25 +WGET_URL="$SF_MIRROR/enigma-game/$TARBALL"
    5.26  
    5.27 -# Rules to configure and make the package.
    5.28 -compile_rules()
    5.29 -{
    5.30 -	cd $src
    5.31 +BUILD_DEPENDS="gettext libsdl-ttf-dev libsdl-mixer-dev libsdl-image-dev \
    5.32 +libsdl-dev xerces-c-dev"
    5.33 +
    5.34 +compile_rules() {
    5.35  	sed -i 's/stdexcept>/&\n#include <stddef.h>/' lib-src/zipios++/src/directory.h
    5.36  	sed -i 's/#ifndef.*/&\n#include <stddef.h>/' lib-src/enigma-core/ecl_dict.hh
    5.37  	./configure \
    5.38 -		--build=$HOST_SYSTEM \
    5.39 -		--host=$HOST_SYSTEM \
    5.40 -		--enable-optimize 2>&1 | grep -v 'config.rpath: No such file' &&
    5.41 +		--enable-optimize \
    5.42 +		CPPFLAGS="-I/usr/include/SDL" \
    5.43 +		$CONFIGURE_ARGS &&
    5.44  	make &&
    5.45  	make DESTDIR=$DESTDIR install
    5.46  }
    5.47  
    5.48 -# Rules to gen a SliTaz package suitable for Tazpkg.
    5.49 -genpkg_rules()
    5.50 -{
    5.51 -	mkdir -p $fs/usr/share
    5.52 -	cp -a $install/usr/bin $fs/usr
    5.53 -	cp -a $install/usr/lib $fs/usr
    5.54 -	cp -a $install/usr/share/enigma $fs/usr/share
    5.55 +genpkg_rules() {
    5.56 +	copy @std
    5.57 +	DEPENDS="libsdl libsdl-ttf libsdl-mixer libsdl-image xerces-c"
    5.58  }
     6.1 --- a/gpm/receipt	Wed Mar 14 17:22:06 2018 +0200
     6.2 +++ b/gpm/receipt	Wed Mar 14 17:27:57 2018 +0200
     6.3 @@ -1,7 +1,7 @@
     6.4  # SliTaz package receipt v2.
     6.5  
     6.6  PACKAGE="gpm"
     6.7 -VERSION="1.20.7"
     6.8 +VERSION="1.99.7"
     6.9  CATEGORY="misc"
    6.10  SHORT_DESC="Mouse server for console."
    6.11  MAINTAINER="pascal.bellard@slitaz.org"
    6.12 @@ -11,67 +11,48 @@
    6.13  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    6.14  WGET_URL="${WEB_SITE}archives/$TARBALL"
    6.15  
    6.16 +BUILD_DEPENDS_arm=" "
    6.17  BUILD_DEPENDS="gawk bison ncurses-dev automake autoconf libtool texinfo"
    6.18  SPLIT="gpm gpm-dev gpm-extra"
    6.19  
    6.20 -# When cross compiling gawk and bison build system are used.
    6.21 -case "$ARCH" in
    6.22 -	arm) BUILD_DEPENDS="" ;;
    6.23 -esac
    6.24 +compile_rules() {
    6.25 +	sed -i 's|-Werror||' Makefile.include.in
    6.26  
    6.27 -# Rules to configure and make the package.
    6.28 -compile_rules()
    6.29 -{
    6.30  	./autogen.sh
    6.31  	ln -s headers/gpm.h src		# ???
    6.32 -	./configure \
    6.33 -		--prefix=/usr \
    6.34 -		--sysconfdir=/etc \
    6.35 -		$CONFIGURE_ARGS &&
    6.36 -	make && make install
    6.37 +	./configure $CONFIGURE_ARGS &&
    6.38 +	make && make install || return 1
    6.39 +
    6.40 +#	chmod a+x $install/usr/lib/*
    6.41 +	cp -a $stuff/* $install
    6.42  }
    6.43  
    6.44 -# Rules to gen a SliTaz package suitable for Tazpkg.
    6.45 -genpkg_rules()
    6.46 -{
    6.47 +genpkg_rules() {
    6.48  	case $PACKAGE in
    6.49 -	gpm)
    6.50 -		DEPENDS="ncurses"
    6.51 -		mkdir -p $fs/usr/lib
    6.52 -		cp -a $install/usr/sbin $fs/usr
    6.53 -		cp -a $install/usr/lib/*.so* $fs/usr/lib
    6.54 -		chmod a+x $fs/usr/lib/*
    6.55 -		cp -a $stuff/* $fs
    6.56 -		;;
    6.57 -	gpm-dev)
    6.58 -		CAT="development|Mouse server for console, development files."
    6.59 -		DEPENDS="gpm"
    6.60 -		mkdir -p $fs/usr/lib
    6.61 -		cp -a $install/usr/include $fs/usr
    6.62 -		cp -a $install/usr/lib/*a $fs/usr/lib
    6.63 -		;;
    6.64 -	gpm-extra)
    6.65 -		CAT="misc|Mouse server for console, extra files."
    6.66 -		DEPENDS="gpm"
    6.67 -		mkdir -p $fs/usr
    6.68 -		cp -a $install/usr/bin $fs/usr
    6.69 -		;;
    6.70 +		gpm-extra)
    6.71 +			copy bin/
    6.72 +			CAT="misc|extra files"
    6.73 +			DEPENDS="gpm"
    6.74 +			;;
    6.75 +		gpm)
    6.76 +			copy @std @rm
    6.77 +			DEPENDS="ncurses"
    6.78 +			;;
    6.79 +		gpm-dev)
    6.80 +			copy @dev
    6.81 +			;;
    6.82  	esac
    6.83  }
    6.84  
    6.85 -# Pre and post install commands for Tazpkg.
    6.86 -pre_remove_gpm()
    6.87 -{
    6.88 +pre_remove_gpm() {
    6.89  	[ -n "$1" ] || /etc/init.d/gpm stop
    6.90  }
    6.91  
    6.92 -post_install_gpm()
    6.93 -{
    6.94 +post_install_gpm() {
    6.95  	[ -n "$1" -o -s /aufs-umount.sh ] || /etc/init.d/gpm start
    6.96  }
    6.97  
    6.98  # Just to be sure when cross-compiling.
    6.99 -testsuite_gpm_extra()
   6.100 -{
   6.101 +testsuite_gpm_extra() {
   6.102  	readelf -h $install/usr/bin/gpm-root
   6.103  }
     7.1 --- a/zsnes/receipt	Wed Mar 14 17:22:06 2018 +0200
     7.2 +++ b/zsnes/receipt	Wed Mar 14 17:27:57 2018 +0200
     7.3 @@ -1,32 +1,31 @@
     7.4 -# SliTaz package receipt.
     7.5 +# SliTaz package receipt v2.
     7.6  
     7.7  PACKAGE="zsnes"
     7.8  VERSION="1.51"
     7.9  CATEGORY="games"
    7.10 +SHORT_DESC="Super Nintendo emulator"
    7.11  MAINTAINER="slaxemulator@gmail.com"
    7.12  LICENSE="GPL2"
    7.13 -SHORT_DESC="Super Nintendo emulator"
    7.14  WEB_SITE="http://www.zsnes.com/"
    7.15 +
    7.16  TARBALL="$PACKAGE${VERSION//./}src.tar.bz2"
    7.17  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    7.18 -TAGS="emulator nintendo snes"
    7.19  
    7.20 -DEPENDS="gcc-lib-base libsdl libpng16 ncurses mesa zlib"
    7.21 -BUILD_DEPENDS="$DEPENDS nasm libsdl-dev libpng16-dev ncurses-dev mesa-dev \
    7.22 +BUILD_DEPENDS="nasm libsdl-dev libpng16-dev ncurses-dev mesa17-dev \
    7.23  automake autoconf zlib-dev patch"
    7.24  
    7.25 -# Rules to configure and make the package.
    7.26 -
    7.27 -compile_rules()
    7.28 -{
    7.29 +compile_rules() {
    7.30  	sed -i -e '/info_ptr->color_type = /d' \
    7.31  	  -e 's/info_ptr->color_type/png_get_color_type(png_ptr, info_ptr)/' \
    7.32  		src/zip/zpng.c
    7.33  	sed -i 's/cstdio.*/&\n#include <unistd.h>/' src/tools/depbuild.cpp
    7.34 -	patch -p1 -i $stuff/zsnes.patch 
    7.35 +	patch -p1 -i $stuff/zsnes.patch
    7.36 +
    7.37  	cd $src/src
    7.38 +
    7.39  	sed -i 's|/usr/man/|/usr/share/man/|' Makefile*
    7.40 -	./configure --prefix=/usr \
    7.41 +	./configure \
    7.42 +		--prefix=/usr \
    7.43  		--x-libraries=/usr/lib \
    7.44  		--enable-release \
    7.45  		force_arch=$ARCH \
    7.46 @@ -34,10 +33,11 @@
    7.47  	make &&
    7.48  	make -j 1 install
    7.49  }
    7.50 -	
    7.51 -# Rules to gen a SliTaz package suitable for Tazpkg.
    7.52 -genpkg_rules()
    7.53 -{
    7.54 -	mkdir -p $fs/usr/bin
    7.55 -	cp -a $src/src/zsnes $fs/usr/bin
    7.56 +
    7.57 +genpkg_rules() {
    7.58 +	copy @std
    7.59 +#	mkdir -p $fs/usr/bin
    7.60 +#	cp -a $src/src/zsnes $fs/usr/bin
    7.61 +	DEPENDS="gcc-lib-base libsdl libpng16 ncurses mesa17 zlib"
    7.62 +	TAGS="emulator nintendo snes"
    7.63  }