Wed Feb 1 03:29:47 2023 UTC ()
apr: Fix an output of 'apr-1-config --includes' in buildlink3 case

* Do not detect buildlink3 case as crosscompile.
  Disable crosscompile case.
  Fix devel/subversion-base build.
* Bump PKGREVISION


(ryoon)
diff -r1.84 -r1.85 pkgsrc/devel/apr/Makefile
diff -r1.50 -r1.51 pkgsrc/devel/apr/distinfo
diff -r0 -r1.1 pkgsrc/devel/apr/patches/patch-apr-config.in
cvs diff -r1.84 -r1.85 pkgsrc/devel/apr/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/apr/Makefile 2023/01/31 18:41:49 1.84
+++ pkgsrc/devel/apr/Makefile 2023/02/01 03:29:47 1.85
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1# $NetBSD: Makefile,v 1.84 2023/01/31 18:41:49 wiz Exp $ 1# $NetBSD: Makefile,v 1.85 2023/02/01 03:29:47 ryoon Exp $
2# 2#
3# Take care, changelogs often include "PR 12345" strings 3# Take care, changelogs often include "PR 12345" strings
4# which cause GNATS indigestion. 4# which cause GNATS indigestion.
5 5
6DISTNAME= apr-1.7.1 6DISTNAME= apr-1.7.1
 7PKGREVISION= 1
7CATEGORIES= devel 8CATEGORIES= devel
8MASTER_SITES= ${MASTER_SITE_APACHE:=apr/} 9MASTER_SITES= ${MASTER_SITE_APACHE:=apr/}
9EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
10 11
11MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://apr.apache.org/ 13HOMEPAGE= https://apr.apache.org/
13COMMENT= Apache Portable Runtime 14COMMENT= Apache Portable Runtime
14LICENSE= apache-2.0 15LICENSE= apache-2.0
15 16
16# bug in 1.7.1 tarball 17# bug in 1.7.1 tarball
17WRKSRC= ${WRKDIR}/apr-1.7.1-rc2 18WRKSRC= ${WRKDIR}/apr-1.7.1-rc2
18 19
19USE_LIBTOOL= yes 20USE_LIBTOOL= yes
cvs diff -r1.50 -r1.51 pkgsrc/devel/apr/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/apr/distinfo 2023/01/31 18:41:49 1.50
+++ pkgsrc/devel/apr/distinfo 2023/02/01 03:29:47 1.51
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.50 2023/01/31 18:41:49 wiz Exp $ 1$NetBSD: distinfo,v 1.51 2023/02/01 03:29:47 ryoon Exp $
2 2
3BLAKE2s (apr-1.7.1.tar.bz2) = f409825011ba80d53c16f08a0fa5fa40b451dd9db26e2db3edf863ff3499ef23 3BLAKE2s (apr-1.7.1.tar.bz2) = f409825011ba80d53c16f08a0fa5fa40b451dd9db26e2db3edf863ff3499ef23
4SHA512 (apr-1.7.1.tar.bz2) = c23d074fc5d7e0934815b0c87e2c788f8670c3061f30b5dc1fd1d9571e7ec2a43143b52ee1fd6be5dc2d662069eaba2be918d7e8b9a55095a9e33affc68b53f9 4SHA512 (apr-1.7.1.tar.bz2) = c23d074fc5d7e0934815b0c87e2c788f8670c3061f30b5dc1fd1d9571e7ec2a43143b52ee1fd6be5dc2d662069eaba2be918d7e8b9a55095a9e33affc68b53f9
5Size (apr-1.7.1.tar.bz2) = 890114 bytes 5Size (apr-1.7.1.tar.bz2) = 890114 bytes
 6SHA1 (patch-apr-config.in) = 6040716b008cb993c0deb969c139e2bf4b34b67e
6SHA1 (patch-atomic_unix_builtins.c) = e90d0232013650c3d227fa3a8be952c51b7148e8 7SHA1 (patch-atomic_unix_builtins.c) = e90d0232013650c3d227fa3a8be952c51b7148e8
7SHA1 (patch-atomic_unix_builtins64.c) = a009c6418c13919080757cba6e4b9630013f4bc7 8SHA1 (patch-atomic_unix_builtins64.c) = a009c6418c13919080757cba6e4b9630013f4bc7
8SHA1 (patch-include_apr__general.h) = 08959c41f37b166c2d45fcefdf65acc47c593206 9SHA1 (patch-include_apr__general.h) = 08959c41f37b166c2d45fcefdf65acc47c593206
9SHA1 (patch-include_arch_unix_apr__arch__atomic.h) = ffa08ccc2bd600f20da0ea33c1b006467ca3154f 10SHA1 (patch-include_arch_unix_apr__arch__atomic.h) = ffa08ccc2bd600f20da0ea33c1b006467ca3154f
File Added: pkgsrc/devel/apr/patches/patch-apr-config.in
$NetBSD: patch-apr-config.in,v 1.1 2023/02/01 03:29:47 ryoon Exp $

* Do not detect pkgsrc buildlink3 environment as crosscompile.
  Fix consumer's builds.

--- apr-config.in.orig	2020-01-01 10:43:39.000000000 +0000
+++ apr-config.in
@@ -51,7 +51,7 @@ location=@APR_CONFIG_LOCATION@
 # absolute path, but not installed path - we're cross compiling
 case "$0" in
   "${bindir}/"*) ;;
-  "/"*)         location=crosscompile;
+  "/"*)         #location=crosscompile;
                 APR_TARGET_DIR=${0%${bindir}/apr-${APR_MAJOR_VERSION}-config} ;;
   *)            ;;
 esac