diff options
| author | Olli Hauer <ohauer@FreeBSD.org> | 2011-05-13 23:00:17 +0000 |
|---|---|---|
| committer | Olli Hauer <ohauer@FreeBSD.org> | 2011-05-13 23:00:17 +0000 |
| commit | ef457ed720a9e1475a6593a4f14d1eb467552572 (patch) | |
| tree | 0c581905407b98e2ef0fff2ae5630d5ba316d24d /devel/apr1 | |
| parent | 3afa32a9fd40c057747e53c7a8447dd08cc5adc4 (diff) | |
Notes
Diffstat (limited to 'devel/apr1')
| -rw-r--r-- | devel/apr1/Makefile | 4 | ||||
| -rw-r--r-- | devel/apr1/distinfo | 10 | ||||
| -rw-r--r-- | devel/apr1/files/patch-apr_buildconf | 13 | ||||
| -rw-r--r-- | devel/apr1/files/patch-apr_hints.m4 | 6 |
4 files changed, 9 insertions, 24 deletions
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index e7e35de5d263..d998e7b8ea8b 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -29,8 +29,8 @@ OPTIONS= THREADS "Enable Threads in apr" on \ SQLITE "Enable SQLite3 support in apr-util" off \ DEVRANDOM "Use /dev/random or compatible in apr" on -APR_VERSION= 1.4.2 -APU_VERSION= 1.3.10 +APR_VERSION= 1.4.4 +APU_VERSION= 1.3.11 USE_ICONV= yes USE_AUTOTOOLS= automake autoconf libtool:env diff --git a/devel/apr1/distinfo b/devel/apr1/distinfo index d3ea3cc14e31..182e1d15dcf6 100644 --- a/devel/apr1/distinfo +++ b/devel/apr1/distinfo @@ -1,6 +1,4 @@ -MD5 (apr-1.4.2.tar.gz) = fc80cb54f158c2674f9eeb47a1f672cd -SHA256 (apr-1.4.2.tar.gz) = 6a0291d6f6a59d5eab5ae5441c37b78b17f7a1a2fa1478741b7178f5fbc33ebe -SIZE (apr-1.4.2.tar.gz) = 949945 -MD5 (apr-util-1.3.10.tar.gz) = 82acd25cf3df8c72eba44eaee8b80c19 -SHA256 (apr-util-1.3.10.tar.gz) = 7c37ac40b2351bfc23000fb6b7b54a67e0872255df315c82eb60c821bcef4b23 -SIZE (apr-util-1.3.10.tar.gz) = 768634 +SHA256 (apr-1.4.4.tar.gz) = 49819f4f28f7856995886193d822edde47062c3dd00597d4fbe575ef2bda16c8 +SIZE (apr-1.4.4.tar.gz) = 995954 +SHA256 (apr-util-1.3.11.tar.gz) = 6590d663927bf609d614ad407406dcc84af78d031650f60ab48853e9b3f4d87f +SIZE (apr-util-1.3.11.tar.gz) = 769021 diff --git a/devel/apr1/files/patch-apr_buildconf b/devel/apr1/files/patch-apr_buildconf deleted file mode 100644 index 780101677758..000000000000 --- a/devel/apr1/files/patch-apr_buildconf +++ /dev/null @@ -1,13 +0,0 @@ ---- apr-1.4.2/buildconf.orig 2009-11-12 16:19:49.000000000 -0600 -+++ apr-1.4.2/buildconf 2011-02-15 16:07:59.000000000 -0600 -@@ -54,4 +54,4 @@ - # libtool 2.x -- aclocal_dir=`sed -n '/^aclocaldir=/{s/.*=//;p;q;}' < $libtoolize` -- ltfiles=`sed -n '/^all_pkgmacro_files=/{s/.*=//;;s/"//;p;q;}' < $libtoolize` -+ aclocal_dir=`sed -n '/^ *aclocaldir=/{s/.*=//;p;q;}' < $libtoolize` -+ ltfiles=`sed -n '/^ *all_pkgmacro_files=/{s/.*=//;;s/"//;p;q;}' < $libtoolize` - for f in $ltfiles; do -@@ -78,2 +78,3 @@ - -+chmod 664 build/libtool.m4 - cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 diff --git a/devel/apr1/files/patch-apr_hints.m4 b/devel/apr1/files/patch-apr_hints.m4 index f86ec6c0fd5b..3726568f3e93 100644 --- a/devel/apr1/files/patch-apr_hints.m4 +++ b/devel/apr1/files/patch-apr_hints.m4 @@ -1,6 +1,6 @@ ---- apr-1.4.2/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004 -+++ apr-1.4.2/build/apr_hints.m4 Wed Oct 27 11:25:32 2004 -@@ -137,11 +137,7 @@ +--- apr-1.4.4/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004 ++++ apr-1.4.4/build/apr_hints.m4 Wed Oct 27 11:25:32 2004 +@@ -159,11 +159,7 @@ ;; *-freebsd*) APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE]) |