aboutsummaryrefslogtreecommitdiff
path: root/devel/apr1
diff options
context:
space:
mode:
Diffstat (limited to 'devel/apr1')
-rw-r--r--devel/apr1/Makefile63
-rw-r--r--devel/apr1/distinfo8
-rw-r--r--devel/apr1/files/patch-apr_hints.m44
-rw-r--r--devel/apr1/files/patch-apr_ldap_rebind.c15
-rw-r--r--devel/apr1/pkg-plist2
5 files changed, 16 insertions, 76 deletions
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index 944c13fff5e5..e675e14af2a9 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -31,8 +31,8 @@ NDBM_DESC= NDBM support
.include <bsd.port.options.mk>
-APR_VERSION= 1.4.5
-APU_VERSION= 1.3.12
+APR_VERSION= 1.4.6
+APU_VERSION= 1.4.1
USE_ICONV= yes
USE_AUTOTOOLS= automake autoconf libtool:env
@@ -49,7 +49,7 @@ APU_WRKDIR= ${WRKDIR}/apr-util-${APU_VERSION}
PLIST_SUB= SHLIB_APR_MAJOR="${SHLIB_APR_MAJOR}" SHLIB_APU_MAJOR="${SHLIB_APU_MAJOR}"
SHLIB_APR_MAJOR= 4
-SHLIB_APU_MAJOR= 3
+SHLIB_APU_MAJOR= 4
APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1
APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \
@@ -61,31 +61,16 @@ APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \
APR_CONF_ARGS+= --enable-threads
.else
APR_CONF_ARGS+= --disable-threads
-. if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nothr
-. else
-PKGNAMESUFFIX= -nothr
-. endif
.endif
.if ${PORT_OPTIONS:MIPV6}
APR_CONF_ARGS+= --enable-ipv6
-. if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ipv6
-. else
-PKGNAMESUFFIX= -ipv6
-. endif
.else
APR_CONF_ARGS+= --disable-ipv6
.endif
.if ${PORT_OPTIONS:MDEVRANDOM}
APR_CONF_ARGS+= --with-devrandom
-. if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-devrandom
-. else
-PKGNAMESUFFIX= -devrandom
-. endif
.else
APR_CONF_ARGS+= --without-devrandom
.endif
@@ -96,11 +81,6 @@ PLIST_SUB+= GDBM=""
APU_EXTRAS= yes
LIB_DEPENDS+= gdbm:${PORTSDIR}/databases/gdbm
APU_CONF_ARGS+= --with-gdbm=${LOCALBASE}
-. if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gdbm
-. else
-PKGNAMESUFFIX= -gdbm
-. endif
.else
PLIST_SUB+= GDBM="@comment "
APU_CONF_ARGS+= --without-gdbm
@@ -111,11 +91,6 @@ APU_EXTRAS= yes
PLIST_SUB+= BDB=""
USE_BDB= 42+
APU_CONF_ARGS+= --with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}
-. if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
-. else
-PKGNAMESUFFIX= -${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
-. endif
.else
PLIST_SUB+= BDB="@comment "
APU_CONF_ARGS+= --without-berkeley-db
@@ -125,11 +100,6 @@ APU_CONF_ARGS+= --without-berkeley-db
APU_EXTRAS= yes
PLIST_SUB+= NDBM=""
APU_CONF_ARGS+= --with-ndbm=/usr
-. if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ndbm
-. else
-PKGNAMESUFFIX= -ndbm
-. endif
.else
PLIST_SUB+= NDBM="@comment "
APU_CONF_ARGS+= --without-ndbm
@@ -141,11 +111,6 @@ PLIST_SUB+= LDAP=""
USE_OPENLDAP= yes
APU_CONF_ARGS+= --with-ldap-include=${LOCALBASE}/include \
--with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap
-. if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ldap${OPENLDAP_VER}
-. else
-PKGNAMESUFFIX= -ldap
-. endif
.else
PLIST_SUB+= LDAP="@comment "
APU_CONF_ARGS+= --without-ldap
@@ -159,11 +124,6 @@ APU_CONF_ARGS+= --with-mysql=${LOCALBASE}
CONFIGURE_ENV+= LIBS="${LIBS}"
CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H
LDFLAGS+= -L${LOCALBASE}/lib/mysql
-. if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-mysql${MYSQL_VER}
-. else
-PKGNAMESUFFIX= -mysql
-. endif
.else
PLIST_SUB+= MYSQL="@comment "
APU_CONF_ARGS+= --without-mysql
@@ -175,11 +135,6 @@ PLIST_SUB+= PGSQL=""
USE_PGSQL= YES
APU_CONF_ARGS+= --with-pgsql=${LOCALBASE}
CONFIGURE_ENV+= ac_cv_path_PGSQL_CONFIG=""
-. if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-pgsql${PGSQL_VER}
-. else
-PKGNAMESUFFIX= -pgsql
-. endif
.else
PLIST_SUB+= PGSQL="@comment "
APU_CONF_ARGS+= --without-pgsql
@@ -190,11 +145,6 @@ APU_EXTRAS= yes
PLIST_SUB+= SQLITE3=""
USE_SQLITE= YES
APU_CONF_ARGS+= --with-sqlite3=${LOCALBASE}
-. if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-sqlite3
-. else
-PKGNAMESUFFIX= -sqlite3
-. endif
.else
APU_CONF_ARGS+= --without-sqlite3
PLIST_SUB+= SQLITE3="@comment "
@@ -218,6 +168,9 @@ post-patch:
${APR_WRKDIR}/build/gen-build.py
${REINPLACE_CMD} -e 's/void main/int main/' ${APR_WRKDIR}/build/apr_network.m4
+# http://svn.apache.org/viewvc?view=revision&revision=1362895
+ ${REINPLACE_CMD} -e 's|sql = apr_palloc|sql = apr_pcalloc|' ${APU_WRKDIR}/dbd/apr_dbd_freetds.c
+
run-autotools::
cd ${APR_WRKDIR} ; \
${SETENV} ${CONFIGURE_ENV} ${SH} ./buildconf
@@ -248,8 +201,8 @@ do-install:
cd ${APU_WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
test: build
- @(cd ${APR_WRKDIR}; ${MAKE} test)
- @(cd ${APU_WRKDIR}; ${MAKE} test)
+ -@(cd ${APR_WRKDIR}; ${MAKE} test)
+ -@(cd ${APU_WRKDIR}; ${MAKE} test)
#regression-test: test
diff --git a/devel/apr1/distinfo b/devel/apr1/distinfo
index a9d269cce695..e21c84c561f7 100644
--- a/devel/apr1/distinfo
+++ b/devel/apr1/distinfo
@@ -1,4 +1,4 @@
-SHA256 (apr-1.4.5.tar.gz) = 7323d5f72d6bddf7d1ecb63e4326df82a66210018bb2f1e8f6d97357e68302df
-SIZE (apr-1.4.5.tar.gz) = 994320
-SHA256 (apr-util-1.3.12.tar.gz) = 815b6fc82950f61050a5e711a7f3c20fd9b6ffcc7a4cacfe9f291fb241210cd8
-SIZE (apr-util-1.3.12.tar.gz) = 769076
+SHA256 (apr-1.4.6.tar.gz) = 538d593d805c36985fc6d200d31bf6c1b5f90df2a50b917902743a13bbc10e05
+SIZE (apr-1.4.6.tar.gz) = 982243
+SHA256 (apr-util-1.4.1.tar.gz) = d636d9ef95c6e50e47fc338d532aa375edd11e5d7a3c30dee48beb38ddf4ab4c
+SIZE (apr-util-1.4.1.tar.gz) = 774770
diff --git a/devel/apr1/files/patch-apr_hints.m4 b/devel/apr1/files/patch-apr_hints.m4
index d335b20571eb..0664cafe4baa 100644
--- a/devel/apr1/files/patch-apr_hints.m4
+++ b/devel/apr1/files/patch-apr_hints.m4
@@ -1,5 +1,5 @@
---- apr-1.4.5/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004
-+++ apr-1.4.5/build/apr_hints.m4 Wed Oct 27 11:25:32 2004
+--- apr-1.4.6/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004
++++ apr-1.4.6/build/apr_hints.m4 Wed Oct 27 11:25:32 2004
@@ -159,11 +159,7 @@
;;
*-freebsd*)
diff --git a/devel/apr1/files/patch-apr_ldap_rebind.c b/devel/apr1/files/patch-apr_ldap_rebind.c
deleted file mode 100644
index e7c9cd2a17d7..000000000000
--- a/devel/apr1/files/patch-apr_ldap_rebind.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- apr-util-1.3.12/ldap/apr_ldap_rebind.c.orig 2011-06-18 14:42:15.000000000 +0000
-+++ apr-util-1.3.12/ldap/apr_ldap_rebind.c 2011-06-18 14:42:28.000000000 +0000
-@@ -81,11 +81,11 @@
- get_apd
- #endif
-
-+#if APR_HAS_THREADS
- /* run after apr_thread_mutex_create cleanup */
- apr_pool_cleanup_register(pool, &apr_ldap_xref_lock, apr_ldap_pool_cleanup_set_null,
- apr_pool_cleanup_null);
-
--#if APR_HAS_THREADS
- if (apr_ldap_xref_lock == NULL) {
- retcode = apr_thread_mutex_create(&apr_ldap_xref_lock, APR_THREAD_MUTEX_DEFAULT, pool);
- }
diff --git a/devel/apr1/pkg-plist b/devel/apr1/pkg-plist
index b95280bb5c44..1cad14656df0 100644
--- a/devel/apr1/pkg-plist
+++ b/devel/apr1/pkg-plist
@@ -6,6 +6,7 @@ include/apr-1/apr_anylock.h
include/apr-1/apr_atomic.h
include/apr-1/apr_base64.h
include/apr-1/apr_buckets.h
+include/apr-1/apr_crypto.h
include/apr-1/apr_date.h
include/apr-1/apr_dbd.h
include/apr-1/apr_dbm.h
@@ -65,6 +66,7 @@ include/apr-1/apr_want.h
include/apr-1/apr_xlate.h
include/apr-1/apr_xml.h
include/apr-1/apu.h
+include/apr-1/apu_errno.h
include/apr-1/apu_version.h
include/apr-1/apu_want.h
%%MYSQL%%lib/apr-util-1/apr_dbd_mysql-1.so
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-06 16:32:37 +0000