From owner-svn-ports-head@FreeBSD.ORG  Mon May  6 16:02:06 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 5D91246A;
 Mon,  6 May 2013 16:02:06 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 50130E96;
 Mon,  6 May 2013 16:02:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r46G26kX058749;
 Mon, 6 May 2013 16:02:06 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r46G26Dl058747;
 Mon, 6 May 2013 16:02:06 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201305061602.r46G26Dl058747@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 6 May 2013 16:02:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r317528 - head/Mk/Uses
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 May 2013 16:02:06 -0000

Author: bapt
Date: Mon May  6 16:02:05 2013
New Revision: 317528
URL: http://svnweb.freebsd.org/changeset/ports/317528

Log:
  Actually commit the right version of ncurses.mk
  
  Reported by:	rene

Modified:
  head/Mk/Uses/ncurses.mk

Modified: head/Mk/Uses/ncurses.mk
==============================================================================
--- head/Mk/Uses/ncurses.mk	Mon May  6 15:54:23 2013	(r317527)
+++ head/Mk/Uses/ncurses.mk	Mon May  6 16:02:05 2013	(r317528)
@@ -46,7 +46,7 @@ check-depends::
 	@${FALSE}
 .  endif
 
-NCURSESPATH=	/usr/lib:${LOCALBASE}/lib
+NCURSESRPATH=	/usr/lib:${LOCALBASE}/lib
 
 .elif ${ncurses_ARGS} == port
 NCURSESBASE=	${LOCALBASE}
@@ -69,9 +69,6 @@ NCURSES_INSTALLED!=	find "${PKG_DBDIR}/"
 					echo "$${contents}"; break; fi; done; ${ECHO_CMD}
 .    endif
 .  endif
-.else
-.error		USES=ncurses only accept 'port' and 'base' as arguments, got ${ncurses_ARGS}
-.endif
 NCURSES_INSTALLED?=
 
 .if ${NCURSES_INSTALLED} != ""
@@ -90,13 +87,17 @@ NCURSES_SHLIBVER?=	5
 
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${PORTSDIR}/${NCURSES_PORT}
 RUN_DEPENDS+=		${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${PORTSDIR}/${NCURSES_PORT}
-NCURSESRPATH=		${LOCALBASE}/lib
+NCURSESRPATH=		${NCURSESBASE}/lib
+
+.else
+.error		USES=ncurses only accept 'port' and 'base' as arguments, got ${ncurses_ARGS}
+.endif
 
 NCURSESLIB=	${NCURSESBASE}/lib
 
 .if defined(NCURSES_RPATH)
 CFLAGS+=	-Wl,-rpath,${NCURSESRPATH}
 .endif
-LDFLAGS+=	-Wl,-rpath=${NCURSESPATH}
+LDFLAGS+=	-Wl,-rpath=${NCURSESRPATH}
 
 .endif