CVS commit: pkgsrc/devel/apr-util

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jan 31 18:44:01 UTC 2023

Modified Files:
        pkgsrc/devel/apr-util: Makefile buildlink3.mk distinfo options.mk

Log Message:
apr-util: update to 1.6.2.

Changes with APR-util 1.6.2

  *) Teach configure how to find and build against MariaDB 10.2. PR 61517
     [Kris Karas <bugs-a17 moonlit-rail.com>]

  *) apr_crypto_commoncrypto: Remove stray reference to -lcrypto that
     prevented commoncrypto being enabled. [Graham Leggett]

  *) Add --tag=CC to libtool invocations. PR 62640. [Michael Osipov]

  *) apr_dbm_gdbm: Fix handling of error codes. This makes gdbm 1.14 work.
     apr_dbm_gdbm will now also return error codes starting with
     APR_OS_START_USEERR, as apr_dbm_berkleydb does, instead of always
     returning APR_EGENERAL. [Stefan Fritsch]


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/devel/apr-util/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/apr-util/buildlink3.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/apr-util/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/apr-util/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/apr-util/Makefile
diff -u pkgsrc/devel/apr-util/Makefile:1.66 pkgsrc/devel/apr-util/Makefile:1.67
--- pkgsrc/devel/apr-util/Makefile:1.66 Wed Nov 23 16:19:45 2022
+++ pkgsrc/devel/apr-util/Makefile      Tue Jan 31 18:44:01 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.66 2022/11/23 16:19:45 adam Exp $
+# $NetBSD: Makefile,v 1.67 2023/01/31 18:44:01 wiz Exp $
 
-DISTNAME=      apr-util-1.6.1
-PKGREVISION=   14
+DISTNAME=      apr-util-1.6.2
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_APACHE:=apr/}
 EXTRACT_SUFX=  .tar.bz2
@@ -11,6 +10,9 @@ HOMEPAGE=     https://apr.apache.org/
 COMMENT=       Apache Portable Runtime utilities
 LICENSE=       apache-2.0
 
+# bug in 1.6.2 distfile
+WRKSRC=                        ${WRKDIR}/apr-util-1.6.2-rc3
+
 USE_LIBTOOL=           yes
 USE_TOOLS+=            pkg-config
 GNU_CONFIGURE=         yes

Index: pkgsrc/devel/apr-util/buildlink3.mk
diff -u pkgsrc/devel/apr-util/buildlink3.mk:1.19 pkgsrc/devel/apr-util/buildlink3.mk:1.20
--- pkgsrc/devel/apr-util/buildlink3.mk:1.19    Sat Jan 18 21:48:02 2020
+++ pkgsrc/devel/apr-util/buildlink3.mk Tue Jan 31 18:44:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2020/01/18 21:48:02 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2023/01/31 18:44:01 wiz Exp $
 
 BUILDLINK_TREE+=       apr-util
 
@@ -15,6 +15,7 @@ BUILDLINK_FILES.apr-util+=    lib/aprutil.e
 ${BUILDLINK_DIR}/bin/apu-config: buildlink-directories
        ${MKDIR} ${BUILDLINK_DIR}/bin && ${LN} -fs apu-1-config ${BUILDLINK_DIR}/bin/apu-config
 
+.PHONY: buildlink-apr-util-cookie
 buildlink-apr-util-cookie: ${BUILDLINK_DIR}/bin/apu-config
 
 .include "../../mk/bsd.fast.prefs.mk"
@@ -22,12 +23,12 @@ buildlink-apr-util-cookie: ${BUILDLINK_D
 pkgbase := apr-util
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.apr-util:Mdb4)
+.if ${PKG_BUILD_OPTIONS.apr-util:Mdb4}
 BDB_ACCEPTED?=         db4 db5
 .  include "../../mk/bdb.buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.apr-util:Mldap)
+.if ${PKG_BUILD_OPTIONS.apr-util:Mldap}
 .  include "../../databases/openldap-client/buildlink3.mk"
 .endif
 

Index: pkgsrc/devel/apr-util/distinfo
diff -u pkgsrc/devel/apr-util/distinfo:1.24 pkgsrc/devel/apr-util/distinfo:1.25
--- pkgsrc/devel/apr-util/distinfo:1.24 Tue Oct 26 10:14:15 2021
+++ pkgsrc/devel/apr-util/distinfo      Tue Jan 31 18:44:01 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.24 2021/10/26 10:14:15 nia Exp $
+$NetBSD: distinfo,v 1.25 2023/01/31 18:44:01 wiz Exp $
 
-BLAKE2s (apr-util-1.6.1.tar.bz2) = 885415f0ea97ad1eaafe479f6672c05f9f0eb6f9bf0d0c587a94ffcf00bed53c
-SHA512 (apr-util-1.6.1.tar.bz2) = 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
-Size (apr-util-1.6.1.tar.bz2) = 428595 bytes
+BLAKE2s (apr-util-1.6.2.tar.bz2) = fa782733f6087c721eda2a07f46bb4f799e120e243e33f551759322c71933347
+SHA512 (apr-util-1.6.2.tar.bz2) = 4d4561d1e77c8f680abf2bb71ea5c9cb7b3fd1d341d66dd262886ba483a4ba2564c66814790f28b92a84510faaf33049120e4b0ff5b4d2ad21096f58c16cbd50
+Size (apr-util-1.6.2.tar.bz2) = 432120 bytes
 SHA1 (patch-aa) = 350b4e8fb3097d4df597c284321ca5dc25ce015c

Index: pkgsrc/devel/apr-util/options.mk
diff -u pkgsrc/devel/apr-util/options.mk:1.7 pkgsrc/devel/apr-util/options.mk:1.8
--- pkgsrc/devel/apr-util/options.mk:1.7        Tue Aug 11 12:39:18 2015
+++ pkgsrc/devel/apr-util/options.mk    Tue Jan 31 18:44:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2015/08/11 12:39:18 jperkin Exp $
+# $NetBSD: options.mk,v 1.8 2023/01/31 18:44:01 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.apr-util
 PKG_SUPPORTED_OPTIONS= db4 ldap mysql pgsql sqlite3 ssl
@@ -10,7 +10,7 @@ PLIST_VARS+=          db4 ldap mysql pgsql sqlit
 .if !empty(PKG_OPTIONS:Mdb4)
 BDB_ACCEPTED=          db4 db5
 BUILDLINK_TRANSFORM+=  l:db4:${BDB_TYPE}
-CONFIGURE_ARGS+=       --with-berkeley-db=${BDBBASE}/include:${LOCALBASE}
+CONFIGURE_ARGS+=       --with-berkeley-db=${BDBBASE}/include:${PREFIX}
 PLIST.db4=             yes
 .  include "../../mk/bdb.buildlink3.mk"
 .else