3 files changed, 51 insertions, 42 deletions

diff --git a/editors/flim-xemacs21-mule/Makefile b/editors/flim-xemacs21-mule/Makefile
index deac4fcc9137..f60cce981e3c 100644
--- a/editors/flim-xemacs21-mule/Makefile
+++ b/editors/flim-xemacs21-mule/Makefile
@@ -17,9 +17,11 @@ MASTERDIR=	${.CURDIR}/../../editors/flim-emacs
 EMACS_NAME=	xemacs
 EMACS_PORT=	xemacs-mule
 EMACS_VER=	21.1.6
-EMACS_LIBDIR=		lib/${EMACS_NAME}-${EMACS_VER}
-# xemacs-mule-21.1.6 has no version specific site-lisp directories.
-EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}
+EMACS_PACKAGESDIR=	lib/${EMACS_NAME}/${EMACS_NAME}-packages
+
+# how to make and install
+ALL_TARGET=	package
+INSTALL_TARGET=	install-package
 
 # RUN_DEPENDS port name's suffix is '-common'.
 HAVE_COMMON_PORT=	YES
@@ -27,4 +29,9 @@ HAVE_COMMON_PORT=	YES
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
+# package info manifest
+MANIFEST=	MANIFEST.flim
+# package documents
+FLIMDOCDIR=	${EMACS_PACKAGESDIR}/lisp/flim
+
 .include <${MASTERDIR}/Makefile>
diff --git a/editors/flim-xemacs21-mule/pkg-descr b/editors/flim-xemacs21-mule/pkg-descr
index 4de45aa43cd7..a406f8b715bf 100644
--- a/editors/flim-xemacs21-mule/pkg-descr
+++ b/editors/flim-xemacs21-mule/pkg-descr
@@ -8,6 +8,6 @@ FLIM, message representation or encoding emacs lisp library for xemacs-mule.
     - mailcap parser and utility
 
   FLIM is installed the following directory tree:
-	${PREFIX}/lib/xemacs-20.4/site-lisp/flim/	--- FLIM
+	${PREFIX}/lib/xemacs/xemacs-packages/lisp/flim/	--- FLIM
 
 --- Porting by shige <shige@FreeBSD.ORG>
diff --git a/editors/flim-xemacs21-mule/pkg-plist b/editors/flim-xemacs21-mule/pkg-plist
index d5276737f5f7..6fefa51c4271 100644
--- a/editors/flim-xemacs21-mule/pkg-plist
+++ b/editors/flim-xemacs21-mule/pkg-plist
@@ -1,38 +1,40 @@
-%%EMACS_LIBDIR%%/site-lisp/flim/eword-decode.el
-%%EMACS_LIBDIR%%/site-lisp/flim/eword-decode.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/eword-encode.el
-%%EMACS_LIBDIR%%/site-lisp/flim/eword-encode.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mailcap.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-b.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-b.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-g.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-g.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-q.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-q.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-u.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel-u.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mel.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mel.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mime-def.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mime-def.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mime-parse.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mime-parse.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mime.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mime.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mmbuffer.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmbuffer.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/mmcooked.el
-%%EMACS_LIBDIR%%/site-lisp/flim/mmcooked.elc
-%%EMACS_LIBDIR%%/site-lisp/flim/std11.el
-%%EMACS_LIBDIR%%/site-lisp/flim/std11.elc
-@dirrm %%EMACS_LIBDIR%%/site-lisp/flim
-%%FLIMDOCDIR%%/ChangeLog
-%%FLIMDOCDIR%%/README.en
-@dirrm %%FLIMDOCDIR%%
-@unexec install-info --delete %D/info/mime-en.info %D/info/dir
-@unexec install-info --delete %D/info/mime-ja.info %D/info/dir
-info/mime-en.info
-info/mime-ja.info
-@exec install-info %D/info/mime-en.info %D/info/dir
-@exec install-info %D/info/mime-ja.info %D/info/dir
+%%EMACS_PACKAGESDIR%%/lisp/flim/ChangeLog
+%%EMACS_PACKAGESDIR%%/lisp/flim/README.en
+%%EMACS_PACKAGESDIR%%/lisp/flim/auto-autoloads.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/auto-autoloads.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/custom-load.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/custom-load.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/eword-decode.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/eword-decode.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/eword-encode.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/eword-encode.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/mailcap.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/mailcap.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/mel-b.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/mel-b.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/mel-g.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/mel-g.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/mel-q.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/mel-q.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/mel-u.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/mel-u.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/mel.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/mel.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/mime-def.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/mime-def.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/mime-parse.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/mime-parse.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/mime.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/mime.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/mmbuffer.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/mmbuffer.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/mmcooked.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/mmcooked.elc
+%%EMACS_PACKAGESDIR%%/lisp/flim/std11.el
+%%EMACS_PACKAGESDIR%%/lisp/flim/std11.elc
+@dirrm %%EMACS_PACKAGESDIR%%/lisp/flim
+%%EMACS_PACKAGESDIR%%/info/mime-en.info
+%%EMACS_PACKAGESDIR%%/info/mime-ja.info
+%%EMACS_PACKAGESDIR%%/man/flim/mime-en.texi
+%%EMACS_PACKAGESDIR%%/man/flim/mime-ja.texi
+@dirrm %%EMACS_PACKAGESDIR%%/man/flim