# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1577801899 -3600
# Node ID f4cb7c6f97ac304c5bbe0c9781d474ef04864e7b
# Parent  3017ac7f921997eb2e14bf056c39d0eb90153fab
updated apr utilities (1.5.2 -> 1.6.1)

diff -r 3017ac7f9219 -r f4cb7c6f97ac apr-dbd-mysql/receipt
--- a/apr-dbd-mysql/receipt	Tue Dec 31 14:21:42 2019 +0100
+++ b/apr-dbd-mysql/receipt	Tue Dec 31 15:18:19 2019 +0100
@@ -1,20 +1,19 @@
 # SliTaz package receipt.
 
 PACKAGE="apr-dbd-mysql"
-VERSION="1.5.2"
+VERSION="1.6.1"
 CATEGORY="development"
-SHORT_DESC="APR Library Utilities MySQL DBD driver"
+SHORT_DESC="APR Library Utilities MySQL DBD driver."
 MAINTAINER="erjo@slitaz.org"
 LICENSE="Apache"
-WEB_SITE="http://apr.apache.org"
-WANTED="apr-util"
+WEB_SITE="https://apr.apache.org"
 
 DEPENDS="apr-util libmysqlclient"
+WANTED="apr-util"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib/apr-util-1
-	
 	cp -a $install/usr/lib/apr-util-1/*mysql*.so $fs/usr/lib/apr-util-1
 }
diff -r 3017ac7f9219 -r f4cb7c6f97ac apr-dbd-odbc/receipt
--- a/apr-dbd-odbc/receipt	Tue Dec 31 14:21:42 2019 +0100
+++ b/apr-dbd-odbc/receipt	Tue Dec 31 15:18:19 2019 +0100
@@ -1,21 +1,19 @@
 # SliTaz package receipt.
 
 PACKAGE="apr-dbd-odbc"
-VERSION="1.5.2"
+VERSION="1.6.1"
 CATEGORY="development"
-SHORT_DESC="APR Library Utilities ODBC DBD driver"
+SHORT_DESC="APR Library Utilities ODBC DBD driver."
 MAINTAINER="erjo@slitaz.org"
 LICENSE="Apache"
-WEB_SITE="http://apr.apache.org"
-WANTED="apr-util"
+WEB_SITE="https://apr.apache.org"
 
 DEPENDS="apr-util libunixODBC"
+WANTED="apr-util"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib/apr-util-1
-	
 	cp -a $install/usr/lib/apr-util-1/*odbc*.so $fs/usr/lib/apr-util-1
 }
-
diff -r 3017ac7f9219 -r f4cb7c6f97ac apr-dbd-pgsql/receipt
--- a/apr-dbd-pgsql/receipt	Tue Dec 31 14:21:42 2019 +0100
+++ b/apr-dbd-pgsql/receipt	Tue Dec 31 15:18:19 2019 +0100
@@ -1,20 +1,19 @@
 # SliTaz package receipt.
 
 PACKAGE="apr-dbd-pgsql"
-VERSION="1.5.2"
+VERSION="1.6.1"
 CATEGORY="development"
-SHORT_DESC="APR Library Utilities PostgreSQL DBD driver"
+SHORT_DESC="APR Library Utilities PostgreSQL DBD driver."
 MAINTAINER="erjo@slitaz.org"
 LICENSE="Apache"
-WEB_SITE="http://apr.apache.org"
-WANTED="apr-util"
+WEB_SITE="https://apr.apache.org"
 
 DEPENDS="apr-util libpostgresqlclient"
+WANTED="apr-util"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib/apr-util-1
-	
 	cp -a $install/usr/lib/apr-util-1/*pgsql*.so $fs/usr/lib/apr-util-1
 }
diff -r 3017ac7f9219 -r f4cb7c6f97ac apr-dbd-sqlite/receipt
--- a/apr-dbd-sqlite/receipt	Tue Dec 31 14:21:42 2019 +0100
+++ b/apr-dbd-sqlite/receipt	Tue Dec 31 15:18:19 2019 +0100
@@ -1,21 +1,19 @@
 # SliTaz package receipt.
 
 PACKAGE="apr-dbd-sqlite"
-VERSION="1.5.2"
+VERSION="1.6.1"
 CATEGORY="development"
-SHORT_DESC="Apache Portable Runtime Library Utilities SQLite DBD driver"
+SHORT_DESC="Apache Portable Runtime Library Utilities SQLite DBD driver."
 MAINTAINER="erjo@slitaz.org"
 LICENSE="Apache"
-WEB_SITE="http://apr.apache.org"
-WANTED="apr-util"
+WEB_SITE="https://apr.apache.org"
 
 DEPENDS="apr-util sqlite"
+WANTED="apr-util"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib/apr-util-1
-	
 	cp -a $install/usr/lib/apr-util-1/*sqlite*.so $fs/usr/lib/apr-util-1
 }
-
diff -r 3017ac7f9219 -r f4cb7c6f97ac apr-util-dev/receipt
--- a/apr-util-dev/receipt	Tue Dec 31 14:21:42 2019 +0100
+++ b/apr-util-dev/receipt	Tue Dec 31 15:18:19 2019 +0100
@@ -1,24 +1,24 @@
 # SliTaz package receipt.
 
 PACKAGE="apr-util-dev"
-VERSION="1.5.2"
+VERSION="1.6.1"
 CATEGORY="development"
-SHORT_DESC="APR Library Utilities"
+SHORT_DESC="APR Library Utilities."
 MAINTAINER="lehswe@gmail.com"
 LICENSE="Apache"
-WANTED="apr-util"
-WEB_SITE="http://apr.apache.org"
+WEB_SITE="https://apr.apache.org"
 
 DEPENDS="apr-util pkg-config"
+WANTED="apr-util"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib/apr-util-1
-	cp -a $install/usr/include $fs/usr
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib/*.*a $fs/usr/lib
-	cp -a $install/usr/lib/apr-util-1/*.*a $fs/usr/lib/apr-util-1
-	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
+
+	cp -a $install/usr/include		$fs/usr
+	cp -a $install/usr/bin			$fs/usr
+	cp -a $install/usr/lib/*.*a		$fs/usr/lib
+	cp -a $install/usr/lib/apr-util-1/*.*a	$fs/usr/lib/apr-util-1
+	cp -a $install/usr/lib/pkgconfig	$fs/usr/lib
 }
-
diff -r 3017ac7f9219 -r f4cb7c6f97ac apr-util/receipt
--- a/apr-util/receipt	Tue Dec 31 14:21:42 2019 +0100
+++ b/apr-util/receipt	Tue Dec 31 15:18:19 2019 +0100
@@ -1,29 +1,32 @@
 # SliTaz package receipt.
 
 PACKAGE="apr-util"
-VERSION="1.5.2"
+VERSION="1.6.1"
 CATEGORY="development"
-SHORT_DESC="APR Library Utilities"
+SHORT_DESC="APR Library Utilities."
 MAINTAINER="lehswe@gmail.com"
 LICENSE="Apache"
+WEB_SITE="https://apr.apache.org"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://apr.apache.org"
 WGET_URL="http://www.apache.org/dist/apr/$TARBALL"
-#WGET_URL="http://apache.crihan.fr/dist/apr/$TARBALL"
 
 DEPENDS="apr expat ncurses readline zlib"
-BUILD_DEPENDS="apr-dev unixODBC-dev sqlite-dev postgresql-dev mysql-dev libmysqlclient libpostgresqlclient util-linux-uuid-dev gawk"
- 
+BUILD_DEPENDS="apr-dev expat-dev gawk libmysqlclient 
+	libpostgresqlclient libtool mysql-dev postgresql-dev 
+	sqlite-dev unixODBC-dev util-linux-uuid-dev"
+
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	./configure --with-apr=$(apr-1-config --bindir) \
-		--with-pgsql=/usr \
-		--with-mysql \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-	--mandir=/usr/share/man $CONFIGURE_ARGS &&
+	./configure					\
+		--with-apr=$(apr-1-config --bindir)	\
+		--with-pgsql=/usr			\
+		--with-mysql				\
+		--prefix=/usr				\
+		--infodir=/usr/share/info		\
+		--mandir=/usr/share/man			\
+		$CONFIGURE_ARGS &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
@@ -33,6 +36,6 @@
 {
 	mkdir -p $fs/usr/lib/apr-util-1
 	
-	cp -a $install/usr/lib/*.so* $fs/usr/lib
-	#cp -a $install/usr/lib/apr-util-1/*.so* $fs/usr/lib/apr-util-1
+	cp -a $install/usr/lib/*.so*			$fs/usr/lib
+	#cp -a $install/usr/lib/apr-util-1/*.so*	$fs/usr/lib/apr-util-1
 }