wok-next rev 20875

Fix bastet, cherokee
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Jul 06 12:59:08 2018 +0300 (2018-07-06)
parents f9a0722dc284
children 99196848027e
files bastet/.icon.png bastet/receipt bin86/receipt cherokee/.icon.png cherokee/receipt
line diff
     1.1 Binary file bastet/.icon.png has changed
     2.1 --- a/bastet/receipt	Wed Jul 04 03:13:07 2018 +0300
     2.2 +++ b/bastet/receipt	Fri Jul 06 12:59:08 2018 +0300
     2.3 @@ -1,7 +1,8 @@
     2.4  # SliTaz package receipt v2.
     2.5  
     2.6  PACKAGE="bastet"
     2.7 -VERSION="0.43.2"
     2.8 +VERSION="0.43.2+3" # 3 commits ahead of release 0.43.2 (really fix build)
     2.9 +COMMIT="1b3e692"
    2.10  CATEGORY="games"
    2.11  SHORT_DESC="Bastard tetris clone"
    2.12  MAINTAINER="pankso@slitaz.org"
    2.13 @@ -9,21 +10,18 @@
    2.14  WEB_SITE="http://fph.altervista.org/prog/bastet.html"
    2.15  
    2.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.17 -WGET_URL="https://github.com/fph/bastet/archive/$VERSION.tar.gz"
    2.18 +WGET_URL="https://github.com/fph/bastet/archive/${COMMIT:-$VERSION}.tar.gz"
    2.19  
    2.20  BUILD_DEPENDS="ncurses-dev libboost-dev libboost-program-options"
    2.21  
    2.22 -# Rules to configure and make the package.
    2.23 -compile_rules()
    2.24 -{
    2.25 +compile_rules() {
    2.26  	cp $stuff/*.png $src
    2.27  
    2.28 -	make && make install
    2.29 +	make &&
    2.30 +	make install
    2.31  }
    2.32  
    2.33 -# Rules to gen a SliTaz package suitable for Tazpkg.
    2.34 -genpkg_rules()
    2.35 -{
    2.36 +genpkg_rules() {
    2.37  	copy @std
    2.38  	DEPENDS="libboost-program-options ncurses"
    2.39  	TAGS="tetris"
     3.1 --- a/bin86/receipt	Wed Jul 04 03:13:07 2018 +0300
     3.2 +++ b/bin86/receipt	Fri Jul 06 12:59:08 2018 +0300
     3.3 @@ -1,4 +1,4 @@
     3.4 -# SliTaz package receipt.
     3.5 +# SliTaz package receipt v2.
     3.6  
     3.7  PACKAGE="bin86"
     3.8  VERSION="0.16.21"
     3.9 @@ -7,23 +7,19 @@
    3.10  MAINTAINER="slaxemulator@gmail.com"
    3.11  LICENSE="GPL2"
    3.12  WEB_SITE="http://www.debath.co.uk/"
    3.13 +HOST_ARCH="i486"
    3.14 +
    3.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
    3.16  WGET_URL="http://v3.sk/~lkundrak/dev86/$TARBALL"
    3.17 -TAGS="assembler 8086"
    3.18  
    3.19 -DEPENDS="glibc-base"
    3.20 -
    3.21 -# Rules to configure and make the package.
    3.22 -compile_rules()
    3.23 -{
    3.24 +compile_rules() {
    3.25  	mkdir -p $DESTDIR/usr/bin $DESTDIR/usr/share/man/man1
    3.26  	make PREFIX=/usr &&
    3.27  	make PREFIX=$DESTDIR/usr MANDIR=$DESTDIR/usr/share/man/man1 install
    3.28  }
    3.29  
    3.30 -# Rules to gen a SliTaz package suitable for Tazpkg.
    3.31 -genpkg_rules()
    3.32 -{
    3.33 -	mkdir -p $fs/usr
    3.34 -	cp -a $install/usr/bin $fs/usr
    3.35 +genpkg_rules() {
    3.36 +	copy @std
    3.37 +	DEPENDS="glibc-base"
    3.38 +	TAGS="assembler 8086"
    3.39  }
     4.1 Binary file cherokee/.icon.png has changed
     5.1 --- a/cherokee/receipt	Wed Jul 04 03:13:07 2018 +0300
     5.2 +++ b/cherokee/receipt	Fri Jul 06 12:59:08 2018 +0300
     5.3 @@ -1,33 +1,38 @@
     5.4  # SliTaz package receipt v2.
     5.5  
     5.6  PACKAGE="cherokee"
     5.7 -VERSION="1.2.101"
     5.8 +VERSION="1.2.103.d021376"
     5.9  CATEGORY="network"
    5.10 -SHORT_DESC="A very fast, fiexible and easy to configure Web Server"
    5.11 +SHORT_DESC="Cherokee Web Server"
    5.12  MAINTAINER="slaxemulator@gmail.com"
    5.13  LICENSE="GPL2"
    5.14 -WEB_SITE="http://www.cherokee-project.com/"
    5.15 +WEB_SITE="http://cherokee-project.com/"
    5.16  
    5.17  TARBALL="$PACKAGE-$VERSION.tar.gz"
    5.18 -WGET_URL="http://www.cherokee-project.com/download/${VERSION%.*}/$VERSION/$TARBALL"
    5.19 +WGET_URL="https://github.com/cherokee/webserver/archive/v$VERSION.tar.gz"
    5.20  
    5.21 -BUILD_DEPENDS="pcre-dev cyrus-sasl-dev openssl-dev openldap-dev python-dev \
    5.22 -pam-dev libmysqlclient ffmpeg-dev gettext autoconf automake"
    5.23 +BUILD_DEPENDS="pcre-dev cyrus-sasl-dev openssl10-dev openldap-dev python-dev \
    5.24 +pam-dev libmysqlclient ffmpeg-dev gettext autoconf automake libtool"
    5.25  SPLIT="cherokee cherokee-dev cherokee-doc"
    5.26  
    5.27  compile_rules() {
    5.28 -	# Update deprecated symbols of ffmpeg
    5.29 -	sed -i 's|hdl->avformat->file_size|avio_size(hdl->avformat)|' cherokee/handler_streaming.c
    5.30 -
    5.31  	# Use subdirectory for logs
    5.32  	sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' cherokee.conf.sample.pre
    5.33  
    5.34 -	autoreconf -v
    5.35 -	./configure \
    5.36 +	# Fix pid file location
    5.37 +	sed -i 's|var/run/|run/|g' admin/PageNewConfig.py
    5.38 +
    5.39 +	cp po/admin/ca.po po/admin/cherokee.pot
    5.40 +
    5.41 +	CFLAGS="$CFLAGS -I/usr/include/openssl-1.0" \
    5.42 +	LDFLAGS="$LDFLAGS -L/usr/lib/openssl-1.0" \
    5.43 +	./autogen.sh \
    5.44  		--prefix=/usr \
    5.45  		--sysconfdir=/etc \
    5.46  		--localstatedir=/var \
    5.47 +		--sbindir=/usr/bin \
    5.48  		--with-wwwroot=/var/www/cherokee \
    5.49 +		--with-cgiroot=/var/www/cherokee/cgi-bin \
    5.50  		--disable-static \
    5.51  		--with-wwwuser=www \
    5.52  		--with-wwwgroup=www \