Revived COMMENT, DESCR in these ports and then modified about it.

PR:		15331
Submitted by:	maintainer

4 files changed, 59 insertions, 8 deletions

diff --git a/editors/xemacs21-mule-common/Makefile b/editors/xemacs21-mule-common/Makefile
index b87a2dc9ad01..4bdd30669033 100644
--- a/editors/xemacs21-mule-common/Makefile
+++ b/editors/xemacs21-mule-common/Makefile
@@ -51,7 +51,7 @@ MAN1=		ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
 INSTALL_TARGET=	install-arch-indep
 PKGINSTALL=	${WRKDIR}/INSTALL.${PKGNAME}
 PLIST=		${PKGDIR}/PLIST
-DESCR=		${WRKDIR}/DESCR.${PKGNAME}
+# DESCR=		${WRKDIR}/DESCR.${PKGNAME}
 PLIST_SUB=	XEMACS_DIR=${XEMACS_DIR}
 PKGINSTALL=	${WRKDIR}/INSTALL
 TMPPLIST=	${WRKDIR}/.PLIST.mktmp-${PKGNAME}
@@ -75,8 +75,6 @@ pre-install:
 		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/lib/xemacs/info/dir; \
 	fi
 	@${SED} -e "s/%%XEMACS_VER%%/${XEMACS_VER}/g" \
-		${DESCR_TMPL} > ${DESCR}
-	@${SED} -e "s/%%XEMACS_VER%%/${XEMACS_VER}/g" \
 		${INSTALL_TMPL} > ${PKGINSTALL}
 
 post-install::
diff --git a/editors/xemacs21-mule-common/pkg-descr b/editors/xemacs21-mule-common/pkg-descr
new file mode 100644
index 000000000000..b30a9e36a7f4
--- /dev/null
+++ b/editors/xemacs21-mule-common/pkg-descr
@@ -0,0 +1,18 @@
+This is XEmacs lisp files, info pages, and so on (except executables)
+for XEmacs with Mule(version 21.1.8), the next generation of Emacs. 
+
+You must install one of packages, xemacs-mule-21.1.8,
+ja-xemacs-*-21.1.8 (ja-xemacs-canna-21.1.8, ja-xemacs-canna+wnn4-21.1.8, etc.),
+each of which contains only the executables for XEmacs with Mule(vresion 21.1.8).
+
+This package and the above package of the executables *will* clobber any
+existing XEmacs installation.  In particular, the executables and man
+pages of etags/ctags are installed, and the info pages that come with
+the original emacs get installed too.
+
+Although this shouldn't cause any problems to run both mule and emacs,
+it may cause some confusion when one of them is pkg_delete'd.  If
+someone has a solution to this, please tell me.
+
+-- 
+Kazz
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index b226981feebd..d094aef89b11 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -82,7 +82,6 @@ INSTALL_COOKIE=	${WRKDIR}/.install_done-${PKGNAME}
 PACKAGE_COOKIE=	${WRKDIR}/.package_done-${PKGNAME}
 STRIP=
 INSTALL_TARGET?=install-arch-dep
-DESCR?=		${WRKDIR}/DESCR
 PLIST?=		${PKGLDIR}/PLIST
 PLIST_SUB?=	XEMACS_DIR=${XEMACS_DIR} ARCH_SUBDIR=${ARCH_SUBDIR} EMACS_CMD=${EMACS_CMD}
 
@@ -102,10 +101,6 @@ WITH_INPUT_METHOD?=	--with-canna=no --with-wnn=no --with-wnn6=no
 .endif
 
 .if !defined(MULE_COMMON)
-post-configure::
-	@${SED} -e "s/%%XEMACS_VER%%/${XEMACS_VER}/g" \
-		${DESCR_TMPL} > ${DESCR}
-
 pre-build:
 	@find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
 	@${RM} -f ${WRKSRC}/lib-src/DOC* ${WRKSRC}/src/xemacs
@@ -126,4 +121,10 @@ post-install::
 post-package:
 	@${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE}
 
+# for make DESCR (only maintainer use)
+arrange::
+	@${MKDIR} ${PKGDIR}
+	@${SED} -e "s/%%XEMACS_VER%%/${XEMACS_VER}/g" \
+		${DESCR_TMPL} > ${DESCR}
+
 .include <bsd.port.mk>
diff --git a/editors/xemacs21-mule/pkg-descr b/editors/xemacs21-mule/pkg-descr
new file mode 100644
index 000000000000..91afef983fcf
--- /dev/null
+++ b/editors/xemacs21-mule/pkg-descr
@@ -0,0 +1,34 @@
+This is a package containing only the executables for XEmacs with
+Mule(version 21.1.8), the next generation of Emacs.
+
+You need to install a package, xemacs-common-21.1.8, containing emacs
+lisp files, info pages, and so on (except executables) for
+XEmacs with Mule(version 21.1.8).
+
+This package is not built with any particular language support except for
+already built-in Imput Method - SKK and SJ3.  If you want other built-in
+input method, look into the xemacs ports in language- specific directories.
+Currently only Japanese (Canna,Wnn4 and Wnn6) is available.
+
+This package and the package, xemacs-common-21.1.8 are designed
+*not* to clobber any existing emacs installation.  In particular, the
+executables and man pages of etags/ctags are not installed, and the
+info pages that come with the original emacs don't get installed too.
+The Japanese version is build to install everything, by the way.
+This is a package containing only the executables for XEmacs with
+Mule(version 21.1.8), the next generation of Emacs.
+
+You need to install a package, xemacs-common-21.1.8, containing emacs
+lisp files, info pages, and so on (except executables) for
+XEmacs with Mule(version 21.1.8).
+
+This package is not built with any particular language support except for
+already built-in Imput Method - SKK and SJ3.  If you want other built-in
+input method, look into the xemacs ports in language- specific directories.
+Currently only Japanese (Canna,Wnn4 and Wnn6) is available.
+
+This package and the package, xemacs-common-21.1.8 are designed
+*not* to clobber any existing emacs installation.  In particular, the
+executables and man pages of etags/ctags are not installed, and the
+info pages that come with the original emacs don't get installed too.
+The Japanese version is build to install everything, by the way.