wok-next diff git/receipt @ rev 20744

ibus: update bdeps
author Aleksej Bobylev <al.bobylev@gmail.com>
date Wed May 30 01:07:54 2018 +0300 (2018-05-30)
parents c4e53a39395a
children f08ef8cf230f
line diff
     1.1 --- a/git/receipt	Fri Mar 02 12:12:14 2018 +0200
     1.2 +++ b/git/receipt	Wed May 30 01:07:54 2018 +0300
     1.3 @@ -1,52 +1,49 @@
     1.4 -# SliTaz package receipt.
     1.5 +# SliTaz package receipt v2.
     1.6  
     1.7  PACKAGE="git"
     1.8 -VERSION="2.3.0"
     1.9 +VERSION="2.16.2"
    1.10  CATEGORY="development"
    1.11  SHORT_DESC="Fast version control system"
    1.12  MAINTAINER="b1+slitaz@nagel.org"
    1.13  LICENSE="GPL2"
    1.14 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.15  WEB_SITE="http://git-scm.com/"
    1.16 +
    1.17 +TARBALL="$PACKAGE-$VERSION.tar.xz"
    1.18  WGET_URL="https://www.kernel.org/pub/software/scm/git/$TARBALL"
    1.19  
    1.20  # NO_NSEC=1
    1.21  CROSS_BUGS="bug: can't run test and make package."
    1.22  
    1.23 -DEPENDS="zlib openssl curl expat"
    1.24 -BUILD_DEPENDS="wget zlib-dev openssl-dev curl-dev expat-dev perl python-dev \
    1.25 +BUILD_DEPENDS="zlib-dev openssl-dev curl-dev expat-dev perl python-dev \
    1.26  tar bzip2 gettext-tools"
    1.27  
    1.28 -# Rules to configure and make the package.
    1.29 -compile_rules()
    1.30 -{
    1.31 -	[ -L /bin/tar ] && tazpkg get-install tar --forced
    1.32 +compile_rules() {
    1.33  	./configure \
    1.34  		--prefix=/usr \
    1.35 +		--with-gitconfig=/etc/gitconfig \
    1.36  		--libexecdir=/usr/lib \
    1.37  		--without-tcltk \
    1.38  		$CONFIGURE_ARGS &&
    1.39  	make THREADED_DELTA_SEARCH=1 &&
    1.40 -	make THREADED_DELTA_SEARCH=1 DESTDIR=$DESTDIR install
    1.41 +	make THREADED_DELTA_SEARCH=1 DESTDIR=$DESTDIR install || return 1
    1.42 +
    1.43 +	install -Dm755 $stuff/git-daemon $install/etc/init.d/git-daemon
    1.44  }
    1.45  
    1.46 -# Rules to gen a SliTaz package suitable for Tazpkg.
    1.47 -genpkg_rules()
    1.48 -{
    1.49 -	mkdir -p $fs/etc/init.d
    1.50 -	cp -a $stuff/git-daemon $fs/etc/init.d
    1.51 -	cp -a $install/usr $fs/
    1.52 -	strip -s $fs/usr/lib/git-core/* 2>/dev/null || true
    1.53 +genpkg_rules() {
    1.54 +	copy @std
    1.55 +	DEPENDS="zlib openssl curl expat"
    1.56  }
    1.57  
    1.58  # edit daemons.conf.
    1.59 -post_install()
    1.60 -{
    1.61 +post_install() {
    1.62  	if ! grep -q 'GIT_OPTIONS' "$1/etc/daemons.conf"; then
    1.63  		mkdir -p "$1/var/www/git"
    1.64 -		echo '# Git daemon options.' >> "$1/etc/daemons.conf"
    1.65 -		echo 'GIT_REPO="/var/www/git/"' >> "$1/etc/daemons.conf"
    1.66 -		echo 'GIT_OPTIONS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO"' >> "$1/etc/daemons.conf"
    1.67 -		echo '' >> "$1/etc/daemons.conf"
    1.68 +		cat >> "$1/etc/daemons.conf" <<EOT
    1.69 +# Git daemon options.
    1.70 +GIT_REPO="/var/www/git/"
    1.71 +GIT_OPTIONS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO"
    1.72 +
    1.73 +EOT
    1.74  	fi
    1.75  }