wok-next diff tcl/receipt @ rev 20645

Up libjpeg-turbo (1.5.3), libpng16 (1.6.34), libraw (0.18.7), shared-mime-info (1.9), tree (1.7.0), xapian (1.4.5); add time.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Tue May 01 23:19:32 2018 +0300 (2018-05-01)
parents 0a667524ce79
children 1ff723a6455b
line diff
     1.1 --- a/tcl/receipt	Mon Oct 16 22:34:14 2017 +0300
     1.2 +++ b/tcl/receipt	Tue May 01 23:19:32 2018 +0300
     1.3 @@ -15,43 +15,43 @@
     1.4  BUILD_DEPENDS="zlib-dev"
     1.5  SPLIT="tcl-dev"
     1.6  
     1.7 -# Rules to configure and make the package.
     1.8  compile_rules() {
     1.9 -	export SRCDIR=$(pwd) &&
    1.10 +	case "$ARCH" in
    1.11 +		x86_64) ARCH_ARGS='--enable-64bit';;
    1.12 +		*)      ARCH_ARGS='';;
    1.13 +	esac
    1.14  
    1.15 -	cd unix &&
    1.16 +	cd unix
    1.17  
    1.18  	./configure \
    1.19  		--prefix=/usr \
    1.20  		--mandir=/usr/share/man \
    1.21 -		$([ $(uname -m) = x86_64 ] && echo --enable-64bit) &&
    1.22 -	make &&
    1.23 +		$ARCH_ARGS &&
    1.24 +	make || return 1
    1.25  
    1.26 -	sed -e "s|$SRCDIR/unix|/usr/lib|" \
    1.27 -		-e "s|$SRCDIR|/usr/include|" \
    1.28 -		-i tclConfig.sh &&
    1.29 +	sed -e "s|$src/unix|/usr/lib|" \
    1.30 +		-e "s|$src|/usr/include|" \
    1.31 +		-i tclConfig.sh
    1.32  
    1.33 -	sed -e "s|$SRCDIR/unix/pkgs/tdbc1.0.5|/usr/lib/tdbc1.0.5|" \
    1.34 -		-e "s|$SRCDIR/pkgs/tdbc1.0.5/generic|/usr/include|" \
    1.35 -		-e "s|$SRCDIR/pkgs/tdbc1.0.5/library|/usr/lib/tcl8.6|" \
    1.36 -		-e "s|$SRCDIR/pkgs/tdbc1.0.5|/usr/include|" \
    1.37 -		-i pkgs/tdbc1.0.5/tdbcConfig.sh &&
    1.38 +	sed -e "s|$src/unix/pkgs/tdbc1.0.5|/usr/lib/tdbc1.0.5|" \
    1.39 +		-e "s|$src/pkgs/tdbc1.0.5/generic|/usr/include|" \
    1.40 +		-e "s|$src/pkgs/tdbc1.0.5/library|/usr/lib/tcl8.6|" \
    1.41 +		-e "s|$src/pkgs/tdbc1.0.5|/usr/include|" \
    1.42 +		-i pkgs/tdbc1.0.5/tdbcConfig.sh
    1.43  
    1.44 -	sed -e "s|$SRCDIR/unix/pkgs/itcl4.1.0|/usr/lib/itcl4.1.0|" \
    1.45 -		-e "s|$SRCDIR/pkgs/itcl4.1.0/generic|/usr/include|" \
    1.46 -		-e "s|$SRCDIR/pkgs/itcl4.1.0|/usr/include|" \
    1.47 -		-i pkgs/itcl4.1.0/itclConfig.sh &&
    1.48 -
    1.49 -	unset SRCDIR
    1.50 +	sed -e "s|$src/unix/pkgs/itcl4.1.0|/usr/lib/itcl4.1.0|" \
    1.51 +		-e "s|$src/pkgs/itcl4.1.0/generic|/usr/include|" \
    1.52 +		-e "s|$src/pkgs/itcl4.1.0|/usr/include|" \
    1.53 +		-i pkgs/itcl4.1.0/itclConfig.sh
    1.54  
    1.55  	make install &&
    1.56 -	make install-private-headers &&
    1.57 -	ln -v -sf tclsh${VERSION:0:3} $install/usr/bin/tclsh &&
    1.58 -	chmod -v 755 $install/usr/lib/libtcl${VERSION:0:3}.so &&
    1.59 -	find $install -name '*.sh' -exec chmod -v 755 '{}' \;
    1.60 +	make install-private-headers || return 1
    1.61 +
    1.62 +	ln -v -sf tclsh${VERSION:0:3} $install/usr/bin/tclsh
    1.63 +	chmod 755 $install/usr/lib/libtcl${VERSION:0:3}.so
    1.64 +	find $install -name '*.sh' -exec chmod 755 '{}' \;
    1.65  }
    1.66  
    1.67 -# Rules to gen a SliTaz package suitable for Tazpkg.
    1.68  genpkg_rules() {
    1.69  	case $PACKAGE in
    1.70  		tcl)