From 2cbf03ebd73285d3c0a0b031c6c377bd0768ed25 Mon Sep 17 00:00:00 2001 From: olgeni Date: Wed, 15 Aug 2012 13:37:44 +0000 Subject: Patch ports depending on lang/erlang-lite to use lang/erlang instead. The current lang/erlang option defaults match those specified in lang/erlang-lite, thus making it redundant. Also, mixing ports depending on lang/erlang and lang/erlang-lite is impossible without manual patching. Hence, lang/erlang-lite is going to be removed. --- databases/couchdb/Makefile | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'databases') diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile index d86f3d76914..4e5ee00b2b1 100644 --- a/databases/couchdb/Makefile +++ b/databases/couchdb/Makefile @@ -20,8 +20,8 @@ LIB_DEPENDS= icudata:${PORTSDIR}/devel/icu \ js:${PORTSDIR}/lang/spidermonkey \ curl:${PORTSDIR}/ftp/curl BUILD_DEPENDS= ${LOCALBASE}/bin/help2man:${PORTSDIR}/misc/help2man \ - erlc:${ERLANG_PORT} -RUN_DEPENDS= erl:${ERLANG_PORT} + erlc:${PORTSDIR}/lang/erlang +RUN_DEPENDS= erl:${PORTSDIR}/lang/erlang USERS= couchdb GROUPS= couchdb @@ -38,19 +38,10 @@ CONFIGURE_ARGS= --with-erlang=${LOCALBASE}/lib/erlang/usr/include \ --with-js-lib=${LOCALBASE}/lib PLIST_SUB+= PORTVERSION="${PORTVERSION}" -OPTIONS_DEFINE= ERLANG -ERLANG_DESC= Use lang/erlang instead of lang/erlang-lite - MAN1= couchdb.1 couchjs.1 .include -.if ${PORT_OPTIONS:MERLANG} -ERLANG_PORT= ${PORTSDIR}/lang/erlang -.else -ERLANG_PORT= ${PORTSDIR}/lang/erlang-lite -.endif - # This stanza could be removed around version 1.7 pre-everything:: @if [ -f ${PREFIX}/etc/couchdb/local.ini -a \ -- cgit