From owner-svn-ports-head@FreeBSD.ORG Wed Aug 15 13:37:45 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5CE4F106564A; Wed, 15 Aug 2012 13:37:45 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 464B68FC0A; Wed, 15 Aug 2012 13:37:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7FDbjvh061106; Wed, 15 Aug 2012 13:37:45 GMT (envelope-from olgeni@svn.freebsd.org) Received: (from olgeni@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7FDbjf1061101; Wed, 15 Aug 2012 13:37:45 GMT (envelope-from olgeni@svn.freebsd.org) Message-Id: <201208151337.q7FDbjf1061101@svn.freebsd.org> From: Jimmy Olgeni Date: Wed, 15 Aug 2012 13:37:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302574 - in head: databases/couchdb net/freeswitch-core net/freeswitch-core-devel net/rabbitmq X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Aug 2012 13:37:45 -0000 Author: olgeni Date: Wed Aug 15 13:37:44 2012 New Revision: 302574 URL: http://svn.freebsd.org/changeset/ports/302574 Log: 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. Modified: head/databases/couchdb/Makefile (contents, props changed) head/net/freeswitch-core-devel/Makefile (contents, props changed) head/net/freeswitch-core/Makefile (contents, props changed) head/net/rabbitmq/Makefile Modified: head/databases/couchdb/Makefile ============================================================================== --- head/databases/couchdb/Makefile Wed Aug 15 13:36:29 2012 (r302573) +++ head/databases/couchdb/Makefile Wed Aug 15 13:37:44 2012 (r302574) @@ -20,8 +20,8 @@ LIB_DEPENDS= icudata:${PORTSDIR}/devel/i 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=${LOCALBAS --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 \ Modified: head/net/freeswitch-core-devel/Makefile ============================================================================== --- head/net/freeswitch-core-devel/Makefile Wed Aug 15 13:36:29 2012 (r302573) +++ head/net/freeswitch-core-devel/Makefile Wed Aug 15 13:37:44 2012 (r302574) @@ -202,7 +202,7 @@ LIB_DEPENDS+= gdbm:${PORTSDIR}/databases .endif .if defined(WITH_MODERLANGEVENT) -BUILD_DEPENDS+= ${LOCALBASE}/lib/erlang/usr/include/erl_driver.h:${PORTSDIR}/lang/erlang-lite +BUILD_DEPENDS+= ${LOCALBASE}/lib/erlang/usr/include/erl_driver.h:${PORTSDIR}/lang/erlang .endif .if defined(WITH_MODPYTHON) Modified: head/net/freeswitch-core/Makefile ============================================================================== --- head/net/freeswitch-core/Makefile Wed Aug 15 13:36:29 2012 (r302573) +++ head/net/freeswitch-core/Makefile Wed Aug 15 13:37:44 2012 (r302574) @@ -201,7 +201,7 @@ LIB_DEPENDS+= gdbm:${PORTSDIR}/databases PLIST_SUB+= WITH_MODERLANGEVENT="@comment " .else PLIST_SUB+= WITH_MODERLANGEVENT="" -BUILD_DEPENDS+= ${LOCALBASE}/lib/erlang/usr/include/erl_driver.h:${PORTSDIR}/lang/erlang-lite +BUILD_DEPENDS+= ${LOCALBASE}/lib/erlang/usr/include/erl_driver.h:${PORTSDIR}/lang/erlang .endif .if !defined(WITH_MODPYTHON) Modified: head/net/rabbitmq/Makefile ============================================================================== --- head/net/rabbitmq/Makefile Wed Aug 15 13:36:29 2012 (r302573) +++ head/net/rabbitmq/Makefile Wed Aug 15 13:37:44 2012 (r302574) @@ -14,12 +14,12 @@ DISTNAME= ${PORTNAME}-server-${PORTVERSI MAINTAINER= pneumann@gmail.com COMMENT= RabbitMQ is an implementation of AMQP -BUILD_DEPENDS= erl:${PORTSDIR}/lang/erlang-lite \ +BUILD_DEPENDS= erl:${PORTSDIR}/lang/erlang \ ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:${PORTSDIR}/devel/py-simplejson \ xmlto:${PORTSDIR}/textproc/xmlto \ unzip:${PORTSDIR}/archivers/unzip \ zip:${PORTSDIR}/archivers/zip -RUN_DEPENDS= erl:${PORTSDIR}/lang/erlang-lite +RUN_DEPENDS= erl:${PORTSDIR}/lang/erlang USE_GMAKE= yes USE_PYTHON= yes