3 files changed, 60 insertions, 28 deletions

diff --git a/devel/distel/Makefile b/devel/distel/Makefile
index 9a6017e46161..58f68995d95a 100644
--- a/devel/distel/Makefile
+++ b/devel/distel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	distel
-PORTVERSION=	2007.11.03
+PORTVERSION=	2008.06.26
 CATEGORIES=	devel elisp
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	olgeni
@@ -22,7 +22,6 @@ BUILD_DEPENDS+=	erlc:${PORTSDIR}/lang/erlang
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21
 
 DISTEL_MANUALS=	distel-euc.pdf distel-euc.ps.gz \
 		distel-user-3.3.pdf distel-user-3.3.ps.gz \
@@ -36,6 +35,8 @@ do-build:
 do-install:
 	@${MKDIR} ${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}
 	@${INSTALL_DATA} ${WRKSRC}/elisp/*el ${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}
+
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@for FILE in ${DISTEL_DOCS}; do \
 		${INSTALL_DATA} ${WRKSRC}/$${FILE} ${DOCSDIR}; \
@@ -43,7 +44,14 @@ do-install:
 	@for FILE in ${DISTEL_MANUALS}; do \
 		${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$${FILE} ${DOCSDIR}; \
 	done
+	@${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${DOCSDIR}
+	@for FILE in ${DISTEL_MANUALS}; do \
+		${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$${FILE} ${DOCSDIR}; \
+	done
+	@${MKDIR} ${DOCSDIR}/html
+	@${INSTALL_DATA} ${WRKSRC}/doc/distel/*.html ${DOCSDIR}/html
 	@${MKDIR} ${DISTEL_ROOT}
+.endif
 	@${MKDIR} ${DISTEL_ROOT}/src
 	@${MKDIR} ${DISTEL_ROOT}/ebin
 	@${INSTALL_DATA} ${WRKSRC}/src/*.erl ${DISTEL_ROOT}/src
diff --git a/devel/distel/distinfo b/devel/distel/distinfo
index be69d4b2c0d6..8f40fd54e7ba 100644
--- a/devel/distel/distinfo
+++ b/devel/distel/distinfo
@@ -1,6 +1,6 @@
-MD5 (erlang/distel-2007.11.03.tar.gz) = 3d70336beb43fbde3d0b968d0125d6de
-SHA256 (erlang/distel-2007.11.03.tar.gz) = 43cb9283983b749b8549cb9b4f54cfb923cf29d48432083d7c0ab9b506b64654
-SIZE (erlang/distel-2007.11.03.tar.gz) = 177206
+MD5 (erlang/distel-2008.06.26.tar.gz) = 30727e1cf56a998fae10da1cf12382ef
+SHA256 (erlang/distel-2008.06.26.tar.gz) = 84c031ee1d7c08802e5fd6eae83f83be1870f873dad33877e6e784482eeaa388
+SIZE (erlang/distel-2008.06.26.tar.gz) = 212002
 MD5 (erlang/distel-euc.pdf) = 576a2fcfa68c9a1b3411bc5c83010f79
 SHA256 (erlang/distel-euc.pdf) = f730edddc511cf59beb4261cc1d1e3575d5763db1853f18f2c156b38d97c2d9d
 SIZE (erlang/distel-euc.pdf) = 154855
diff --git a/devel/distel/pkg-plist b/devel/distel/pkg-plist
index 64a59ba4a02a..799b5ea650bb 100644
--- a/devel/distel/pkg-plist
+++ b/devel/distel/pkg-plist
@@ -1,21 +1,44 @@
-%%LIB32DIR%%/erlang/lib/distel-2007.11.03/ebin/distel.beam
-%%LIB32DIR%%/erlang/lib/distel-2007.11.03/ebin/distel_ie.beam
-%%LIB32DIR%%/erlang/lib/distel-2007.11.03/ebin/fdoc.beam
-%%LIB32DIR%%/erlang/lib/distel-2007.11.03/src/distel.erl
-%%LIB32DIR%%/erlang/lib/distel-2007.11.03/src/distel_ie.erl
-%%LIB32DIR%%/erlang/lib/distel-2007.11.03/src/fdoc.erl
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/INSTALL.WIN32
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/README
-%%DOCSDIR%%/README.ie-session
-%%DOCSDIR%%/distel-3.1.pdf
-%%DOCSDIR%%/distel-euc.pdf
-%%DOCSDIR%%/distel-euc.ps.gz
-%%DOCSDIR%%/distel-user-3.3.pdf
-%%DOCSDIR%%/distel-user-3.3.ps.gz
+%%LIB32DIR%%/erlang/lib/distel-%%VERSION%%/ebin/distel.beam
+%%LIB32DIR%%/erlang/lib/distel-%%VERSION%%/ebin/distel_ie.beam
+%%LIB32DIR%%/erlang/lib/distel-%%VERSION%%/ebin/fdoc.beam
+%%LIB32DIR%%/erlang/lib/distel-%%VERSION%%/ebin/otp_doc.beam
+%%LIB32DIR%%/erlang/lib/distel-%%VERSION%%/src/distel.erl
+%%LIB32DIR%%/erlang/lib/distel-%%VERSION%%/src/distel_ie.erl
+%%LIB32DIR%%/erlang/lib/distel-%%VERSION%%/src/fdoc.erl
+%%LIB32DIR%%/erlang/lib/distel-%%VERSION%%/src/otp_doc.erl
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.WIN32
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.ie-session
+%%PORTDOCS%%%%DOCSDIR%%/distel-3.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/distel-euc.pdf
+%%PORTDOCS%%%%DOCSDIR%%/distel-euc.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/distel-user-3.3.pdf
+%%PORTDOCS%%%%DOCSDIR%%/distel-user-3.3.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/gorrie02distel.pdf
+%%PORTDOCS%%%%DOCSDIR%%/html/Applications.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Attach-Buffer.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Basic-Commands.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Completion.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Conventions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Debugger.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Documentation.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Evaluation.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Interactive-Sessions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Monitor-Buffer.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Principles.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Process-Manager.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Profiler.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Programming-Aids.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Refactoring.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Saving-and-Restoring.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Synchronising-Breakpoints.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Tags.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
 %%EMACS_SITE_LISPDIR%%/distel/derl.el
 %%EMACS_SITE_LISPDIR%%/distel/distel-ie.el
 %%EMACS_SITE_LISPDIR%%/distel/distel.el
@@ -29,9 +52,10 @@
 %%EMACS_SITE_LISPDIR%%/distel/net-fsm.el
 %%EMACS_SITE_LISPDIR%%/distel/patmatch.el
 @dirrm %%EMACS_SITE_LISPDIR%%/distel
-@dirrm %%DOCSDIR%%
-@dirrm %%LIB32DIR%%/erlang/lib/distel-2007.11.03/src
-@dirrm %%LIB32DIR%%/erlang/lib/distel-2007.11.03/ebin
-@dirrm %%LIB32DIR%%/erlang/lib/distel-2007.11.03
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%LIB32DIR%%/erlang/lib/distel-%%VERSION%%/src
+@dirrm %%LIB32DIR%%/erlang/lib/distel-%%VERSION%%/ebin
+@dirrm %%LIB32DIR%%/erlang/lib/distel-%%VERSION%%
 @exec ln -sf distel-%%VERSION%% %D/%%LIB32DIR%%/erlang/lib/distel
-@rmtry %%LIB32DIR%%/erlang/lib/distel
+@unexec rm -f %D/%%LIB32DIR%%/erlang/lib/distel