wok-current rev 22491

updated apr and apr-dev (1.4.6 -> 1.7.0)
author Hans-G?nter Theisgen
date Tue Dec 31 14:21:42 2019 +0100 (2019-12-31)
parents c4d721cfd662
children f4cb7c6f97ac
files apr-dev/receipt apr/receipt
line diff
     1.1 --- a/apr-dev/receipt	Tue Dec 31 13:52:50 2019 +0100
     1.2 +++ b/apr-dev/receipt	Tue Dec 31 14:21:42 2019 +0100
     1.3 @@ -1,25 +1,25 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="apr-dev"
     1.7 -VERSION="1.4.6"
     1.8 +VERSION="1.7.0"
     1.9  CATEGORY="development"
    1.10 -SHORT_DESC="Apache Portable Runtime Library dev files"
    1.11 +SHORT_DESC="Apache Portable Runtime Library - development files."
    1.12  MAINTAINER="lehswe@gmail.com"
    1.13  LICENSE="Apache"
    1.14 -WANTED="apr"
    1.15 -WEB_SITE="http://apr.apache.org"
    1.16 +WEB_SITE="https://apr.apache.org"
    1.17  
    1.18  DEPENDS="apr bash pkg-config"
    1.19 +WANTED="apr"
    1.20  
    1.21  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.22  genpkg_rules()
    1.23  {
    1.24 -	mkdir -p $fs/usr/lib $fs/usr/share
    1.25 -	
    1.26 -	cp -a $install/usr/bin $fs/usr
    1.27 -	cp -a $install/usr/include $fs/usr
    1.28 -	cp -a $install/usr/lib/*.*a $fs/usr/lib
    1.29 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    1.30 -	cp -a $install/usr/share/apr-1 $fs/usr/share
    1.31 +	mkdir -p $fs/usr/lib
    1.32 +	mkdir -p $fs/usr/share
    1.33 +
    1.34 +	cp -a $install/usr/bin			$fs/usr
    1.35 +	cp -a $install/usr/include		$fs/usr
    1.36 +	cp -a $install/usr/lib/*.*a		$fs/usr/lib
    1.37 +	cp -a $install/usr/lib/pkgconfig	$fs/usr/lib
    1.38 +	cp -a $install/usr/share/apr-1		$fs/usr/share
    1.39  }
    1.40 -
     2.1 --- a/apr/receipt	Tue Dec 31 13:52:50 2019 +0100
     2.2 +++ b/apr/receipt	Tue Dec 31 14:21:42 2019 +0100
     2.3 @@ -1,39 +1,40 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="apr"
     2.7 -VERSION="1.4.6"
     2.8 +VERSION="1.7.0"
     2.9  CATEGORY="misc"
    2.10 -SHORT_DESC="Apache Portable Runtime Library"
    2.11 +SHORT_DESC="Apache Portable Runtime Library."
    2.12  MAINTAINER="lehswe@gmail.com"
    2.13  LICENSE="Apache"
    2.14 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.15 -WEB_SITE="http://apr.apache.org"
    2.16 -WGET_URL="http://mir2.ovh.net/ftp.apache.org/dist/$PACKAGE/$TARBALL
    2.17 - http://apache.crihan.fr/dist/$PACKAGE/$TARBALL"
    2.18 -CROSS="error: cannot check for file existence when cross compiling"
    2.19 +WEB_SITE="https://apr.apache.org"
    2.20 +
    2.21 +TARBALL="$PACKAGE-$VERSION.tar.bz2"
    2.22 +WGET_URL="http://www.apache.org/dist/$PACKAGE/$TARBALL"
    2.23  
    2.24  DEPENDS="util-linux-uuid"
    2.25  BUILD_DEPENDS="util-linux-uuid-dev"
    2.26  
    2.27 +CROSS="error: cannot check for file existence when cross compiling"
    2.28 +
    2.29  # Rules to configure and make the package.
    2.30  compile_rules()
    2.31  {
    2.32 -	cd $src
    2.33 -	./configure \
    2.34 -		--prefix=/usr \
    2.35 -		--with-installbuilddir=/usr/share/apr-1/build \
    2.36 -		--enable-nonportable-atomics \
    2.37 -		--with-devrandom \
    2.38 -		--build=$HOST_SYSTEM \
    2.39 +	./configure						\
    2.40 +		--prefix=/usr					\
    2.41 +		--with-installbuilddir=/usr/share/apr-1/build	\
    2.42 +		--enable-nonportable-atomics			\
    2.43 +		--with-devrandom				\
    2.44 +		--build=$HOST_SYSTEM				\
    2.45  		--host=$HOST_SYSTEM 2>&1 | grep -v '/libtool:' &&
    2.46 -	make && make install
    2.47 +	make &&
    2.48 +	make install
    2.49  }
    2.50  
    2.51  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.52  genpkg_rules()
    2.53  {
    2.54  	mkdir -p $fs/usr/lib
    2.55 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    2.56 -	cp -a $install/usr/lib/*.exp $fs/usr/lib
    2.57 +
    2.58 +	cp -a $install/usr/lib/*.so*	$fs/usr/lib
    2.59 +	cp -a $install/usr/lib/*.exp	$fs/usr/lib
    2.60  }
    2.61 -