* Remove support of all xemacsen ports. xemacsens depends on

  xemacs-packages port that already contains apel.
  Add message about this.
* One pkg-descr for master and all slave ports.

Approved by:	sem(mentor)

7 files changed, 11 insertions, 227 deletions

diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index 114684b0a16b..8e8850caaddf 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -30,11 +30,10 @@ APEL_VERSION_SPECIFIC_LISPDIR?=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 PORTCLASS?=	master
 
 # emacs port setup
-.if (${PORTCLASS} == "master")
-EMACS_PORT_NAME=	emacs21
-.endif
+EMACS_PORT_NAME?=	emacs21
 
 EMACS_MASTERDIR_PKGFILES=YES
+DESCR=		${PKGDIR}/pkg-descr
 
 # target name for make build
 ALL_TARGET?=	elc
@@ -53,9 +52,11 @@ MAKE_ARGS+=	PREFIX="${LOCALBASE}" \
 BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_NAME}
 RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_NAME}
 .endif
-.if defined(EMACS_PACKAGESDIR)
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/xemacs-base/advice.el:${PORTSDIR}/editors/xemacs-packages
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/xemacs-base/advice.el:${PORTSDIR}/editors/xemacs-packages
+.if (${EMACS_NAME} == "xemacs")
+.BEGIN:
+	@${ECHO} "Please use apel from editors/xemacs-packages port."
+	@${ECHO} "This port only for GNU Emacs."
+	@${FALSE}
 .endif
 .else
 .BEGIN:
diff --git a/editors/apel/pkg-descr.xemacs21-mule b/editors/apel/pkg-descr
index db04e866cb16..74015011ccf9 100644
--- a/editors/apel/pkg-descr.xemacs21-mule
+++ b/editors/apel/pkg-descr
@@ -18,15 +18,16 @@ APEL is programed by MORIOKA Tomohiko <tomo@m17n.org>.
      - emu: bundled in tm-7.106 compat module
      - invisible: provide features about invisible region
      - mcharset: provide MIME charset related features
-     - pccl: utility to write portable CCL program
      - pces: provide portable character encoding scheme features
+     - pccl: utility to write portable CCL program
      - pcustom: provide portable custom environment
      - poe: emulation module mainly for basic functions and special forms/macros
      - poem: provide basic functions to write portable MULE programs
      - static: utility for static evaluation
 
-  APEL is installed the following directory tree:
-	${LOCALBASE}/lib/xemacs/site-packages/lisp/apel/	--- apel & emu
+To use apel, put the following setup into your ~/.emacs:
+
+	(require 'apel-setupel)
 
 WWW: http://cvs.m17n.org/elisp/APEL/index.en.html
 
diff --git a/editors/apel/pkg-descr.emacs19 b/editors/apel/pkg-descr.emacs19
deleted file mode 100644
index ac985883ac64..000000000000
--- a/editors/apel/pkg-descr.emacs19
+++ /dev/null
@@ -1,39 +0,0 @@
-A Portable Emacs Library.
-
---- Emacs Library Porting
-
-APEL is programed by MORIOKA Tomohiko <tomo@m17n.org>.
-
-  APEL stands for "A Portable Emacs Library".  It consists of
-  following modules:
-    apel
-     - alist: utility for Association-list
-     - calist: utility for condition tree and condition/situation-alist
-     - filename: utility to make file-name
-     - install: utility to install emacs-lisp package
-     - mule-caeser: ROT 13-47-48 Caesar rotation utility
-     - path-util: utility for path management or file detection
-    emu
-     - broken: provide information of broken facilities of Emacs.
-     - emu: bundled in tm-7.106 compat module
-     - invisible: provide features about invisible region
-     - mcharset: provide MIME charset related features
-     - pccl: utility to write portable CCL program
-     - pces: provide portable character encoding scheme features
-     - pcustom: provide portable custom environment
-     - poe: emulation module mainly for basic functions and special forms/macros
-     - poem: provide basic functions to write portable MULE programs
-     - static: utility for static evaluation
-
-  APEL is installed the following directory tree:
-	${LOCALBASE}/share/emacs/19.34/site-lisp/apel/	--- apel
-	${LOCALBASE}/share/emacs/19.34/site-lisp/emu/	--- emu
-
-
-To use apel, put the following setup into your ~/.emacs:
-
-	(require 'apel-setupel)
-
-WWW: http://cvs.m17n.org/elisp/APEL/index.en.html
-
-Ported by shige@FreeBSD.ORG.
diff --git a/editors/apel/pkg-descr.emacs20 b/editors/apel/pkg-descr.emacs20
deleted file mode 100644
index fb4830e50559..000000000000
--- a/editors/apel/pkg-descr.emacs20
+++ /dev/null
@@ -1,34 +0,0 @@
-A Portable Emacs Library.
-
---- Emacs Library Porting
-
-APEL is programed by MORIOKA Tomohiko <tomo@m17n.org>.
-
-  APEL stands for "A Portable Emacs Library".  It consists of
-  following modules:
-    apel
-     - alist: utility for Association-list
-     - calist: utility for condition tree and condition/situation-alist
-     - filename: utility to make file-name
-     - install: utility to install emacs-lisp package
-     - mule-caeser: ROT 13-47-48 Caesar rotation utility
-     - path-util: utility for path management or file detection
-    emu
-     - broken: provide information of broken facilities of Emacs.
-     - emu: bundled in tm-7.106 compat module
-     - invisible: provide features about invisible region
-     - mcharset: provide MIME charset related features
-     - pccl: utility to write portable CCL program
-     - pces: provide portable character encoding scheme features
-     - pcustom: provide portable custom environment
-     - poe: emulation module mainly for basic functions and special forms/macros
-     - poem: provide basic functions to write portable MULE programs
-     - static: utility for static evaluation
-
-  APEL is installed the following directory tree:
-	${LOCALBASE}/share/emacs/20.7/site-lisp/apel/	--- apel
-	${LOCALBASE}/share/emacs/20.7/site-lisp/emu/	--- emu
-
-WWW: http://cvs.m17n.org/elisp/APEL/index.en.html
-
-Ported by shige@FreeBSD.ORG.
diff --git a/editors/apel/pkg-descr.emacs21 b/editors/apel/pkg-descr.emacs21
deleted file mode 100644
index b38effa3e0c0..000000000000
--- a/editors/apel/pkg-descr.emacs21
+++ /dev/null
@@ -1,34 +0,0 @@
-A Portable Emacs Library.
-
---- Emacs Library Porting
-
-APEL is programed by MORIOKA Tomohiko <tomo@m17n.org>.
-
-  APEL stands for "A Portable Emacs Library".  It consists of
-  following modules:
-    apel
-     - alist: utility for Association-list
-     - calist: utility for condition tree and condition/situation-alist
-     - filename: utility to make file-name
-     - install: utility to install emacs-lisp package
-     - mule-caeser: ROT 13-47-48 Caesar rotation utility
-     - path-util: utility for path management or file detection
-    emu
-     - broken: provide information of broken facilities of Emacs.
-     - emu: bundled in tm-7.106 compat module
-     - invisible: provide features about invisible region
-     - mcharset: provide MIME charset related features
-     - pccl: utility to write portable CCL program
-     - pces: provide portable character encoding scheme features
-     - pcustom: provide portable custom environment
-     - poe: emulation module mainly for basic functions and special forms/macros
-     - poem: provide basic functions to write portable MULE programs
-     - static: utility for static evaluation
-
-  APEL is installed the following directory tree:
-	${LOCALBASE}/share/emacs/21.1/site-lisp/apel/	--- apel
-	${LOCALBASE}/share/emacs/21.1/site-lisp/emu/	--- emu
-
-WWW: http://cvs.m17n.org/elisp/APEL/index.en.html
-
-Ported by shige@FreeBSD.ORG.
diff --git a/editors/apel/pkg-descr.mule b/editors/apel/pkg-descr.mule
deleted file mode 100644
index b630703376a0..000000000000
--- a/editors/apel/pkg-descr.mule
+++ /dev/null
@@ -1,39 +0,0 @@
-A Portable Emacs Library.
-
---- Emacs Library Porting
-
-APEL is programed by MORIOKA Tomohiko <tomo@m17n.org>.
-
-  APEL stands for "A Portable Emacs Library".  It consists of
-  following modules:
-    apel
-     - alist: utility for Association-list
-     - calist: utility for condition tree and condition/situation-alist
-     - filename: utility to make file-name
-     - install: utility to install emacs-lisp package
-     - mule-caeser: ROT 13-47-48 Caesar rotation utility
-     - path-util: utility for path management or file detection
-    emu
-     - broken: provide information of broken facilities of Emacs.
-     - emu: bundled in tm-7.106 compat module
-     - invisible: provide features about invisible region
-     - mcharset: provide MIME charset related features
-     - pces: provide portable character encoding scheme features
-     - pccl: utility to write portable CCL program
-     - pcustom: provide portable custom environment
-     - poe: emulation module mainly for basic functions and special forms/macros
-     - poem: provide basic functions to write portable MULE programs
-     - static: utility for static evaluation
-
-  APEL is installed the following directory tree:
-	${LOCALBASE}/share/mule/19.34/site-lisp/apel/	--- apel
-	${LOCALBASE}/share/mule/19.34/site-lisp/emu/	--- emu
-
-
-To use apel, put the following setup into your ~/.emacs:
-
-	(require 'apel-setupel)
-
-WWW: http://cvs.m17n.org/elisp/APEL/index.en.html
-
-Ported by shige@FreeBSD.ORG.
diff --git a/editors/apel/pkg-plist.xemacs21-mule b/editors/apel/pkg-plist.xemacs21-mule
deleted file mode 100644
index dc872ede5d7b..000000000000
--- a/editors/apel/pkg-plist.xemacs21-mule
+++ /dev/null
@@ -1,72 +0,0 @@
-%%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
-%%EMACS_PACKAGESDIR%%/lisp/apel/alist.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/alist.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/auto-autoloads.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/auto-autoloads.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/apel-ver.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/apel-ver.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/broken.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/broken.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/calist.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/calist.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/custom-load.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/custom-load.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/emu.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/emu.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/filename.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/filename.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/install.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/install.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/inv-xemacs.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/inv-xemacs.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/invisible.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/invisible.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/mcharset.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/mcharset.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/mcs-20.el
-%%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
-%%EMACS_PACKAGESDIR%%/lisp/apel/path-util.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/pccl-20.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/pccl-20.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/pccl.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/pccl.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/pces-20.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/pces-20.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/pces-xfc.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/pces-xfc.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/pces-xm.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/pces-xm.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/pces.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/pces.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/pcustom.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/pcustom.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/poe-xemacs.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/poe-xemacs.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/poe.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/poe.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/poem.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/poem.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/poem-xm.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/poem-xm.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/product.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/product.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/pym.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/pym.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/richtext.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/richtext.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/static.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/static.elc
-%%EMACS_PACKAGESDIR%%/lisp/apel/timezone.el
-%%EMACS_PACKAGESDIR%%/lisp/apel/timezone.elc
-@dirrm %%EMACS_PACKAGESDIR%%/lisp/apel