8 files changed, 37 insertions, 62 deletions

diff --git a/mail/Makefile b/mail/Makefile
index af450b3c2e67..c3cb9d5dcf66 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -28,6 +28,7 @@
     SUBDIR += drac
     SUBDIR += elm
     SUBDIR += elm+ME
+    SUBDIR += emh
     SUBDIR += emh-emacs20
     SUBDIR += emh-xemacs21-mule
     SUBDIR += emil
diff --git a/mail/emh-emacs20/Makefile b/mail/emh-emacs20/Makefile
index d62a548fcf4b..52b53d77a8aa 100644
--- a/mail/emh-emacs20/Makefile
+++ b/mail/emh-emacs20/Makefile
@@ -1,33 +1,12 @@
-# New ports collection makefile for:	emh
+# New ports collection makefile for:	emh (for emacs20)
 # Date Created:		12 Mar 2001
 # Whom:			Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	emh
-PORTVERSION=	1.10.1
-CATEGORIES=	mail elisp
-MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/semi/emh/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+MASTERDIR=	${.CURDIR}/../emh
 
-MAINTAINER=	yoichi@eken.phys.nagoya-u.ac.jp
+EMACS_PORT_NAME=	emacs20
 
-BUILD_DEPENDS+=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
-RUN_DEPENDS+=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
-
-MIMEUI_PRODUCT?=	semi
-MIMEUI_BRANCH?=		1.13
-MIMEUI_PORT_NAME?=	${MIMEUI_PRODUCT}${MIMEUI_BRANCH:S/.//}-${EMACS_PORT_NAME}
-MIMEUI_COOKIE=	${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_BRANCH}.FreeBSD-packages
-
-EMACS_PORT_NAME?=	emacs20
-
-ALL_TARGET?=	elc
-EMH_LISPDIR?=	share/emacs/site-lisp/semi
-XEMACS_ONLY?=	"@comment "
-
-PLIST_SUB=	XEMACS_ONLY=${XEMACS_ONLY} \
-		EMH_LISPDIR=${EMH_LISPDIR}
-
-.include <bsd.port.mk>
+.include <${MASTERDIR}/Makefile>
diff --git a/mail/emh-emacs20/distinfo b/mail/emh-emacs20/distinfo
deleted file mode 100644
index 3bce96d3ad87..000000000000
--- a/mail/emh-emacs20/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (emh-1.10.1.tar.gz) = c99c6b51bed0bab66a621b21accce089
diff --git a/mail/emh-emacs20/pkg-comment b/mail/emh-emacs20/pkg-comment
deleted file mode 100644
index 397605f847b9..000000000000
--- a/mail/emh-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-MIME extension of mh-e.el
diff --git a/mail/emh-emacs20/pkg-descr b/mail/emh-emacs20/pkg-descr
deleted file mode 100644
index dece215e01eb..000000000000
--- a/mail/emh-emacs20/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-EMH is a extender for mh-e to provide MIME feature using SEMI.
diff --git a/mail/emh-emacs20/pkg-plist b/mail/emh-emacs20/pkg-plist
deleted file mode 100644
index f05746ffeb7c..000000000000
--- a/mail/emh-emacs20/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-%%EMH_LISPDIR%%/emh.el
-%%EMH_LISPDIR%%/emh.elc
-%%EMH_LISPDIR%%/emh-comp.el
-%%EMH_LISPDIR%%/emh-comp.elc
-%%EMH_LISPDIR%%/emh-face.el
-%%EMH_LISPDIR%%/emh-face.elc
-%%EMH_LISPDIR%%/emh-setup.el
-%%EMH_LISPDIR%%/emh-setup.elc
-%%XEMACS_ONLY%%%%EMH_LISPDIR%%/custom-load.el
-%%XEMACS_ONLY%%%%EMH_LISPDIR%%/custom-load.elc
-%%XEMACS_ONLY%%@dirrm %%EMH_LISPDIR%%
diff --git a/mail/emh-xemacs21-mule/Makefile b/mail/emh-xemacs21-mule/Makefile
index 18bc853850cd..ce703de919ff 100644
--- a/mail/emh-xemacs21-mule/Makefile
+++ b/mail/emh-xemacs21-mule/Makefile
@@ -1,17 +1,12 @@
-# New ports collection makefile for:	emh-xemacs21-mule
+# New ports collection makefile for:	emh (for xemacs21-mule)
 # Date Created:		12 Mar 2001
 # Whom:			Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-MASTERDIR=	${.CURDIR}/../emh-emacs20
+MASTERDIR=	${.CURDIR}/../emh
 
 EMACS_PORT_NAME=	xemacs21-mule
 
-ALL_TARGET=	package
-INSTALL_TARGET=	install-package
-EMH_LISPDIR=	lib/xemacs/site-packages/lisp/emh
-XEMACS_ONLY=	""
-
 .include <${MASTERDIR}/Makefile>
diff --git a/mail/emh/Makefile b/mail/emh/Makefile
index d62a548fcf4b..9405b6173db0 100644
--- a/mail/emh/Makefile
+++ b/mail/emh/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	emh
+# New ports collection makefile for:	emh (for emacs21)
 # Date Created:		12 Mar 2001
 # Whom:			Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
 #
@@ -11,21 +11,35 @@ CATEGORIES=	mail elisp
 MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/semi/emh/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
-MAINTAINER=	yoichi@eken.phys.nagoya-u.ac.jp
-
-BUILD_DEPENDS+=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
-RUN_DEPENDS+=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
-
-MIMEUI_PRODUCT?=	semi
-MIMEUI_BRANCH?=		1.13
-MIMEUI_PORT_NAME?=	${MIMEUI_PRODUCT}${MIMEUI_BRANCH:S/.//}-${EMACS_PORT_NAME}
-MIMEUI_COOKIE=	${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_BRANCH}.FreeBSD-packages
-
-EMACS_PORT_NAME?=	emacs20
-
-ALL_TARGET?=	elc
-EMH_LISPDIR?=	share/emacs/site-lisp/semi
-XEMACS_ONLY?=	"@comment "
+MAINTAINER=	yoichi@FreeBSD.org
+
+BUILD_DEPENDS+=	${LOCALBASE}/share/semi/${SEMI_COOKIE}:${PORTSDIR}/editors/semi${DEPPORT_SUFFIX}
+RUN_DEPENDS+=	${LOCALBASE}/share/semi/${SEMI_COOKIE}:${PORTSDIR}/editors/semi${DEPPORT_SUFFIX}
+
+SEMI_TRUNK=	1.14
+SEMI_COOKIE=	semi-${EMACS_PORT_NAME}-${SEMI_TRUNK}.FreeBSD-packages
+
+EMACS_PORT_NAME?=	emacs21
+
+.if ${EMACS_PORT_NAME} == "emacs21"
+DEPPORT_SUFFIX=		
+.else
+DEPPORT_SUFFIX=		-${EMACS_PORT_NAME}
+.endif
+
+.if ${EMACS_PORT_NAME} == xemacs21-mule
+ALL_TARGET=	package
+INSTALL_TARGET=	install-package
+EMH_LISPDIR=	${EMACS_LIBDIR}/site-packages/lisp/emh
+XEMACS_ONLY=	""
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/mh-e/mh-e.el:${PORTSDIR}/editors/xemacs-comm-packages
+RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/mh-e/mh-e.el:${PORTSDIR}/editors/xemacs-comm-packages
+.else
+ALL_TARGET=	elc
+EMH_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/semi
+MAKE_ARGS+=	LISPDIR=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
+XEMACS_ONLY=	"@comment "
+.endif
 
 PLIST_SUB=	XEMACS_ONLY=${XEMACS_ONLY} \
 		EMH_LISPDIR=${EMH_LISPDIR}