From eef41dfa7c397c013162719604177ea86fbfade0 Mon Sep 17 00:00:00 2001 From: Gleb Popov Date: Tue, 8 Apr 2025 13:55:59 +0300 Subject: [PATCH] D ports: fixup after Dub upgrade Approved by: acm Pull Request: https://github.com/freebsd/freebsd-ports/pull/369 --- devel/containers/Makefile | 3 ++- devel/d-scanner/Makefile | 4 +++- devel/derelict-sdl2/Makefile | 3 ++- devel/derelict-util/Makefile | 3 ++- devel/dlib/Makefile | 3 ++- devel/dsymbol/Makefile | 3 ++- devel/icontheme/Makefile | 3 ++- devel/inifiled/Makefile | 3 ++- devel/inilike/Makefile | 3 ++- devel/isfreedesktop/Makefile | 3 ++- devel/libddoc/Makefile | 3 ++- devel/libdparse/Makefile | 3 ++- devel/mir-core/Makefile | 3 ++- devel/msgpack-d/Makefile | 3 ++- devel/stdx-allocator/Makefile | 3 ++- devel/undead/Makefile | 3 ++- devel/xdgpaths/Makefile | 3 ++- graphics/derelict-gl3/Makefile | 3 ++- print/derelict-ft/Makefile | 3 ++- 19 files changed, 39 insertions(+), 19 deletions(-) diff --git a/devel/containers/Makefile b/devel/containers/Makefile index 3182d3380bce..500c26c18e71 100644 --- a/devel/containers/Makefile +++ b/devel/containers/Makefile @@ -24,7 +24,8 @@ D_LIB_DIR= ${PREFIX}/lib/d DC= ${PREFIX}/bin/ldmd2 do-build: - @cd ${WRKSRC} && DC=${DC} ${DUB_CMD} + @cd ${WRKSRC} && \ + ${SETENV} DUB_HOME=${WRKDIR}/dub_home DC=${DC} ${DUB_CMD} do-install: @${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR} diff --git a/devel/d-scanner/Makefile b/devel/d-scanner/Makefile index 6e1dff42db5a..3cf2127c3f99 100644 --- a/devel/d-scanner/Makefile +++ b/devel/d-scanner/Makefile @@ -31,12 +31,14 @@ GH_PROJECT= D-Scanner PLIST_FILES= bin/dscanner DUB_CMD= ${LOCALBASE}/bin/dub build --build=release +DC= ${PREFIX}/bin/ldmd2 post-patch: ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/dub.json do-build: - @cd ${WRKSRC} && ${DUB_CMD} + @cd ${WRKSRC} && \ + ${SETENV} DUB_HOME=${WRKDIR}/dub_home DC=${DC} ${DUB_CMD} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/dscanner ${STAGEDIR}${PREFIX}/bin/ diff --git a/devel/derelict-sdl2/Makefile b/devel/derelict-sdl2/Makefile index b4e7d834b56c..5fe938d03194 100644 --- a/devel/derelict-sdl2/Makefile +++ b/devel/derelict-sdl2/Makefile @@ -28,7 +28,8 @@ post-patch: ${REINPLACE_CMD} -e '13,15d' ${WRKSRC}/dub.json do-build: - @cd ${WRKSRC} && DC=${DC} ${DUB_CMD} + @cd ${WRKSRC} && \ + ${SETENV} DUB_HOME=${WRKDIR}/dub_home DC=${DC} ${DUB_CMD} do-install: @${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR} diff --git a/devel/derelict-util/Makefile b/devel/derelict-util/Makefile index 67d8aca34289..69d7e571f017 100644 --- a/devel/derelict-util/Makefile +++ b/devel/derelict-util/Makefile @@ -23,7 +23,8 @@ D_LIB_DIR= ${PREFIX}/lib/d DC= ${PREFIX}/bin/ldmd2 do-build: - @cd ${WRKSRC} && DC=${DC} ${DUB_CMD} + @cd ${WRKSRC} && \ + ${SETENV} DUB_HOME=${WRKDIR}/dub_home DC=${DC} ${DUB_CMD} do-install: @${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR} diff --git a/devel/dlib/Makefile b/devel/dlib/Makefile index 6c9e51f9ff62..aebc660b9989 100644 --- a/devel/dlib/Makefile +++ b/devel/dlib/Makefile @@ -22,7 +22,8 @@ D_LIB_DIR= ${PREFIX}/lib/d DC= ${PREFIX}/bin/ldmd2 do-build: - @cd ${WRKSRC} && DC=${DC} ${DUB_CMD} + @cd ${WRKSRC} && \ + ${SETENV} DUB_HOME=${WRKDIR}/dub_home DC=${DC} ${DUB_CMD} do-install: @${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR}/${PORTNAME} diff --git a/devel/dsymbol/Makefile b/devel/dsymbol/Makefile index 92b96454fb46..8c3525685d58 100644 --- a/devel/dsymbol/Makefile +++ b/devel/dsymbol/Makefile @@ -32,7 +32,8 @@ post-patch: ${WRKSRC}/src/dsymbol/modulecache.d do-build: - @cd ${WRKSRC} && DC=${DC} ${DUB_CMD} + @cd ${WRKSRC} && \ + ${SETENV} DUB_HOME=${WRKDIR}/dub_home DC=${DC} ${DUB_CMD} do-install: @${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR} diff --git a/devel/icontheme/Makefile b/devel/icontheme/Makefile index 6b9dd502a6a7..da278be3e7f7 100644 --- a/devel/icontheme/Makefile +++ b/devel/icontheme/Makefile @@ -25,7 +25,8 @@ D_LIB_DIR= ${PREFIX}/lib/d DC= ${PREFIX}/bin/ldmd2 do-build: - @cd ${WRKSRC} && DC=${DC} ${DUB_CMD} + @cd ${WRKSRC} && \ + ${SETENV} DUB_HOME=${WRKDIR}/dub_home DC=${DC} ${DUB_CMD} do-install: @${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR} diff --git a/devel/inifiled/Makefile b/devel/inifiled/Makefile index e07ed60e765b..56643ac7fc46 100644 --- a/devel/inifiled/Makefile +++ b/devel/inifiled/Makefile @@ -22,7 +22,8 @@ D_LIB_DIR= ${PREFIX}/lib/d DC= ${PREFIX}/bin/ldmd2 do-build: - @cd ${WRKSRC} && DC=${DC} ${DUB_CMD} + @cd ${WRKSRC} && \ + ${SETENV} DUB_HOME=${WRKDIR}/dub_home DC=${DC} ${DUB_CMD} do-install: @${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR} diff --git a/devel/inilike/Makefile b/devel/inilike/Makefile index 077c32da21d8..3fa267be08f1 100644 --- a/devel/inilike/Makefile +++ b/devel/inilike/Makefile @@ -22,7 +22,8 @@ D_LIB_DIR= ${PREFIX}/lib/d DC= ${PREFIX}/bin/ldmd2 do-build: - @cd ${WRKSRC} && DC=${DC} ${DUB_CMD} + @cd ${WRKSRC} && \ + ${SETENV} DUB_HOME=${WRKDIR}/dub_home DC=${DC} ${DUB_CMD} do-install: @${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR} diff --git a/devel/isfreedesktop/Makefile b/devel/isfreedesktop/Makefile index bd04f65f983c..a12a633d8189 100644 --- a/devel/isfreedesktop/Makefile +++ b/devel/isfreedesktop/Makefile @@ -22,7 +22,8 @@ D_LIB_DIR= ${PREFIX}/lib/d DC= ${PREFIX}/bin/ldmd2 do-build: - @cd ${WRKSRC} && DC=${DC} ${DUB_CMD} + @cd ${WRKSRC} && \ + ${SETENV} DUB_HOME=${WRKDIR}/dub_home DC=${DC} ${DUB_CMD} do-install: @${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR} diff --git a/devel/libddoc/Makefile b/devel/libddoc/Makefile index 7187e522eaee..a07949a2ef5b 100644 --- a/devel/libddoc/Makefile +++ b/devel/libddoc/Makefile @@ -27,7 +27,8 @@ post-patch: ${REINPLACE_CMD} -e '23d' ${WRKSRC}/dub.json do-build: - @cd ${WRKSRC} && DC=${DC} ${DUB_CMD} + @cd ${WRKSRC} && \ + ${SETENV} DUB_HOME=${WRKDIR}/dub_home DC=${DC} ${DUB_CMD} do-install: @${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR} diff --git a/devel/libdparse/Makefile b/devel/libdparse/Makefile index cb759b1e0aa0..423b935c39a4 100644 --- a/devel/libdparse/Makefile +++ b/devel/libdparse/Makefile @@ -24,7 +24,8 @@ D_LIB_DIR= ${PREFIX}/lib/d DC= ${PREFIX}/bin/ldmd2 do-build: - @cd ${WRKSRC} && DC=${DC} ${DUB_CMD} + @cd ${WRKSRC} && \ + ${SETENV} DUB_HOME=${WRKDIR}/dub_home DC=${DC} ${DUB_CMD} do-install: @${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR} diff --git a/devel/mir-core/Makefile b/devel/mir-core/Makefile index 6a5861f8cb71..53df05f1f138 100644 --- a/devel/mir-core/Makefile +++ b/devel/mir-core/Makefile @@ -22,7 +22,8 @@ D_LIB_DIR= ${PREFIX}/lib/d DC= ${PREFIX}/bin/ldmd2 do-build: - @cd ${WRKSRC} && DC=${DC} ${DUB_CMD} + @cd ${WRKSRC} && \ + ${SETENV} DUB_HOME=${WRKDIR}/dub_home DC=${DC} ${DUB_CMD} do-install: @${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR} diff --git a/devel/msgpack-d/Makefile b/devel/msgpack-d/Makefile index 263cfc57974c..ed6ad6876cb2 100644 --- a/devel/msgpack-d/Makefile +++ b/devel/msgpack-d/Makefile @@ -22,7 +22,8 @@ D_LIB_DIR= ${PREFIX}/lib/d DC= ${PREFIX}/bin/ldmd2 do-build: - @cd ${WRKSRC} && DC=${DC} ${DUB_CMD} + @cd ${WRKSRC} && \ + ${SETENV} DUB_HOME=${WRKDIR}/dub_home DC=${DC} ${DUB_CMD} do-install: @${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR} diff --git a/devel/stdx-allocator/Makefile b/devel/stdx-allocator/Makefile index 30b1188ca2c5..917592b880db 100644 --- a/devel/stdx-allocator/Makefile +++ b/devel/stdx-allocator/Makefile @@ -26,7 +26,8 @@ post-patch: ${REINPLACE_CMD} '6d' ${WRKSRC}/dub.sdl do-build: - @cd ${WRKSRC} && DC=${DC} ${DUB_CMD} + @cd ${WRKSRC} && \ + ${SETENV} DUB_HOME=${WRKDIR}/dub_home DC=${DC} ${DUB_CMD} do-install: @${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR} diff --git a/devel/undead/Makefile b/devel/undead/Makefile index 95c908cb2892..24bfe89e4271 100644 --- a/devel/undead/Makefile +++ b/devel/undead/Makefile @@ -26,7 +26,8 @@ SUB_FILES= undead.pc SUB_LIST= DISTVERSION=${DISTVERSION} do-build: - @cd ${WRKSRC} && DC=${DC} ${DUB_CMD} + @cd ${WRKSRC} && \ + ${SETENV} DUB_HOME=${WRKDIR}/dub_home DC=${DC} ${DUB_CMD} do-install: @${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR} diff --git a/devel/xdgpaths/Makefile b/devel/xdgpaths/Makefile index 38d141bd37df..e224e2a86d28 100644 --- a/devel/xdgpaths/Makefile +++ b/devel/xdgpaths/Makefile @@ -23,7 +23,8 @@ D_LIB_DIR= ${PREFIX}/lib/d DC= ${PREFIX}/bin/ldmd2 do-build: - @cd ${WRKSRC} && DC=${DC} ${DUB_CMD} + @cd ${WRKSRC} && \ + ${SETENV} DUB_HOME=${WRKDIR}/dub_home DC=${DC} ${DUB_CMD} do-install: @${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR} diff --git a/graphics/derelict-gl3/Makefile b/graphics/derelict-gl3/Makefile index c2b8f9a73a51..46b350f548e3 100644 --- a/graphics/derelict-gl3/Makefile +++ b/graphics/derelict-gl3/Makefile @@ -27,7 +27,8 @@ post-patch: @${REINPLACE_CMD} -e '13,15d' ${WRKSRC}/dub.json do-build: - @cd ${WRKSRC} && DC=${DC} ${DUB_CMD} + @cd ${WRKSRC} && \ + ${SETENV} DUB_HOME=${WRKDIR}/dub_home DC=${DC} ${DUB_CMD} do-install: @${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR} diff --git a/print/derelict-ft/Makefile b/print/derelict-ft/Makefile index 1138a831d06d..8fe5333c8b85 100644 --- a/print/derelict-ft/Makefile +++ b/print/derelict-ft/Makefile @@ -27,7 +27,8 @@ post-patch: @${REINPLACE_CMD} -e '13,15d' ${WRKSRC}/dub.json do-build: - @cd ${WRKSRC} && DC=${DC} ${DUB_CMD} + @cd ${WRKSRC} && \ + ${SETENV} DUB_HOME=${WRKDIR}/dub_home DC=${DC} ${DUB_CMD} do-install: @${MKDIR} ${STAGEDIR}${D_INCLUDE_DIR}