3 files changed, 25 insertions, 26 deletions

diff --git a/devel/distel/Makefile b/devel/distel/Makefile
index a012f161819e..582e74836510 100644
--- a/devel/distel/Makefile
+++ b/devel/distel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	distel
 PORTVERSION=	3.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel elisp
 MASTER_SITES=	http://www.bluetail.com/%7Eluke/distel/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -22,6 +22,8 @@ COMMENT=	Distel extends Emacs Lisp with Erlang-style message passing
 BUILD_DEPENDS+=	erlc:${PORTSDIR}/lang/erlang
 RUN_DEPENDS+=	${LOCALBASE}/lib/erlang/lib/syntax_tools/ebin/erl_syntax.beam:${PORTSDIR}/devel/syntax_tools
 
+PLIST_SUB=	VERSION="${PORTVERSION}"
+
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	base
@@ -31,6 +33,7 @@ DISTEL_MANUALS=	distel-euc.pdf distel-euc.ps.gz \
 		distel-user-3.3.pdf distel-user-3.3.ps.gz \
 		distel-3.1.pdf
 DISTEL_DOCS=	config/emacs-init-snippet.el AUTHORS ChangeLog NEWS README README.ie-session
+DISTEL_ROOT=	${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/c/dec32 ${PREFIX}/bin
@@ -45,8 +48,11 @@ do-install:
 	@for FILE in ${DISTEL_MANUALS}; do \
 		${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$${FILE} ${DOCSDIR}; \
 	done
-	@${MKDIR} ${DATADIR}/ebin ${DATADIR}/src
-	@${INSTALL_DATA} ${WRKSRC}/erl/*.erl ${DATADIR}/src
-	@${INSTALL_DATA} ${WRKSRC}/ebin/*.beam ${DATADIR}/ebin
+	@${MKDIR} ${DISTEL_ROOT}
+	@${MKDIR} ${DISTEL_ROOT}/src
+	@${MKDIR} ${DISTEL_ROOT}/ebin
+	@${INSTALL_DATA} ${WRKSRC}/erl/*.erl ${DISTEL_ROOT}/src
+	@${INSTALL_DATA} ${WRKSRC}/ebin/*.beam ${DISTEL_ROOT}/ebin
+	@${LN} -sf ${DISTEL_ROOT} ${PREFIX}/lib/erlang/lib/distel
 
 .include <bsd.port.mk>
diff --git a/devel/distel/pkg-message b/devel/distel/pkg-message
deleted file mode 100644
index 7ee42b464e48..000000000000
--- a/devel/distel/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-======================================================================
-
-Quick start instructions: add the following code to your $HOME/.erlang
-file to enable distel in your default OTP environment.
-
-  code:add_path ("/usr/local/share/distel/ebin").
-  c:l (distel).
-
-======================================================================
diff --git a/devel/distel/pkg-plist b/devel/distel/pkg-plist
index 865eb6947e42..abe9de0fc7a8 100644
--- a/devel/distel/pkg-plist
+++ b/devel/distel/pkg-plist
@@ -13,16 +13,16 @@ bin/dec32
 %%EMACS_SITE_LISPDIR%%/distel/ewoc.el
 %%EMACS_SITE_LISPDIR%%/distel/distel.el
 %%EMACS_SITE_LISPDIR%%/distel/md5.el
-share/distel/ebin/dilber.beam
-share/distel/ebin/dilber_servant.beam
-share/distel/ebin/distel.beam
-share/distel/ebin/distel_ie.beam
-share/distel/ebin/fdoc.beam
-share/distel/src/dilber.erl
-share/distel/src/dilber_servant.erl
-share/distel/src/distel.erl
-share/distel/src/distel_ie.erl
-share/distel/src/fdoc.erl
+lib/erlang/lib/distel-%%VERSION%%/ebin/dilber.beam
+lib/erlang/lib/distel-%%VERSION%%/ebin/dilber_servant.beam
+lib/erlang/lib/distel-%%VERSION%%/ebin/distel.beam
+lib/erlang/lib/distel-%%VERSION%%/ebin/distel_ie.beam
+lib/erlang/lib/distel-%%VERSION%%/ebin/fdoc.beam
+lib/erlang/lib/distel-%%VERSION%%/src/dilber.erl
+lib/erlang/lib/distel-%%VERSION%%/src/dilber_servant.erl
+lib/erlang/lib/distel-%%VERSION%%/src/distel.erl
+lib/erlang/lib/distel-%%VERSION%%/src/distel_ie.erl
+lib/erlang/lib/distel-%%VERSION%%/src/fdoc.erl
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/ChangeLog
 %%DOCSDIR%%/NEWS
@@ -35,6 +35,8 @@ share/distel/src/fdoc.erl
 %%DOCSDIR%%/distel-user-3.3.ps.gz
 %%DOCSDIR%%/emacs-init-snippet.el
 @dirrm %%DOCSDIR%%
-@dirrm share/distel/src
-@dirrm share/distel/ebin
-@dirrm share/distel
+@dirrm lib/erlang/lib/distel-%%VERSION%%/src
+@dirrm lib/erlang/lib/distel-%%VERSION%%/ebin
+@dirrm lib/erlang/lib/distel-%%VERSION%%
+@exec ln -sf distel-%%VERSION%% %D/lib/erlang/lib/distel
+@unexec rm -f %D/lib/erlang/lib/distel