Change pkg-plist to be automatically generated.

Reviewed by:	knu

8 files changed, 40 insertions, 660 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.
diff --git a/editors/xemacs-games-packages/Makefile b/editors/xemacs-games-packages/Makefile
index 05e839ce4de7..0259944b6773 100644
--- a/editors/xemacs-games-packages/Makefile
+++ b/editors/xemacs-games-packages/Makefile
@@ -21,9 +21,10 @@ DIST_SUBDIR=	xemacs
 MAINTAINER=	kiri@FreeBSD.org
 
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/xemacs-packages
+WRKSRC=		${WRKDIR}/${PACKAGES_SUBDIR}
 
 XEMACSDIR=	${PREFIX}/lib/xemacs
+PACKAGES_SUBDIR=	xemacs-packages
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
@@ -34,9 +35,15 @@ do-extract:
 
 do-install:
 	${MKDIR} ${XEMACSDIR}
-	${CP} -Rp ${WRKDIR}/xemacs-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 set of the packages for xemacs with the games category. You can"
 	@${ECHO_MSG} "install other packages provided by XEmacs.org with editors/xemacs-*-packages"
 	@${ECHO_MSG} "ports. These ports are prepared for corresponding XEmacs packages except for"
diff --git a/editors/xemacs-games-packages/pkg-plist b/editors/xemacs-games-packages/pkg-plist
index e025a0713ee9..904ed06b456e 100644
--- a/editors/xemacs-games-packages/pkg-plist
+++ b/editors/xemacs-games-packages/pkg-plist
@@ -1,114 +1 @@
-lib/xemacs/xemacs-packages/etc/mine/1_16_flat.png
-lib/xemacs/xemacs-packages/etc/mine/1_16_flat_sel.png
-lib/xemacs/xemacs-packages/etc/mine/2_16_flat.png
-lib/xemacs/xemacs-packages/etc/mine/2_16_flat_sel.png
-lib/xemacs/xemacs-packages/etc/mine/3_16_flat.png
-lib/xemacs/xemacs-packages/etc/mine/3_16_flat_sel.png
-lib/xemacs/xemacs-packages/etc/mine/4_16_flat.png
-lib/xemacs/xemacs-packages/etc/mine/4_16_flat_sel.png
-lib/xemacs/xemacs-packages/etc/mine/5_16_flat.png
-lib/xemacs/xemacs-packages/etc/mine/5_16_flat_sel.png
-lib/xemacs/xemacs-packages/etc/mine/6_16_flat.png
-lib/xemacs/xemacs-packages/etc/mine/6_16_flat_sel.png
-lib/xemacs/xemacs-packages/etc/mine/7_16_flat.png
-lib/xemacs/xemacs-packages/etc/mine/7_16_flat_sel.png
-lib/xemacs/xemacs-packages/etc/mine/8_16_flat.png
-lib/xemacs/xemacs-packages/etc/mine/8_16_flat_sel.png
-lib/xemacs/xemacs-packages/etc/mine/bomb_16_flat.png
-lib/xemacs/xemacs-packages/etc/mine/bomb_trapped_16_flat.png
-lib/xemacs/xemacs-packages/etc/mine/empty_16_down.png
-lib/xemacs/xemacs-packages/etc/mine/empty_16_flat.png
-lib/xemacs/xemacs-packages/etc/mine/empty_16_flat_sel.png
-lib/xemacs/xemacs-packages/etc/mine/empty_16_up.png
-lib/xemacs/xemacs-packages/etc/mine/empty_16_up_sel.png
-lib/xemacs/xemacs-packages/etc/mine/explosion3.au
-lib/xemacs/xemacs-packages/etc/mine/flagged_16_up.png
-lib/xemacs/xemacs-packages/etc/mine/flagged_16_up_sel.png
-lib/xemacs/xemacs-packages/etc/mine/new_down.png
-lib/xemacs/xemacs-packages/etc/mine/new_up.png
-lib/xemacs/xemacs-packages/etc/mine/pad.xpm
-lib/xemacs/xemacs-packages/etc/mine/question_16_up.png
-lib/xemacs/xemacs-packages/etc/mine/quit_down.png
-lib/xemacs/xemacs-packages/etc/mine/quit_up.png
-lib/xemacs/xemacs-packages/etc/mine/splash.xpm
-lib/xemacs/xemacs-packages/etc/sokoban.levels
-lib/xemacs/xemacs-packages/etc/spook.lines
-lib/xemacs/xemacs-packages/etc/yow.lines
-lib/xemacs/xemacs-packages/lisp/cookie/ChangeLog
-lib/xemacs/xemacs-packages/lisp/cookie/_pkg.el
-lib/xemacs/xemacs-packages/lisp/cookie/auto-autoloads.el
-lib/xemacs/xemacs-packages/lisp/cookie/auto-autoloads.elc
-lib/xemacs/xemacs-packages/lisp/cookie/cookie1.el
-lib/xemacs/xemacs-packages/lisp/cookie/cookie1.elc
-lib/xemacs/xemacs-packages/lisp/cookie/spook.el
-lib/xemacs/xemacs-packages/lisp/cookie/spook.elc
-lib/xemacs/xemacs-packages/lisp/cookie/yow.el
-lib/xemacs/xemacs-packages/lisp/cookie/yow.elc
-lib/xemacs/xemacs-packages/lisp/games/ChangeLog
-lib/xemacs/xemacs-packages/lisp/games/_pkg.el
-lib/xemacs/xemacs-packages/lisp/games/auto-autoloads.el
-lib/xemacs/xemacs-packages/lisp/games/auto-autoloads.elc
-lib/xemacs/xemacs-packages/lisp/games/gamegrid.el
-lib/xemacs/xemacs-packages/lisp/games/gamegrid.elc
-lib/xemacs/xemacs-packages/lisp/games/snake.el
-lib/xemacs/xemacs-packages/lisp/games/snake.elc
-lib/xemacs/xemacs-packages/lisp/games/sokoban.el
-lib/xemacs/xemacs-packages/lisp/games/sokoban.elc
-lib/xemacs/xemacs-packages/lisp/games/tetris.el
-lib/xemacs/xemacs-packages/lisp/games/tetris.elc
-lib/xemacs/xemacs-packages/lisp/mine/ChangeLog
-lib/xemacs/xemacs-packages/lisp/mine/_pkg.el
-lib/xemacs/xemacs-packages/lisp/mine/auto-autoloads.el
-lib/xemacs/xemacs-packages/lisp/mine/auto-autoloads.elc
-lib/xemacs/xemacs-packages/lisp/mine/custom-load.el
-lib/xemacs/xemacs-packages/lisp/mine/custom-load.elc
-lib/xemacs/xemacs-packages/lisp/mine/xmine.el
-lib/xemacs/xemacs-packages/lisp/mine/xmine.elc
-lib/xemacs/xemacs-packages/lisp/misc-games/ChangeLog
-lib/xemacs/xemacs-packages/lisp/misc-games/NeXTify.el
-lib/xemacs/xemacs-packages/lisp/misc-games/NeXTify.elc
-lib/xemacs/xemacs-packages/lisp/misc-games/_pkg.el
-lib/xemacs/xemacs-packages/lisp/misc-games/advocacy.el
-lib/xemacs/xemacs-packages/lisp/misc-games/advocacy.elc
-lib/xemacs/xemacs-packages/lisp/misc-games/auto-autoloads.el
-lib/xemacs/xemacs-packages/lisp/misc-games/auto-autoloads.elc
-lib/xemacs/xemacs-packages/lisp/misc-games/blackbox.el
-lib/xemacs/xemacs-packages/lisp/misc-games/blackbox.elc
-lib/xemacs/xemacs-packages/lisp/misc-games/conx.el
-lib/xemacs/xemacs-packages/lisp/misc-games/conx.elc
-lib/xemacs/xemacs-packages/lisp/misc-games/decipher.el
-lib/xemacs/xemacs-packages/lisp/misc-games/decipher.elc
-lib/xemacs/xemacs-packages/lisp/misc-games/dissociate.el
-lib/xemacs/xemacs-packages/lisp/misc-games/dissociate.elc
-lib/xemacs/xemacs-packages/lisp/misc-games/doctor.el
-lib/xemacs/xemacs-packages/lisp/misc-games/doctor.elc
-lib/xemacs/xemacs-packages/lisp/misc-games/dunnet.el
-lib/xemacs/xemacs-packages/lisp/misc-games/dunnet.elc
-lib/xemacs/xemacs-packages/lisp/misc-games/flame.el
-lib/xemacs/xemacs-packages/lisp/misc-games/flame.elc
-lib/xemacs/xemacs-packages/lisp/misc-games/gomoku.el
-lib/xemacs/xemacs-packages/lisp/misc-games/gomoku.elc
-lib/xemacs/xemacs-packages/lisp/misc-games/hanoi.el
-lib/xemacs/xemacs-packages/lisp/misc-games/hanoi.elc
-lib/xemacs/xemacs-packages/lisp/misc-games/life.el
-lib/xemacs/xemacs-packages/lisp/misc-games/life.elc
-lib/xemacs/xemacs-packages/lisp/misc-games/morse.el
-lib/xemacs/xemacs-packages/lisp/misc-games/morse.elc
-lib/xemacs/xemacs-packages/lisp/misc-games/mpuz.el
-lib/xemacs/xemacs-packages/lisp/misc-games/mpuz.elc
-lib/xemacs/xemacs-packages/lisp/misc-games/rot13.el
-lib/xemacs/xemacs-packages/lisp/misc-games/rot13.elc
-lib/xemacs/xemacs-packages/lisp/misc-games/studly.el
-lib/xemacs/xemacs-packages/lisp/misc-games/studly.elc
-lib/xemacs/xemacs-packages/pkginfo/MANIFEST.cookie
-lib/xemacs/xemacs-packages/pkginfo/MANIFEST.games
-lib/xemacs/xemacs-packages/pkginfo/MANIFEST.mine
-lib/xemacs/xemacs-packages/pkginfo/MANIFEST.misc-games
-@dirrm lib/xemacs/xemacs-packages/lisp/misc-games
-@dirrm lib/xemacs/xemacs-packages/lisp/mine
-@dirrm lib/xemacs/xemacs-packages/lisp/games
-@dirrm lib/xemacs/xemacs-packages/lisp/cookie
-@dirrm lib/xemacs/xemacs-packages/etc/mine
-@unexec rmdir %D/lib/xemacs/xemacs-packages/* 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/xemacs-packages 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs 2>/dev/null || true
+@comment This list is automatically generated.
diff --git a/editors/xemacs-mule-packages/Makefile b/editors/xemacs-mule-packages/Makefile
index e6f13b6711cb..9ceccdbb0c26 100644
--- a/editors/xemacs-mule-packages/Makefile
+++ b/editors/xemacs-mule-packages/Makefile
@@ -20,9 +20,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}
@@ -33,9 +34,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 set of the packages for xemacs with the mule category. You can"
 	@${ECHO_MSG} "install other packages provided by XEmacs.org with editors/xemacs-*-packages"
 	@${ECHO_MSG} "ports. These ports are prepared for corresponding XEmacs packages except for"
diff --git a/editors/xemacs-mule-packages/pkg-plist b/editors/xemacs-mule-packages/pkg-plist
index 3cefbb0ed15d..904ed06b456e 100644
--- a/editors/xemacs-mule-packages/pkg-plist
+++ b/editors/xemacs-mule-packages/pkg-plist
@@ -1,178 +1 @@
-lib/xemacs/mule-packages/info/lookup.info
-lib/xemacs/mule-packages/info/lookup.info-1
-lib/xemacs/mule-packages/info/lookup.info-2
-lib/xemacs/mule-packages/lisp/edict/ChangeLog
-lib/xemacs/mule-packages/lisp/edict/_pkg.el
-lib/xemacs/mule-packages/lisp/edict/auto-autoloads.el
-lib/xemacs/mule-packages/lisp/edict/auto-autoloads.elc
-lib/xemacs/mule-packages/lisp/edict/dui-registry.el
-lib/xemacs/mule-packages/lisp/edict/dui-registry.elc
-lib/xemacs/mule-packages/lisp/edict/dui.el
-lib/xemacs/mule-packages/lisp/edict/dui.elc
-lib/xemacs/mule-packages/lisp/edict/edict-edit.el
-lib/xemacs/mule-packages/lisp/edict/edict-edit.elc
-lib/xemacs/mule-packages/lisp/edict/edict-english.el
-lib/xemacs/mule-packages/lisp/edict/edict-english.elc
-lib/xemacs/mule-packages/lisp/edict/edict-japanese.el
-lib/xemacs/mule-packages/lisp/edict/edict-japanese.elc
-lib/xemacs/mule-packages/lisp/edict/edict-morphology.el
-lib/xemacs/mule-packages/lisp/edict/edict-morphology.elc
-lib/xemacs/mule-packages/lisp/edict/edict-test.el
-lib/xemacs/mule-packages/lisp/edict/edict-test.elc
-lib/xemacs/mule-packages/lisp/edict/edict.el
-lib/xemacs/mule-packages/lisp/edict/edict.elc
-lib/xemacs/mule-packages/lisp/edict/edictj.demo
-lib/xemacs/mule-packages/lisp/edict/ts-mode.el
-lib/xemacs/mule-packages/lisp/leim/ChangeLog
-lib/xemacs/mule-packages/lisp/leim/_pkg.el
-lib/xemacs/mule-packages/lisp/leim/auto-autoloads.el
-lib/xemacs/mule-packages/lisp/leim/auto-autoloads.elc
-lib/xemacs/mule-packages/lisp/leim/leim-list.el
-lib/xemacs/mule-packages/lisp/leim/leim-list.elc
-lib/xemacs/mule-packages/lisp/leim/quail.el
-lib/xemacs/mule-packages/lisp/leim/quail.elc
-lib/xemacs/mule-packages/lisp/leim/quail/4Corner.el
-lib/xemacs/mule-packages/lisp/leim/quail/4Corner.elc
-lib/xemacs/mule-packages/lisp/leim/quail/ARRAY30.el
-lib/xemacs/mule-packages/lisp/leim/quail/ARRAY30.elc
-lib/xemacs/mule-packages/lisp/leim/quail/CCDOSPY.el
-lib/xemacs/mule-packages/lisp/leim/quail/CCDOSPY.elc
-lib/xemacs/mule-packages/lisp/leim/quail/CTLau.el
-lib/xemacs/mule-packages/lisp/leim/quail/CTLau.elc
-lib/xemacs/mule-packages/lisp/leim/quail/CTLauB.el
-lib/xemacs/mule-packages/lisp/leim/quail/CTLauB.elc
-lib/xemacs/mule-packages/lisp/leim/quail/ECDICT.el
-lib/xemacs/mule-packages/lisp/leim/quail/ECDICT.elc
-lib/xemacs/mule-packages/lisp/leim/quail/ETZY.el
-lib/xemacs/mule-packages/lisp/leim/quail/ETZY.elc
-lib/xemacs/mule-packages/lisp/leim/quail/PY-b5.el
-lib/xemacs/mule-packages/lisp/leim/quail/PY-b5.elc
-lib/xemacs/mule-packages/lisp/leim/quail/PY.el
-lib/xemacs/mule-packages/lisp/leim/quail/PY.elc
-lib/xemacs/mule-packages/lisp/leim/quail/Punct-b5.el
-lib/xemacs/mule-packages/lisp/leim/quail/Punct-b5.elc
-lib/xemacs/mule-packages/lisp/leim/quail/Punct.el
-lib/xemacs/mule-packages/lisp/leim/quail/Punct.elc
-lib/xemacs/mule-packages/lisp/leim/quail/QJ-b5.el
-lib/xemacs/mule-packages/lisp/leim/quail/QJ-b5.elc
-lib/xemacs/mule-packages/lisp/leim/quail/QJ.el
-lib/xemacs/mule-packages/lisp/leim/quail/QJ.elc
-lib/xemacs/mule-packages/lisp/leim/quail/SW.el
-lib/xemacs/mule-packages/lisp/leim/quail/SW.elc
-lib/xemacs/mule-packages/lisp/leim/quail/TONEPY.el
-lib/xemacs/mule-packages/lisp/leim/quail/TONEPY.elc
-lib/xemacs/mule-packages/lisp/leim/quail/ZIRANMA.el
-lib/xemacs/mule-packages/lisp/leim/quail/ZIRANMA.elc
-lib/xemacs/mule-packages/lisp/leim/quail/ZOZY.el
-lib/xemacs/mule-packages/lisp/leim/quail/ZOZY.elc
-lib/xemacs/mule-packages/lisp/leim/quail/cyril-jis.el
-lib/xemacs/mule-packages/lisp/leim/quail/cyril-jis.elc
-lib/xemacs/mule-packages/lisp/leim/quail/cyrillic.el
-lib/xemacs/mule-packages/lisp/leim/quail/cyrillic.elc
-lib/xemacs/mule-packages/lisp/leim/quail/czech.el
-lib/xemacs/mule-packages/lisp/leim/quail/czech.elc
-lib/xemacs/mule-packages/lisp/leim/quail/greek.el
-lib/xemacs/mule-packages/lisp/leim/quail/greek.elc
-lib/xemacs/mule-packages/lisp/leim/quail/hangul.el
-lib/xemacs/mule-packages/lisp/leim/quail/hangul.elc
-lib/xemacs/mule-packages/lisp/leim/quail/hangul3.el
-lib/xemacs/mule-packages/lisp/leim/quail/hangul3.elc
-lib/xemacs/mule-packages/lisp/leim/quail/hanja-jis.el
-lib/xemacs/mule-packages/lisp/leim/quail/hanja-jis.elc
-lib/xemacs/mule-packages/lisp/leim/quail/hanja.el
-lib/xemacs/mule-packages/lisp/leim/quail/hanja.elc
-lib/xemacs/mule-packages/lisp/leim/quail/ipa.el
-lib/xemacs/mule-packages/lisp/leim/quail/ipa.elc
-lib/xemacs/mule-packages/lisp/leim/quail/latin-alt.el
-lib/xemacs/mule-packages/lisp/leim/quail/latin-alt.elc
-lib/xemacs/mule-packages/lisp/leim/quail/latin-post.el
-lib/xemacs/mule-packages/lisp/leim/quail/latin-post.elc
-lib/xemacs/mule-packages/lisp/leim/quail/latin-pre.el
-lib/xemacs/mule-packages/lisp/leim/quail/latin-pre.elc
-lib/xemacs/mule-packages/lisp/leim/quail/py-punct.el
-lib/xemacs/mule-packages/lisp/leim/quail/py-punct.elc
-lib/xemacs/mule-packages/lisp/leim/quail/pypunct-b5.el
-lib/xemacs/mule-packages/lisp/leim/quail/pypunct-b5.elc
-lib/xemacs/mule-packages/lisp/leim/quail/quick-b5.el
-lib/xemacs/mule-packages/lisp/leim/quail/quick-b5.elc
-lib/xemacs/mule-packages/lisp/leim/quail/quick-cns.el
-lib/xemacs/mule-packages/lisp/leim/quail/quick-cns.elc
-lib/xemacs/mule-packages/lisp/leim/quail/symbol-ksc.el
-lib/xemacs/mule-packages/lisp/leim/quail/symbol-ksc.elc
-lib/xemacs/mule-packages/lisp/leim/quail/thai-xtis.el
-lib/xemacs/mule-packages/lisp/leim/quail/thai-xtis.elc
-lib/xemacs/mule-packages/lisp/leim/quail/tsang-b5.el
-lib/xemacs/mule-packages/lisp/leim/quail/tsang-b5.elc
-lib/xemacs/mule-packages/lisp/leim/quail/tsang-cns.el
-lib/xemacs/mule-packages/lisp/leim/quail/tsang-cns.elc
-lib/xemacs/mule-packages/lisp/lookup/ChangeLog
-lib/xemacs/mule-packages/lisp/lookup/_pkg.el
-lib/xemacs/mule-packages/lisp/lookup/auto-autoloads.el
-lib/xemacs/mule-packages/lisp/lookup/auto-autoloads.elc
-lib/xemacs/mule-packages/lisp/lookup/custom-load.el
-lib/xemacs/mule-packages/lisp/lookup/custom-load.elc
-lib/xemacs/mule-packages/lisp/lookup/evi-mule.el
-lib/xemacs/mule-packages/lisp/lookup/evi-mule.elc
-lib/xemacs/mule-packages/lisp/lookup/evi.el
-lib/xemacs/mule-packages/lisp/lookup/evi.elc
-lib/xemacs/mule-packages/lisp/lookup/lookup-compile.el
-lib/xemacs/mule-packages/lisp/lookup/lookup-compile.elc
-lib/xemacs/mule-packages/lisp/lookup/lookup-content.el
-lib/xemacs/mule-packages/lisp/lookup/lookup-content.elc
-lib/xemacs/mule-packages/lisp/lookup/lookup-defs.el
-lib/xemacs/mule-packages/lisp/lookup/lookup-defs.elc
-lib/xemacs/mule-packages/lisp/lookup/lookup-entry.el
-lib/xemacs/mule-packages/lisp/lookup/lookup-entry.elc
-lib/xemacs/mule-packages/lisp/lookup/lookup-misc.el
-lib/xemacs/mule-packages/lisp/lookup/lookup-misc.elc
-lib/xemacs/mule-packages/lisp/lookup/lookup-package.el
-lib/xemacs/mule-packages/lisp/lookup/lookup-package.elc
-lib/xemacs/mule-packages/lisp/lookup/lookup-select.el
-lib/xemacs/mule-packages/lisp/lookup/lookup-select.elc
-lib/xemacs/mule-packages/lisp/lookup/lookup-types.el
-lib/xemacs/mule-packages/lisp/lookup/lookup-types.elc
-lib/xemacs/mule-packages/lisp/lookup/lookup-utils.el
-lib/xemacs/mule-packages/lisp/lookup/lookup-utils.elc
-lib/xemacs/mule-packages/lisp/lookup/lookup-vars.el
-lib/xemacs/mule-packages/lisp/lookup/lookup-vars.elc
-lib/xemacs/mule-packages/lisp/lookup/lookup-vse.el
-lib/xemacs/mule-packages/lisp/lookup/lookup-vse.elc
-lib/xemacs/mule-packages/lisp/lookup/lookup.el
-lib/xemacs/mule-packages/lisp/lookup/lookup.elc
-lib/xemacs/mule-packages/lisp/lookup/ndcookie.el
-lib/xemacs/mule-packages/lisp/lookup/ndcookie.elc
-lib/xemacs/mule-packages/lisp/lookup/ndeb.el
-lib/xemacs/mule-packages/lisp/lookup/ndeb.elc
-lib/xemacs/mule-packages/lisp/lookup/ndic.el
-lib/xemacs/mule-packages/lisp/lookup/ndic.elc
-lib/xemacs/mule-packages/lisp/lookup/ndict.el
-lib/xemacs/mule-packages/lisp/lookup/ndict.elc
-lib/xemacs/mule-packages/lisp/lookup/ndkks.el
-lib/xemacs/mule-packages/lisp/lookup/ndkks.elc
-lib/xemacs/mule-packages/lisp/lookup/ndmisc.el
-lib/xemacs/mule-packages/lisp/lookup/ndmisc.elc
-lib/xemacs/mule-packages/lisp/lookup/ndnmz.el
-lib/xemacs/mule-packages/lisp/lookup/ndnmz.elc
-lib/xemacs/mule-packages/lisp/lookup/ndspell.el
-lib/xemacs/mule-packages/lisp/lookup/ndspell.elc
-lib/xemacs/mule-packages/lisp/lookup/ndsrd.el
-lib/xemacs/mule-packages/lisp/lookup/ndsrd.elc
-lib/xemacs/mule-packages/lisp/lookup/ndtp.el
-lib/xemacs/mule-packages/lisp/lookup/ndtp.elc
-lib/xemacs/mule-packages/lisp/lookup/sdicf.el
-lib/xemacs/mule-packages/lisp/lookup/sdicf.elc
-lib/xemacs/mule-packages/lisp/lookup/stem-english.el
-lib/xemacs/mule-packages/lisp/lookup/stem-english.elc
-lib/xemacs/mule-packages/man/lookup/lookup-guide.texi
-lib/xemacs/mule-packages/man/lookup/lookup.texi
-lib/xemacs/mule-packages/pkginfo/MANIFEST.edict
-lib/xemacs/mule-packages/pkginfo/MANIFEST.leim
-lib/xemacs/mule-packages/pkginfo/MANIFEST.lookup
-@dirrm lib/xemacs/mule-packages/man/lookup
-@dirrm lib/xemacs/mule-packages/lisp/lookup
-@dirrm lib/xemacs/mule-packages/lisp/leim/quail
-@dirrm lib/xemacs/mule-packages/lisp/leim
-@dirrm lib/xemacs/mule-packages/lisp/edict
-@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.
diff --git a/editors/xemacs-wp-packages/Makefile b/editors/xemacs-wp-packages/Makefile
index bbc949153cde..9f7b88a02b96 100644
--- a/editors/xemacs-wp-packages/Makefile
+++ b/editors/xemacs-wp-packages/Makefile
@@ -22,9 +22,10 @@ DIST_SUBDIR=	xemacs
 MAINTAINER=	kiri@FreeBSD.org
 
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/xemacs-packages
+WRKSRC=		${WRKDIR}/${PACKAGES_SUBDIR}
 
 XEMACSDIR=	${PREFIX}/lib/xemacs
+PACKAGES_SUBDIR=	xemacs-packages
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
@@ -35,9 +36,15 @@ do-extract:
 
 do-install:
 	${MKDIR} ${XEMACSDIR}
-	${CP} -Rp ${WRKDIR}/xemacs-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 set of the packages for xemacs with the wp category. You can"
 	@${ECHO_MSG} "install other packages provided by XEmacs.org with editors/xemacs-*-packages"
 	@${ECHO_MSG} "ports. These ports are prepared for corresponding XEmacs packages except for"
diff --git a/editors/xemacs-wp-packages/pkg-plist b/editors/xemacs-wp-packages/pkg-plist
index 4440c1cecb93..904ed06b456e 100644
--- a/editors/xemacs-wp-packages/pkg-plist
+++ b/editors/xemacs-wp-packages/pkg-plist
@@ -1,100 +1 @@
-lib/xemacs/xemacs-packages/etc/edt-user.doc
-lib/xemacs/xemacs-packages/etc/reftex/CHANGES
-lib/xemacs/xemacs-packages/etc/reftex/NUTSHELL
-lib/xemacs/xemacs-packages/etc/tpu-edt.xmodmap
-lib/xemacs/xemacs-packages/info/reftex.info
-lib/xemacs/xemacs-packages/info/reftex.info-1
-lib/xemacs/xemacs-packages/info/reftex.info-2
-lib/xemacs/xemacs-packages/info/reftex.info-3
-lib/xemacs/xemacs-packages/info/reftex.info-4
-lib/xemacs/xemacs-packages/info/reftex.info-5
-lib/xemacs/xemacs-packages/lisp/crisp/ChangeLog
-lib/xemacs/xemacs-packages/lisp/crisp/_pkg.el
-lib/xemacs/xemacs-packages/lisp/crisp/auto-autoloads.el
-lib/xemacs/xemacs-packages/lisp/crisp/auto-autoloads.elc
-lib/xemacs/xemacs-packages/lisp/crisp/crisp.el
-lib/xemacs/xemacs-packages/lisp/crisp/crisp.elc
-lib/xemacs/xemacs-packages/lisp/crisp/custom-load.el
-lib/xemacs/xemacs-packages/lisp/crisp/custom-load.elc
-lib/xemacs/xemacs-packages/lisp/crisp/scroll-lock.el
-lib/xemacs/xemacs-packages/lisp/crisp/scroll-lock.elc
-lib/xemacs/xemacs-packages/lisp/edt/ChangeLog
-lib/xemacs/xemacs-packages/lisp/edt/_pkg.el
-lib/xemacs/xemacs-packages/lisp/edt/auto-autoloads.el
-lib/xemacs/xemacs-packages/lisp/edt/auto-autoloads.elc
-lib/xemacs/xemacs-packages/lisp/edt/edt-lk201.el
-lib/xemacs/xemacs-packages/lisp/edt/edt-lk201.elc
-lib/xemacs/xemacs-packages/lisp/edt/edt-mapper.el
-lib/xemacs/xemacs-packages/lisp/edt/edt-mapper.elc
-lib/xemacs/xemacs-packages/lisp/edt/edt-pc.el
-lib/xemacs/xemacs-packages/lisp/edt/edt-pc.elc
-lib/xemacs/xemacs-packages/lisp/edt/edt-vt100.el
-lib/xemacs/xemacs-packages/lisp/edt/edt-vt100.elc
-lib/xemacs/xemacs-packages/lisp/edt/edt.el
-lib/xemacs/xemacs-packages/lisp/edt/edt.elc
-lib/xemacs/xemacs-packages/lisp/reftex/ChangeLog
-lib/xemacs/xemacs-packages/lisp/reftex/_pkg.el
-lib/xemacs/xemacs-packages/lisp/reftex/auto-autoloads.el
-lib/xemacs/xemacs-packages/lisp/reftex/auto-autoloads.elc
-lib/xemacs/xemacs-packages/lisp/reftex/reftex-auc.el
-lib/xemacs/xemacs-packages/lisp/reftex/reftex-auc.elc
-lib/xemacs/xemacs-packages/lisp/reftex/reftex-cite.el
-lib/xemacs/xemacs-packages/lisp/reftex/reftex-cite.elc
-lib/xemacs/xemacs-packages/lisp/reftex/reftex-dcr.el
-lib/xemacs/xemacs-packages/lisp/reftex/reftex-dcr.elc
-lib/xemacs/xemacs-packages/lisp/reftex/reftex-global.el
-lib/xemacs/xemacs-packages/lisp/reftex/reftex-global.elc
-lib/xemacs/xemacs-packages/lisp/reftex/reftex-index.el
-lib/xemacs/xemacs-packages/lisp/reftex/reftex-index.elc
-lib/xemacs/xemacs-packages/lisp/reftex/reftex-parse.el
-lib/xemacs/xemacs-packages/lisp/reftex/reftex-parse.elc
-lib/xemacs/xemacs-packages/lisp/reftex/reftex-ref.el
-lib/xemacs/xemacs-packages/lisp/reftex/reftex-ref.elc
-lib/xemacs/xemacs-packages/lisp/reftex/reftex-sel.el
-lib/xemacs/xemacs-packages/lisp/reftex/reftex-sel.elc
-lib/xemacs/xemacs-packages/lisp/reftex/reftex-toc.el
-lib/xemacs/xemacs-packages/lisp/reftex/reftex-toc.elc
-lib/xemacs/xemacs-packages/lisp/reftex/reftex-vars.el
-lib/xemacs/xemacs-packages/lisp/reftex/reftex-vars.elc
-lib/xemacs/xemacs-packages/lisp/reftex/reftex.el
-lib/xemacs/xemacs-packages/lisp/reftex/reftex.elc
-lib/xemacs/xemacs-packages/lisp/textools/ChangeLog
-lib/xemacs/xemacs-packages/lisp/textools/_pkg.el
-lib/xemacs/xemacs-packages/lisp/textools/auto-autoloads.el
-lib/xemacs/xemacs-packages/lisp/textools/auto-autoloads.elc
-lib/xemacs/xemacs-packages/lisp/textools/bib-mode.el
-lib/xemacs/xemacs-packages/lisp/textools/bib-mode.elc
-lib/xemacs/xemacs-packages/lisp/textools/bibtex.el
-lib/xemacs/xemacs-packages/lisp/textools/bibtex.elc
-lib/xemacs/xemacs-packages/lisp/textools/doctex.el
-lib/xemacs/xemacs-packages/lisp/textools/doctex.elc
-lib/xemacs/xemacs-packages/lisp/textools/refbib.el
-lib/xemacs/xemacs-packages/lisp/textools/refbib.elc
-lib/xemacs/xemacs-packages/lisp/tpu/ChangeLog
-lib/xemacs/xemacs-packages/lisp/tpu/_pkg.el
-lib/xemacs/xemacs-packages/lisp/tpu/auto-autoloads.el
-lib/xemacs/xemacs-packages/lisp/tpu/auto-autoloads.elc
-lib/xemacs/xemacs-packages/lisp/tpu/tpu-doc.el
-lib/xemacs/xemacs-packages/lisp/tpu/tpu-doc.elc
-lib/xemacs/xemacs-packages/lisp/tpu/tpu-edt.el
-lib/xemacs/xemacs-packages/lisp/tpu/tpu-edt.elc
-lib/xemacs/xemacs-packages/lisp/tpu/tpu-extras.el
-lib/xemacs/xemacs-packages/lisp/tpu/tpu-extras.elc
-lib/xemacs/xemacs-packages/lisp/tpu/tpu-mapper.el
-lib/xemacs/xemacs-packages/lisp/tpu/tpu-mapper.elc
-lib/xemacs/xemacs-packages/man/reftex/reftex.texi
-lib/xemacs/xemacs-packages/pkginfo/MANIFEST.crisp
-lib/xemacs/xemacs-packages/pkginfo/MANIFEST.edt
-lib/xemacs/xemacs-packages/pkginfo/MANIFEST.reftex
-lib/xemacs/xemacs-packages/pkginfo/MANIFEST.textools
-lib/xemacs/xemacs-packages/pkginfo/MANIFEST.tpu
-@dirrm lib/xemacs/xemacs-packages/man/reftex
-@dirrm lib/xemacs/xemacs-packages/lisp/tpu
-@dirrm lib/xemacs/xemacs-packages/lisp/textools
-@dirrm lib/xemacs/xemacs-packages/lisp/reftex
-@dirrm lib/xemacs/xemacs-packages/lisp/edt
-@dirrm lib/xemacs/xemacs-packages/lisp/crisp
-@dirrm lib/xemacs/xemacs-packages/etc/reftex
-@unexec rmdir %D/lib/xemacs/xemacs-packages/* 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/xemacs-packages 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs 2>/dev/null || true
+@comment This list is automatically generated.