- Upgrade to version R16B03.

- Add MANPATH entry.
- Do not mute the remaining install commands.

4 files changed, 21 insertions, 18 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index d579fa1cbcfa..8f23190c7eac 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	erlang
-PORTVERSION=	16.b.02
+PORTVERSION=	16.b.03
 PORTEPOCH=	3
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
@@ -23,7 +23,7 @@ PATCH_SITES=	http://www.erlang.org/download
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	A functional programming language from Ericsson
 
-WRKSRC=		${WRKDIR}/otp_src_R16B02
+WRKSRC=		${WRKDIR}/otp_src_R16B03
 
 ERLANG_LIB=	${PORTNAME}
 
@@ -55,8 +55,8 @@ USE_RC_SUBR=	epmd
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-EI_VSN=		3.7.14
-TOOLS_VSN=	2.6.12
+EI_VSN=		3.7.15
+TOOLS_VSN=	2.6.13
 
 .include <bsd.port.options.mk>
 
@@ -181,9 +181,14 @@ MAKE_ARGS+=	ARCH=x86
 # rest, not in share/doc/erlang as it should, because of relative
 # links in the documentation.
 
+post-patch:
+	@${ECHO_CMD} "MANPATH ${PREFIX}/lib/erlang/man" > ${WRKDIR}/erlang.conf
+
+
 post-install:
-	@${LN} -sf ../lib/${ERLANG_LIB}/lib/erl_interface-${EI_VSN}/bin/erl_call ${STAGEDIR}${PREFIX}/bin/erl_call
-	@for SECTION in 1 3 4 6 7; do \
+	${INSTALL_DATA} ${WRKDIR}/erlang.conf ${STAGEDIR}${PREFIX}/etc/man.d/erlang.conf
+	${LN} -sf ../lib/${ERLANG_LIB}/lib/erl_interface-${EI_VSN}/bin/erl_call ${STAGEDIR}${PREFIX}/bin/erl_call
+	for SECTION in 1 3 4 6 7; do \
 		${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \
 			-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \
 			"man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \
@@ -191,13 +196,13 @@ post-install:
 	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
 
 .if ${PORT_OPTIONS:MDOCS}
-	@${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
+	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
 		-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
-	@${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
+	${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
 		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for FILE in ${DOC_DISTFILES}
-	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$$(expr ${FILE} : '\([^:]*\)') ${STAGEDIR}/${DOCSDIR}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$$(expr ${FILE} : '\([^:]*\)') ${STAGEDIR}/${DOCSDIR}
 .endfor
 .endif
 
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index cfdf0687de9a..8432621c3f64 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,9 +1,9 @@
-SHA256 (erlang/otp_src_R16B02.tar.gz) = 6ab8ad1df8185345554a4b80e10fd8be06c4f2b71b69dcfb8528352787b32f85
-SIZE (erlang/otp_src_R16B02.tar.gz) = 66023455
-SHA256 (erlang/otp_doc_man_R16B02.tar.gz) = b79ceb0383415088b5f040f2f3705632b425cb3f29c3955ef2219556abec5789
-SIZE (erlang/otp_doc_man_R16B02.tar.gz) = 1318271
-SHA256 (erlang/otp_doc_html_R16B02.tar.gz) = 2d54119b30c4d905b6b1298865309c3392fefb1580ad69725e997644bed04b7f
-SIZE (erlang/otp_doc_html_R16B02.tar.gz) = 33241266
+SHA256 (erlang/otp_src_R16B03.tar.gz) = 6133b3410681a5c934e54c76eee1825f96dead8d6a12c31a64f6e160daf0bb06
+SIZE (erlang/otp_src_R16B03.tar.gz) = 66208591
+SHA256 (erlang/otp_doc_man_R16B03.tar.gz) = a2038d32e7c940d5d04f7338406e11b723cac0d26e82d7834596105eea492452
+SIZE (erlang/otp_doc_man_R16B03.tar.gz) = 1322484
+SHA256 (erlang/otp_doc_html_R16B03.tar.gz) = d392dc254fe4dc917e68d1c1217aff70e2c92d88c19362037a18209c4fae23c3
+SIZE (erlang/otp_doc_html_R16B03.tar.gz) = 33287369
 SHA256 (erlang/armstrong_thesis_2003.pdf) = da585b914eb07350e2d6f727db5eb0fb1551f49fc1270f7d4dc079f2c8c1ab7a
 SIZE (erlang/armstrong_thesis_2003.pdf) = 859249
 SHA256 (erlang/bjarnelic.pdf) = 9544d4af5cea324e5c9cf77e670d9561ad61ddc240cdb5c2afecebc0a3d7429b
diff --git a/lang/erlang/files/pkg-message.in b/lang/erlang/files/pkg-message.in
index a6f9807b058b..2e7ba80371c7 100644
--- a/lang/erlang/files/pkg-message.in
+++ b/lang/erlang/files/pkg-message.in
@@ -5,7 +5,4 @@ You can find an emacs mode for Erlang here:
 
     %%LOCALBASE%%/lib/erlang/lib/tools-%%TOOLS_VSN%%/emacs
 
-You may wish to add the following line to /etc/manpath.config:
-
-OPTIONAL_MANPATH	%%LOCALBASE%%/lib/erlang/man
 ===========================================================================
diff --git a/lang/erlang/pkg-plist b/lang/erlang/pkg-plist
index c02e74c7a447..5fbdd5aaa8c9 100644
--- a/lang/erlang/pkg-plist
+++ b/lang/erlang/pkg-plist
@@ -8,6 +8,7 @@ bin/escript
 bin/run_erl
 bin/to_erl
 bin/typer
+etc/man.d/erlang.conf
 @comment Insert PLIST here
 @comment -=[ begin PLIST.lib-erlang ]=-
 @comment -=[ end PLIST.lib-erlang ]=-