1 files changed, 29 insertions, 34 deletions

diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile
index 5f04b82c5cbc..b79bdc99e23b 100644
--- a/editors/xemacs-packages/Makefile
+++ b/editors/xemacs-packages/Makefile
@@ -6,40 +6,39 @@
 #
 
 PORTNAME=	xemacs-packages
-PORTVERSION=	7.0
+PORTVERSION=	8.0
 CATEGORIES=	editors elisp
-MASTER_SITES=	${MASTER_SITE_XEMACS} \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	packages kiri/xemacs
+MASTER_SITES=	${MASTER_SITE_LOCAL:S|%SUBDIR%|kiri/xemacs|} \
+		${MASTER_SITE_XEMACS:S|%SUBDIR%|packages|}
 DISTFILES=	\
 		Sun-1.13-pkg.tar.gz \
 		ada-1.13-pkg.tar.gz \
 		apel-1.26-pkg.tar.gz \
-		auctex-1.33-pkg.tar.gz \
+		auctex-1.35-pkg.tar.gz \
 		bbdb-1.21-pkg.tar.gz \
 		build-1.10-pkg.tar.gz \
 		c-support-1.16-pkg.tar.gz \
 		calc-1.23-pkg.tar.gz \
 		calendar-1.19-pkg.tar.gz \
-		cc-mode-1.32-pkg.tar.gz \
-		clearcase-1.04-pkg.tar.gz \
+		cc-mode-1.33-pkg.tar.gz \
+		clearcase-1.06-pkg.tar.gz \
 		cookie-1.14-pkg.tar.gz \
 		crisp-1.12-pkg.tar.gz \
 		debug-1.16-pkg.tar.gz \
 		dictionary-1.11-pkg.tar.gz \
 		dired-1.13-pkg.tar.gz \
 		docbookide-0.06-pkg.tar.gz \
-		ecb-1.01-pkg.tar.gz \
+		ecb-1.06-pkg.tar.gz \
 		ecrypto-0.12-pkg.tar.gz \
-		edebug-1.15-pkg.tar.gz \
+		edebug-1.17-pkg.tar.gz \
 		ediff-1.46-pkg.tar.gz \
-		edit-utils-1.98-pkg.tar.gz \
+		edit-utils-2.00-pkg.tar.gz \
 		edt-1.12-pkg.tar.gz \
 		efs-1.29-pkg.tar.gz \
 		eieio-1.04-pkg.tar.gz \
 		elib-1.10-pkg.tar.gz \
 		emerge-1.09-pkg.tar.gz \
-		eshell-1.04-pkg.tar.gz \
+		eshell-1.05-pkg.tar.gz \
 		ess-1.03-pkg.tar.gz \
 		eterm-1.13-pkg.tar.gz \
 		eudc-1.37-pkg.tar.gz \
@@ -50,20 +49,20 @@ DISTFILES=	\
 		fsf-compat-1.12-pkg.tar.gz \
 		games-1.13-pkg.tar.gz \
 		gnats-1.15-pkg.tar.gz \
-		gnus-1.65-pkg.tar.gz \
+		gnus-1.68-pkg.tar.gz \
 		haskell-mode-1.05-pkg.tar.gz \
-		hm--html-menus-1.18-pkg.tar.gz \
+		hm--html-menus-1.20-pkg.tar.gz \
 		ibuffer-1.08-pkg.tar.gz \
 		idlwave-1.28-pkg.tar.gz \
 		igrep-1.10-pkg.tar.gz \
-		ilisp-1.29-pkg.tar.gz \
+		ilisp-1.31-pkg.tar.gz \
 		ispell-1.24-pkg.tar.gz \
-		jde-1.43-pkg.tar.gz \
-		liece-1.10-pkg.tar.gz \
-		mail-lib-1.56-pkg.tar.gz \
+		jde-1.45-pkg.tar.gz \
+		liece-1.11-pkg.tar.gz \
+		mail-lib-1.57-pkg.tar.gz \
 		mailcrypt-2.12-pkg.tar.gz \
 		mew-1.17-pkg.tar.gz \
-		mh-e-1.17-pkg.tar.gz \
+		mh-e-1.19-pkg.tar.gz \
 		mine-1.14-pkg.tar.gz \
 		misc-games-1.16-pkg.tar.gz \
 		mmm-mode-1.00-pkg.tar.gz \
@@ -77,7 +76,7 @@ DISTFILES=	\
 		pgg-1.02-pkg.tar.gz \
 		prog-modes-1.72-pkg.tar.gz \
 		ps-print-1.08-pkg.tar.gz \
-		psgml-1.38-pkg.tar.gz \
+		psgml-1.40-pkg.tar.gz \
 		psgml-dtds-1.02-pkg.tar.gz \
 		python-modes-1.02-pkg.tar.gz \
 		reftex-1.28-pkg.tar.gz \
@@ -88,32 +87,33 @@ DISTFILES=	\
 		semantic-1.17-pkg.tar.gz \
 		sgml-1.08-pkg.tar.gz \
 		sh-script-1.17-pkg.tar.gz \
-		sieve-1.11-pkg.tar.gz \
+		sieve-1.13-pkg.tar.gz \
 		slider-1.13-pkg.tar.gz \
-		sml-mode-0.07-pkg.tar.gz \
+		sml-mode-0.09-pkg.tar.gz \
 		sounds-au-1.10-pkg.tar.gz \
 		sounds-wav-1.10-pkg.tar.gz \
 		speedbar-1.26-pkg.tar.gz \
 		strokes-1.08-pkg.tar.gz \
 		supercite-1.19-pkg.tar.gz \
 		texinfo-1.23-pkg.tar.gz \
-		text-modes-1.58-pkg.tar.gz \
+		text-modes-1.60-pkg.tar.gz \
 		textools-1.14-pkg.tar.gz \
 		time-1.12-pkg.tar.gz \
 		tm-1.35-pkg.tar.gz \
 		tooltalk-1.13-pkg.tar.gz \
 		tpu-1.12-pkg.tar.gz \
-		tramp-1.11-pkg.tar.gz \
-		vc-1.35-pkg.tar.gz \
+		tramp-1.12-pkg.tar.gz \
+		vc-1.37-pkg.tar.gz \
 		vc-cc-1.21-pkg.tar.gz \
 		vhdl-1.16-pkg.tar.gz \
 		view-process-1.12-pkg.tar.gz \
 		viper-1.35-pkg.tar.gz \
-		vm-7.07-pkg.tar.gz \
+		vm-7.14-pkg.tar.gz \
 		w3-1.28-pkg.tar.gz \
+		x-symbol-1.03-pkg.tar.gz \
 		xemacs-base-1.75-pkg.tar.gz \
-		xemacs-devel-1.50-pkg.tar.gz \
-		xslide-1.04-pkg.tar.gz \
+		xemacs-devel-1.52-pkg.tar.gz \
+		xslide-1.06-pkg.tar.gz \
 		xslt-process-1.11-pkg.tar.gz \
 		zenirc-1.13-pkg.tar.gz
 DIST_SUBDIR=	xemacs
@@ -130,7 +130,7 @@ PACKAGES_SUBDIR=	xemacs-packages
 do-extract:
 	@${MKDIR} ${WRKSRC}
 .for f in ${DISTFILES}
-	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DIST_SUBDIR}/${f} \
+	-@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DIST_SUBDIR}/${f} \
 		${EXTRACT_AFTER_ARGS} -C ${WRKSRC}
 .endfor
 
@@ -147,12 +147,7 @@ post-install:
 	@${ECHO_CMD} '@unexec rmdir %D/lib/xemacs 2>/dev/null || true' >> ${TMPPLIST}
 	@${ECHO_MSG} "    This is the set of the packages for xemacs with the xemacs-packages"
 	@${ECHO_MSG} "category. You might be enough only with this package(or if you are non-Latin"
-	@${ECHO_MSG} "people, together with xemacs-mule-packages) for working at XEmacs but if you"
-	@${ECHO_MSG} "think it insufficient,you can install other packages of"
-	@${ECHO_MSG} "editors/xemacs-*-packages ports. These ports are prepared for the rack of"
-	@${ECHO_MSG} "corresponding XEmacs packages except for xemacs-packages, xemacs-mule-packages"
-	@${ECHO_MSG} "and xemacs-additional-packages by which all the additional packages those above"
-	@${ECHO_MSG} "will be installed at once."
+	@${ECHO_MSG} "people, together with xemacs-mule-packages) for working at XEmacs."
 	@${ECHO_MSG} "    You can also install with running it as root and using the 'Manage Packages'"
 	@${ECHO_MSG} "menu within the 'Options' menu of the menubar. But using this xemacs package"
 	@${ECHO_MSG} "managing, you could not control under ports managing ;-)"