From b272f84c1e85342d8736524054b08d8781dc6110 Mon Sep 17 00:00:00 2001
From: Thomas Heil <heil@terminal-consulting.de>
Date: Sat, 12 Jul 2014 13:39:14 +0200
Subject: [PATCH] apr-util: import from oldpackages, add myself as maintainer,
 add license information, update source-url update to v1.5.3

Signed-off-by: Thomas Heil <heil@terminal-consulting.de>
---
 libs/apr-util/Makefile                        | 77 +++++++++++++++++++
 .../patches/001-automake-compat.patch         | 21 +++++
 2 files changed, 98 insertions(+)
 create mode 100644 libs/apr-util/Makefile
 create mode 100644 libs/apr-util/patches/001-automake-compat.patch

diff --git a/libs/apr-util/Makefile b/libs/apr-util/Makefile
new file mode 100644
index 000000000..90f856a11
--- /dev/null
+++ b/libs/apr-util/Makefile
@@ -0,0 +1,77 @@
+#
+# Copyright (C) 2007-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=apr-util
+PKG_VERSION:=1.5.3
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://mirrors.ibiblio.org/apache/apr/
+PKG_MD5SUM:=6f3417691c7a27090f36e7cf4d94b36e
+PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
+PKG_LICENSE:=Apache License
+
+PKG_FIXUP:=autoreconf
+PKG_REMOVE_FILES:=aclocal.m4 build/ltmain.sh
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+
+define Package/libaprutil
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=+libapr +libexpat +libsqlite3 +libuuid $(ICONV_DEPENDS)
+  TITLE:=Apache Portable Runtime Utility Library
+  URL:=http://apr.apache.org/
+endef
+
+TARGET_CFLAGS += $(FPIC)
+TARGET_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
+
+CONFIGURE_ARGS += \
+	--with-pgsql=no \
+	--with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
+	--with-expat="$(STAGING_DIR)/usr" \
+	--without-sqlite2 \
+	--with-sqlite3="$(STAGING_DIR)/usr" \
+	--with-iconv="$(ICONV_PREFIX)" \
+
+CONFIGURE_VARS += \
+	ac_cv_file_dbd_apr_dbd_mysql_c=no \
+	ac_cv_path_ODBC_CONFIG= \
+	APR_BUILD_DIR="$(STAGING_DIR)/usr/share/build-1" \
+
+MAKE_FLAGS += \
+	APRUTIL_LIBS="-lsqlite3 $(TARGET_LDFLAGS) -lexpat $(if $(ICONV_FULL),-liconv) -lapr-1 -luuid -lm -lcrypt" \
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1/ $(1)/usr/lib  $(1)/usr/lib/pkgconfig/
+	$(CP)   $(PKG_INSTALL_DIR)/usr/bin/apu-1-config \
+	 	$(1)/usr/bin/
+	$(CP)   $(PKG_INSTALL_DIR)/usr/include/apr-1/* \
+		$(1)/usr/include/apr-1/
+	$(CP)   $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{la,a,so*} \
+		$(1)/usr/lib/
+	$(CP)   $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-util-1.pc \
+		$(1)/usr/lib/pkgconfig/
+	$(SED) 's, -e \"s -I$$$$prefix/lib  g\",,g' $(1)/usr/bin/apu-1-config
+	$(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' $(1)/usr/bin/apu-1-config
+	$(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/usr/include/,g' $(1)/usr/bin/apu-1-config
+	$(SED) 's,-L$$$$libdir,,g' $(1)/usr/bin/apu-1-config
+	$(SED) 's,-R$$$$libdir,,g' $(1)/usr/bin/apu-1-config
+endef
+
+define Package/libaprutil/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libaprutil))
diff --git a/libs/apr-util/patches/001-automake-compat.patch b/libs/apr-util/patches/001-automake-compat.patch
new file mode 100644
index 000000000..20c4cf2b9
--- /dev/null
+++ b/libs/apr-util/patches/001-automake-compat.patch
@@ -0,0 +1,21 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -8,6 +8,7 @@ APRUTIL_MAJOR_VERSION=@APRUTIL_MAJOR_VER
+ APRUTIL_DOTTED_VERSION=@APRUTIL_DOTTED_VERSION@
+ 
+ srcdir = @srcdir@
++top_builddir = @top_builddir@
+ VPATH = @srcdir@
+ 
+ INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
+--- a/configure.in
++++ b/configure.in
+@@ -41,6 +41,8 @@ AC_SUBST(APU_CONFIG_LOCATION)
+ AC_CANONICAL_SYSTEM
+ 
+ AC_PROG_INSTALL
++AC_PROG_LIBTOOL
++LT_INIT
+ 
+ # Use -no-install or -no-fast-install to link the test 
+ # programs on all platforms but Darwin, where it would cause