2 files changed, 10 insertions, 262 deletions

diff --git a/editors/xemacs-basic-mule-packages/Makefile b/editors/xemacs-basic-mule-packages/Makefile
index ee972294211e..fc2c12787fbd 100644
--- a/editors/xemacs-basic-mule-packages/Makefile
+++ b/editors/xemacs-basic-mule-packages/Makefile
@@ -22,9 +22,10 @@ DIST_SUBDIR=	xemacs
 MAINTAINER=	kiri@FreeBSD.org
 
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/mule-packages
+WRKSRC=		${WRKDIR}/${PACKAGES_SUBDIR}
 
 XEMACSDIR=	${PREFIX}/lib/xemacs
+PACKAGES_SUBDIR=	mule-packages
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
@@ -35,9 +36,15 @@ do-extract:
 
 do-install:
 	${MKDIR} ${XEMACSDIR}
-	${CP} -Rp ${WRKDIR}/mule-packages ${XEMACSDIR}
+	${CP} -R ${WRKSRC} ${XEMACSDIR}
 
 post-install:
+	@cd ${WRKDIR} && \
+	find ${PACKAGES_SUBDIR} -type f|sort|${SED} 's:^:lib/xemacs/:' >> ${TMPPLIST}; \
+	find ${PACKAGES_SUBDIR}/*/* -type d|sort -r|${SED} 's:^:@dirrm lib/xemacs/:'>> ${TMPPLIST}
+	@${ECHO} '@unexec rmdir %D/lib/xemacs/${PACKAGES_SUBDIR}/* 2>/dev/null || true' >> ${TMPPLIST}
+	@${ECHO} '@unexec rmdir %D/lib/xemacs/${PACKAGES_SUBDIR} 2>/dev/null || true' >> ${TMPPLIST}
+	@${ECHO} '@unexec rmdir %D/lib/xemacs 2>/dev/null || true' >> ${TMPPLIST}
 	@${ECHO_MSG} "    This is the basic mule package for XEmacs(version over 21). You might be"
 	@${ECHO_MSG} "enough with this package installing basic package(editors/xemacs-packages)"
 	@${ECHO_MSG} "altogether for working at XEmacs but if you think it insufficient,you can"
diff --git a/editors/xemacs-basic-mule-packages/pkg-plist b/editors/xemacs-basic-mule-packages/pkg-plist
index 109d31c80d49..904ed06b456e 100644
--- a/editors/xemacs-basic-mule-packages/pkg-plist
+++ b/editors/xemacs-basic-mule-packages/pkg-plist
@@ -1,260 +1 @@
-lib/xemacs/mule-packages/etc/app-defaults/de/Emacs
-lib/xemacs/mule-packages/etc/app-defaults/fr/Emacs
-lib/xemacs/mule-packages/etc/app-defaults/ja/Emacs
-lib/xemacs/mule-packages/etc/app-defaults/ro/Emacs
-lib/xemacs/mule-packages/etc/mule-doc/ChangeLog.Mule
-lib/xemacs/mule-packages/etc/mule-doc/ChangeLog.Mule-Wnn6
-lib/xemacs/mule-packages/etc/mule-doc/ChinesePoem.cn
-lib/xemacs/mule-packages/etc/mule-doc/INSTALL
-lib/xemacs/mule-packages/etc/mule-doc/ISO2022.ja
-lib/xemacs/mule-packages/etc/mule-doc/NEWFEATURE
-lib/xemacs/mule-packages/etc/mule-doc/NeXT.ja
-lib/xemacs/mule-packages/etc/mule-doc/README.Mule
-lib/xemacs/mule-packages/etc/mule-doc/README.SJ3.ja
-lib/xemacs/mule-packages/etc/mule-doc/TAB.ja
-lib/xemacs/mule-packages/etc/mule-doc/Thai/README.Mule
-lib/xemacs/mule-packages/etc/mule-doc/Thai/sample.Thai
-lib/xemacs/mule-packages/etc/mule-doc/X11.ja
-lib/xemacs/mule-packages/etc/mule-doc/arabic.txt
-lib/xemacs/mule-packages/etc/mule-doc/sample.ks
-lib/xemacs/mule-packages/etc/mule-doc/viet/FAQ.VISCII
-lib/xemacs/mule-packages/etc/mule-doc/viet/QUAIL
-lib/xemacs/mule-packages/etc/mule-doc/viet/README.Mule
-lib/xemacs/mule-packages/etc/mule-doc/viet/TERMINOLOGY
-lib/xemacs/mule-packages/etc/mule/FAQ-Mule
-lib/xemacs/mule-packages/etc/mule/FAQ-Mule.cn
-lib/xemacs/mule-packages/etc/mule/FAQ-Mule.ja
-lib/xemacs/mule-packages/etc/mule/FAQ-Mule.kr
-lib/xemacs/mule-packages/etc/mule/FAQ-Mule.th
-lib/xemacs/mule-packages/etc/mule/Makefile.in
-lib/xemacs/mule-packages/etc/mule/TUTORIAL.kr
-lib/xemacs/mule-packages/etc/mule/VERSIONS
-lib/xemacs/mule-packages/etc/mule/coco.1
-lib/xemacs/mule-packages/etc/mule/demo.ps
-lib/xemacs/mule-packages/etc/mule/m2ps.1
-lib/xemacs/mule-packages/etc/mule/m2ps.1.in
-lib/xemacs/mule-packages/etc/mule/m2ps.ps
-lib/xemacs/mule-packages/etc/mule/mule-refcard.tex
-lib/xemacs/mule-packages/etc/mule/mule.1
-lib/xemacs/mule-packages/etc/mule/mule.xbm
-lib/xemacs/mule-packages/etc/mule/tom.xbm
-lib/xemacs/mule-packages/etc/skk/ReadMe
-lib/xemacs/mule-packages/etc/skk/ReadMe.10
-lib/xemacs/mule-packages/etc/skk/ReadMe.English
-lib/xemacs/mule-packages/etc/skk/SKK-JISYO.L
-lib/xemacs/mule-packages/etc/skk/SKK-JISYO.M
-lib/xemacs/mule-packages/etc/skk/SKK-JISYO.S
-lib/xemacs/mule-packages/etc/skk/SKK.tut
-lib/xemacs/mule-packages/etc/skk/SKK.tut.E
-lib/xemacs/mule-packages/etc/start-files/fr/locale-start.el
-lib/xemacs/mule-packages/etc/start-files/fr/locale-start.elc
-lib/xemacs/mule-packages/etc/start-files/ja/locale-start.el
-lib/xemacs/mule-packages/etc/start-files/ja/locale-start.elc
-lib/xemacs/mule-packages/etc/start-files/ro/locale-start.el
-lib/xemacs/mule-packages/etc/start-files/ro/locale-start.elc
-lib/xemacs/mule-packages/info/elib.info
-lib/xemacs/mule-packages/info/elib.info-1
-lib/xemacs/mule-packages/info/elib.info-2
-lib/xemacs/mule-packages/info/skk.info
-lib/xemacs/mule-packages/info/skk.info-1
-lib/xemacs/mule-packages/info/skk.info-2
-lib/xemacs/mule-packages/info/skk.info-3
-lib/xemacs/mule-packages/info/skk.info-4
-lib/xemacs/mule-packages/lisp/egg-its/ChangeLog
-lib/xemacs/mule-packages/lisp/egg-its/_pkg.el
-lib/xemacs/mule-packages/lisp/egg-its/auto-autoloads.el
-lib/xemacs/mule-packages/lisp/egg-its/auto-autoloads.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg-busyu.el
-lib/xemacs/mule-packages/lisp/egg-its/egg-busyu.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg-cwnn-leim.el
-lib/xemacs/mule-packages/lisp/egg-its/egg-cwnn-leim.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg-jisx0201.el
-lib/xemacs/mule-packages/lisp/egg-its/egg-jisx0201.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg-jsymbol.el
-lib/xemacs/mule-packages/lisp/egg-its/egg-jsymbol.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg-keymap.el
-lib/xemacs/mule-packages/lisp/egg-its/egg-keymap.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg-kwnn-leim.el
-lib/xemacs/mule-packages/lisp/egg-its/egg-kwnn-leim.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg-leim.el
-lib/xemacs/mule-packages/lisp/egg-its/egg-leim.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg-quail.el
-lib/xemacs/mule-packages/lisp/egg-its/egg-quail.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg-sj3-client.el
-lib/xemacs/mule-packages/lisp/egg-its/egg-sj3-client.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg-sj3-leim.el
-lib/xemacs/mule-packages/lisp/egg-its/egg-sj3-leim.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg-sj3.el
-lib/xemacs/mule-packages/lisp/egg-its/egg-sj3.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg-wnn.el
-lib/xemacs/mule-packages/lisp/egg-its/egg-wnn.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg.el
-lib/xemacs/mule-packages/lisp/egg-its/egg.elc
-lib/xemacs/mule-packages/lisp/egg-its/eggrc-sj3
-lib/xemacs/mule-packages/lisp/egg-its/eggrc-wnn
-lib/xemacs/mule-packages/lisp/egg-its/its-han-kata.el
-lib/xemacs/mule-packages/lisp/egg-its/its-han-kata.elc
-lib/xemacs/mule-packages/lisp/egg-its/its-hangul.el
-lib/xemacs/mule-packages/lisp/egg-its/its-hangul.elc
-lib/xemacs/mule-packages/lisp/egg-its/its-hankaku.el
-lib/xemacs/mule-packages/lisp/egg-its/its-hankaku.elc
-lib/xemacs/mule-packages/lisp/egg-its/its-hira.el
-lib/xemacs/mule-packages/lisp/egg-its/its-hira.elc
-lib/xemacs/mule-packages/lisp/egg-its/its-kanainput.el
-lib/xemacs/mule-packages/lisp/egg-its/its-kanainput.elc
-lib/xemacs/mule-packages/lisp/egg-its/its-kata.el
-lib/xemacs/mule-packages/lisp/egg-its/its-kata.elc
-lib/xemacs/mule-packages/lisp/egg-its/its-pinyin.el
-lib/xemacs/mule-packages/lisp/egg-its/its-pinyin.elc
-lib/xemacs/mule-packages/lisp/egg-its/its-zenkaku.el
-lib/xemacs/mule-packages/lisp/egg-its/its-zenkaku.elc
-lib/xemacs/mule-packages/lisp/egg-its/its-zhuyin.el
-lib/xemacs/mule-packages/lisp/egg-its/its-zhuyin.elc
-lib/xemacs/mule-packages/lisp/elib/ChangeLog
-lib/xemacs/mule-packages/lisp/elib/NEWS
-lib/xemacs/mule-packages/lisp/elib/README
-lib/xemacs/mule-packages/lisp/elib/_pkg.el
-lib/xemacs/mule-packages/lisp/elib/auto-autoloads.el
-lib/xemacs/mule-packages/lisp/elib/auto-autoloads.elc
-lib/xemacs/mule-packages/lisp/elib/avltree.el
-lib/xemacs/mule-packages/lisp/elib/avltree.elc
-lib/xemacs/mule-packages/lisp/elib/bintree.el
-lib/xemacs/mule-packages/lisp/elib/bintree.elc
-lib/xemacs/mule-packages/lisp/elib/cookie.el
-lib/xemacs/mule-packages/lisp/elib/cookie.elc
-lib/xemacs/mule-packages/lisp/elib/dll-debug.el
-lib/xemacs/mule-packages/lisp/elib/dll-debug.elc
-lib/xemacs/mule-packages/lisp/elib/dll.el
-lib/xemacs/mule-packages/lisp/elib/dll.elc
-lib/xemacs/mule-packages/lisp/elib/elib-node.el
-lib/xemacs/mule-packages/lisp/elib/elib-node.elc
-lib/xemacs/mule-packages/lisp/elib/queue-f.el
-lib/xemacs/mule-packages/lisp/elib/queue-f.elc
-lib/xemacs/mule-packages/lisp/elib/queue-m.el
-lib/xemacs/mule-packages/lisp/elib/queue-m.elc
-lib/xemacs/mule-packages/lisp/elib/read.el
-lib/xemacs/mule-packages/lisp/elib/read.elc
-lib/xemacs/mule-packages/lisp/elib/stack-f.el
-lib/xemacs/mule-packages/lisp/elib/stack-f.elc
-lib/xemacs/mule-packages/lisp/elib/stack-m.el
-lib/xemacs/mule-packages/lisp/elib/stack-m.elc
-lib/xemacs/mule-packages/lisp/elib/string.el
-lib/xemacs/mule-packages/lisp/elib/string.elc
-lib/xemacs/mule-packages/lisp/locale/ChangeLog
-lib/xemacs/mule-packages/lisp/locale/_pkg.el
-lib/xemacs/mule-packages/lisp/locale/auto-autoloads.el
-lib/xemacs/mule-packages/lisp/locale/auto-autoloads.elc
-lib/xemacs/mule-packages/lisp/locale/locale-start.el
-lib/xemacs/mule-packages/lisp/locale/locale-start.elc
-lib/xemacs/mule-packages/lisp/mule-base/ChangeLog
-lib/xemacs/mule-packages/lisp/mule-base/_pkg.el
-lib/xemacs/mule-packages/lisp/mule-base/auto-autoloads.el
-lib/xemacs/mule-packages/lisp/mule-base/auto-autoloads.elc
-lib/xemacs/mule-packages/lisp/mule-base/canna.el
-lib/xemacs/mule-packages/lisp/mule-base/canna.elc
-lib/xemacs/mule-packages/lisp/mule-base/char-table.el
-lib/xemacs/mule-packages/lisp/mule-base/char-table.elc
-lib/xemacs/mule-packages/lisp/mule-base/chartblxmas.el
-lib/xemacs/mule-packages/lisp/mule-base/chartblxmas.elc
-lib/xemacs/mule-packages/lisp/mule-base/china-util.el
-lib/xemacs/mule-packages/lisp/mule-base/china-util.elc
-lib/xemacs/mule-packages/lisp/mule-base/cyril-util.el
-lib/xemacs/mule-packages/lisp/mule-base/cyril-util.elc
-lib/xemacs/mule-packages/lisp/mule-base/ethio-util.el
-lib/xemacs/mule-packages/lisp/mule-base/ethio-util.elc
-lib/xemacs/mule-packages/lisp/mule-base/isearch-mule.el
-lib/xemacs/mule-packages/lisp/mule-base/isearch-mule.elc
-lib/xemacs/mule-packages/lisp/mule-base/japan-util.el
-lib/xemacs/mule-packages/lisp/mule-base/japan-util.elc
-lib/xemacs/mule-packages/lisp/mule-base/kana-keyboard.el
-lib/xemacs/mule-packages/lisp/mule-base/kana-keyboard.elc
-lib/xemacs/mule-packages/lisp/mule-base/korea-util.el
-lib/xemacs/mule-packages/lisp/mule-base/korea-util.elc
-lib/xemacs/mule-packages/lisp/mule-base/mule-cne.el
-lib/xemacs/mule-packages/lisp/mule-base/mule-cne.elc
-lib/xemacs/mule-packages/lisp/mule-base/mule-diag.el
-lib/xemacs/mule-packages/lisp/mule-base/mule-diag.elc
-lib/xemacs/mule-packages/lisp/mule-base/mule-keyboard.el
-lib/xemacs/mule-packages/lisp/mule-base/mule-keyboard.elc
-lib/xemacs/mule-packages/lisp/mule-base/mule-trex.el
-lib/xemacs/mule-packages/lisp/mule-base/mule-trex.elc
-lib/xemacs/mule-packages/lisp/mule-base/mule-util.el
-lib/xemacs/mule-packages/lisp/mule-base/mule-util.elc
-lib/xemacs/mule-packages/lisp/mule-base/thai-xtis-util.el
-lib/xemacs/mule-packages/lisp/mule-base/thai-xtis-util.elc
-lib/xemacs/mule-packages/lisp/mule-base/viet-util.el
-lib/xemacs/mule-packages/lisp/mule-base/viet-util.elc
-lib/xemacs/mule-packages/lisp/skk/ChangeLog
-lib/xemacs/mule-packages/lisp/skk/_pkg.el
-lib/xemacs/mule-packages/lisp/skk/auto-autoloads.el
-lib/xemacs/mule-packages/lisp/skk/auto-autoloads.elc
-lib/xemacs/mule-packages/lisp/skk/skk-auto.el
-lib/xemacs/mule-packages/lisp/skk/skk-auto.elc
-lib/xemacs/mule-packages/lisp/skk/skk-comp.el
-lib/xemacs/mule-packages/lisp/skk/skk-comp.elc
-lib/xemacs/mule-packages/lisp/skk/skk-cursor.el
-lib/xemacs/mule-packages/lisp/skk/skk-cursor.elc
-lib/xemacs/mule-packages/lisp/skk/skk-develop.el
-lib/xemacs/mule-packages/lisp/skk/skk-develop.elc
-lib/xemacs/mule-packages/lisp/skk/skk-foreword.el
-lib/xemacs/mule-packages/lisp/skk/skk-foreword.elc
-lib/xemacs/mule-packages/lisp/skk/skk-gadget.el
-lib/xemacs/mule-packages/lisp/skk/skk-gadget.elc
-lib/xemacs/mule-packages/lisp/skk/skk-isearch.el
-lib/xemacs/mule-packages/lisp/skk/skk-isearch.elc
-lib/xemacs/mule-packages/lisp/skk/skk-kakasi.el
-lib/xemacs/mule-packages/lisp/skk/skk-kakasi.elc
-lib/xemacs/mule-packages/lisp/skk/skk-kcode.el
-lib/xemacs/mule-packages/lisp/skk/skk-kcode.elc
-lib/xemacs/mule-packages/lisp/skk/skk-leim.el
-lib/xemacs/mule-packages/lisp/skk/skk-leim.elc
-lib/xemacs/mule-packages/lisp/skk/skk-look.el
-lib/xemacs/mule-packages/lisp/skk/skk-look.elc
-lib/xemacs/mule-packages/lisp/skk/skk-num.el
-lib/xemacs/mule-packages/lisp/skk/skk-num.elc
-lib/xemacs/mule-packages/lisp/skk/skk-obsolete.el
-lib/xemacs/mule-packages/lisp/skk/skk-obsolete.elc
-lib/xemacs/mule-packages/lisp/skk/skk-server.el
-lib/xemacs/mule-packages/lisp/skk/skk-server.elc
-lib/xemacs/mule-packages/lisp/skk/skk-tut.el
-lib/xemacs/mule-packages/lisp/skk/skk-tut.elc
-lib/xemacs/mule-packages/lisp/skk/skk-vars.el
-lib/xemacs/mule-packages/lisp/skk/skk-vars.elc
-lib/xemacs/mule-packages/lisp/skk/skk-viper.el
-lib/xemacs/mule-packages/lisp/skk/skk-viper.elc
-lib/xemacs/mule-packages/lisp/skk/skk.el
-lib/xemacs/mule-packages/lisp/skk/skk.elc
-lib/xemacs/mule-packages/man/elib/elib.texi
-lib/xemacs/mule-packages/man/elib/gpl.texi
-lib/xemacs/mule-packages/man/skk/gpl.texi
-lib/xemacs/mule-packages/man/skk/skk-faq.texi
-lib/xemacs/mule-packages/man/skk/skk.texi
-lib/xemacs/mule-packages/pkginfo/MANIFEST.egg-its
-lib/xemacs/mule-packages/pkginfo/MANIFEST.elib
-lib/xemacs/mule-packages/pkginfo/MANIFEST.locale
-lib/xemacs/mule-packages/pkginfo/MANIFEST.mule-base
-lib/xemacs/mule-packages/pkginfo/MANIFEST.skk
-@dirrm lib/xemacs/mule-packages/man/skk
-@dirrm lib/xemacs/mule-packages/man/elib
-@dirrm lib/xemacs/mule-packages/lisp/skk
-@dirrm lib/xemacs/mule-packages/lisp/mule-base
-@dirrm lib/xemacs/mule-packages/lisp/locale
-@dirrm lib/xemacs/mule-packages/lisp/elib
-@dirrm lib/xemacs/mule-packages/lisp/egg-its
-@dirrm lib/xemacs/mule-packages/etc/start-files/ro
-@dirrm lib/xemacs/mule-packages/etc/start-files/ja
-@dirrm lib/xemacs/mule-packages/etc/start-files/fr
-@dirrm lib/xemacs/mule-packages/etc/start-files
-@dirrm lib/xemacs/mule-packages/etc/skk
-@dirrm lib/xemacs/mule-packages/etc/mule-doc/viet
-@dirrm lib/xemacs/mule-packages/etc/mule-doc/Thai
-@dirrm lib/xemacs/mule-packages/etc/mule-doc
-@dirrm lib/xemacs/mule-packages/etc/mule
-@dirrm lib/xemacs/mule-packages/etc/app-defaults/ro
-@dirrm lib/xemacs/mule-packages/etc/app-defaults/ja
-@dirrm lib/xemacs/mule-packages/etc/app-defaults/fr
-@dirrm lib/xemacs/mule-packages/etc/app-defaults/de
-@dirrm lib/xemacs/mule-packages/etc/app-defaults
-@unexec rmdir %D/lib/xemacs/mule-packages/* 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/mule-packages 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs 2>/dev/null || true
+@comment This list is automatically generated.