Update to 9.19.

4 files changed, 53 insertions, 49 deletions

diff --git a/editors/apel-mule/Makefile b/editors/apel-mule/Makefile
index 4043dca8c41e..96fac8019997 100644
--- a/editors/apel-mule/Makefile
+++ b/editors/apel-mule/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for:	apel for mule
-# Version required:	9.18
+# Version required:	9.19
 # Date created:		23 September 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1999/03/01 09:37:20 shige Exp $
+# $Id: Makefile,v 1.3 1999/05/09 16:14:35 shige Exp $
 #
 
 MAINTAINER=	shige@FreeBSD.ORG
@@ -17,11 +17,12 @@ MASTERDIR=	${.CURDIR}/../../editors/apel-emacs
 EMACS_NAME=	mule
 EMACS_PORT=	mule
 EMACS_VER=	19.34
-EMACS_LIBDIR=	share/${EMACS_NAME}
+EMACS_LIBDIR=		share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 # RUN_DEPENDS port name's suffix is '-common'.
 HAVE_COMMON_PORT=	YES
-# emacs requires *-setup.el
+# emacs requires *-setupel.el
 REQUIRE_SETUPEL=	YES
 
 # use pkg/* files in ${.CURDIR}
diff --git a/editors/apel-mule/pkg-comment b/editors/apel-mule/pkg-comment
index d2aef39aa680..23aba2c81559 100644
--- a/editors/apel-mule/pkg-comment
+++ b/editors/apel-mule/pkg-comment
@@ -1 +1 @@
-A Portable Emacs Library for mule
+A Portable Emacs Library for mule.
diff --git a/editors/apel-mule/pkg-descr b/editors/apel-mule/pkg-descr
index c6f4921ef807..ebb746786646 100644
--- a/editors/apel-mule/pkg-descr
+++ b/editors/apel-mule/pkg-descr
@@ -7,21 +7,22 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
   APEL stands for "A Portable Emacs Library".  It consists of
   following modules:
     apel
-     - utility to write portable CCL program
-     - utility for Association-list
-     - utility for condition tree and condition/situation-alist
-     - utility for path management or file detection
-     - utility to make file-name
-     - utility to install emacs-lisp package
-     - ROT 13-47-48 Caesar rotation utility
-     - portable custom environment
+     - 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
+     - 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
-     - mcs: provide MIME charset related features
-     - broken: provide information of broken facilities of Emacs.
-     - emu: bundled in tm-7.106 compat module; it required poe, poem and mcs
-     - text/richtext module
+     - static: utility for static evaluation
 
   APEL is installed the following directory tree:
 	${PREFIX}/share/mule/site-lisp/apel/		--- apel
diff --git a/editors/apel-mule/pkg-plist b/editors/apel-mule/pkg-plist
index c997ca0229a3..f315fbd441da 100644
--- a/editors/apel-mule/pkg-plist
+++ b/editors/apel-mule/pkg-plist
@@ -10,39 +10,41 @@
 %%EMACS_LIBDIR%%/site-lisp/apel/mule-caesar.elc
 %%EMACS_LIBDIR%%/site-lisp/apel/path-util.el
 %%EMACS_LIBDIR%%/site-lisp/apel/path-util.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pcustom.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pcustom.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-om.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-om.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-om.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-om.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-om.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-om.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu-mule.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu-mule.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/static.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/static.elc
-%%EMACS_LIBDIR%%/site-lisp/%%APEL_SETUPEL%%
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/emu.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/emu.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pcustom.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pcustom.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/tinycustom.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/tinycustom.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poe.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poe.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/invisible.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/invisible.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcharset.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcharset.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/inv-19.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/inv-19.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-om.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-om.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-om.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-om.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl-om.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl-om.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/emu-mule.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/emu-mule.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/broken.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/broken.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%APEL_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/apel
-@dirrm %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu
+@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu
 %%APELDOCDIR%%/ChangeLog
 %%APELDOCDIR%%/README.en
 %%APELDOCDIR%%/README.ja