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@)

4 files changed, 6 insertions, 26 deletions

diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index 2c297e89b184..3900e393a988 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -18,6 +18,7 @@ COMMENT=	Console-based music player with really cool features
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
+USE_NCURSES=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=prefix=${PREFIX} mandir=${MANPREFIX}/man \
 		exampledir=${EXAMPLESDIR} \
@@ -40,10 +41,6 @@ OPTIONS=	FLAC "FLAC (Free Lossless Audio Codec) support" Off \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 602107 || (${OSVERSION} > 700000 && ${OSVERSION} < 700033)
-LIB_DEPENDS+=	ncursesw.5:${PORTSDIR}/devel/ncurses
-.endif
-
 .if defined(WITH_FLAC)
 LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
 CONFIGURE_ARGS+=CONFIG_FLAC=y
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
diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile
index 1e5817972649..4bbd86026d16 100644
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@@ -25,6 +25,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_NCURSES=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 MAKE_JOBS_UNSAFE=	yes
@@ -42,7 +43,7 @@ CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
 
 CONFIGURE_ARGS=	--with-dir-suffix="" \
 		--without-alsa \
-		--libdir=${LOCALBASE}/lib
+		--libdir=${PREFIX}/lib
 
 LICENSE=	GPLv2
 INFO=		ocp
@@ -119,10 +120,6 @@ CONFIGURE_ARGS+=	--without-flac
 MAKE_ENV+=	DOCS="\#"
 .endif
 
-.if ${OSVERSION} < 602107 || (${OSVERSION} > 700000 && ${OSVERSION} < 700033)
-LIB_DEPENDS+=	ncursesw.5:${PORTSDIR}/devel/ncurses
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/.*\.cfg|${TIMIDITY_CFG}|' \
 		${WRKSRC}/playgmi/gmitimidity.c
@@ -131,14 +128,4 @@ post-patch:
 		${WRKSRC}/filesel/adb.c \
 		${WRKSRC}/filesel/pfilesel.c
 
-.if ${OSVERSION} < 602107 || (${OSVERSION} > 700000 && ${OSVERSION} < 700033)
-# use ncursesw from ports
-	@${REINPLACE_CMD} -e 's|-l\(curses\)|-ln\1w|' ${WRKSRC}/stuff/Makefile
-.for f in ${PFILES}
-	@${REINPLACE_CMD} -e \
-		's|#include.*<curses\.h.*|#include <ncurses/ncurses.h>|' \
-			${WRKSRC}/${f}
-.endfor
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/audio/pytone/Makefile b/audio/pytone/Makefile
index 03719c7c908b..a524038de774 100644
--- a/audio/pytone/Makefile
+++ b/audio/pytone/Makefile
@@ -21,6 +21,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pysqlite2/_sqlite.so:${PORTSDIR}/databases/py-
 		${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
 
 USE_PYTHON=	yes
+USE_NCURSES=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	PyTone
 
@@ -35,10 +36,6 @@ OPTIONS=	MAD "MPEG Audio Decoder (libmad) support" On \
 
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
-.if ${OSVERSION} < 602107 || (${OSVERSION} > 700000 && ${OSVERSION} < 700033)
-LIB_DEPENDS+=	ncursesw.5:${PORTSDIR}/devel/ncurses
-.endif
-
 .if !defined(WITHOUT_MAD)
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/madmodule.so:${PORTSDIR}/audio/py-mad
 .endif