svn commit: r302574 - in head: databases/couchdb net/freeswitch-core net/freeswitch-core-devel net/rabbitmq
Jimmy Olgeni
olgeni at FreeBSD.org
Wed Aug 15 13:37:45 UTC 2012
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 <bsd.port.options.mk>
-.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 at 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
More information about the svn-ports-head
mailing list