4 files changed, 10 insertions, 32 deletions

diff --git a/devel/distel/Makefile b/devel/distel/Makefile
index b15413c0f46d..717b90e5cd18 100644
--- a/devel/distel/Makefile
+++ b/devel/distel/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	distel
-PORTVERSION=	2012.05.28
-PORTREVISION=	3
+PORTVERSION=	4.0.7
 CATEGORIES=	devel elisp
 
 MAINTAINER=	olgeni@FreeBSD.org
@@ -12,7 +11,6 @@ BUILD_DEPENDS+=	erlc:${PORTSDIR}/lang/erlang
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	massemanet
-GH_TAGNAME=	ecc8581
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
@@ -21,28 +19,25 @@ USE_EMACS=	yes
 DISTEL_DOCS=	AUTHORS ChangeLog INSTALL INSTALL.WIN32 NEWS README README.ie-session
 DISTEL_ROOT=	${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION}
 
-OPTIONS_DEFINE=	DOCS
-
 do-build:
 	@${MKDIR} ${WRKSRC}/ebin
 	@cd ${WRKSRC} && erlc -W0 -o ebin/ +debug_info src/*.erl
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/elisp/*el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/elisp/*el ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@for FILE in ${DISTEL_DOCS}; do \
+	for FILE in ${DISTEL_DOCS}; do \
 		${INSTALL_DATA} ${WRKSRC}/$${FILE} ${STAGEDIR}${DOCSDIR}; \
 	done
-	@${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
-	@${INSTALL_DATA} ${WRKSRC}/doc/distel/*.html ${STAGEDIR}${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKSRC}/doc/distel/*.html ${STAGEDIR}${DOCSDIR}/html
 
 	@${MKDIR} ${STAGEDIR}${DISTEL_ROOT}/src
 	@${MKDIR} ${STAGEDIR}${DISTEL_ROOT}/ebin
-	@${INSTALL_DATA} ${WRKSRC}/src/*.erl ${STAGEDIR}${DISTEL_ROOT}/src
-	@${INSTALL_DATA} ${WRKSRC}/ebin/*.beam ${STAGEDIR}${DISTEL_ROOT}/ebin
-	@${LN} -sf ${DISTNAME} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/src/*.erl ${STAGEDIR}${DISTEL_ROOT}/src
+	${INSTALL_DATA} ${WRKSRC}/ebin/*.beam ${STAGEDIR}${DISTEL_ROOT}/ebin
 
 .include <bsd.port.mk>
diff --git a/devel/distel/distinfo b/devel/distel/distinfo
index e6a189aec11b..3baa0b390df2 100644
--- a/devel/distel/distinfo
+++ b/devel/distel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (massemanet-distel-2012.05.28-ecc8581_GH0.tar.gz) = 617de23de7bccbb0d772f42f18c8c4c13a2008cd7e9a9af4356131512912fd68
-SIZE (massemanet-distel-2012.05.28-ecc8581_GH0.tar.gz) = 212119
+SHA256 (massemanet-distel-4.0.7_GH0.tar.gz) = 9d7d683d3ef4ca016056796af8047f639572a750d645827690564a15dc8579e0
+SIZE (massemanet-distel-4.0.7_GH0.tar.gz) = 213672
diff --git a/devel/distel/files/patch-elisp_erl-service.el b/devel/distel/files/patch-elisp_erl-service.el
deleted file mode 100644
index 05fad9de8acc..000000000000
--- a/devel/distel/files/patch-elisp_erl-service.el
+++ /dev/null
@@ -1,16 +0,0 @@
---- elisp/erl-service.el.orig
-+++ elisp/erl-service.el
-@@ -783,11 +783,11 @@
- (defun erl-search-function (function arity)
-   "Goto the definition of FUNCTION/ARITY in the current buffer."
-   (let ((origin (point))
--	(str (concat "\n" function "("))
-+	(str (concat "\n" function " *("))
- 	(searching t))
-     (goto-char (point-min))
-     (while searching
--      (cond ((search-forward str nil t)
-+      (cond ((search-forward-regexp str nil t)
- 	     (backward-char)
- 	     (when (or (null arity)
- 		       (eq (erl-arity-at-point) arity))
diff --git a/devel/distel/pkg-plist b/devel/distel/pkg-plist
index e7f793211f89..04f9f455203d 100644
--- a/devel/distel/pkg-plist
+++ b/devel/distel/pkg-plist
@@ -1,4 +1,3 @@
-lib/erlang/lib/distel
 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
@@ -45,5 +44,5 @@ lib/erlang/lib/distel-%%VERSION%%/src/otp_doc.erl
 %%EMACS_SITE_LISPDIR%%/distel/erl-test.el
 %%EMACS_SITE_LISPDIR%%/distel/erl.el
 %%EMACS_SITE_LISPDIR%%/distel/erlext.el
+%%EMACS_SITE_LISPDIR%%/distel/mcase.el
 %%EMACS_SITE_LISPDIR%%/distel/net-fsm.el
-%%EMACS_SITE_LISPDIR%%/distel/patmatch.el