pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mail/alpine Fix alpine build under Mac OS X Yosemite.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c5d8cbe0299f
branches:  trunk
changeset: 641595:c5d8cbe0299f
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Wed Nov 12 20:30:55 2014 +0000

description:
Fix alpine build under Mac OS X Yosemite.

Alpine uses a function called panic(). However, mach/mach.h, which somehow
ends up always included, defines panic with different arguments. Rename
alpine's panic to Panic on Darwin.

diffstat:

 mail/alpine/Makefile |  12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diffs (26 lines):

diff -r ad43fd4cb0ba -r c5d8cbe0299f mail/alpine/Makefile
--- a/mail/alpine/Makefile      Wed Nov 12 18:39:39 2014 +0000
+++ b/mail/alpine/Makefile      Wed Nov 12 20:30:55 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2014/02/12 23:18:06 tron Exp $
+# $NetBSD: Makefile,v 1.35 2014/11/12 20:30:55 bsiegert Exp $
 #
 
 DISTNAME=      alpine-2.11
@@ -33,6 +33,16 @@
 CONFIGURE_ARGS+= --without-pthread
 .endif
 
+.if ${OPSYS} == "Darwin"
+# mach/mach.h defines panic, differently.
+SUBST_CLASSES+=        panic
+SUBST_STAGE.panic=     pre-configure
+SUBST_MESSAGE.panic=   Renaming the panic function
+SUBST_FILES.panic=     */*.c
+SUBST_FILES.panic+=    pith/util.h
+SUBST_SED.panic+=      -e 's,panic(,Panic(,g'
+.endif
+
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/alpine/alpine ${DESTDIR}${PREFIX}/bin/alpine
        ${INSTALL_MAN} ${WRKSRC}/doc/alpine.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/alpine.1



Home | Main Index | Thread Index | Old Index