Attachment 116017 Details for Bug 157918 – file.diff

[patch] file.diff

file.diff (text/plain), 1012 bytes, created by Grzegorz Blach on 2011-06-16 07:30:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Grzegorz Blach

Created: 2011-06-16 07:30:09 UTC

Size: 1012 bytes

patch

obsolete

>--- Makefile.orig   2011-05-26 09:57:23.000000000 +0000
>+++ Makefile    2011-05-26 09:56:55.000000000 +0000
>@@ -35,14 +35,14 @@
> .include <bsd.port.pre.mk>
>
> .if defined(WITH_LIBEVENT2)
>-CFLAGS+=   -I${LOCALBASE}/include/event2/compat -I${LOCALBASE}/include
>+EXTRA_CPPFLAGS+=   -I${LOCALBASE}/include/event2/compat -I${LOCALBASE}/include
> LDFLAGS+=  -L${LOCALBASE}/lib/event2
> .else
>-CFLAGS+=   -I${LOCALBASE}/include
>+EXTRA_CPPFLAGS+=   -I${LOCALBASE}/include
> LDFLAGS+=  -L${LOCALBASE}/lib
> .endif
>
>-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
>+MAKE_ENV+= EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}" LDFLAGS="${LDFLAGS}"
>
> .if defined(WITH_LIBEVENT_STATIC)
> . if defined(WITH_LIBEVENT2)
>@@ -81,6 +81,7 @@
>        ${WRKSRC}/tmux.1 ${WRKSRC}/tmux.h
>    @${REINPLACE_CMD} -e 's|-I/usr/local/include||g' \
>        -e 's|/usr/local|${LOCALBASE}|g' \
>+       -e 's|$${CPPFLAGS}$$|${CPPFLAGS} ${EXTRA_CPPFLAGS}|g' \
>        -e 's|LDFLAGS+=|#LDFLAGS+=|g' \
>        ${WRKSRC}/Makefile
>    @${REINPLACE_CMD} -e 's|-levent|${_LEVENT_LIB}|g' \

Actions: View | Diff

Attachments on bug 157918: 116017