diff options
| author | bapt <bapt@FreeBSD.org> | 2011-04-11 16:34:17 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2011-04-11 16:34:17 +0800 |
| commit | 7c2279c9ea2445795906f17a17b4992ef5db8fe5 (patch) | |
| tree | fa82e80371d6b2ded726b8ca4e53e49b52901507 /net-im | |
| parent | 00a8191fa754e9677dd68c7595adb287b76a451e (diff) | |
| download | freebsd-ports-gnome-7c2279c9ea2445795906f17a17b4992ef5db8fe5.tar.gz freebsd-ports-gnome-7c2279c9ea2445795906f17a17b4992ef5db8fe5.tar.zst freebsd-ports-gnome-7c2279c9ea2445795906f17a17b4992ef5db8fe5.zip | |
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@)
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/mcabber/Makefile | 5 | ||||
| -rw-r--r-- | net-im/tmsnc/Makefile | 11 |
2 files changed, 3 insertions, 13 deletions
diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile index 87781a6682d0..fd8e946a67b8 100644 --- a/net-im/mcabber/Makefile +++ b/net-im/mcabber/Makefile @@ -25,6 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" USE_ICONV= yes USE_GETTEXT= yes USE_LDCONFIG= yes +USE_NCURSES= yes USE_GNOME= glib20 MAN1= mcabber.1 @@ -36,10 +37,6 @@ OPTIONS= GPGME "Use security/gpgme for PGP 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_GPGME) LIB_DEPENDS+= gpgme.18:${PORTSDIR}/security/gpgme CONFIGURE_ARGS+=--enable-gpgme diff --git a/net-im/tmsnc/Makefile b/net-im/tmsnc/Makefile index ac068ebc5f50..41b3920e936b 100644 --- a/net-im/tmsnc/Makefile +++ b/net-im/tmsnc/Makefile @@ -14,17 +14,10 @@ MAINTAINER= snowfly@yuntech.edu.tw COMMENT= A textbased (console) MSN client GNU_CONFIGURE= yes +USE_NCURSES= yes PLIST_FILES= bin/tmsnc MAN1= tmsnc.1 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 602107 || (${OSVERSION} > 700000 && ${OSVERSION} < 700033) -# this port needs ncurses 5.4+ -BUILD_DEPENDS+= ${LOCALBASE}/include/ncurses/ncurses.h:${PORTSDIR}/devel/ncurses -RUN_DEPENDS+= ${LOCALBASE}/include/ncurses/ncurses.h:${PORTSDIR}/devel/ncurses -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> |