svn commit: r317410 - in head/lang: . erlang-runtime15 erlang-runtime15/files

Sun May 5 13:04:36 UTC 2013

Author: olgeni
Date: Sun May  5 13:04:34 2013
New Revision: 317410
URL: http://svnweb.freebsd.org/changeset/ports/317410

Log:
  Add lang/erlang-runtime15.
  
  This port is indented for developers and port maintainers. It is a
  copy of lang/erlang with a few differences:
  
  - Nothing is installed in $PREFIX/bin
  - Libraries are installed in $PREFIX/lib/erlang15
  - You have to change your PATH to actually use it
  - Support for building PLTs is removed
  - Other ports are not supposed to install anything inside this environment
  
  What is this for:
  
  - Building Erlang applications using the R15 runtime, once R16 is
    committed (think Riak).
  
  - Building Erlang applications when there are conflicts with modules
    provided by other ports (for example, the RabbitMQ client libraries
    conflict with the server code installed by net/rabbitmq).
  
  - Testing new Erlang versions before the main port is upgraded.

Added:
  head/lang/erlang-runtime15/
     - copied from r317409, head/lang/erlang/
  head/lang/erlang-runtime15/files/patch-Makefile.in   (contents, props changed)
Modified:
  head/lang/Makefile
  head/lang/erlang-runtime15/Makefile
  head/lang/erlang-runtime15/files/pkg-message.in   (contents, props changed)
  head/lang/erlang-runtime15/pkg-descr
  head/lang/erlang-runtime15/pkg-plist

Modified: head/lang/Makefile
==============================================================================

--- head/lang/Makefile	Sun May  5 12:20:16 2013	(r317409)
+++ head/lang/Makefile	Sun May  5 13:04:34 2013	(r317410)
@@ -58,6 +58,7 @@
     SUBDIR += emacs-lisp-intro
     SUBDIR += embryo
     SUBDIR += erlang
+    SUBDIR += erlang-runtime15
     SUBDIR += execline
     SUBDIR += expect
     SUBDIR += expect-devel

Modified: head/lang/erlang-runtime15/Makefile
==============================================================================
--- head/lang/erlang/Makefile	Sun May  5 12:20:16 2013	(r317409)
+++ head/lang/erlang-runtime15/Makefile	Sun May  5 13:04:34 2013	(r317410)
@@ -3,8 +3,6 @@
 
 PORTNAME=	erlang
 PORTVERSION=	15.b.03.1
-PORTREVISION=	1
-PORTEPOCH=	3
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\
@@ -13,6 +11,7 @@ MASTER_SITES=	http://www.erlang.org/down
 		http://www.erlang.se/publications/:publications		\
 		http://www.sics.se/~joe/thesis/:joe			\
 		${MASTER_SITE_LOCAL:S/$/:local/:S,%SUBDIR%/,olgeni/,}
+PKGNAMESUFFIX=	-runtime
 DISTNAME=	otp_src_${ERL_RELEASE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg	\
 		${ERLANG_MAN}:erlangorg
@@ -26,7 +25,7 @@ COMMENT=	A functional programming langua
 
 WRKSRC=		${WRKDIR}/otp_src_R15B03
 
-ERLANG_LIB=	${PORTNAME}
+ERLANG_LIB=	${PORTNAME}${PORTVERSION:C/\..*//}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	TOOLS_VSN=${TOOLS_VSN}
@@ -187,7 +186,6 @@ MAN6PREFIX=	${PREFIX}/lib/${ERLANG_LIB}
 # rest, not in share/doc/erlang as it should, because of relative
 # links in the documentation.
 post-install:
-	@${LN} -sf ${PREFIX}/lib/${ERLANG_LIB}/lib/erl_interface-*/bin/erl_call ${PREFIX}/bin/erl_call
 	@for SECTION in 1 3 4 6; do \
 		${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \
 			-C ${PREFIX}/lib/${ERLANG_LIB} \
@@ -259,15 +257,6 @@ post-install:
 	@cd ${WRKDIR}; ex < ex.script
 	@${CAT} ${PKGMESSAGE}
 
-buildplt:
-	@${ECHO_CMD} =====================================================
-	@${ECHO_CMD} WARNING: building a full PLT may literally take hours
-	@${ECHO_CMD}
-	@${ECHO_CMD} You may wish to settle for the standard PLT built by
-	@${ECHO_CMD} dialyzer on the first run.
-	@${ECHO_CMD} =====================================================
-	@cd ${PREFIX}/lib/${ERLANG_LIB}/lib; ${PREFIX}/bin/dialyzer --verbose --build_plt --output_plt ${HOME}/.dialyzer_plt -c $$(find ${OTP_LIBS} -name ebin -maxdepth 1) || true
-
 .include "Makefile.lib"
 .include "Makefile.man"
 

Added: head/lang/erlang-runtime15/files/patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/erlang-runtime15/files/patch-Makefile.in	Sun May  5 13:04:34 2013	(r317410)
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig
++++ Makefile.in
+@@ -56,7 +56,7 @@
+ libdir		= @libdir@
+ 
+ # Where Erlang/OTP is located
+-libdir_suffix	= /erlang
++libdir_suffix	= /erlang15
+ erlang_libdir	= $(libdir)$(libdir_suffix)
+ erlang_bindir	= $(erlang_libdir)/bin
+ 
+@@ -913,7 +913,7 @@
+ #
+ # Order is important here, don't change it!
+ #
+-INST_DEP += install.dirs install.emulator install.libs install.Install install.bin
++INST_DEP += install.dirs install.emulator install.libs install.Install
+ 
+ install: $(INST_DEP)
+ 

Modified: head/lang/erlang-runtime15/files/pkg-message.in
==============================================================================
--- head/lang/erlang/files/pkg-message.in	Sun May  5 12:20:16 2013	(r317409)
+++ head/lang/erlang-runtime15/files/pkg-message.in	Sun May  5 13:04:34 2013	(r317410)
@@ -8,4 +8,8 @@ You can find an emacs mode for Erlang he
 You may wish to add the following line to /etc/manpath.config:
 
 OPTIONAL_MANPATH	%%LOCALBASE%%/lib/erlang/man
+
+To use this runtime port for development or testing, just prepend
+its binary path ("/usr/local/lib/erlang15/bin") to your PATH variable.
+
 ===========================================================================

Modified: head/lang/erlang-runtime15/pkg-descr
==============================================================================
--- head/lang/erlang/pkg-descr	Sun May  5 12:20:16 2013	(r317409)
+++ head/lang/erlang-runtime15/pkg-descr	Sun May  5 13:04:34 2013	(r317410)
@@ -4,4 +4,7 @@ uses are in telecoms, banking, e-commerc
 instant messaging. Erlang's runtime system has built-in support for
 concurrency, distribution and fault tolerance.
 
+This port contains a standalone runtime environment of Erlang R15
+to be used during the development of OTP applications.
+
 WWW: http://www.erlang.org/

Modified: head/lang/erlang-runtime15/pkg-plist
==============================================================================
--- head/lang/erlang/pkg-plist	Sun May  5 12:20:16 2013	(r317409)
+++ head/lang/erlang-runtime15/pkg-plist	Sun May  5 13:04:34 2013	(r317410)
@@ -1,14 +1,3 @@
-bin/ct_run
-bin/dialyzer
-bin/epmd
-bin/erl
-bin/erl_call
-bin/erlc
-bin/escript
-bin/run_erl
-bin/run_test
-bin/to_erl
-bin/typer
 @comment Insert PLIST here
 @comment -=[ begin PLIST.lib-erlang ]=-
 @comment -=[ end PLIST.lib-erlang ]=-
