8 files changed, 0 insertions, 54 deletions

diff --git a/textproc/Makefile b/textproc/Makefile
index 4510bada7c79..fdf1419ed173 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1476,8 +1476,6 @@
     SUBDIR += txt2tags
     SUBDIR += uim
     SUBDIR += uim-el
-    SUBDIR += uim-el-emacs21
-    SUBDIR += uim-el-emacs22
     SUBDIR += uim-el-xemacs21-mule
     SUBDIR += uim-gtk
     SUBDIR += uim-gtk3
@@ -1561,7 +1559,6 @@
     SUBDIR += yali
     SUBDIR += yamcha
     SUBDIR += yaml-mode.el
-    SUBDIR += yaml-mode.el-emacs21
     SUBDIR += yelp-tools
     SUBDIR += yelp-xsl
     SUBDIR += yi-aspell
diff --git a/textproc/emacs-wiki/Makefile b/textproc/emacs-wiki/Makefile
index 8e1d51dc5ca5..76a9ec8e52cb 100644
--- a/textproc/emacs-wiki/Makefile
+++ b/textproc/emacs-wiki/Makefile
@@ -13,7 +13,6 @@ MAINTAINER=	dryice@FreeBSD.org
 COMMENT=	Create and use hyperlinks and simple formatting in plain text files
 
 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21
 
 OPTIONS_DEFINE=	CONTRIB
 CONTRIB_DESC=	Install extra packages. This can shadow versions already there.
diff --git a/textproc/htmlize.el/Makefile b/textproc/htmlize.el/Makefile
index 7df7a4bf70f6..e59446c26a3e 100644
--- a/textproc/htmlize.el/Makefile
+++ b/textproc/htmlize.el/Makefile
@@ -14,7 +14,6 @@ MAINTAINER=	dryice@FreeBSD.org
 COMMENT=	Emacs major mode to create HTML files from Emacs buffers (in colour!)
 
 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21
 NO_WRKSUBDIR=	yes
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=
diff --git a/textproc/uim-el-emacs21/Makefile b/textproc/uim-el-emacs21/Makefile
deleted file mode 100644
index bd58ce782671..000000000000
--- a/textproc/uim-el-emacs21/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org>
-# $FreeBSD$
-
-MAINTAINER=	nobutaka@FreeBSD.org
-
-COMMENT=	Emacs lisp for uim input method library
-
-CONFLICTS=	uim-el-xemacs21-mule-[0-9]* \
-	uim-el-emacs23-[0-9]* \
-	uim-el-emacs22-[0-9]*
-
-EMACS_PORT_NAME=emacs21
-
-PLIST=		${MASTERDIR}/pkg-plist
-DESCR=		${MASTERDIR}/pkg-descr
-
-MASTERDIR=	${.CURDIR}/../uim-el
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/uim-el-emacs22/Makefile b/textproc/uim-el-emacs22/Makefile
deleted file mode 100644
index f6e5f9c47443..000000000000
--- a/textproc/uim-el-emacs22/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org>
-# $FreeBSD$
-
-MAINTAINER=	nobutaka@FreeBSD.org
-
-COMMENT=	Emacs lisp for uim input method library
-
-CONFLICTS=	uim-el-xemacs21-mule-[0-9]* \
-	uim-el-emacs23-[0-9]* \
-	uim-el-emacs21-[0-9]*
-
-EMACS_PORT_NAME=	emacs22
-
-PLIST=	${MASTERDIR}/pkg-plist
-DESCR=	${MASTERDIR}/pkg-descr
-
-MASTERDIR=	${.CURDIR}/../uim-el
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/xml-lite.el/Makefile b/textproc/xml-lite.el/Makefile
index 6344e17849c6..fcf75522a79f 100644
--- a/textproc/xml-lite.el/Makefile
+++ b/textproc/xml-lite.el/Makefile
@@ -14,7 +14,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple XML-editing for GNU Emacs
 
 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21
 NO_WRKSUBDIR=	yes
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=
diff --git a/textproc/xml-parse.el/Makefile b/textproc/xml-parse.el/Makefile
index 224f1d7c7549..e9bf66920bbe 100644
--- a/textproc/xml-parse.el/Makefile
+++ b/textproc/xml-parse.el/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	dryice@dryice.name
 COMMENT=	Code to efficiently read/write XML data with Elisp
 
 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21
 
 .if ${EMACS_PORT_NAME} != "emacs21"
 PORTNAMESUFFIX=	${PKGNAMESUFFIX}
diff --git a/textproc/yaml-mode.el-emacs21/Makefile b/textproc/yaml-mode.el-emacs21/Makefile
deleted file mode 100644
index 3977f950f46f..000000000000
--- a/textproc/yaml-mode.el-emacs21/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# Created by: KIMURA Yasuhiro <yasu@utahime.org>
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../yaml-mode.el
-
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs21
-
-.include "${MASTERDIR}/Makefile"