--- a/components/apr-1_5/Makefile Fri Dec 12 08:20:34 2014 -0800
+++ b/components/apr-1_5/Makefile Tue Dec 09 02:00:43 2014 -0800
@@ -23,16 +23,16 @@
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= apr
-COMPONENT_VERSION= 1.5.0
+COMPONENT_VERSION= 1.5.1
COMPONENT_PROJECT_URL= http://apr.apache.org/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:9879f02054cb22e99f605f6fdbf47f4c028af4cd4f351cf64186a7ee447f35d7
+ sha256:94b1c9d9835cc9e902838b95d62ecc9a39b698f23e3e706812ec65a78ba41af7
COMPONENT_ARCHIVE_URL= http://archive.apache.org/dist/apr/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= utility/apache
-TPNO= 16531
+TPNO= 20711
CONFIGURE_DEFAULT_DIRS=no
@@ -40,6 +40,10 @@
include ../../make-rules/configure.mk
include ../../make-rules/ips.mk
+# Micro version for easy libraries packaging
+MICRO_VERSION:= $(shell echo $(COMPONENT_VERSION) | awk -F. '{ print $$3 }')
+PKG_MACROS+= MICRO_VERSION=$(MICRO_VERSION)
+
PATCH_LEVEL=0
# CC will be used via libtool for linking (thus need to be bitness aware).
--- a/components/apr-1_5/apr-15.p5m Fri Dec 12 08:20:34 2014 -0800
+++ b/components/apr-1_5/apr-15.p5m Tue Dec 09 02:00:43 2014 -0800
@@ -90,9 +90,9 @@
file path=usr/apr/1.5/include/apr_user.h
file path=usr/apr/1.5/include/apr_version.h
file path=usr/apr/1.5/include/apr_want.h
-file path=usr/apr/1.5/lib/$(MACH64)/libapr-1.so.0.5.0 facet.devel=false
+file path=usr/apr/1.5/lib/$(MACH64)/libapr-1.so.0.5.$(MICRO_VERSION) facet.devel=false
file path=usr/apr/1.5/lib/$(MACH64)/pkgconfig/apr-1.pc
-file path=usr/apr/1.5/lib/libapr-1.so.0.5.0 facet.devel=false
+file path=usr/apr/1.5/lib/libapr-1.so.0.5.$(MICRO_VERSION) facet.devel=false
file path=usr/apr/1.5/lib/pkgconfig/apr-1.pc
file path=usr/apr/1.5/manual/annotated.html
file path=usr/apr/1.5/manual/apr__allocator_8h_source.html
@@ -302,14 +302,14 @@
file path=usr/apr/1.5/manual/unionapr__descriptor.html
link path=usr/apr/1.5/bin/64 target=$(MACH64)
link path=usr/apr/1.5/build/64 target=$(MACH64)
-link path=usr/apr/1.5/lib/$(MACH64)/libapr-1.so target=libapr-1.so.0.5.0 \
+link path=usr/apr/1.5/lib/$(MACH64)/libapr-1.so target=libapr-1.so.0.5.$(MICRO_VERSION) \
facet.devel=false
-link path=usr/apr/1.5/lib/$(MACH64)/libapr-1.so.0 target=libapr-1.so.0.5.0 \
+link path=usr/apr/1.5/lib/$(MACH64)/libapr-1.so.0 target=libapr-1.so.0.5.$(MICRO_VERSION) \
facet.devel=false
link path=usr/apr/1.5/lib/64 target=$(MACH64)
-link path=usr/apr/1.5/lib/libapr-1.so target=libapr-1.so.0.5.0 \
+link path=usr/apr/1.5/lib/libapr-1.so target=libapr-1.so.0.5.$(MICRO_VERSION) \
facet.devel=false
-link path=usr/apr/1.5/lib/libapr-1.so.0 target=libapr-1.so.0.5.0 \
+link path=usr/apr/1.5/lib/libapr-1.so.0 target=libapr-1.so.0.5.$(MICRO_VERSION) \
facet.devel=false
link path=usr/bin/$(MACH64)/apr-1-config target=../../apr/1.5/bin/$(MACH64)/apr-1-config \
mediator=apr-1-config mediator-version=1.5 pkg.linted.pkglint.dupaction010.2=true
--- a/components/apr-1_5/apr.license Fri Dec 12 08:20:34 2014 -0800
+++ b/components/apr-1_5/apr.license Tue Dec 09 02:00:43 2014 -0800
@@ -1,7 +1,7 @@
Apache Portable Runtime
-Copyright (c) 2009 The Apache Software Foundation.
+Copyright (c) 2000-2014 The Apache Software Foundation.
-This product includes software developed by
+This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Portions of this software were developed at the National Center
@@ -234,8 +234,8 @@
The Apache Portable Runtime includes a number of subcomponents with
separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
+code for these subcomponents is subject to the terms and conditions
+of the following licenses.
From strings/apr_fnmatch.c, include/apr_fnmatch.h, misc/unix/getopt.c,
file_io/unix/mktemp.c, strings/apr_strings.c:
--- a/components/apr-1_5/patches/makefile.patch Fri Dec 12 08:20:34 2014 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-Patch origin: upstream
-Patch status: will be part of next version
-
-http://svn.apache.org/viewvc?view=revision&revision=1541744
-http://svn.apache.org/viewvc?view=revision&revision=757740
-
---- Makefile.in 2013-10-29 11:37:29.000000000 -0700
-+++ Makefile.in 2014-01-27 07:24:52.564639849 -0800
-@@ -18,7 +18,7 @@
- INCDIR=./include
- OSDIR=$(top_srcdir)/include/arch/@OSDIR@
- DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
--INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include/arch/@DEFAULT_OSDIR@ -I$(top_srcdir)/include -I$(top_srcdir)/include/private
-+INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include/arch/@DEFAULT_OSDIR@ -I$(top_srcdir)/include -I$(top_srcdir)/include/private -I$(top_builddir)/include/private
-
- #
- # Macros for target determination
-@@ -134,6 +134,7 @@
- $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
-
- include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
-+ mkdir -p include/private
- tools/gen_test_char@EXEEXT@ > $@
-
- LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \