[Midnightbsd-cvs] mports: devel/apr: Update and switch autoconf
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Mar 24 14:26:08 EDT 2008
Log Message:
-----------
Update and switch autoconf
Modified Files:
--------------
mports/devel/apr:
Makefile (r1.4 -> r1.5)
distinfo (r1.1 -> r1.2)
mports/devel/apr/files:
patch-apr-util_build_dbm.m4 (r1.1 -> r1.2)
patch-apr-util_configure (r1.1 -> r1.2)
patch-apr_hints.m4 (r1.2 -> r1.3)
Removed Files:
-------------
mports/devel/apr/files:
patch-apr_dbd_sqlite3.c
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/apr/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L devel/apr/Makefile -L devel/apr/Makefile -u -r1.4 -r1.5
--- devel/apr/Makefile
+++ devel/apr/Makefile
@@ -16,8 +16,7 @@
# APR_UTIL_WITH_LDAP: force dependency on OpenLDAP
PORTNAME= apr
-PORTVERSION= 1.2.7
-PORTREVISION= 2
+PORTVERSION= 1.2.8
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= apr
@@ -25,12 +24,12 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= The Apache Group's Portability Library
-# '
+
LIB_DEPENDS+= expat.6:${PORTSDIR}/textproc/expat2
USE_ICONV= yes
-USE_AUTOTOOLS= automake:19 autoconf:259 libtool:15:env
+USE_AUTOTOOLS= automake:19 autoconf:261 libtool:15:env
USE_PERL5= yes
USE_GMAKE= yes
USE_PYTHON_BUILD= yes
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/devel/apr/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/apr/distinfo -L devel/apr/distinfo -u -r1.1 -r1.2
--- devel/apr/distinfo
+++ devel/apr/distinfo
@@ -1,6 +1,6 @@
-MD5 (apr-1.2.7.tar.gz) = aea926cbe588f844ad9e317157d60175
-SHA256 (apr-1.2.7.tar.gz) = 4bde26d8168216f00e0f652e34e20e527dab38edca6a7c0d85aea542bf0fc5fa
-SIZE (apr-1.2.7.tar.gz) = 1102370
-MD5 (apr-util-1.2.7.tar.gz) = c3702668a640be1695956115857ec22e
-SHA256 (apr-util-1.2.7.tar.gz) = 8cd84eb2031a91572e1be2975f4171730a9be72c4cd88718c4c40ac7dc4fd7d3
-SIZE (apr-util-1.2.7.tar.gz) = 641600
+MD5 (apr-1.2.8.tar.gz) = 814f19528d9cfc79aef188dd752e04d8
+SHA256 (apr-1.2.8.tar.gz) = 96e31f0ea2e028f372d5fdbbd4f88f31d59e14eda85cd12153183759f8e221c7
+SIZE (apr-1.2.8.tar.gz) = 1107189
+MD5 (apr-util-1.2.8.tar.gz) = a2e2e54d65e9eae961f7171335cf2550
+SHA256 (apr-util-1.2.8.tar.gz) = 6527cb0b3dd619acfca668412e84e52860dfd862054246ca903822d5ea824de6
+SIZE (apr-util-1.2.8.tar.gz) = 646379
Index: patch-apr_hints.m4
===================================================================
RCS file: /home/cvs/mports/devel/apr/files/patch-apr_hints.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -L devel/apr/files/patch-apr_hints.m4 -L devel/apr/files/patch-apr_hints.m4 -u -r1.2 -r1.3
--- devel/apr/files/patch-apr_hints.m4
+++ devel/apr/files/patch-apr_hints.m4
@@ -1,5 +1,5 @@
---- apr-1.2.7/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004
-+++ apr-1.2.7/build/apr_hints.m4 Wed Oct 27 11:25:32 2004
+--- apr-1.2.8/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004
++++ apr-1.2.8/build/apr_hints.m4 Wed Oct 27 11:25:32 2004
@@ -137,11 +137,7 @@
;;
*-freebsd*)
Index: patch-apr-util_configure
===================================================================
RCS file: /home/cvs/mports/devel/apr/files/patch-apr-util_configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/apr/files/patch-apr-util_configure -L devel/apr/files/patch-apr-util_configure -u -r1.1 -r1.2
--- devel/apr/files/patch-apr-util_configure
+++ devel/apr/files/patch-apr-util_configure
@@ -1,5 +1,5 @@
---- apr-util-1.2.7/configure.orig Mon Sep 26 18:28:49 2005
-+++ apr-util-1.2.7/configure Fri Dec 23 15:06:09 2005
+--- apr-util-1.2.8/configure.orig Mon Sep 26 18:28:49 2005
++++ apr-util-1.2.8/configure Fri Dec 23 15:06:09 2005
@@ -13806,6 +13806,8 @@
elif test "$withval" = "no"; then
apu_have_gdbm=0
--- devel/apr/files/patch-apr_dbd_sqlite3.c
+++ /dev/null
@@ -1,101 +0,0 @@
---- apr-util-1.2.7/dbd/apr_dbd_sqlite3.c.orig Wed Mar 15 01:04:54 2006
-+++ apr-util-1.2.7/dbd/apr_dbd_sqlite3.c Mon May 29 09:08:08 2006
-@@ -24,6 +24,7 @@
- #include <sqlite3.h>
-
- #include "apr_strings.h"
-+#include "apr_thread_mutex.h"
- #include "apr_time.h"
-
- #include "apr_dbd_internal.h"
-@@ -39,7 +40,9 @@
- struct apr_dbd_t {
- sqlite3 *conn;
- apr_dbd_transaction_t *trans;
-+#if APR_HAS_THREADS
- apr_thread_mutex_t *mutex;
-+#endif
- apr_pool_t *pool;
- };
-
-@@ -93,11 +96,15 @@
- return sql->trans->errnum;
- }
-
-+#if APR_HAS_THREADS
- apr_thread_mutex_lock(sql->mutex);
-+#endif
-
- ret = sqlite3_prepare(sql->conn, query, strlen(query), &stmt, &tail);
- if (!dbd_sqlite3_is_success(ret)) {
-+#if APR_HAS_THREADS
- apr_thread_mutex_unlock(sql->mutex);
-+#endif
- return ret;
- } else {
- int column_count;
-@@ -118,7 +125,9 @@
- if (retry_count++ > MAX_RETRY_COUNT) {
- ret = SQLITE_ERROR;
- } else {
-+#if APR_HAS_THREADS
- apr_thread_mutex_unlock(sql->mutex);
-+#endif
- apr_sleep(MAX_RETRY_SLEEP);
- apr_thread_mutex_lock(sql->mutex);
- }
-@@ -179,7 +188,9 @@
- } while (ret == SQLITE_ROW || ret == SQLITE_BUSY);
- }
- ret = sqlite3_finalize(stmt);
-+#if APR_HAS_THREADS
- apr_thread_mutex_unlock(sql->mutex);
-+#endif
-
- if (sql->trans) {
- sql->trans->errnum = ret;
-@@ -242,7 +253,9 @@
- }
-
- length = strlen(query);
-+#if APR_HAS_THREADS
- apr_thread_mutex_lock(sql->mutex);
-+#endif
-
- do {
- ret = sqlite3_prepare(sql->conn, query, length, &stmt, &tail);
-@@ -260,7 +273,9 @@
- if (dbd_sqlite3_is_success(ret)) {
- ret = 0;
- }
-+#if APR_HAS_THREADS
- apr_thread_mutex_unlock(sql->mutex);
-+#endif
- if (sql->trans) {
- sql->trans->errnum = ret;
- }
-@@ -366,12 +381,14 @@
- sql->conn = conn;
- sql->pool = pool;
- sql->trans = NULL;
-+#if APR_HAS_THREADS
- /* Create a mutex */
- res = apr_thread_mutex_create(&sql->mutex, APR_THREAD_MUTEX_DEFAULT,
- pool);
- if (res != APR_SUCCESS) {
- return NULL;
- }
-+#endif
-
- return sql;
- }
-@@ -379,7 +396,9 @@
- static apr_status_t dbd_sqlite3_close(apr_dbd_t *handle)
- {
- sqlite3_close(handle->conn);
-+#if APR_HAS_THREADS
- apr_thread_mutex_destroy(handle->mutex);
-+#endif
- return APR_SUCCESS;
- }
-
Index: patch-apr-util_build_dbm.m4
===================================================================
RCS file: /home/cvs/mports/devel/apr/files/patch-apr-util_build_dbm.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/apr/files/patch-apr-util_build_dbm.m4 -L devel/apr/files/patch-apr-util_build_dbm.m4 -u -r1.1 -r1.2
--- devel/apr/files/patch-apr-util_build_dbm.m4
+++ devel/apr/files/patch-apr-util_build_dbm.m4
@@ -1,5 +1,5 @@
---- apr-util-1.2.7/build/dbm.m4-orig Wed Dec 7 09:02:23 2005
-+++ apr-util-1.2.7/build/dbm.m4 Wed Dec 23 09:07:34 2005
+--- apr-util-1.2.8/build/dbm.m4-orig Wed Dec 7 09:02:23 2005
++++ apr-util-1.2.8/build/dbm.m4 Wed Dec 23 09:07:34 2005
@@ -588,6 +588,8 @@
elif test "$withval" = "no"; then
apu_have_gdbm=0
More information about the Midnightbsd-cvs
mailing list