Delete BROKEN mark.

Add target `xemacs-package'.

7 files changed, 27 insertions, 8 deletions

diff --git a/editors/apel-xemacs21-mule/Makefile b/editors/apel-xemacs21-mule/Makefile
index fb40db0b5b01..c7abc98f4d69 100644
--- a/editors/apel-xemacs21-mule/Makefile
+++ b/editors/apel-xemacs21-mule/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	apel for xemacs-mule
+# New ports collection makefile for:	apel for xemacs21-mule
 # Version required:	9.23
 # Date created:		13 June 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
@@ -7,7 +7,6 @@
 #
 
 MAINTAINER=	shige@FreeBSD.org
-BROKEN=		editors/xemacs-mule is removed.
 
 # This is a slave port.
 PORTCLASS=	slave
@@ -16,8 +15,9 @@ MASTERDIR=	${.CURDIR}/../../editors/apel-emacs
 
 # emacs port setup
 EMACS_NAME=	xemacs
-EMACS_PORT=	xemacs-mule
+EMACS_PORT=	xemacs21-mule
 EMACS_VER=	21.1.8
+EMACS_CMD=	${PREFIX}/bin/${EMACS_PORT}
 EMACS_LIBDIR=	lib/${EMACS_NAME}
 EMACS_PACKAGESDIR=	${EMACS_LIBDIR}/site-packages
 # packages-subdirectories which this port requires
@@ -35,11 +35,24 @@ PKGDIR=		${.CURDIR}/pkg
 
 # package info manifest
 MANIFEST=	MANIFEST.apel
+
+# xemacs package
+XEMACS_PKGNAME=	apel
+XEMACS_PKGVER=	1.16
+XEMACS_PKG_TARBALL=	${XEMACS_PKGNAME}-${XEMACS_PKGVER}-pkg.tar.gz
+XEMACS_PKG_CONTENTS=	pkginfo/${MANIFEST} lisp/${XEMACS_PKGNAME}
+
 # package documents
-APELDOCDIR=	${EMACS_PACKAGESDIR}/lisp/apel
+APELDOCDIR=	${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}
 
 .if defined(PARALLEL_PACKAGE_BUILD)
 FORBIDDEN=	hang
 .endif
 
+xemacs-package: install
+	@${RM} -f ${.CURDIR}/${XEMACS_PKG_TARBALL}
+	@(cd ${PREFIX}/${EMACS_PACKAGESDIR} ;\
+	  ${TAR} -zcf ${.CURDIR}/${XEMACS_PKG_TARBALL} ${XEMACS_PKG_CONTENTS} ;\
+	)
+
 .include <${MASTERDIR}/Makefile>
diff --git a/editors/apel-xemacs21-mule/pkg-comment b/editors/apel-xemacs21-mule/pkg-comment
index e5fd50483d85..96d1015dd519 100644
--- a/editors/apel-xemacs21-mule/pkg-comment
+++ b/editors/apel-xemacs21-mule/pkg-comment
@@ -1 +1 @@
-A Portable Emacs Library for xemacs-mule
+A Portable Emacs Library for xemacs21-mule
diff --git a/editors/apel-xemacs21-mule/pkg-descr b/editors/apel-xemacs21-mule/pkg-descr
index 63a9ebfee200..140a1ba742ca 100644
--- a/editors/apel-xemacs21-mule/pkg-descr
+++ b/editors/apel-xemacs21-mule/pkg-descr
@@ -1,4 +1,4 @@
-A Portable Emacs Library.
+A Portable Emacs Library for xemacs21-mule.
 
 --- Emacs Library Porting
 
diff --git a/editors/apel-xemacs21-mule/pkg-plist b/editors/apel-xemacs21-mule/pkg-plist
index ef1fb4ef0112..e3507b4f37ee 100644
--- a/editors/apel-xemacs21-mule/pkg-plist
+++ b/editors/apel-xemacs21-mule/pkg-plist
@@ -1,4 +1,5 @@
 %%EMACS_PACKAGESDIR%%/pkginfo/MANIFEST.apel
+%%EMACS_PACKAGESDIR%%/lisp/apel/_pkg.el
 %%EMACS_PACKAGESDIR%%/lisp/apel/ChangeLog
 %%EMACS_PACKAGESDIR%%/lisp/apel/README.en
 %%EMACS_PACKAGESDIR%%/lisp/apel/README.ja
@@ -28,6 +29,8 @@
 %%EMACS_PACKAGESDIR%%/lisp/apel/mcs-20.elc
 %%EMACS_PACKAGESDIR%%/lisp/apel/mcs-xm.el
 %%EMACS_PACKAGESDIR%%/lisp/apel/mcs-xm.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/mcs-xmu.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/mcs-xmu.elc
 %%EMACS_PACKAGESDIR%%/lisp/apel/mule-caesar.el
 %%EMACS_PACKAGESDIR%%/lisp/apel/mule-caesar.elc
 %%EMACS_PACKAGESDIR%%/lisp/apel/path-util.el
diff --git a/editors/apel/pkg-comment.xemacs21-mule b/editors/apel/pkg-comment.xemacs21-mule
index e5fd50483d85..96d1015dd519 100644
--- a/editors/apel/pkg-comment.xemacs21-mule
+++ b/editors/apel/pkg-comment.xemacs21-mule
@@ -1 +1 @@
-A Portable Emacs Library for xemacs-mule
+A Portable Emacs Library for xemacs21-mule
diff --git a/editors/apel/pkg-descr.xemacs21-mule b/editors/apel/pkg-descr.xemacs21-mule
index 63a9ebfee200..140a1ba742ca 100644
--- a/editors/apel/pkg-descr.xemacs21-mule
+++ b/editors/apel/pkg-descr.xemacs21-mule
@@ -1,4 +1,4 @@
-A Portable Emacs Library.
+A Portable Emacs Library for xemacs21-mule.
 
 --- Emacs Library Porting
 
diff --git a/editors/apel/pkg-plist.xemacs21-mule b/editors/apel/pkg-plist.xemacs21-mule
index ef1fb4ef0112..e3507b4f37ee 100644
--- a/editors/apel/pkg-plist.xemacs21-mule
+++ b/editors/apel/pkg-plist.xemacs21-mule
@@ -1,4 +1,5 @@
 %%EMACS_PACKAGESDIR%%/pkginfo/MANIFEST.apel
+%%EMACS_PACKAGESDIR%%/lisp/apel/_pkg.el
 %%EMACS_PACKAGESDIR%%/lisp/apel/ChangeLog
 %%EMACS_PACKAGESDIR%%/lisp/apel/README.en
 %%EMACS_PACKAGESDIR%%/lisp/apel/README.ja
@@ -28,6 +29,8 @@
 %%EMACS_PACKAGESDIR%%/lisp/apel/mcs-20.elc
 %%EMACS_PACKAGESDIR%%/lisp/apel/mcs-xm.el
 %%EMACS_PACKAGESDIR%%/lisp/apel/mcs-xm.elc
+%%EMACS_PACKAGESDIR%%/lisp/apel/mcs-xmu.el
+%%EMACS_PACKAGESDIR%%/lisp/apel/mcs-xmu.elc
 %%EMACS_PACKAGESDIR%%/lisp/apel/mule-caesar.el
 %%EMACS_PACKAGESDIR%%/lisp/apel/mule-caesar.elc
 %%EMACS_PACKAGESDIR%%/lisp/apel/path-util.el