- Add version number to application path.

- Add support for DOCS and EXAMPLES.
- Cleanup do-install target.

2 files changed, 52 insertions, 45 deletions

diff --git a/net/erlang_xmlrpc/Makefile b/net/erlang_xmlrpc/Makefile
index 9a453507a134..465dc4901287 100644
--- a/net/erlang_xmlrpc/Makefile
+++ b/net/erlang_xmlrpc/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	erlang_xmlrpc
 PORTVERSION=	1.13
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	net
 MASTER_SITES=	http://www.erlang.org/contrib/
 DISTNAME=	xmlrpc-${PORTVERSION}
@@ -15,12 +15,18 @@ COMMENT=	A library for XMLRPC support in Erlang
 BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
 RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
 
+PLIST_SUB=      VERSION="${PORTVERSION}"
+
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/xmlrpc-${PORTVERSION}
 
 MAN3=		erlang_xmlrpc.3
 
-XMLRPC_DOCS=	xmlrpc.pdf xmlrpc.ps xmlrpc.txt
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+PORTDOCS=	*
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|XMERL_PATH=.*|XMERL_PATH=${LOCALBASE}/lib/erlang/lib/xmerl|g' ${WRKSRC}/src/Makefile
@@ -30,16 +36,21 @@ do-build:
 	@cd ${WRKSRC}/src && ${GMAKE}
 
 do-install:
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	@for FILE in ${XMLRPC_DOCS}; do \
+	@for FILE in xmlrpc.pdf xmlrpc.ps xmlrpc.txt; do \
 		${INSTALL_DATA} ${WRKSRC}/doc/$${FILE} ${DOCSDIR}; \
 	done
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
-	@${MKDIR} ${PREFIX}/lib/erlang/lib/xmlrpc
-	@${CP} -r ${WRKSRC}/ebin ${PREFIX}/lib/erlang/lib/xmlrpc
-	@${CP} -r ${WRKSRC}/src ${PREFIX}/lib/erlang/lib/xmlrpc
+.endif
+	@${MKDIR} ${PREFIX}/lib/erlang/lib/xmlrpc-${PORTVERSION}
+	@${MKDIR} ${PREFIX}/lib/erlang/lib/xmlrpc-${PORTVERSION}/ebin
+	@${MKDIR} ${PREFIX}/lib/erlang/lib/xmlrpc-${PORTVERSION}/src
+	@${INSTALL_DATA} ${WRKSRC}/ebin/* ${PREFIX}/lib/erlang/lib/xmlrpc-${PORTVERSION}/ebin
+	@${INSTALL_DATA} ${WRKSRC}/src/* ${PREFIX}/lib/erlang/lib/xmlrpc-${PORTVERSION}/src
 	@${INSTALL_MAN} ${WRKSRC}/doc/xmlrpc.3 ${MANPREFIX}/man/man3/erlang_xmlrpc.3
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/erlang/lib/xmlrpc
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/erlang_xmlrpc/pkg-plist b/net/erlang_xmlrpc/pkg-plist
index 635d00f0197c..46667acdcd0a 100644
--- a/net/erlang_xmlrpc/pkg-plist
+++ b/net/erlang_xmlrpc/pkg-plist
@@ -1,37 +1,33 @@
-lib/erlang/lib/xmlrpc/ebin/tcp_serv.beam
-lib/erlang/lib/xmlrpc/ebin/xmlrpc.beam
-lib/erlang/lib/xmlrpc/ebin/xmlrpc_decode.beam
-lib/erlang/lib/xmlrpc/ebin/xmlrpc_encode.beam
-lib/erlang/lib/xmlrpc/ebin/xmlrpc_http.beam
-lib/erlang/lib/xmlrpc/ebin/xmlrpc_util.beam
-lib/erlang/lib/xmlrpc/src/Makefile
-lib/erlang/lib/xmlrpc/src/example_serv.erl
-lib/erlang/lib/xmlrpc/src/log.hrl
-lib/erlang/lib/xmlrpc/src/tcp_serv.erl
-lib/erlang/lib/xmlrpc/src/xmlrpc.erl
-lib/erlang/lib/xmlrpc/src/xmlrpc.hrl
-lib/erlang/lib/xmlrpc/src/xmlrpc_decode.erl
-lib/erlang/lib/xmlrpc/src/xmlrpc_encode.erl
-lib/erlang/lib/xmlrpc/src/xmlrpc_http.erl
-lib/erlang/lib/xmlrpc/src/xmlrpc_util.erl
-%%DOCSDIR%%/xmlrpc.pdf
-%%DOCSDIR%%/xmlrpc.ps
-%%DOCSDIR%%/xmlrpc.txt
-%%EXAMPLESDIR%%/BankClient.java
-%%EXAMPLESDIR%%/DateClient.java
-%%EXAMPLESDIR%%/EchoClient.java
-%%EXAMPLESDIR%%/FibClient.java
-%%EXAMPLESDIR%%/Makefile
-%%EXAMPLESDIR%%/README
-%%EXAMPLESDIR%%/date_server.erl
-%%EXAMPLESDIR%%/echo_server.erl
-%%EXAMPLESDIR%%/fib_server.erl
-%%EXAMPLESDIR%%/robust_bank_client.erl
-%%EXAMPLESDIR%%/robust_bank_server.erl
-%%EXAMPLESDIR%%/robust_banking.txt
-%%EXAMPLESDIR%%/validator.erl
-@dirrm lib/erlang/lib/xmlrpc/src
-@dirrm lib/erlang/lib/xmlrpc/ebin
-@dirrm lib/erlang/lib/xmlrpc/
-@dirrm %%EXAMPLESDIR%%
-@dirrm %%DOCSDIR%%
+%%LIB32DIR%%/erlang/lib/xmlrpc-%%VERSION%%/ebin/tcp_serv.beam
+%%LIB32DIR%%/erlang/lib/xmlrpc-%%VERSION%%/ebin/xmlrpc.beam
+%%LIB32DIR%%/erlang/lib/xmlrpc-%%VERSION%%/ebin/xmlrpc_decode.beam
+%%LIB32DIR%%/erlang/lib/xmlrpc-%%VERSION%%/ebin/xmlrpc_encode.beam
+%%LIB32DIR%%/erlang/lib/xmlrpc-%%VERSION%%/ebin/xmlrpc_http.beam
+%%LIB32DIR%%/erlang/lib/xmlrpc-%%VERSION%%/ebin/xmlrpc_util.beam
+%%LIB32DIR%%/erlang/lib/xmlrpc-%%VERSION%%/src/Makefile
+%%LIB32DIR%%/erlang/lib/xmlrpc-%%VERSION%%/src/example_serv.erl
+%%LIB32DIR%%/erlang/lib/xmlrpc-%%VERSION%%/src/log.hrl
+%%LIB32DIR%%/erlang/lib/xmlrpc-%%VERSION%%/src/tcp_serv.erl
+%%LIB32DIR%%/erlang/lib/xmlrpc-%%VERSION%%/src/xmlrpc.erl
+%%LIB32DIR%%/erlang/lib/xmlrpc-%%VERSION%%/src/xmlrpc.hrl
+%%LIB32DIR%%/erlang/lib/xmlrpc-%%VERSION%%/src/xmlrpc_decode.erl
+%%LIB32DIR%%/erlang/lib/xmlrpc-%%VERSION%%/src/xmlrpc_encode.erl
+%%LIB32DIR%%/erlang/lib/xmlrpc-%%VERSION%%/src/xmlrpc_http.erl
+%%LIB32DIR%%/erlang/lib/xmlrpc-%%VERSION%%/src/xmlrpc_util.erl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/BankClient.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/DateClient.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/EchoClient.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/FibClient.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/date_server.erl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/echo_server.erl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fib_server.erl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/robust_bank_client.erl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/robust_bank_server.erl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/robust_banking.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/validator.erl
+@dirrm lib/erlang/lib/xmlrpc-%%VERSION%%/src
+@dirrm lib/erlang/lib/xmlrpc-%%VERSION%%/ebin
+@dirrm lib/erlang/lib/xmlrpc-%%VERSION%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%