4 files changed, 38 insertions, 24 deletions

diff --git a/devel/ecb/Makefile b/devel/ecb/Makefile
index 81ab8de34a70..2e98313edbb9 100644
--- a/devel/ecb/Makefile
+++ b/devel/ecb/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	ecb
-PORTVERSION=	1.80
+PORTVERSION=	1.91.1
 CATEGORIES=	devel elisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ecb
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Emacs Code Browser
 
 EMACS_PORT_NAME?=	emacs21
 
@@ -28,19 +29,21 @@ LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+ALL_TARGET=	ecb
+PLIST_SUB=	INFOSECTION="${INFOSECTION}"
+INFOSECTION=	The Emacs editor and associated tools
 
 post-patch:
-	${REINPLACE_CMD} -e 's/.$$//' \
-		-e 's/GNU Emacs Lisp/The Emacs editor and associated tools/' \
-		 ${WRKSRC}/ecb.texi
+	${REINPLACE_CMD} "s|\./info-help|${PREFIX}/info|" ${WRKSRC}/ecb-help.el
 
 do-install:
 	${MKDIR} ${LISPDIR}
 .for i in *.el *.elc
 	${INSTALL_DATA} ${WRKSRC}/${i} ${LISPDIR}
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/ecb.info ${PREFIX}/info
-	install-info ${PREFIX}/info/ecb.info ${PREFIX}/info/dir
+	${INSTALL_DATA} ${WRKSRC}/info-help/* ${PREFIX}/info
+	install-info --section="${INFOSECTION}" ${PREFIX}/info/ecb.info \
+		${PREFIX}/info/dir
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/ecb/distinfo b/devel/ecb/distinfo
index 87629a54f54a..39902e9cd7be 100644
--- a/devel/ecb/distinfo
+++ b/devel/ecb/distinfo
@@ -1 +1 @@
-MD5 (ecb-1.80.tar.gz) = 034623542065620a3ecf969e088f5a60
+MD5 (ecb-1.91.1.tar.gz) = eb14b149237eab512d223ee2aa7d0815
diff --git a/devel/ecb/pkg-descr b/devel/ecb/pkg-descr
index 6983d702ced1..e3d8611c7110 100644
--- a/devel/ecb/pkg-descr
+++ b/devel/ecb/pkg-descr
@@ -1,9 +1,6 @@
-ECB is source code browser for Emacs. It is a global minor-mode which
-displays a couple of windows that can be used to browse directories,
-files and methods. It supports method parsing for Java, C, C++, Elisp
-etc.
+ECB is a source code browser for Emacs.  It is a global minor-mode
+which displays a couple of windows that can be used to browse
+directories, files and file-contents like methods and variables.  It
+supports source-code parsing for Java, C, C++, Elisp, Scheme etc.
 
-WWW: http://home.swipnet.se/mayhem/ecb.html
-
-- Kimura Fuyuki
-fuyuki@hadaly.org
+WWW: http://ecb.sourceforge.net/
diff --git a/devel/ecb/pkg-plist b/devel/ecb/pkg-plist
index 0c0592e00bd1..1fe5a2275a03 100644
--- a/devel/ecb/pkg-plist
+++ b/devel/ecb/pkg-plist
@@ -1,18 +1,28 @@
-@unexec install-info --delete %D/info/ecb.info %D/info/dir
+@unexec install-info --delete --section="%%INFOSECTION%%" %D/info/ecb.info %D/info/dir
 info/ecb.info
-@exec install-info %D/info/ecb.info %D/info/dir
-%%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-buffertab.el
-%%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-buffertab.elc
+info/ecb.info-1
+info/ecb.info-2
+info/ecb.info-3
+info/ecb.info-4
+info/ecb.info-5
+info/ecb.info-6
+@exec install-info --section="%%INFOSECTION%%" %D/info/ecb.info %D/info/dir
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-compilation.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-compilation.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-create-layout.el
+%%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-create-layout.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-cycle.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-cycle.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-eshell.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-eshell.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-examples.el
+%%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-examples.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-face.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-face.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-help.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-help.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-layout-defs.el
+%%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-layout-defs.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-layout.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-layout.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-mode-line.el
@@ -21,16 +31,20 @@ info/ecb.info
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-navigate.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-speedbar.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-speedbar.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-tod.el
+%%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-tod.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-upgrade.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-upgrade.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-util.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-util.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/ecb/silentcomp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/ecb/silentcomp.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/tree-buffer.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/tree-buffer.elc
 @dirrm %%EMACS_VERSION_SITE_LISPDIR%%/ecb
-%%PORTDOCS%%share/doc/ecb/HISTORY
-%%PORTDOCS%%share/doc/ecb/README
-%%PORTDOCS%%share/doc/ecb/RELEASE_NOTES
-%%PORTDOCS%%@dirrm share/doc/ecb
+%%PORTDOCS%%%%DOCSDIR%%/HISTORY
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
+%%PORTDOCS%%@dirrm %%DOCSDIR%%