5 files changed, 9 insertions, 15 deletions

diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index 879346caeb14..0c059bdc2220 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	apr
 PORTVERSION=	${APR_VERSION}.${APU_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	APACHE/apr
 DISTFILES=	apr-${APR_VERSION}.tar.gz \
@@ -20,7 +19,7 @@ USES=		iconv pathfix libtool cpe
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
-APR_VERSION=	1.6.5
+APR_VERSION=	1.7.0
 APU_VERSION=	1.6.1
 
 CPE_VENDOR=	apache
@@ -122,10 +121,6 @@ APU_CONF_ARGS+=	--without-crypto
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MMYSQL} && ${MYSQL_VER} == 80
-BROKEN=	Does not build with MySQL 8.0, see https://bz.apache.org/bugzilla/show_bug.cgi?id=62631
-.endif
-
 post-extract:
 # cleanup files not used on this platform
 	@${FIND} ${WRKDIR} -type f \( -name 'NWGNU*' -o -name '*.ds?' -o -name '*.dep' -o -name '*.mak' -o -name '*.win' \) -delete
diff --git a/devel/apr1/distinfo b/devel/apr1/distinfo
index b024ef73daeb..0f7ca55d459d 100644
--- a/devel/apr1/distinfo
+++ b/devel/apr1/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1540370746
-SHA256 (apr-1.6.5.tar.gz) = 70dcf9102066a2ff2ffc47e93c289c8e54c95d8dda23b503f9e61bb0cbd2d105
-SIZE (apr-1.6.5.tar.gz) = 1073556
+TIMESTAMP = 1564990523
+SHA256 (apr-1.7.0.tar.gz) = 48e9dbf45ae3fdc7b491259ffb6ccf7d63049ffacbc1c0977cced095e4c2d5a2
+SIZE (apr-1.7.0.tar.gz) = 1093896
 SHA256 (apr-util-1.6.1.tar.gz) = b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459
 SIZE (apr-util-1.6.1.tar.gz) = 554301
diff --git a/devel/apr1/files/patch-apr__configure b/devel/apr1/files/patch-apr-1.7.0_configure
index 73e0a5fe14a7..c31f12dd0ab0 100644
--- a/devel/apr1/files/patch-apr__configure
+++ b/devel/apr1/files/patch-apr-1.7.0_configure
@@ -1,5 +1,5 @@
---- apr-1.6.5/configure.orig	2015-04-25 12:04:18 UTC
-+++ apr-1.6.5/configure
+--- apr-1.7.0/configure.orig	2015-04-25 12:04:18 UTC
++++ apr-1.7.0/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_poll_unix_kqueue.c b/devel/apr1/files/patch-apr-1.7.0_poll_unix_kqueue.c
index 3e6de213e257..e93abccf3fb1 100644
--- a/devel/apr1/files/patch-apr_poll_unix_kqueue.c
+++ b/devel/apr1/files/patch-apr-1.7.0_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.6.5/poll/unix/kqueue.c.orig	2015-03-20 01:34:07 UTC
-+++ apr-1.6.5/poll/unix/kqueue.c
+--- apr-1.7.0/poll/unix/kqueue.c.orig	2015-03-20 01:34:07 UTC
++++ apr-1.7.0/poll/unix/kqueue.c
 @@ -25,21 +25,40 @@
  
  #ifdef HAVE_KQUEUE
diff --git a/devel/apr1/pkg-plist b/devel/apr1/pkg-plist
index 43588bb9e172..a04ebe020dca 100644
--- a/devel/apr1/pkg-plist
+++ b/devel/apr1/pkg-plist
@@ -12,6 +12,7 @@ include/apr-1/apr_date.h
 include/apr-1/apr_dbd.h
 include/apr-1/apr_dbm.h
 include/apr-1/apr_dso.h
+include/apr-1/apr_encode.h
 include/apr-1/apr_env.h
 include/apr-1/apr_errno.h
 include/apr-1/apr_escape.h
@@ -118,9 +119,7 @@ lib/libaprutil-1.so.0
 lib/libaprutil-1.so.%%SHLIB_APU_MAJOR%%
 libdata/pkgconfig/apr-1.pc
 libdata/pkgconfig/apr-util-1.pc
-%%DATADIR%%/build-1/apr_common.m4
 %%DATADIR%%/build-1/apr_rules.mk
-%%DATADIR%%/build-1/find_apr.m4
 %%DATADIR%%/build-1/libtool
 %%DATADIR%%/build-1/make_exports.awk
 %%DATADIR%%/build-1/make_var_export.awk