Update to 9.18.

3 files changed, 29 insertions, 20 deletions

diff --git a/editors/apel-emacs20/Makefile b/editors/apel-emacs20/Makefile
index e9deccc..3bb1bd9 100644
--- a/editors/apel-emacs20/Makefile
+++ b/editors/apel-emacs20/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for:	apel for emacs20
-# Version required:	9.x
+# Version required:	9.18
 # Date created:		22 September 1998
-# Whom:			Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
+# Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1999/01/02 13:26:51 kuriyama Exp $
+# $Id: Makefile,v 1.2 1999/03/01 09:37:17 shige Exp $
 #
 
 MAINTAINER=	shige@FreeBSD.ORG
@@ -19,7 +19,7 @@ EMACS_PORT=	emacs20
 EMACS_VER=	20.3
 EMACS_LIBDIR=	share/${EMACS_NAME}
 
-# pkg/* files are used in ${.CURDIR}
+# use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>
diff --git a/editors/apel-emacs20/pkg-descr b/editors/apel-emacs20/pkg-descr
index 5f94683..8d696aa 100644
--- a/editors/apel-emacs20/pkg-descr
+++ b/editors/apel-emacs20/pkg-descr
@@ -6,7 +6,7 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
 
   APEL stands for "A Portable Emacs Library".  It consists of
   following modules:
-    APEL
+    apel
      - utility to write portable CCL program
      - utility for Association-list
      - utility for condition tree and condition/situation-alist
@@ -14,6 +14,7 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
      - utility to make file-name
      - utility to install emacs-lisp package
      - ROT 13-47-48 Caesar rotation utility
+     - portable custom environment
     emu
      - poe: emulation module mainly for basic functions and special forms/macros
      - poem: provide basic functions to write portable MULE programs
@@ -23,7 +24,7 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
      - text/richtext module
 
   APEL is installed the following directory tree:
-	${PREFIX}/share/emacs/site-lisp/apel/		--- APEL
+	${PREFIX}/share/emacs/site-lisp/apel/		--- apel
 	${PREFIX}/share/emacs/20.3/site-lisp/emu/	--- emu
 
 --- Porting by shige <shige@FreeBSD.ORG>.
diff --git a/editors/apel-emacs20/pkg-plist b/editors/apel-emacs20/pkg-plist
index d84a695..abe4af4 100644
--- a/editors/apel-emacs20/pkg-plist
+++ b/editors/apel-emacs20/pkg-plist
@@ -10,24 +10,14 @@
 %%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/broken.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.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/inv-19.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.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/richtext.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.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/poem-20.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-20.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20_3.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20_3.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/mcs-20.el
@@ -38,7 +28,25 @@
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-20.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-20.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/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/poem-20.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-20.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20_3.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20_3.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/static.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/static.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.elc
 @dirrm %%EMACS_LIBDIR%%/site-lisp/apel
 @dirrm %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu
+%%APELDOCDIR%%/ChangeLog
+%%APELDOCDIR%%/README.en
+%%APELDOCDIR%%/README.ja
+@dirrm %%APELDOCDIR%%