diff options
| author | tobik <tobik@FreeBSD.org> | 2017-04-11 22:04:37 +0800 |
|---|---|---|
| committer | tobik <tobik@FreeBSD.org> | 2017-04-11 22:04:37 +0800 |
| commit | 87eba3d82181d0dcfd8ba27390ae7d4d33e2ac93 (patch) | |
| tree | 2c8512b1b5f4ce3c79cc17831b07fcb1b71e1635 | |
| parent | d34217981f454197c52a0cf619266832218cb061 (diff) | |
| download | freebsd-ports-gnome-87eba3d82181d0dcfd8ba27390ae7d4d33e2ac93.tar.gz freebsd-ports-gnome-87eba3d82181d0dcfd8ba27390ae7d4d33e2ac93.tar.zst freebsd-ports-gnome-87eba3d82181d0dcfd8ba27390ae7d4d33e2ac93.zip | |
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
| -rw-r--r-- | audio/cmus/Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile index b10441b629ff..0274b7e9bc42 100644 --- a/audio/cmus/Makefile +++ b/audio/cmus/Makefile @@ -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 |