Date: Mon, 6 May 2013 16:02:06 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317528 - head/Mk/Uses Message-ID: <201305061602.r46G26Dl058747@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305061602.r46G26Dl058747>