CVS commit: pkgsrc/devel/apr

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Wed Feb  1 03:29:47 UTC 2023

Modified Files:
        pkgsrc/devel/apr: Makefile distinfo
Added Files:
        pkgsrc/devel/apr/patches: patch-apr-config.in

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 pkgsrc/devel/apr/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/devel/apr/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/apr/patches/patch-apr-config.in

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/Makefile
diff -u pkgsrc/devel/apr/Makefile:1.84 pkgsrc/devel/apr/Makefile:1.85
--- pkgsrc/devel/apr/Makefile:1.84      Tue Jan 31 18:41:49 2023
+++ pkgsrc/devel/apr/Makefile   Wed Feb  1 03:29:47 2023
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.84 2023/01/31 18:41:49 wiz Exp $
+# $NetBSD: Makefile,v 1.85 2023/02/01 03:29:47 ryoon Exp $
 #
 # Take care, changelogs often include "PR 12345" strings
 # which cause GNATS indigestion.
 
 DISTNAME=      apr-1.7.1
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_APACHE:=apr/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/devel/apr/distinfo
diff -u pkgsrc/devel/apr/distinfo:1.50 pkgsrc/devel/apr/distinfo:1.51
--- pkgsrc/devel/apr/distinfo:1.50      Tue Jan 31 18:41:49 2023
+++ pkgsrc/devel/apr/distinfo   Wed Feb  1 03:29:47 2023
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.50 2023/01/31 18:41:49 wiz Exp $
+$NetBSD: distinfo,v 1.51 2023/02/01 03:29:47 ryoon Exp $
 
 BLAKE2s (apr-1.7.1.tar.bz2) = f409825011ba80d53c16f08a0fa5fa40b451dd9db26e2db3edf863ff3499ef23
 SHA512 (apr-1.7.1.tar.bz2) = c23d074fc5d7e0934815b0c87e2c788f8670c3061f30b5dc1fd1d9571e7ec2a43143b52ee1fd6be5dc2d662069eaba2be918d7e8b9a55095a9e33affc68b53f9
 Size (apr-1.7.1.tar.bz2) = 890114 bytes
+SHA1 (patch-apr-config.in) = 6040716b008cb993c0deb969c139e2bf4b34b67e
 SHA1 (patch-atomic_unix_builtins.c) = e90d0232013650c3d227fa3a8be952c51b7148e8
 SHA1 (patch-atomic_unix_builtins64.c) = a009c6418c13919080757cba6e4b9630013f4bc7
 SHA1 (patch-include_apr__general.h) = 08959c41f37b166c2d45fcefdf65acc47c593206

Added files:

Index: pkgsrc/devel/apr/patches/patch-apr-config.in
diff -u /dev/null pkgsrc/devel/apr/patches/patch-apr-config.in:1.1
--- /dev/null   Wed Feb  1 03:29:48 2023
+++ pkgsrc/devel/apr/patches/patch-apr-config.in        Wed Feb  1 03:29:47 2023
@@ -0,0 +1,16 @@
+$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