CVS commit: pkgsrc

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Mon Jan  6 11:09:03 UTC 2025

Modified Files:
        pkgsrc/devel/gmp: inplace.mk
        pkgsrc/math/mpcomplex: inplace.mk
        pkgsrc/math/mpfr: inplace.mk

Log Message:
devel/gmp, math/mpcomplex, math/mpfr: Tidy inplace.mk messaging.

Use STEP_MSG and RUN to make this produce prettier output and play
nicer with PKG_DEBUG &c.

No functional change intended.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/gmp/inplace.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/mpcomplex/inplace.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/mpfr/inplace.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/gmp/inplace.mk
diff -u pkgsrc/devel/gmp/inplace.mk:1.8 pkgsrc/devel/gmp/inplace.mk:1.9
--- pkgsrc/devel/gmp/inplace.mk:1.8     Mon Nov 16 13:12:41 2020
+++ pkgsrc/devel/gmp/inplace.mk Mon Jan  6 11:09:03 2025
@@ -1,4 +1,4 @@
-# $NetBSD: inplace.mk,v 1.8 2020/11/16 13:12:41 wiz Exp $
+# $NetBSD: inplace.mk,v 1.9 2025/01/06 11:09:03 riastradh Exp $
 #
 # Include this file to extract devel/gmp source into the WRKSRC of
 # another package. This is to be used by GCC packages to avoid the
@@ -10,13 +10,23 @@ post-extract: extract-inplace-gmp
 
 .PHONY: fetch-inplace-gmp
 fetch-inplace-gmp:
-       (cd ../../devel/gmp && ${MAKE} WRKDIR=${WRKSRC}/.devel.gmp EXTRACT_DIR=${WRKSRC} \
-               WRKSRC='$${EXTRACT_DIR}/$${DISTNAME:C/a$$//}' SKIP_DEPENDS=YES checksum)
+       @${STEP_MSG} Fetching in-place gmp
+       ${RUN}cd ../../devel/gmp && \
+               ${MAKE} WRKDIR=${WRKSRC}/.devel.gmp \
+                       EXTRACT_DIR=${WRKSRC} \
+                       WRKSRC='$${EXTRACT_DIR}/$${DISTNAME:C/a$$//}' \
+                       SKIP_DEPENDS=YES \
+                       checksum
 
 .PHONY: extract-inplace-gmp
 extract-inplace-gmp:
-       (cd ../../devel/gmp && ${MAKE} WRKDIR=${WRKSRC}/.devel.gmp EXTRACT_DIR=${WRKSRC} \
-               WRKSRC='$${EXTRACT_DIR}/$${DISTNAME:C/a$$//}' SKIP_DEPENDS=YES patch)
-       ${MV} ${WRKSRC}/gmp-* ${WRKSRC}/gmp
+       @${STEP_MSG} Extracting in-place gmp
+       ${RUN}cd ../../devel/gmp && \
+               ${MAKE} WRKDIR=${WRKSRC}/.devel.gmp \
+                       EXTRACT_DIR=${WRKSRC} \
+                       WRKSRC='$${EXTRACT_DIR}/$${DISTNAME:C/a$$//}' \
+                       SKIP_DEPENDS=YES \
+                       patch
+       ${RUN}${MV} ${WRKSRC}/gmp-* ${WRKSRC}/gmp
 
 USE_TOOLS+=    bzcat tar

Index: pkgsrc/math/mpcomplex/inplace.mk
diff -u pkgsrc/math/mpcomplex/inplace.mk:1.5 pkgsrc/math/mpcomplex/inplace.mk:1.6
--- pkgsrc/math/mpcomplex/inplace.mk:1.5        Sun Oct 29 18:06:32 2023
+++ pkgsrc/math/mpcomplex/inplace.mk    Mon Jan  6 11:09:03 2025
@@ -1,4 +1,4 @@
-# $NetBSD: inplace.mk,v 1.5 2023/10/29 18:06:32 wiz Exp $
+# $NetBSD: inplace.mk,v 1.6 2025/01/06 11:09:03 riastradh Exp $
 #
 # Include this file to extract math/mpcomplex source into the WRKSRC of
 # another package. This is to be used by GCC packages to avoid the numerous
@@ -10,11 +10,21 @@ post-extract: extract-inplace-mpcomplex
 
 .PHONY: fetch-inplace-mpcomplex
 fetch-inplace-mpcomplex:
-       (cd ../../math/mpcomplex && ${MAKE} WRKDIR=${WRKSRC}/.devel.mpcomplex EXTRACT_DIR=${WRKSRC} \
-               WRKSRC='$${EXTRACT_DIR}/$${DISTNAME}' SKIP_DEPENDS=YES checksum)
+       @${STEP_MSG} Fetching in-place mpcomplex
+       ${RUN}cd ../../math/mpcomplex && \
+               ${MAKE} WRKDIR=${WRKSRC}/.devel.mpcomplex \
+                       EXTRACT_DIR=${WRKSRC} \
+                       WRKSRC='$${EXTRACT_DIR}/$${DISTNAME}' \
+                       SKIP_DEPENDS=YES \
+                       checksum
 
 .PHONY: extract-inplace-mpcomplex
 extract-inplace-mpcomplex:
-       (cd ../../math/mpcomplex && ${MAKE} WRKDIR=${WRKSRC}/.devel.mpcomplex EXTRACT_DIR=${WRKSRC} \
-               WRKSRC='$${EXTRACT_DIR}/$${DISTNAME}' SKIP_DEPENDS=YES patch)
-       ${MV} ${WRKSRC}/mpc-* ${WRKSRC}/mpc
+       @${STEP_MSG} Extracting in-place mpcomplex
+       ${RUN}cd ../../math/mpcomplex && \
+               ${MAKE} WRKDIR=${WRKSRC}/.devel.mpcomplex \
+                       EXTRACT_DIR=${WRKSRC} \
+                       WRKSRC='$${EXTRACT_DIR}/$${DISTNAME}' \
+                       SKIP_DEPENDS=YES \
+                       patch
+       ${RUN}${MV} ${WRKSRC}/mpc-* ${WRKSRC}/mpc

Index: pkgsrc/math/mpfr/inplace.mk
diff -u pkgsrc/math/mpfr/inplace.mk:1.5 pkgsrc/math/mpfr/inplace.mk:1.6
--- pkgsrc/math/mpfr/inplace.mk:1.5     Tue Sep 15 20:56:33 2015
+++ pkgsrc/math/mpfr/inplace.mk Mon Jan  6 11:09:03 2025
@@ -1,4 +1,4 @@
-# $NetBSD: inplace.mk,v 1.5 2015/09/15 20:56:33 joerg Exp $
+# $NetBSD: inplace.mk,v 1.6 2025/01/06 11:09:03 riastradh Exp $
 #
 # Include this file to extract math/mpfr source into the WRKSRC of
 # another package. This is to be used by GCC packages to avoid the
@@ -10,10 +10,20 @@ post-fetch: fetch-inplace-mpfr
 post-extract: extract-inplace-mpfr
 
 fetch-inplace-mpfr:
-       (cd ../../math/mpfr && ${MAKE} WRKDIR=${WRKSRC}/.devel.mpfr EXTRACT_DIR=${WRKSRC} \
-               WRKSRC='$${EXTRACT_DIR}/$${DISTNAME}' SKIP_DEPENDS=YES checksum)
+       @${STEP_MSG} Fetching in-place mpfr
+       ${RUN}cd ../../math/mpfr && \
+               ${MAKE} WRKDIR=${WRKSRC}/.devel.mpfr \
+                       EXTRACT_DIR=${WRKSRC} \
+                       WRKSRC='$${EXTRACT_DIR}/$${DISTNAME}' \
+                       SKIP_DEPENDS=YES \
+                       checksum
 
 extract-inplace-mpfr:
-       (cd ../../math/mpfr && ${MAKE} WRKDIR=${WRKSRC}/.devel.mpfr EXTRACT_DIR=${WRKSRC} \
-               WRKSRC='$${EXTRACT_DIR}/$${DISTNAME}' SKIP_DEPENDS=YES patch)
-       ${MV} ${WRKSRC}/mpfr-* ${WRKSRC}/mpfr
+       @${STEP_MSG} Extracting in-place mpfr
+       ${RUN}cd ../../math/mpfr && \
+               ${MAKE} WRKDIR=${WRKSRC}/.devel.mpfr \
+                       EXTRACT_DIR=${WRKSRC} \
+                       WRKSRC='$${EXTRACT_DIR}/$${DISTNAME}' \
+                       SKIP_DEPENDS=YES \
+                       patch
+       ${RUN}${MV} ${WRKSRC}/mpfr-* ${WRKSRC}/mpfr