# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1577798502 -3600
# Node ID 3017ac7f921997eb2e14bf056c39d0eb90153fab
# Parent  c4d721cfd662c05ed82150a17162392482074e22
updated apr and apr-dev (1.4.6 -> 1.7.0)

diff -r c4d721cfd662 -r 3017ac7f9219 apr-dev/receipt
--- a/apr-dev/receipt	Tue Dec 31 13:52:50 2019 +0100
+++ b/apr-dev/receipt	Tue Dec 31 14:21:42 2019 +0100
@@ -1,25 +1,25 @@
 # SliTaz package receipt.
 
 PACKAGE="apr-dev"
-VERSION="1.4.6"
+VERSION="1.7.0"
 CATEGORY="development"
-SHORT_DESC="Apache Portable Runtime Library dev files"
+SHORT_DESC="Apache Portable Runtime Library - development files."
 MAINTAINER="lehswe@gmail.com"
 LICENSE="Apache"
-WANTED="apr"
-WEB_SITE="http://apr.apache.org"
+WEB_SITE="https://apr.apache.org"
 
 DEPENDS="apr bash pkg-config"
+WANTED="apr"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib $fs/usr/share
-	
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/include $fs/usr
-	cp -a $install/usr/lib/*.*a $fs/usr/lib
-	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
-	cp -a $install/usr/share/apr-1 $fs/usr/share
+	mkdir -p $fs/usr/lib
+	mkdir -p $fs/usr/share
+
+	cp -a $install/usr/bin			$fs/usr
+	cp -a $install/usr/include		$fs/usr
+	cp -a $install/usr/lib/*.*a		$fs/usr/lib
+	cp -a $install/usr/lib/pkgconfig	$fs/usr/lib
+	cp -a $install/usr/share/apr-1		$fs/usr/share
 }
-
diff -r c4d721cfd662 -r 3017ac7f9219 apr/receipt
--- a/apr/receipt	Tue Dec 31 13:52:50 2019 +0100
+++ b/apr/receipt	Tue Dec 31 14:21:42 2019 +0100
@@ -1,39 +1,40 @@
 # SliTaz package receipt.
 
 PACKAGE="apr"
-VERSION="1.4.6"
+VERSION="1.7.0"
 CATEGORY="misc"
-SHORT_DESC="Apache Portable Runtime Library"
+SHORT_DESC="Apache Portable Runtime Library."
 MAINTAINER="lehswe@gmail.com"
 LICENSE="Apache"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://apr.apache.org"
-WGET_URL="http://mir2.ovh.net/ftp.apache.org/dist/$PACKAGE/$TARBALL
- http://apache.crihan.fr/dist/$PACKAGE/$TARBALL"
-CROSS="error: cannot check for file existence when cross compiling"
+WEB_SITE="https://apr.apache.org"
+
+TARBALL="$PACKAGE-$VERSION.tar.bz2"
+WGET_URL="http://www.apache.org/dist/$PACKAGE/$TARBALL"
 
 DEPENDS="util-linux-uuid"
 BUILD_DEPENDS="util-linux-uuid-dev"
 
+CROSS="error: cannot check for file existence when cross compiling"
+
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	./configure \
-		--prefix=/usr \
-		--with-installbuilddir=/usr/share/apr-1/build \
-		--enable-nonportable-atomics \
-		--with-devrandom \
-		--build=$HOST_SYSTEM \
+	./configure						\
+		--prefix=/usr					\
+		--with-installbuilddir=/usr/share/apr-1/build	\
+		--enable-nonportable-atomics			\
+		--with-devrandom				\
+		--build=$HOST_SYSTEM				\
 		--host=$HOST_SYSTEM 2>&1 | grep -v '/libtool:' &&
-	make && make install
+	make &&
+	make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	cp -a $install/usr/lib/*.so* $fs/usr/lib
-	cp -a $install/usr/lib/*.exp $fs/usr/lib
+
+	cp -a $install/usr/lib/*.so*	$fs/usr/lib
+	cp -a $install/usr/lib/*.exp	$fs/usr/lib
 }
-