Date: Tue, 11 Apr 2017 14:04:37 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438262 - head/audio/cmus Message-ID: <201704111404.v3BE4b4i067777@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Tue Apr 11 14:04:37 2017 New Revision: 438262 URL: https://svnweb.freebsd.org/changeset/ports/438262 Log: Fix broken UI when linking with devel/ncurses Ports r438165 fixed building cmus with devel/ncurses installed, but stripped NCURSES_CFLAGS too aggressivly. The build picked up base's curses.h over the correct headers from devel/ncurses. PR: 218548 Reported by: Oleg Gushchenkov <gor@clogic.com.ua> Reviewed by: Oleg Gushchenkov <gor@clogic.com.ua> Approved by: mat (mentor) Differential Revision: https://reviews.freebsd.org/D10355 Modified: head/audio/cmus/Makefile Modified: head/audio/cmus/Makefile ============================================================================== --- head/audio/cmus/Makefile Tue Apr 11 13:59:43 2017 (r438261) +++ head/audio/cmus/Makefile Tue Apr 11 14:04:37 2017 (r438262) @@ -2,8 +2,9 @@ # $FreeBSD$ PORTNAME= cmus -DISTVERSION= 2.8.0-rc0 DISTVERSIONPREFIX= v +DISTVERSION= 2.8.0-rc0 +PORTREVISION= 1 CATEGORIES= audio DIST_SUBDIR= cmus @@ -136,9 +137,6 @@ WAVPACK_CONFIGURE_ON= CONFIG_WAVPACK=y WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack post-patch: -# From DPorts: prevent passing -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600 - @${REINPLACE_CMD} -e 's@\(NCURSES_CFLAGS=\).*@\1""@g' \ - ${WRKSRC}/configure # Doc/cmus.txt is used to generate the man pages. Fix paths to point # to the correct directories. @${REINPLACE_CMD} \ @@ -146,6 +144,11 @@ post-patch: -e 's,/usr/share/cmus,${DATADIR},g' \ ${WRKSRC}/Doc/cmus.txt +post-configure: +# Prevent passing wrong flags from devel/ncurses' pkg-config file to the build + @${REINPLACE_CMD} -e 's|-D_POSIX_C_SOURCE=200112L||g; s|-D_XOPEN_SOURCE=600||g' \ + ${WRKSRC}/config.mk + post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cmus* @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/cmus/[io]p/*.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704111404.v3BE4b4i067777>