Index: devel/apr1/Makefile =================================================================== --- devel/apr1/Makefile +++ devel/apr1/Makefile @@ -1,6 +1,5 @@ PORTNAME= apr PORTVERSION= ${APR_VERSION}.${APU_VERSION} -PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= APACHE/apr DISTFILES= apr-${APR_VERSION}.tar.gz \ @@ -18,7 +17,7 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes -APR_VERSION= 1.7.3 +APR_VERSION= 1.7.5 APU_VERSION= 1.6.3 CPE_VENDOR= apache Index: devel/apr1/distinfo =================================================================== --- devel/apr1/distinfo +++ devel/apr1/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1680344440 -SHA256 (apr-1.7.3.tar.gz) = af9bfd5b8a04425d6b419673f3e0a7656fade226aae78180d93f8a6f2d3d1c09 -SIZE (apr-1.7.3.tar.gz) = 1097690 +TIMESTAMP = 1728005750 +SHA256 (apr-1.7.5.tar.gz) = 3375fa365d67bcf945e52b52cba07abea57ef530f40b281ffbe977a9251361db +SIZE (apr-1.7.5.tar.gz) = 1131871 SHA256 (apr-util-1.6.3.tar.gz) = 2b74d8932703826862ca305b094eef2983c27b39d5c9414442e9976a9acf1983 SIZE (apr-util-1.6.3.tar.gz) = 556623 Index: devel/apr1/files/patch-PR59332 =================================================================== --- devel/apr1/files/patch-PR59332 +++ /dev/null @@ -1,18 +0,0 @@ -See https://bz.apache.org/bugzilla/show_bug.cgi?id=59332 - -Also reported in PR230538 devel/apr1 fails with mysql80-client - ---- apr-util-1.6.3/dbd/apr_dbd_mysql.c.orig 2023-01-27 13:32:52 UTC -+++ apr-util-1.6.3/dbd/apr_dbd_mysql.c -@@ -44,6 +44,11 @@ - #include - #endif - -+#if !defined(HAVE_TYPE_MY_BOOL) && !defined(LIBMARIADB) -+#include -+typedef bool my_bool; -+#endif -+ - #include "apr_strings.h" - #include "apr_lib.h" - #include "apr_buckets.h" Index: devel/apr1/files/patch-apr-1.7.3_poll_unix_kqueue.c =================================================================== --- devel/apr1/files/patch-apr-1.7.3_poll_unix_kqueue.c +++ devel/apr1/files/patch-apr-1.7.3_poll_unix_kqueue.c @@ -1,8 +1,8 @@ # upstram PR: https://bz.apache.org/bugzilla/show_bug.cgi?id=59914 # FreeBSD PR: 211430 ======================================================================== ---- apr-1.7.3/poll/unix/kqueue.c.orig 2022-01-19 23:17:18 UTC -+++ apr-1.7.3/poll/unix/kqueue.c +--- apr-1.7.5/poll/unix/kqueue.c.orig 2022-01-19 23:17:18 UTC ++++ apr-1.7.5/poll/unix/kqueue.c @@ -25,21 +25,40 @@ #ifdef HAVE_KQUEUE