wok-next rev 20511

Up alsa-tools, git, gmerlin.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Mar 16 17:17:21 2018 +0200 (2018-03-16)
parents 8990149789e5
children 188b011e073a
files alsa-tools/receipt git/receipt gmerlin/receipt
line diff
     1.1 --- a/alsa-tools/receipt	Fri Mar 16 13:43:56 2018 +0200
     1.2 +++ b/alsa-tools/receipt	Fri Mar 16 17:17:21 2018 +0200
     1.3 @@ -28,15 +28,15 @@
     1.4  	fix ld
     1.5  	for i in *; do
     1.6  		case $i in
     1.7 +			Makefile|gitcompile|qlo10k1) continue;;
     1.8  			seq) cd $src/seq/sbiload;;
     1.9  			*)   cd $src/$i;;
    1.10 -			Makefile|gitcompile|qlo10k1) continue;;
    1.11  		esac
    1.12  		./configure $CONFIGURE_ARGS &&
    1.13  		make &&
    1.14  		make install
    1.15 -		cp $stuff/*.desktop $install/usr/share/applications/
    1.16  	done
    1.17 +	cp $stuff/*.desktop $install/usr/share/applications/
    1.18  }
    1.19  
    1.20  genpkg_rules() {
     2.1 --- a/git/receipt	Fri Mar 16 13:43:56 2018 +0200
     2.2 +++ b/git/receipt	Fri Mar 16 17:17:21 2018 +0200
     2.3 @@ -1,52 +1,49 @@
     2.4 -# SliTaz package receipt.
     2.5 +# SliTaz package receipt v2.
     2.6  
     2.7  PACKAGE="git"
     2.8 -VERSION="2.3.0"
     2.9 +VERSION="2.16.2"
    2.10  CATEGORY="development"
    2.11  SHORT_DESC="Fast version control system"
    2.12  MAINTAINER="b1+slitaz@nagel.org"
    2.13  LICENSE="GPL2"
    2.14 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.15  WEB_SITE="http://git-scm.com/"
    2.16 +
    2.17 +TARBALL="$PACKAGE-$VERSION.tar.xz"
    2.18  WGET_URL="https://www.kernel.org/pub/software/scm/git/$TARBALL"
    2.19  
    2.20  # NO_NSEC=1
    2.21  CROSS_BUGS="bug: can't run test and make package."
    2.22  
    2.23 -DEPENDS="zlib openssl curl expat"
    2.24 -BUILD_DEPENDS="wget zlib-dev openssl-dev curl-dev expat-dev perl python-dev \
    2.25 +BUILD_DEPENDS="zlib-dev openssl-dev curl-dev expat-dev perl python-dev \
    2.26  tar bzip2 gettext-tools"
    2.27  
    2.28 -# Rules to configure and make the package.
    2.29 -compile_rules()
    2.30 -{
    2.31 -	[ -L /bin/tar ] && tazpkg get-install tar --forced
    2.32 +compile_rules() {
    2.33  	./configure \
    2.34  		--prefix=/usr \
    2.35 +		--with-gitconfig=/etc/gitconfig \
    2.36  		--libexecdir=/usr/lib \
    2.37  		--without-tcltk \
    2.38  		$CONFIGURE_ARGS &&
    2.39  	make THREADED_DELTA_SEARCH=1 &&
    2.40 -	make THREADED_DELTA_SEARCH=1 DESTDIR=$DESTDIR install
    2.41 +	make THREADED_DELTA_SEARCH=1 DESTDIR=$DESTDIR install || return 1
    2.42 +
    2.43 +	install -Dm755 $stuff/git-daemon $install/etc/init.d/git-daemon
    2.44  }
    2.45  
    2.46 -# Rules to gen a SliTaz package suitable for Tazpkg.
    2.47 -genpkg_rules()
    2.48 -{
    2.49 -	mkdir -p $fs/etc/init.d
    2.50 -	cp -a $stuff/git-daemon $fs/etc/init.d
    2.51 -	cp -a $install/usr $fs/
    2.52 -	strip -s $fs/usr/lib/git-core/* 2>/dev/null || true
    2.53 +genpkg_rules() {
    2.54 +	copy @std
    2.55 +	DEPENDS="zlib openssl curl expat"
    2.56  }
    2.57  
    2.58  # edit daemons.conf.
    2.59 -post_install()
    2.60 -{
    2.61 +post_install() {
    2.62  	if ! grep -q 'GIT_OPTIONS' "$1/etc/daemons.conf"; then
    2.63  		mkdir -p "$1/var/www/git"
    2.64 -		echo '# Git daemon options.' >> "$1/etc/daemons.conf"
    2.65 -		echo 'GIT_REPO="/var/www/git/"' >> "$1/etc/daemons.conf"
    2.66 -		echo 'GIT_OPTIONS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO"' >> "$1/etc/daemons.conf"
    2.67 -		echo '' >> "$1/etc/daemons.conf"
    2.68 +		cat >> "$1/etc/daemons.conf" <<EOT
    2.69 +# Git daemon options.
    2.70 +GIT_REPO="/var/www/git/"
    2.71 +GIT_OPTIONS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO"
    2.72 +
    2.73 +EOT
    2.74  	fi
    2.75  }
     3.1 --- a/gmerlin/receipt	Fri Mar 16 13:43:56 2018 +0200
     3.2 +++ b/gmerlin/receipt	Fri Mar 16 17:17:21 2018 +0200
     3.3 @@ -16,7 +16,9 @@
     3.4  COOKOPTS="skip-log-errors"
     3.5  
     3.6  compile_rules() {
     3.7 +	sed -i 's|@table @bullet|@table @b|' $src/doc/gmerlin.texi
     3.8  	rm -f cpuinfo.sh
     3.9 +
    3.10  	./configure \
    3.11  		--without-doxygen \
    3.12  		$CONFIGURE_ARGS &&