3 files changed, 23 insertions, 37 deletions

diff --git a/devel/ecb/Makefile b/devel/ecb/Makefile
index dbfdb5e826a5..99dda440d976 100644
--- a/devel/ecb/Makefile
+++ b/devel/ecb/Makefile
@@ -6,18 +6,17 @@
 #
 
 PORTNAME=	ecb
-PORTVERSION=	2.32
-PORTREVISION=	8
+PORTVERSION=	2.40
 CATEGORIES=	devel elisp
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
-		http://dryice.name/computer/FreeBSD/distfiles/
-
+MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTNAME:U}%20${PORTVERSION}
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Emacs Code Browser
 
 USE_EMACS=	yes
+USE_GMAKE=	yes
 
 LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 ICONSRC=	${WRKSRC}/ecb-images
@@ -25,44 +24,35 @@ ICONDIR=	${LISPDIR}/ecb-images
 ICONSUBDIRS=	height-10 height-14 height-15 height-16 height-17 height-18 \
 		height-19 height-20 height-21
 
-USE_GMAKE=	yes
 ALL_TARGET=	ecb
 
+INFO=		ecb
+
+OPTIONS=	CEDET	"Use the Cedet library" On \
+		ICONS	"Install ecb's icons" On
+
+.include <bsd.port.pre.mk>
+
 .if defined(WITHOUT_CEDET)
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/semantic/semantic.el:${PORTSDIR}/devel/semantic${PORTNAMESUFFIX}
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/semantic/semantic.el:${PORTSDIR}/devel/semantic
+RUN_DEPENDS+=	${BUILD_DEPENDS}
 MAKE_ARGS=	CEDET=""
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/cedet/common/cedet.el:${PORTSDIR}/devel/cedet${PORTNAMESUFFIX}
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/cedet/common/cedet.el:${PORTSDIR}/devel/cedet
+RUN_DEPENDS+=	${BUILD_DEPENDS}
 MAKE_ARGS=	CEDET=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/cedet
 .endif
 
-RUN_DEPENDS+=	${BUILD_DEPENDS}
-
 .if defined(WITHOUT_ICONS)
 PLIST_SUB+=	ICONS="@comment "
 .else
 PLIST_SUB+=	ICONS=""
 .endif
 
-INFO=		ecb
-
 .if !defined(NOPORTDOCS)
 PORTDOCS=	NEWS README RELEASE_NOTES
 .endif
 
-pre-everything::
-.if !defined(WITHOUT_ICONS)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You may use the following build options:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  WITHOUT_ICONS=yes   Don't install ecb's icons"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  WITHOUT_CEDET=yes   Don't use the CEDET library,"
-	@${ECHO_MSG} "                      use the old version of "
-	@${ECHO_MSG} "                      eieio/semantic/speedbar instead."
-	@${ECHO_MSG} ""
-.endif
-
 post-patch:
 	${REINPLACE_CMD} "s|\./info-help|${PREFIX}/info|" ${WRKSRC}/ecb-help.el
 	${REINPLACE_CMD} "s/^\(@dircategory \)GNU Emacs Lisp/\1The Emacs editor and associated tools/" ${WRKSRC}/ecb.texi
@@ -97,10 +87,4 @@ do-install:
 .endfor
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${EMACS_PORT_NAME} != "emacs23"
-PORTNAMESUFFIX=	${PKGNAMESUFFIX}
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/devel/ecb/distinfo b/devel/ecb/distinfo
index 29e04115b30c..e6fe19e65341 100644
--- a/devel/ecb/distinfo
+++ b/devel/ecb/distinfo
@@ -1,3 +1,3 @@
-MD5 (ecb-2.32.tar.gz) = 565b245f9e49e941214db256cf2b8e23
-SHA256 (ecb-2.32.tar.gz) = b0b4bd5eb00fd43bb4637e3ed67220b0e981471922bf773ff992b662e6be599d
-SIZE (ecb-2.32.tar.gz) = 896382
+MD5 (ecb-2.40.tar.gz) = 7f1df8e1c15b8d95641b40abbd706cd7
+SHA256 (ecb-2.40.tar.gz) = 5a6609699b844b535cc26fac1d6740ffeeb07d9895e8eb8214d3dbe77a34e53e
+SIZE (ecb-2.40.tar.gz) = 986581
diff --git a/devel/ecb/pkg-plist b/devel/ecb/pkg-plist
index 8c6f1416d16e..56ed0b1737f8 100644
--- a/devel/ecb/pkg-plist
+++ b/devel/ecb/pkg-plist
@@ -1,8 +1,12 @@
+%%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-advice-test.el
+%%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-advice-test.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-analyse.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-analyse.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-autogen.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-autogen.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-autoloads.el
+%%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-cedet-wrapper.el
+%%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-cedet-wrapper.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-common-browser.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-common-browser.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-compatibility.el
@@ -35,8 +39,6 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-mode-line.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-navigate.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-navigate.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-semantic-wrapper.el
-%%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-semantic-wrapper.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-speedbar.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-speedbar.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/ecb/ecb-symboldef.el