From 8d27ddb9bd993385ce5d7a9b17e2fe231ec8c69f Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Mon, 11 Apr 2011 08:34:17 +0000 Subject: Add a new macro to deal with conflict between ncurses from base and ncurses from ports. If a ports is linked against ncurses from base or from the ports, it should then add: USE_NCURSES=yes it is also possible to specify the hard dependency on the ports ncurses or one the base one adding the following macros: WITH_NCURSES_PORT=yes or WITH_NCURSES_BASE=yes PR: ports/155269 Submitted by: me Reviwed by: pav@ Approved by: portmgr (pav@) Exp-run by: portmgr (pav@) --- audio/ncmpcpp/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'audio/ncmpcpp') diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile index 47697444564c..56134b6763e7 100644 --- a/audio/ncmpcpp/Makefile +++ b/audio/ncmpcpp/Makefile @@ -21,6 +21,7 @@ LIB_DEPENDS= mpdclient:${PORTSDIR}/audio/libmpdclient \ USE_BZIP2= yes GNU_CONFIGURE= yes USE_ICONV= yes +USE_NCURSES= yes USE_GNOME= glib20 USE_AUTOTOOLS= automake aclocal libtool ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal @@ -43,9 +44,7 @@ OPTIONS= CURL "Enable fetching lyrics from the Internet" on \ BROKEN=>>Does not compile on FreeBSD 6.X .endif -.if ${OSVERSION} < 602107 || (${OSVERSION} > 700000 && ${OSVERSION} < 700033) -LIB_DEPENDS+= ncursesw.5:${PORTSDIR}/devel/ncurses -.else +.if defined(WITH_NCURSES_BASE) # no need to use ncurses-config if we use ncurses from the base system CONFIGURE_ARGS+= NCURSES_CONFIG=/usr/bin/true .endif -- cgit v1.2.3