pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Fix alpine Makefile "panic" subst on MacOS



Hi I made a fix to mail/alpine package wondering if anyone can help take
a look? Here's the Github PR (sorry I'm not sure if this is the proper
way to contribute patches).

https://github.com/NetBSD/pkgsrc/pull/113

Alternatively, here's the git diff:

commit 5b3ec1685411600f4c86c30709ed66ff3cb29a2d (HEAD -> trunk, kfl/trunk)
Date:   Sat Jan 7 23:48:19 2023 -0800

    Fix alpine Makefile "panic" subst on MacOS

    The alpine's Makefile has source string subtitution for `panic(` to
    `Panic(`. However, both the file name search pattern and the replacement
    string search pattern is no longer complete, causing some
    `alpine_panic()` to still exist, while the definition has changed to
    `alpine_Panic()`.

    This change fixes that.

diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile
index 0866e1351ee..93068e7ad8c 100644
--- a/mail/alpine/Makefile
+++ b/mail/alpine/Makefile
@@ -43,8 +43,10 @@ SUBST_CLASSES.Darwin+=       panic
 SUBST_STAGE.panic=     pre-configure
 SUBST_MESSAGE.panic=   Renaming the panic function
 SUBST_FILES.panic=     */*.c
+SUBST_FILES.panic+=    */*/*.c
+SUBST_FILES.panic+=    */*/*/*.c
 SUBST_FILES.panic+=    pith/util.h
-SUBST_SED.panic+=      -e 's,panic(,Panic(,g'
+SUBST_SED.panic+=      -e 's,panic *(,Panic(,g'

 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/alpine/alpine ${DESTDIR}${PREFIX}/bin/alpine




Home | Main Index | Thread Index | Old Index