- Do not install extra PDF documentation

- Do not install epmd
- Replace more ERLANG_LIB occurrences in pkg-message

Noticed by:	stas

6 files changed, 8 insertions, 48 deletions

diff --git a/lang/erlang-runtime15/Makefile b/lang/erlang-runtime15/Makefile
index e6f53868c2d7..3f0bd9680578 100644
--- a/lang/erlang-runtime15/Makefile
+++ b/lang/erlang-runtime15/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	erlang
 PORTVERSION=	15.b.03.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\
@@ -56,14 +56,7 @@ ERL_RELEASE=	R${PORTVERSION:S/.//g:U:S/1$/-1/}
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
-DISTFILES+=	${ERLANG_DOCS}:erlangorg		\
-		${DOC_DISTFILES}
-DOC_DISTFILES=	armstrong_thesis_2003.pdf:joe		\
-		bjarnelic.pdf:publications		\
-		erlang-book-part1.pdf:erlangorg		\
-		master_thesis_patterns.pdf:local	\
-		mnesia_overview.pdf:publications	\
-		programming_rules.pdf:erlangse
+DISTFILES+=	${ERLANG_DOCS}:erlangorg
 .endif
 
 # See http://wiki.freebsd.org/DTrace to learn how to enable DTrace
@@ -129,7 +122,6 @@ CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
 USE_GMAKE=	yes
 USE_CSTD=	gnu89
 USE_PERL5=	yes
-USE_RC_SUBR=	epmd
 GNU_CONFIGURE=	yes
 
 .if ${PORT_OPTIONS:MODBC}
@@ -200,11 +192,6 @@ post-install:
 		-C ${PREFIX}/lib/${ERLANG_LIB}
 	@${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
 		${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/
-
-	@${MKDIR} ${DOCSDIR}
-.for FILE in ${DOC_DISTFILES}
-	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$$(expr ${FILE} : '\([^:]*\)') ${DOCSDIR}
-.endfor
 .endif
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/${ERLANG_LIB}
 	@${CHMOD} -R o+rX-w,g+rX-w ${PREFIX}/lib/${ERLANG_LIB}
diff --git a/lang/erlang-runtime15/files/pkg-message.in b/lang/erlang-runtime15/files/pkg-message.in
index e1f9b0b52c56..f91a8286c15b 100644
--- a/lang/erlang-runtime15/files/pkg-message.in
+++ b/lang/erlang-runtime15/files/pkg-message.in
@@ -3,11 +3,11 @@ Installation tips:
 
 You can find an emacs mode for Erlang here:
 
-    %%LOCALBASE%%/lib/erlang/lib/tools-%%TOOLS_VSN%%/emacs
+    %%LOCALBASE%%/lib/%%ERLANG_LIB%%/lib/tools-%%TOOLS_VSN%%/emacs
 
 You may wish to add the following line to /etc/manpath.config:
 
-OPTIONAL_MANPATH	%%LOCALBASE%%/lib/erlang/man
+OPTIONAL_MANPATH	%%LOCALBASE%%/lib/%%ERLANG_LIB%%/man
 
 To use this runtime port for development or testing, just prepend
 its binary path ("%%LOCALBASE%%/lib/%%ERLANG_LIB%%/bin") to your PATH variable.
diff --git a/lang/erlang-runtime15/pkg-plist b/lang/erlang-runtime15/pkg-plist
index 67ac61425ad2..647f802d89d0 100644
--- a/lang/erlang-runtime15/pkg-plist
+++ b/lang/erlang-runtime15/pkg-plist
@@ -8,10 +8,3 @@
 @dirrm lib/%%ERLANG_LIB%%/man
 @dirrmtry lib/%%ERLANG_LIB%%/lib
 @dirrmtry lib/%%ERLANG_LIB%%
-%%PORTDOCS%%%%DOCSDIR%%/armstrong_thesis_2003.pdf
-%%PORTDOCS%%%%DOCSDIR%%/bjarnelic.pdf
-%%PORTDOCS%%%%DOCSDIR%%/erlang-book-part1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/master_thesis_patterns.pdf
-%%PORTDOCS%%%%DOCSDIR%%/mnesia_overview.pdf
-%%PORTDOCS%%%%DOCSDIR%%/programming_rules.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/lang/erlang-runtime16/Makefile b/lang/erlang-runtime16/Makefile
index 0a703f0c7f05..528f5b10b346 100644
--- a/lang/erlang-runtime16/Makefile
+++ b/lang/erlang-runtime16/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	erlang
 PORTVERSION=	16.b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\
@@ -56,14 +56,7 @@ ERL_RELEASE=	R${PORTVERSION:S/.//g:U:S/1$/-1/}
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
-DISTFILES+=	${ERLANG_DOCS}:erlangorg		\
-		${DOC_DISTFILES}
-DOC_DISTFILES=	armstrong_thesis_2003.pdf:joe		\
-		bjarnelic.pdf:publications		\
-		erlang-book-part1.pdf:erlangorg		\
-		master_thesis_patterns.pdf:local	\
-		mnesia_overview.pdf:publications	\
-		programming_rules.pdf:erlangse
+DISTFILES+=	${ERLANG_DOCS}:erlangorg
 .endif
 
 # See http://wiki.freebsd.org/DTrace to learn how to enable DTrace
@@ -129,7 +122,6 @@ CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
 USE_GMAKE=	yes
 USE_CSTD=	gnu89
 USE_PERL5=	yes
-USE_RC_SUBR=	epmd
 GNU_CONFIGURE=	yes
 
 .if ${PORT_OPTIONS:MODBC}
@@ -201,11 +193,6 @@ post-install:
 		-C ${PREFIX}/lib/${ERLANG_LIB}
 	@${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
 		${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/
-
-	@${MKDIR} ${DOCSDIR}
-.for FILE in ${DOC_DISTFILES}
-	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$$(expr ${FILE} : '\([^:]*\)') ${DOCSDIR}
-.endfor
 .endif
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/${ERLANG_LIB}
 	@${CHMOD} -R o+rX-w,g+rX-w ${PREFIX}/lib/${ERLANG_LIB}
diff --git a/lang/erlang-runtime16/files/pkg-message.in b/lang/erlang-runtime16/files/pkg-message.in
index e1f9b0b52c56..f91a8286c15b 100644
--- a/lang/erlang-runtime16/files/pkg-message.in
+++ b/lang/erlang-runtime16/files/pkg-message.in
@@ -3,11 +3,11 @@ Installation tips:
 
 You can find an emacs mode for Erlang here:
 
-    %%LOCALBASE%%/lib/erlang/lib/tools-%%TOOLS_VSN%%/emacs
+    %%LOCALBASE%%/lib/%%ERLANG_LIB%%/lib/tools-%%TOOLS_VSN%%/emacs
 
 You may wish to add the following line to /etc/manpath.config:
 
-OPTIONAL_MANPATH	%%LOCALBASE%%/lib/erlang/man
+OPTIONAL_MANPATH	%%LOCALBASE%%/lib/%%ERLANG_LIB%%/man
 
 To use this runtime port for development or testing, just prepend
 its binary path ("%%LOCALBASE%%/lib/%%ERLANG_LIB%%/bin") to your PATH variable.
diff --git a/lang/erlang-runtime16/pkg-plist b/lang/erlang-runtime16/pkg-plist
index 34f2622943c4..a5169b775d9b 100644
--- a/lang/erlang-runtime16/pkg-plist
+++ b/lang/erlang-runtime16/pkg-plist
@@ -9,10 +9,3 @@
 @dirrm lib/%%ERLANG_LIB%%/man
 @dirrmtry lib/%%ERLANG_LIB%%/lib
 @dirrmtry lib/%%ERLANG_LIB%%
-%%PORTDOCS%%%%DOCSDIR%%/armstrong_thesis_2003.pdf
-%%PORTDOCS%%%%DOCSDIR%%/bjarnelic.pdf
-%%PORTDOCS%%%%DOCSDIR%%/erlang-book-part1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/master_thesis_patterns.pdf
-%%PORTDOCS%%%%DOCSDIR%%/mnesia_overview.pdf
-%%PORTDOCS%%%%DOCSDIR%%/programming_rules.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%