14 files changed, 6 insertions, 245 deletions

diff --git a/MOVED b/MOVED
index 86ba98e99201..fc8b74e15ec8 100644
--- a/MOVED
+++ b/MOVED
@@ -3155,3 +3155,9 @@ shells/perlsh|shells/psh|2007-08-13|Renamed to reflect correct project's name
 mail/qmHandle|mail/qmhandle|2007-08-13|Renamed to reflect correct project's name
 science/speedcrunch|math/speedcrunch|2007-08-14|Moved to a more appropriate category
 chinese/CJK|print/latex-cjk|2007-08-19|Better category
+databases/bbdb-emacs20||2007-08-19|Has expired: emacs20 and related ports are obsolete; please use a more recent version
+databases/lsdb-emacs20||2007-08-19|Has expired: emacs20 and related ports are obsolete; please use a more recent version
+deskutils/mhc-emacs20||2007-08-19|Has expired: emacs20 and related ports are obsolete; please use a more recent version
+devel/elib-emacs19||2007-08-19|Has expired: emacs19 is obsolete; please use a more recent version
+devel/elib-emacs20||2007-08-19|Has expired: emacs20 and related ports are obsolete; please use a more recent version
+devel/pcl-cvs-emacs20||2007-08-19|Has expired: emacs20 and related ports are obsolete; please use a more recent version
diff --git a/databases/Makefile b/databases/Makefile
index 139963ea0185..72928d673b88 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -11,7 +11,6 @@
     SUBDIR += aolserver-nsmysql
     SUBDIR += aolserver-nspostgres
     SUBDIR += bbdb
-    SUBDIR += bbdb-emacs20
     SUBDIR += cdb
     SUBDIR += clip
     SUBDIR += courier-authlib-mysql
@@ -120,7 +119,6 @@
     SUBDIR += linux-oracle-instantclient-sdk
     SUBDIR += linux-oracle-instantclient-sqlplus
     SUBDIR += lsdb
-    SUBDIR += lsdb-emacs20
     SUBDIR += mantis
     SUBDIR += mdbtools
     SUBDIR += memcached
diff --git a/databases/bbdb-emacs20/Makefile b/databases/bbdb-emacs20/Makefile
deleted file mode 100644
index ec1b0acea885..000000000000
--- a/databases/bbdb-emacs20/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# New ports collection makefile for:	bbdb (for emacs20)
-# Date Created:		12 Dec 2001
-# Whom:			Yoichi NAKAYAMA <yoichi@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-MASTERDIR=	${.CURDIR}/../bbdb
-
-DEPRECATED=	emacs20 and related ports are obsolete; please use a more recent version
-EXPIRATION_DATE=	2007-08-19
-
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs20
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/lsdb-emacs20/Makefile b/databases/lsdb-emacs20/Makefile
deleted file mode 100644
index e1b754eea3ba..000000000000
--- a/databases/lsdb-emacs20/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# New ports collection makefile for:	lsdb (for emacs20)
-# Date Created:		27 Apr 2002
-# Whom:			Yoichi NAKAYAMA <yoichi@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-MASTERDIR=	${.CURDIR}/../lsdb
-
-DEPRECATED=	emacs20 and related ports are obsolete; please use a more recent version
-EXPIRATION_DATE=	2007-08-19
-
-USE_EMACS=		yes
-EMACS_PORT_NAME=	emacs20
-
-.include "${MASTERDIR}/Makefile"
diff --git a/deskutils/Makefile b/deskutils/Makefile
index f5568e6c0688..a5e59e4daa04 100644
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@@ -134,7 +134,6 @@
     SUBDIR += menumaker
     SUBDIR += metabar
     SUBDIR += mhc
-    SUBDIR += mhc-emacs20
     SUBDIR += mical
     SUBDIR += moregroupware
     SUBDIR += mrundlg
diff --git a/deskutils/mhc-emacs20/Makefile b/deskutils/mhc-emacs20/Makefile
deleted file mode 100644
index a42f059f9bc1..000000000000
--- a/deskutils/mhc-emacs20/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# New ports collection makefile for:   mhc
-# Date Created:		6 Mar 2001
-# Whom:			Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
-#
-# $FreeBSD$
-#
-
-MASTERDIR=	${.CURDIR}/../mhc
-MAINTAINER=	yoichi@FreeBSD.org
-
-DEPRECATED=	emacs20 and related ports are obsolete; please use a more recent version
-EXPIRATION_DATE=	2007-08-19
-
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs20
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/Makefile b/devel/Makefile
index 0b481c7b37a8..d41e0505289c 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -282,8 +282,6 @@
     SUBDIR += elfsh
     SUBDIR += elftoaout
     SUBDIR += elib
-    SUBDIR += elib-emacs19
-    SUBDIR += elib-emacs20
     SUBDIR += elib-emacs21
     SUBDIR += engrave
     SUBDIR += entity
@@ -1680,7 +1678,6 @@
     SUBDIR += pas2dox
     SUBDIR += patch
     SUBDIR += pccts
-    SUBDIR += pcl-cvs-emacs20
     SUBDIR += pcre
     SUBDIR += pcre++
     SUBDIR += pcsc-lite
diff --git a/devel/elib-emacs19/Makefile b/devel/elib-emacs19/Makefile
deleted file mode 100644
index f1392786d1b5..000000000000
--- a/devel/elib-emacs19/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# New ports collection makefile for:	Elib for GNU Emacs 19
-# Date created:		24 Feb 2000
-# Whom:			OKAZAKI Tetsurou
-#
-# $FreeBSD$
-#
-
-MAINTAINER=	ports@FreeBSD.org
-
-# This is a slave port.
-PORTCLASS=	slave
-
-MASTERDIR=	${.CURDIR}/../../devel/elib
-
-DEPRECATED=	emacs19 is obsolete; please use a more recent version
-EXPIRATION_DATE=	2007-08-19
-
-# emacs port setup
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs19
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/elib-emacs20/Makefile b/devel/elib-emacs20/Makefile
deleted file mode 100644
index 2b32c7d602ac..000000000000
--- a/devel/elib-emacs20/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# New ports collection makefile for:	Elib for GNU Emacs 20
-# Date created:		24 Feb 2000
-# Whom:			OKAZAKI Tetsurou
-#
-# $FreeBSD$
-#
-
-MAINTAINER=	ports@FreeBSD.org
-
-DEPRECATED=	emacs20 and related ports are obsolete; please use a more recent version
-EXPIRATION_DATE=	2007-08-19
-
-# This is a slave port.
-PORTCLASS=	slave
-
-MASTERDIR=	${.CURDIR}/../../devel/elib
-
-# emacs port setup
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs20
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/pcl-cvs-emacs20/Makefile b/devel/pcl-cvs-emacs20/Makefile
deleted file mode 100644
index 94e5a0552a18..000000000000
--- a/devel/pcl-cvs-emacs20/Makefile
+++ /dev/null
@@ -1,106 +0,0 @@
-# New ports collection makefile for:	PCL-CVS for GNU Emacs 20
-# Date created:		27 Apr 2000
-# Whom:			OKAZAKI Tetsurou
-#
-# $FreeBSD$
-#
-
-PORTNAME=	pcl-cvs
-PORTVERSION=	2.9.9
-PORTREVISION=	2
-CATEGORIES=	devel elisp
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	okazaki/pcl-cvs
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-DIST_SUBDIR=	pcl-cvs
-
-PATCH_SITES=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	okazaki/pcl-cvs
-PATCHFILES=	pcl-cvs-2.9.9-compat.patch
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An Emacs-based front-end to CVS
-
-DEPRECATED=	emacs20 and related ports are obsolete; please use a more recent version
-EXPIRATION_DATE=	2007-08-19
-
-# startup el filename
-PORT_SETUPEL=	pcl-cvs-setup.el
-
-# emacs port setup
-USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs20
-ELIB_PORT_SUFFIX?=	-${EMACS_PORT_NAME}
-
-# target name for make build
-ALL_TARGET?=		elcfiles info
-INSTALL_TARGET?=	install_el install_elc install_info
-INSTALL_TARGET+=	install_startup
-
-INFO=	pcl-cvs
-
-.include <bsd.port.pre.mk>
-
-.if !defined(NOPORTDOCS)
-PORTDOCS=	ChangeLog FAQ NEWS README TODO
-.endif
-
-PLIST_SUB+=	PORT_SETUPEL=${PORT_SETUPEL}
-MAKE_ARGS+=	EMACS="${EMACS_CMD} -q --no-site-file" \
-		CP="${INSTALL_DATA}" \
-		MAKEINFO="makeinfo --no-split" \
-		MKDIR="${MKDIR}" \
-		prefix="${PREFIX}" \
-		lispdir="${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}" \
-		startupfile="${PORT_SETUPEL}"
-
-.if defined(EMACS_PORT_NAME)
-ELIB_PORTDIR=	${PORTSDIR}/devel/elib${ELIB_PORT_SUFFIX}
-BUILD_DEPENDS+=	${EMACS_BASE}/${EMACS_VERSION_SITE_LISPDIR}/elib/cookie.el:${ELIB_PORTDIR}
-RUN_DEPENDS+=	${EMACS_BASE}/${EMACS_VERSION_SITE_LISPDIR}/elib/cookie.el:${ELIB_PORTDIR}
-RUN_DEPENDS+=	${EMACS_BASE}/${EMACS_SITE_LISPDIR}/diff-mode.el:${PORTSDIR}/textproc/diff-mode.el
-.else
-.BEGIN:
-	@${ECHO} "Error: Bad port."
-	@${ECHO} "You must define EMACS_PORT_NAME."
-	@${FALSE}
-.endif
-
-post-extract:
-.if defined(EASY_MMODE)
-	${CP} ${_DISTDIR}/${EASY_MMODE} ${WRKSRC}
-.endif
-
-pre-build:
-	${RM} ${WRKSRC}/pcl-cvs.info*
-
-post-build:
-	${ECHO_CMD} "(provide 'pcl-cvs-startup)" >> ${WRKSRC}/pcl-cvs-startup.el
-
-pre-install:
-	-${RM} ${INSTALL_WRKSRC}/${PORT_SETUPEL}
-.if defined(ELIB_SETUP) && !empty(ELIB_SETUP)
-	${ECHO_CMD} ${ELIB_SETUP} >> ${INSTALL_WRKSRC}/${PORT_SETUPEL}
-.endif
-
-POST_INSTALL_SEQ+=	setupel-install
-.if !defined(NOPORTDOCS)
-POST_INSTALL_SEQ+=	doc-install
-.endif
-
-post-install: ${POST_INSTALL_SEQ}
-	@${CAT} ${PKGMESSAGE}
-
-doc-install:
-	${MKDIR} ${DOCSDIR}
-	cd ${INSTALL_WRKSRC} && \
-	for i in ${PORTDOCS}; do \
-		${INSTALL_DATA} $${i} ${DOCSDIR} ; \
-	done
-
-setupel-install:
-	${ECHO_CMD} "(provide 'pcl-cvs-setup)" >> ${INSTALL_WRKSRC}/${PORT_SETUPEL}
-	${INSTALL_DATA} ${INSTALL_WRKSRC}/${PORT_SETUPEL} \
-		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/
-
-.include <bsd.port.post.mk>
diff --git a/devel/pcl-cvs-emacs20/distinfo b/devel/pcl-cvs-emacs20/distinfo
deleted file mode 100644
index 1029567a3d80..000000000000
--- a/devel/pcl-cvs-emacs20/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 (pcl-cvs/pcl-cvs-2.9.9.tar.gz) = b4511b9eae0bf2ee033f37705cb5f1f9
-SHA256 (pcl-cvs/pcl-cvs-2.9.9.tar.gz) = 3177c5994f2ab36d8c482acb69ca984ba08ebce3e6b52c5765d1d615d5103fdf
-SIZE (pcl-cvs/pcl-cvs-2.9.9.tar.gz) = 140016
-MD5 (pcl-cvs/easy-mmode.el) = 59baa701f3fafcf2a8f47ea58785722b
-SHA256 (pcl-cvs/easy-mmode.el) = a7a37d0a6c7fdfee59a4e5c362a0be2eb6c34b9f79067a4d256c4c9493ca11d8
-SIZE (pcl-cvs/easy-mmode.el) = 5962
-MD5 (pcl-cvs/pcl-cvs-2.9.9-compat.patch) = 42d7926bde6eb3f9375aa511a4da4aa5
-SHA256 (pcl-cvs/pcl-cvs-2.9.9-compat.patch) = 40fb7a15845c0c7b7f769decbf5d8e861aae58dacac9f104a04577ed51679425
-SIZE (pcl-cvs/pcl-cvs-2.9.9-compat.patch) = 2150
diff --git a/devel/pcl-cvs-emacs20/pkg-descr b/devel/pcl-cvs-emacs20/pkg-descr
deleted file mode 100644
index ae924c4a6f91..000000000000
--- a/devel/pcl-cvs-emacs20/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-PCL-CVS is a front-end to CVS.  It integrates the most frequently
-used CVS commands into emacs.
-
-For VC users, PCL-CVS can be thought of as a VC-dired specially designed
-for CVS.  PCL-CVS is not a replacement for VC and is supposed to interact
-well with it.  It provides a global view of your project and allows
-execution of cvs commands on several files at a time.
diff --git a/devel/pcl-cvs-emacs20/pkg-message b/devel/pcl-cvs-emacs20/pkg-message
deleted file mode 100644
index 311ace634ff4..000000000000
--- a/devel/pcl-cvs-emacs20/pkg-message
+++ /dev/null
@@ -1,3 +0,0 @@
-To use pcl-cvs, put the following setup into your ~/.emacs:
-
-        (require 'pcl-cvs-setup)
diff --git a/devel/pcl-cvs-emacs20/pkg-plist b/devel/pcl-cvs-emacs20/pkg-plist
deleted file mode 100644
index a13f79105bd0..000000000000
--- a/devel/pcl-cvs-emacs20/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/cvs-compat.el
-%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/cvs-compat.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/cvs-edit.el
-%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/cvs-edit.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/cvs-log.el
-%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/cvs-log.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/cvs-status.el
-%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/cvs-status.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/pcl-cvs-defs.el
-%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/pcl-cvs-defs.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/pcl-cvs-info.el
-%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/pcl-cvs-info.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/pcl-cvs-parse.el
-%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/pcl-cvs-parse.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/pcl-cvs-startup.el
-%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/pcl-cvs-util.el
-%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/pcl-cvs-util.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/pcl-cvs.el
-%%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs/pcl-cvs.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/%%PORT_SETUPEL%%
-@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/pcl-cvs