From owner-cvs-ports@FreeBSD.ORG Mon Apr 11 08:34:17 2011 Return-Path: Delivered-To: cvs-ports@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7D2FF1065675; Mon, 11 Apr 2011 08:34:17 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 521EA8FC13; Mon, 11 Apr 2011 08:34:17 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p3B8YHg3034679; Mon, 11 Apr 2011 08:34:17 GMT (envelope-from bapt@repoman.freebsd.org) Received: (from bapt@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p3B8YHDQ034678; Mon, 11 Apr 2011 08:34:17 GMT (envelope-from bapt) Message-Id: <201104110834.p3B8YHDQ034678@repoman.freebsd.org> From: Baptiste Daroussin Date: Mon, 11 Apr 2011 08:34:17 +0000 (UTC) To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: ports/Mk bsd.ncurses.mk bsd.port.mk ports/audio/cmus Makefile ports/audio/ncmpcpp Makefile ports/audio/ocp Makefile ports/audio/pytone Makefile ports/deskutils/wyrd Makefile ports/devel/cdk Makefile ports/devel/stfl Makefile ... X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Apr 2011 08:34:17 -0000 bapt 2011-04-11 08:34:17 UTC FreeBSD ports repository Modified files: Mk bsd.port.mk audio/cmus Makefile audio/ncmpcpp Makefile audio/ocp Makefile audio/pytone Makefile deskutils/wyrd Makefile devel/cdk Makefile devel/stfl Makefile games/latrine Makefile games/mangband Makefile mail/cone Makefile mail/mixmaster Makefile mail/mutt Makefile mail/mutt-devel Makefile net-im/mcabber Makefile net-im/tmsnc Makefile security/metasploit Makefile shells/zsh Makefile sysutils/htop Makefile www/newsbeuter Makefile Added files: Mk bsd.ncurses.mk Log: 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@) Revision Changes Path 1.1 +98 -0 ports/Mk/bsd.ncurses.mk (new) 1.678 +7 -1 ports/Mk/bsd.port.mk 1.38 +1 -4 ports/audio/cmus/Makefile 1.34 +2 -3 ports/audio/ncmpcpp/Makefile 1.48 +2 -15 ports/audio/ocp/Makefile 1.9 +1 -4 ports/audio/pytone/Makefile 1.8 +1 -11 ports/deskutils/wyrd/Makefile 1.44 +1 -12 ports/devel/cdk/Makefile 1.13 +2 -6 ports/devel/stfl/Makefile 1.9 +1 -9 ports/games/latrine/Makefile 1.24 +1 -1 ports/games/mangband/Makefile 1.38 +4 -17 ports/mail/cone/Makefile 1.8 +1 -4 ports/mail/mixmaster/Makefile 1.320 +8 -4 ports/mail/mutt-devel/Makefile 1.192 +5 -3 ports/mail/mutt/Makefile 1.43 +1 -4 ports/net-im/mcabber/Makefile 1.9 +2 -9 ports/net-im/tmsnc/Makefile 1.22 +3 -2 ports/security/metasploit/Makefile 1.125 +1 -0 ports/shells/zsh/Makefile 1.19 +1 -4 ports/sysutils/htop/Makefile 1.37 +1 -5 ports/www/newsbeuter/Makefile