update to apr-1.7.0, ok stsp@

devel/apr/Makefile

@@ -1,15 +1,14 @@
 COMMENT=	Apache Portable Runtime
 
-V=		1.6.5
-REVISION=	1
+V=		1.7.0
 DISTNAME=	apr-$V
-SHARED_LIBS +=	apr-1             7.0     # .6.2
+SHARED_LIBS +=	apr-1             7.1     # .6.2
 
 CATEGORIES=	devel
 
 MAINTAINER=	Stefan Sperling <stsp@openbsd.org>
 
-HOMEPAGE=	http://apr.apache.org/
+HOMEPAGE=	https://apr.apache.org/
 
 # Apache License 2.0
 PERMIT_PACKAGE=	Yes

devel/apr/distinfo

@@ -1,2 +1,2 @@
-SHA256 (apr-1.6.5.tar.gz) = cNz5ECBmov8v/EfpPCicjlTJXY3aI7UD+eYbsMvS0QU=
-SIZE (apr-1.6.5.tar.gz) = 1073556
+SHA256 (apr-1.7.0.tar.gz) = SOnb9Frj/ce0kSWf+2zPfWMEn/rLwcCXfM7QleTC1aI=
+SIZE (apr-1.7.0.tar.gz) = 1093896

devel/apr/patches/patch-configure_in

@@ -1,7 +1,7 @@
 Index: configure.in
 --- configure.in.orig
 +++ configure.in
-@@ -1460,6 +1460,10 @@ case $host in
+@@ -1461,6 +1461,10 @@ case $host in
      *)
          AC_CHECK_FUNCS(mkstemp)
          ;;
@@ -12,9 +12,9 @@ Index: configure.in
  esac
  
  AC_SUBST(fork)
-@@ -1936,6 +1940,14 @@ elif test "$ac_cv_type_off_t" = "yes"; then
-         off_t_fmt='#define APR_OFF_T_FMT "I64d"'
-         off_t_strfn='_strtoi64'
+@@ -1971,6 +1975,14 @@ elif test "$ac_cv_type_off_t" = "yes"; then
+     *)
+         AC_ERROR([could not determine the size of off_t])
          ;;
 +    *-openbsd*)
 +        int64_t_fmt='#define APR_INT64_T_FMT "lld"'
@@ -25,37 +25,14 @@ Index: configure.in
 +        int64_strfn="strtoll"
 +	;;
      esac
+     ])])])])
  else
-    # Fallback on int
-@@ -2289,7 +2301,7 @@ fi
- APR_IFALLYES(header:semaphore.h func:sem_open func:sem_close dnl
+@@ -2336,7 +2348,7 @@ APR_IFALLYES(header:semaphore.h func:sem_open func:sem
               func:sem_unlink func:sem_post func:sem_wait,
               hasposixser="1", hasposixser="0")
--APR_IFALLYES(func:semget func:semctl define:SEM_UNDO, hassysvser="1", 
-+APR_IFALLYES(func:semget func:semctl define:SEM_UNDO, hassysvser="0", 
-              hassysvser="0")
+ APR_IFALLYES(func:semget func:semctl func:semop define:SEM_UNDO,
+-             hassysvser="1", hassysvser="0")
++             hassysvser="0", hassysvser="0")
  APR_IFALLYES(func:flock define:LOCK_EX, hasflockser="1", hasflockser="0")
  APR_IFALLYES(header:fcntl.h define:F_SETLK, hasfcntlser="1", hasfcntlser="0")
-@@ -2478,6 +2490,8 @@ else
- fi
- 
- dnl ----------------------------- Checking for /dev/random 
-+AC_CHECK_FUNCS(arc4random_buf)
-+
- AC_MSG_CHECKING(for entropy source)
- 
- why_no_rand=""
-@@ -2494,6 +2508,13 @@ AC_ARG_WITH(egd, 
-     AC_MSG_RESULT(EGD-compatible daemon)
-     rand="1"
-   ])
-+
-+if test "$rand" != "1"; then
-+  if test "$ac_cv_func_arc4random_buf" = yes; then
-+    AC_MSG_RESULT(arc4random)
-+    rand="1"
-+  fi
-+fi
- 
- if test "$rand" != "1"; then
-   AC_ARG_WITH(devrandom,
+ # note: the current APR use of shared mutex requires /dev/zero

devel/apr/patches/patch-misc_unix_rand_c

@@ -1,16 +0,0 @@
-Index: misc/unix/rand.c
---- misc/unix/rand.c.orig
-+++ misc/unix/rand.c
-@@ -87,7 +87,11 @@ APR_DECLARE(apr_status_t) apr_os_uuid_get(unsigned cha
- APR_DECLARE(apr_status_t) apr_generate_random_bytes(unsigned char *buf, 
-                                                     apr_size_t length)
- {
--#ifdef DEV_RANDOM
-+#ifdef HAVE_ARC4RANDOM
-+
-+    arc4random_buf(buf, length);
-+
-+#elif defined(DEV_RANDOM)
- 
-     int fd = -1;
- 

devel/apr/pkg/PLIST

@@ -7,6 +7,7 @@ include/apr-1/apr_allocator.h
 include/apr-1/apr_atomic.h
 include/apr-1/apr_cstr.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
@@ -43,14 +44,12 @@ include/apr-1/apr_user.h
 include/apr-1/apr_version.h
 include/apr-1/apr_want.h
 lib/apr-1/
-lib/apr-1/apr_common.m4
 lib/apr-1/apr_rules.mk
-lib/apr-1/find_apr.m4
 lib/apr-1/make_exports.awk
 lib/apr-1/make_var_export.awk
 lib/apr-1/mkdir.sh
 @comment lib/apr.exp
-lib/libapr-1.a
+@static-lib lib/libapr-1.a
 lib/libapr-1.la
 @lib lib/libapr-1.so.${LIBapr-1_VERSION}
 lib/pkgconfig/apr-1.pc