diff --git a/dev-libs/apr_util/apr_util-1.3.10.recipe b/dev-libs/apr_util/apr_util-1.3.10.recipe
deleted file mode 100644
index e6c525fe3..000000000
--- a/dev-libs/apr_util/apr_util-1.3.10.recipe
+++ /dev/null
@@ -1,99 +0,0 @@
-SUMMARY="Apache Portable Runtime Utility Library"
-DESCRIPTION="The mission of the Apache Portable Runtime (APR) project is to \
-create and maintain software libraries that provide a predictable and \
-consistent interface to underlying platform-specific implementations. The \
-primary goal is to provide an API to which software developers may code and be \
-assured of predictable if not identical behaviour regardless of the platform \
-on which their software is built, relieving them of the need to code special-\
-case conditions to work around or take advantage of platform-specific \
-deficiencies or features.
-
-To give a brief overview, the primary core subsystems of APR 1.x include \
-the following:
-
-- atomic operations
-- dynamic Shared Object loading
-- file I/O
-- locks (mutexes, condition variables, etc)
-- memory management (high performance allocators)
-- memory-mapped files
-- multicast Sockets
-- network I/O
-- shared memory
-- thread and Process management
-- various data structures (tables, hashes, priority queues, etc)"
-HOMEPAGE="http://apr.apache.org/"
-COPYRIGHT="2010 The Apache Software Foundation."
-LICENSE="Apache v2"
-REVISION="4"
-SOURCE_URI="http://archive.apache.org/dist/apr/apr-util-1.3.10.tar.gz"
-CHECKSUM_SHA256="7c37ac40b2351bfc23000fb6b7b54a67e0872255df315c82eb60c821bcef4b23"
-SOURCE_DIR="apr-util-$portVersion"
-PATCHES="apr_util-1.3.10.patch"
-
-ARCHITECTURES="x86_gcc2 ?x86"
-
-PROVIDES="
- apr_util = $portVersion compat >= 1
- lib:libaprutil = $portVersion compat >= 1
- lib:libaprutil_1 = $portVersion compat >= 1
- "
-REQUIRES="
- haiku
- apr >= 1.3.9
- expat >= 2.0
- "
-
-BUILD_REQUIRES="
- $REQUIRES
- "
-BUILD_PREREQUIRES="
- haiku_devel
- cmd:aclocal
- cmd:autoconf
- cmd:autoheader
- cmd:gcc
- cmd:ld
- cmd:libtoolize
- cmd:make
- "
-
-BUILD()
-{
- aprUtilPackageLinksDir=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName
- aprInstallDir=$aprUtilPackageLinksDir/apr
- expatInstallDir=$aprUtilPackageLinksDir/expat
-
- rm -rf aclocal.m4
- mkdir -p m4
- libtoolize -fci
- aclocal --install -I m4
- autoconf -f
- cd xml/expat
- mkdir -p m4
- echo 'AM_INIT_AUTOMAKE' >> configure.in
- libtoolize -fci
- aclocal --install -I m4
- autoconf --force
- autoheader
- touch libtool.m4
- cd ../..
-
- # TODO: fix this hack!
- cp /boot/common/bin/libtool .
- ln -sfn $sourceDir/libtool /libtool
-
- ./configure $configureDirArgs \
- --with-apr=$aprInstallDir \
- --with-expat=$expatInstallDir
- make
-}
-
-INSTALL()
-{
- make install
-
- # prepare develop/lib
- prepareInstalledDevelLibs libaprutil-1
- fixPkgconfig
-}
diff --git a/dev-libs/apr_util/apr_util-1.4.1.recipe b/dev-libs/apr_util/apr_util-1.4.1.recipe
deleted file mode 100644
index 7b43183e0..000000000
--- a/dev-libs/apr_util/apr_util-1.4.1.recipe
+++ /dev/null
@@ -1,128 +0,0 @@
-SUMMARY="Apache Portable Runtime Utility Library"
-HOMEPAGE="http://apr.apache.org/"
-SOURCE_URI="http://archive.apache.org/dist/apr/apr-util-1.4.1.tar.gz"
-CHECKSUM_SHA256="d636d9ef95c6e50e47fc338d532aa375edd11e5d7a3c30dee48beb38ddf4ab4c"
-LICENSE="Apache v2"
-COPYRIGHT="2011 The Apache Software Foundation."
-REVISION="4"
-ARCHITECTURES="all"
-
-PATCHES="apr_util-1.4.1.patch"
-
-PROVIDES="
- apr_util = $portVersion compat >= 1
- lib:libaprutil_1 = 0.4.1 compat >= 0
- "
-REQUIRES="
- haiku
- lib:libapr_1
- lib:libexpat
- lib:libiconv
- "
-BUILD_REQUIRES="
- devel:libapr_1 >= 0.4.6
- devel:libexpat >= 1.5.2
- devel:libiconv
- "
-BUILD_PREREQUIRES="
- haiku_devel
- cmd:aclocal
- cmd:autoconf
- cmd:autoheader
- cmd:gcc
- cmd:ld
- cmd:libtoolize
- cmd:make
- "
-
-SOURCE_DIR="apr-util-$portVersion"
-
-PATCH()
-{
- echo 'AM_INIT_AUTOMAKE' >> xml/expat/configure.in
-}
-
-BUILD()
-{
- aprInstallDir=$portPackageLinksDir/lib~libapr_1
- expatInstallDir=$portPackageLinksDir/lib~libexpat
-
- rm -rf aclocal.m4
- mkdir -p m4
- libtoolize -fci
- aclocal --install -I m4
- autoconf -f
-
- cd xml/expat
- mkdir -p m4
- libtoolize -fci
- aclocal --install -I m4
- autoconf --force
- autoheader
- touch libtool.m4
- cd ../..
-
- # TODO: fix this hack!
- cp /boot/system/bin/libtool .
- ln -sfn $sourceDir/libtool /libtool
-
- runConfigure ./configure \
- --with-apr=$aprInstallDir \
- --with-expat=$expatInstallDir
- make $jobArgs
-}
-
-INSTALL()
-{
- make install
-
- # prepare develop/lib
- prepareInstalledDevelLibs libaprutil-1
- fixPkgconfig
-
- # fix apu-1-config
- fixDevelopLibDirReferences $binDir/apu-1-config
-
- # remove superfluous .exp file
- rm $libDir/aprutil.exp
-
- # devel package
- packageEntries devel \
- $binDir \
- $developDir
-}
-
-DESCRIPTION="
-The mission of the Apache Portable Runtime (APR) project is to create and \
-maintain software libraries that provide a predictable and consistent \
-interface to underlying platform-specific implementations. The primary goal is \
-to provide an API to which software developers may code and be assured of \
-predictable if not identical behaviour regardless of the platform on which \
-their software is built, relieving them of the need to code special-case \
-conditions to work around or take advantage of platform-specific deficiencies \
-or features.
-To give a brief overview, the primary core subsystems of APR 1.x include the \
-following:
-- atomic operations
-- dynamic Shared Object loading
-- file I/O
-- locks (mutexes, condition variables, etc)
-- memory management (high performance allocators)
-- memory-mapped files
-- multicast Sockets
-- network I/O
-- shared memory
-- thread and Process management
-- various data structures (tables, hashes, priority queues, etc)
-"
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
- apr_util_devel = portVersion compat >= 1
- cmd:apu_1_config = $portVersion compat >= 1
- devel:libaprutil_1 = 0.4.1 compat >= 0
- "
-REQUIRES_devel="
- apr_util == $portVersion base
- "
diff --git a/dev-libs/apr_util/apr_util-1.6.1.recipe b/dev-libs/apr_util/apr_util-1.6.3.recipe
similarity index 85%
rename from dev-libs/apr_util/apr_util-1.6.1.recipe
rename to dev-libs/apr_util/apr_util-1.6.3.recipe
index 0aa298167..e201aaec5 100644
--- a/dev-libs/apr_util/apr_util-1.6.1.recipe
+++ b/dev-libs/apr_util/apr_util-1.6.3.recipe
@@ -10,18 +10,21 @@ deficiencies or features."
HOMEPAGE="http://apr.apache.org/"
COPYRIGHT="2011 The Apache Software Foundation."
LICENSE="Apache v2"
-REVISION="2"
+REVISION="1"
SOURCE_URI="http://archive.apache.org/dist/apr/apr-util-$portVersion.tar.gz"
-CHECKSUM_SHA256="b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459"
+CHECKSUM_SHA256="2b74d8932703826862ca305b094eef2983c27b39d5c9414442e9976a9acf1983"
SOURCE_DIR="apr-util-$portVersion"
PATCHES="apr_util-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
+libVersion="0.6.3"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
PROVIDES="
apr_util$secondaryArchSuffix = $portVersion compat >= 1
- lib:libaprutil_1$secondaryArchSuffix = 0.6.1 compat >= 0
+ lib:libaprutil_1$secondaryArchSuffix = $libVersionCompat
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -33,7 +36,7 @@ REQUIRES="
PROVIDES_devel="
apr_util${secondaryArchSuffix}_devel = portVersion compat >= 1
cmd:apu_1_config$secondaryArchSuffix = $portVersion compat >= 1
- devel:libaprutil_1$secondaryArchSuffix = 0.6.1 compat >= 0
+ devel:libaprutil_1$secondaryArchSuffix = $libVersionCompat
"
REQUIRES_devel="
apr_util$secondaryArchSuffix == $portVersion base
@@ -41,7 +44,7 @@ REQUIRES_devel="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
- devel:libapr_1$secondaryArchSuffix >= 0.6.0
+ devel:libapr_1$secondaryArchSuffix
devel:libexpat$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
"
@@ -67,7 +70,7 @@ INSTALL()
make install
# remove libtool library file
- rm $libDir/libaprutil-1.{a,la}
+ rm $libDir/libaprutil-1.la
# prepare develop/lib
prepareInstalledDevelLib libaprutil-1
diff --git a/dev-libs/apr_util/patches/apr_util-1.3.10.patch b/dev-libs/apr_util/patches/apr_util-1.3.10.patch
deleted file mode 100644
index 638694741..000000000
--- a/dev-libs/apr_util/patches/apr_util-1.3.10.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -urN apr-util-1.3.10/config.layout apr-util-1.3.10-haiku/config.layout
---- apr-util-1.3.10/config.layout 2005-02-09 12:18:43.049283072 +0000
-+++ apr-util-1.3.10-haiku/config.layout 2011-03-25 11:04:46.549453824 +0000
-@@ -60,6 +60,23 @@
- runtimedir: ${localstatedir}/run
-
-
-+# Haiku Layout making use of finddir
-+
-+ prefix: /boot/common
-+ exec_prefix: /boot/common
-+ bindir: /boot/common/bin
-+ sbindir: /boot/common/servers
-+ libdir: /boot/common/lib
-+ libexecdir: /boot/common/servers
-+ mandir: /boot/common/documentation/man
-+ sysconfdir: /boot/common/settings
-+ datadir: /boot/common/data
-+ installbuilddir: /boot/develop/build
-+ includedir: /boot/common/include
-+ localstatedir: /boot/common/var
-+ runtimedir: ${localstatedir}/log
-+
-+
- # Mac OS X Server (Rhapsody)
-
- prefix: /Local/Library/WebServer
diff --git a/dev-libs/apr_util/patches/apr_util-1.4.1.patch b/dev-libs/apr_util/patches/apr_util-1.4.1.patch
deleted file mode 100644
index 64006262e..000000000
--- a/dev-libs/apr_util/patches/apr_util-1.4.1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ur orig/apr-util-1.4.1/build/apu-conf.m4 apr_util-1.4.1/build/apu-conf.m4
---- orig/apr-util-1.4.1/build/apu-conf.m4 2011-08-08 11:32:27.026738688 +0200
-+++ apr_util-1.4.1/build/apu-conf.m4 2013-04-30 21:28:37.100401152 +0200
-@@ -145,10 +145,10 @@
- else
- # Add given path to standard search paths if appropriate:
- if test "$withval" != "/usr"; then
-- APR_ADDTO(LDFLAGS, [-L$withval/lib])
-- APR_ADDTO(CPPFLAGS, [-I$withval/include])
-- APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
-- APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
-+ APR_ADDTO(LDFLAGS, [-L$withval/develop/lib])
-+ APR_ADDTO(CPPFLAGS, [-I$withval/develop/headers])
-+ APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/develop/headers])
-+ APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/develop/lib])
- fi
- # ...and refuse to fall back on the builtin expat.
- apu_try_builtin_expat=0
-diff -ur orig/apr-util-1.4.1/config.layout apr_util-1.4.1/config.layout
---- orig/apr-util-1.4.1/config.layout 2005-02-09 13:18:43.064749568 +0100
-+++ apr_util-1.4.1/config.layout 2013-04-30 21:27:27.079953920 +0200
-@@ -60,6 +60,23 @@
- runtimedir: ${localstatedir}/run
-
-
-+# Haiku Layout making use of finddir
-+
-+ prefix: /boot/common
-+ exec_prefix: /boot/common
-+ bindir: /boot/common/bin
-+ sbindir: /boot/common/servers
-+ libdir: /boot/common/lib
-+ libexecdir: /boot/common/servers
-+ mandir: /boot/common/documentation/man
-+ sysconfdir: /boot/common/settings
-+ datadir: /boot/common/data
-+ installbuilddir: /boot/develop/build
-+ includedir: /boot/common/include
-+ localstatedir: /boot/common/var
-+ runtimedir: ${localstatedir}/log
-+
-+
- # Mac OS X Server (Rhapsody)
-
- prefix: /Local/Library/WebServer
diff --git a/dev-libs/apr_util/patches/apr_util-1.6.1.patchset b/dev-libs/apr_util/patches/apr_util-1.6.3.patchset
similarity index 100%
rename from dev-libs/apr_util/patches/apr_util-1.6.1.patchset
rename to dev-libs/apr_util/patches/apr_util-1.6.3.patchset