CVS commit: pkgsrc/devel/apr

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

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Fri Apr  7 14:07:22 UTC 2023

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

Log Message:
apr: Restore apr-config change to fix buildlinking

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 pkgsrc/devel/apr/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/devel/apr/distinfo
cvs rdiff -u -r0 -r1.3 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.87 pkgsrc/devel/apr/Makefile:1.88
--- pkgsrc/devel/apr/Makefile:1.87      Fri Apr  7 09:37:00 2023
+++ pkgsrc/devel/apr/Makefile   Fri Apr  7 14:07:22 2023
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.87 2023/04/07 09:37:00 adam Exp $
+# $NetBSD: Makefile,v 1.88 2023/04/07 14:07:22 ryoon Exp $
 #
 # Take care, changelogs often include "PR 12345" strings
 # which cause GNATS indigestion.
 
 DISTNAME=      apr-1.7.3
+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.53 pkgsrc/devel/apr/distinfo:1.54
--- pkgsrc/devel/apr/distinfo:1.53      Fri Apr  7 09:37:00 2023
+++ pkgsrc/devel/apr/distinfo   Fri Apr  7 14:07:22 2023
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.53 2023/04/07 09:37:00 adam Exp $
+$NetBSD: distinfo,v 1.54 2023/04/07 14:07:22 ryoon Exp $
 
 BLAKE2s (apr-1.7.3.tar.bz2) = b89fd12d249c849f59a1e51d4277e5f540dbdf424207a84b135af2a117198026
 SHA512 (apr-1.7.3.tar.bz2) = d8f62868d8e3ec92cede1f0d93b5d48e49441f575c98e165ff84343746a6abd265290ab16a57f741896ae7a6b3e534a334325a99a61c96c2485e085f7761c124
 Size (apr-1.7.3.tar.bz2) = 901048 bytes
+SHA1 (patch-apr-config.in) = f9b02ec1c8ab4e57fc78b29d45c0da6cf4868e25
 SHA1 (patch-atomic_unix_builtins.c) = e90d0232013650c3d227fa3a8be952c51b7148e8
 SHA1 (patch-atomic_unix_builtins64.c) = 67fd9841a55421466ef0850f910ddcea770be003
 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.3
--- /dev/null   Fri Apr  7 14:07:22 2023
+++ pkgsrc/devel/apr/patches/patch-apr-config.in        Fri Apr  7 14:07:22 2023
@@ -0,0 +1,13 @@
+$NetBSD: patch-apr-config.in,v 1.3 2023/04/07 14:07:22 ryoon Exp $
+
+--- apr-config.in.orig 2023-03-13 10:29:04.000000000 +0000
++++ apr-config.in
+@@ -64,7 +64,7 @@ if test "$cross_compiling" != "no"; then
+     # absolute path, but not installed path - we're cross compiling
+     case "$normalized_command" in
+       "${normalized_bindir}/"*) ;;
+-      "/"*)                     location=crosscompile;
++      "/"*)                     #location=crosscompile;
+                                 APR_TARGET_DIR=${normalized_command%${normalized_bindir}/apr-${APR_MAJOR_VERSION}-config};
+                                 ;;
+       *)                        ;;