devel/apr1: Update APR to 1.7.6

* While here, standardize patch filenames

PR:		292292
Reported by:	Alain De Vos <devosalain ymail com>

7 files changed, 15 insertions, 16 deletions

diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index 2a42b0e29404..a0d38280d704 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -1,10 +1,9 @@
 PORTNAME=	apr
 PORTVERSION=	${APR_VERSION}.${APU_VERSION}
-PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	APACHE/apr
-DISTFILES=	apr-${APR_VERSION}.tar.gz \
-		apr-util-${APU_VERSION}.tar.gz
+DISTFILES=	apr-${APR_VERSION}.tar.bz2 \
+		apr-util-${APU_VERSION}.tar.bz2
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache Portability Library
@@ -14,11 +13,11 @@ LICENSE=	APACHE20
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
-USES=		autoreconf iconv pathfix libtool cpe
+USES=		autoreconf iconv pathfix libtool cpe tar:bz2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
-APR_VERSION=	1.7.5
+APR_VERSION=	1.7.6
 APU_VERSION=	1.6.3
 
 CPE_VENDOR=	apache
diff --git a/devel/apr1/distinfo b/devel/apr1/distinfo
index 716d97d895f7..6436e8556d46 100644
--- a/devel/apr1/distinfo
+++ b/devel/apr1/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1728804933
-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
+TIMESTAMP = 1767947054
+SHA256 (apr-1.7.6.tar.bz2) = 49030d92d2575da735791b496dc322f3ce5cff9494779ba8cc28c7f46c5deb32
+SIZE (apr-1.7.6.tar.bz2) = 899670
+SHA256 (apr-util-1.6.3.tar.bz2) = a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
+SIZE (apr-util-1.6.3.tar.bz2) = 432692
diff --git a/devel/apr1/files/patch-apr-1.7.5_configure b/devel/apr1/files/patch-apr-1.7.6_configure
index 1683dce7eef2..b25826f2a4a9 100644
--- a/devel/apr1/files/patch-apr-1.7.5_configure
+++ b/devel/apr1/files/patch-apr-1.7.6_configure
@@ -1,5 +1,5 @@
---- apr-1.7.5/configure.orig	2015-04-25 12:04:18 UTC
-+++ apr-1.7.5/configure
+--- apr-1.7.6/configure.orig	2015-04-25 12:04:18 UTC
++++ apr-1.7.6/configure
 @@ -6624,11 +6624,7 @@ if test "x$apr_preload_done" != "xyes" ;
      apr_lock_method="USE_FLOCK_SERIALIZE"
    fi
diff --git a/devel/apr1/files/patch-apr-1.7.5_poll_unix_kqueue.c b/devel/apr1/files/patch-apr-1.7.6_poll_unix_kqueue.c
index f06ebc948b52..302c9f5fbd18 100644
--- a/devel/apr1/files/patch-apr-1.7.5_poll_unix_kqueue.c
+++ b/devel/apr1/files/patch-apr-1.7.6_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.5/poll/unix/kqueue.c.orig	2022-01-19 23:17:18 UTC
-+++ apr-1.7.5/poll/unix/kqueue.c
+--- apr-1.7.6/poll/unix/kqueue.c.orig	2022-01-19 23:17:18 UTC
++++ apr-1.7.6/poll/unix/kqueue.c
 @@ -25,21 +25,40 @@
  
  #ifdef HAVE_KQUEUE
diff --git a/devel/apr1/files/patch-support_unix_waitio.c b/devel/apr1/files/patch-apr-1.7.6_support_unix_waitio.c
index 0b1e17d43360..e451fc26a763 100644
--- a/devel/apr1/files/patch-support_unix_waitio.c
+++ b/devel/apr1/files/patch-apr-1.7.6_support_unix_waitio.c
@@ -1,5 +1,5 @@
---- apr-1.7.5/support/unix/waitio.c	(revision 1921905)
-+++ apr-1.7.5/support/unix/waitio.c	(working copy)
+--- apr-1.7.6/support/unix/waitio.c	(revision 1921905)
++++ apr-1.7.6/support/unix/waitio.c	(working copy)
 @@ -46,7 +46,10 @@ apr_status_t apr_wait_for_io_or_timeout(apr_file_t
      pfd.fd     = f        ? f->filedes        : s->socketdes;
      pfd.events = for_read ? POLLIN            : POLLOUT;
diff --git a/devel/apr1/files/patch-PR59332 b/devel/apr1/files/patch-apr-util-1.6.3_dbd_apr__dbd__mysql.c
index 781d41e852dd..781d41e852dd 100644
--- a/devel/apr1/files/patch-PR59332
+++ b/devel/apr1/files/patch-apr-util-1.6.3_dbd_apr__dbd__mysql.c
diff --git a/devel/apr1/files/patch-my_init b/devel/apr1/files/patch-apr-util-1.6.3_my__init
index 563b6ff21ca9..563b6ff21ca9 100644
--- a/devel/apr1/files/patch-my_init
+++ b/devel/apr1/files/patch-apr-util-1.6.3_my__init