Update to 21.1.11.

PR:		ports/20243
Submitted by:	KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>

6 files changed, 22 insertions, 21 deletions

diff --git a/editors/xemacs21-mule-common/pkg-descr b/editors/xemacs21-mule-common/pkg-descr
index 7a8c079f2e6b..74f97e16245d 100644
--- a/editors/xemacs21-mule-common/pkg-descr
+++ b/editors/xemacs21-mule-common/pkg-descr
@@ -1,9 +1,9 @@
 This is XEmacs lisp files, info pages, and so on (except executables)
-for XEmacs with Mule(version 21.1.10), the next generation of Emacs. 
+for XEmacs with Mule(version 21.1.11), the next generation of Emacs. 
 
-You must install one of packages, xemacs-mule-21.1.10,
-ja-xemacs-*-21.1.10 (ja-xemacs-canna-21.1.10, ja-xemacs-canna+wnn4-21.1.10, etc.),
-each of which contains only the executables for XEmacs with Mule(vresion 21.1.10).
+You must install one of packages, xemacs-mule-21.1.11,
+ja-xemacs-*-21.1.11 (ja-xemacs-canna-21.1.11, ja-xemacs-canna+wnn4-21.1.11, etc.),
+each of which contains only the executables for XEmacs with Mule(vresion 21.1.11).
 
 This package and the above package of the executables *will* clobber any
 existing XEmacs installation.  In particular, the executables and man
diff --git a/editors/xemacs21-mule-common/pkg-install b/editors/xemacs21-mule-common/pkg-install
index 053667e8e29a..1435b0c0cbcf 100644
--- a/editors/xemacs21-mule-common/pkg-install
+++ b/editors/xemacs21-mule-common/pkg-install
@@ -2,6 +2,6 @@
 if [ "$2" != "POST-INSTALL" ]; then exit 0; fi
 echo "################################################################"
 echo "You must install one of packages, xemacs-mule and "
-echo " ja-xemacs-*-21.1.10 (ja-xemacs-21.1.10, ja-xemacs-canna-21.1.10, etc.)"
-echo ", each of which contains only the executables for XEmacs(version 21.1.10)"
+echo " ja-xemacs-*-21.1.11 (ja-xemacs-21.1.11, ja-xemacs-canna-21.1.11, etc.)"
+echo ", each of which contains only the executables for XEmacs(version 21.1.11)"
 echo "################################################################"
diff --git a/editors/xemacs21-mule-common/pkg-plist b/editors/xemacs21-mule-common/pkg-plist
index 43a9eac43d2b..d41a0d9e722b 100644
--- a/editors/xemacs21-mule-common/pkg-plist
+++ b/editors/xemacs21-mule-common/pkg-plist
@@ -395,6 +395,7 @@ lib/xemacs-%%XEMACS_VER%%/info/cl.info-4
 lib/xemacs-%%XEMACS_VER%%/info/cl.info-5
 lib/xemacs-%%XEMACS_VER%%/info/cl.info-6
 lib/xemacs-%%XEMACS_VER%%/info/custom.info
+lib/xemacs-%%XEMACS_VER%%/info/dir
 lib/xemacs-%%XEMACS_VER%%/info/external-widget.info
 lib/xemacs-%%XEMACS_VER%%/info/info.info
 lib/xemacs-%%XEMACS_VER%%/info/internals.info
@@ -950,5 +951,4 @@ lib/xemacs-%%XEMACS_VER%%/lisp/xpm-button.elc
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc/eos
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc/custom
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc
-@unexec rmdir %D/lib/xemacs-%%XEMACS_VER%% 2>/dev/null || true
-@unexec rmdir %D/etc/rc.d 2>/dev/null || true
+@unexec rmdir %%PREFIX%%/lib/xemacs-%%XEMACS_VER%% 2>/dev/null || true
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index 27de45d493b4..81d11f33cc44 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -24,8 +24,6 @@ MULE_SLAVE=	yes
 
 MAINTAINER=	kiri@kiri.toba-cmt.ac.jp
 
-#BUILD_DEPENDS=	${LOCALBASE}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-devel:${PORTSDIR}/editors/xemacs-packages \
-#		${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-basic-mule-packages \
 BUILD_DEPENDS=	${BUILD_INPUT_METHOD}
 .if defined(MULE_SLAVE)
 RUN_DEPENDS=	${LOCALBASE}/lib/xemacs-${XEMACS_VER}/lisp/x-win-xfree86.elc:${PORTSDIR}/editors/xemacs${XEMACS_MAJOR_VER}-mule-common \
@@ -34,6 +32,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/xemacs-${XEMACS_VER}/lisp/x-win-xfree86.elc:${PORT
 RUN_DEPENDS=	${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-basic-mule-packages
 .endif
 LIB_DEPENDS=	compface.1:${PORTSDIR}/mail/faces \
+		intl.1:${PORTSDIR}/devel/gettext \
 		${LIB_INPUT_METHOD}
 
 CONFIGURE_ARGS?=${XEMACS_ARCH} \
@@ -120,6 +119,7 @@ post-package:
 #.if (${PKGNAMESUFFIX} == "-mule")
 #	${RM} -f ${WRKPLIST}
 #	if [ -f ${PLIST} ]; then ${MV} ${PLIST} ${PLIST}.org; fi
+#	${MAKE} build
 #	${MAKE} DIRRM2RMDIRS="lib/xemacs/mule-packages/etc lib/xemacs/mule-packages lib/xemacs/mule-packages/etc/app-defaults" \
 #		DIRRMDEPTH=2 plist
 #	${RM} -f ${PLIST}.org
@@ -128,7 +128,8 @@ post-package:
 #	${RM} -f ${WRKPLIST}.tmp
 #	if [ -f ${PLIST} ]; then ${MV} ${PLIST} ${PLIST}.org; fi
 #	${TOUCH} ${PLIST}
-#	${MAKE} DIRRM2RMDIRS="lib/xemacs-${XEMACS_VER} etc/rc.d" \
+#	${MAKE} build
+#	${MAKE} DIRRM2RMDIRS="lib/xemacs-${XEMACS_VER}" PLIST_EXCLS="etc/rc.d" \
 #		DIRRMDEPTH=1 plist
 #.for dirp in site mule xemacs
 #.for dir in etc info man pkginfo
@@ -146,7 +147,7 @@ post-package:
 #	fi
 #	${RM} -f ${PLIST}.org
 #.endif
-#
+
 .if ${PKGNAMESUFFIX} != "-mule-common"
 pre-plist:
 	@${ECHO} "===> pre-plist of ${PKGNAME}"
diff --git a/editors/xemacs21-mule/pkg-descr b/editors/xemacs21-mule/pkg-descr
index 119cd11d7588..7041c608bfaa 100644
--- a/editors/xemacs21-mule/pkg-descr
+++ b/editors/xemacs21-mule/pkg-descr
@@ -1,16 +1,16 @@
 This is a package containing only the executables for XEmacs with
-Mule(version 21.1.10), the next generation of Emacs.
+Mule(version 21.1.11), the next generation of Emacs.
 
-You need to install a package, xemacs-common-21.1.10, containing emacs
+You need to install a package, xemacs-common-21.1.11, containing emacs
 lisp files, info pages, and so on (except executables) for
-XEmacs with Mule(version 21.1.10).
+XEmacs with Mule(version 21.1.11).
 
 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.10 are designed
+This package and the package, xemacs-common-21.1.11 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.
diff --git a/editors/xemacs21-mule/pkg-plist b/editors/xemacs21-mule/pkg-plist
index b97b3c998b7e..ea3d897e5f06 100644
--- a/editors/xemacs21-mule/pkg-plist
+++ b/editors/xemacs21-mule/pkg-plist
@@ -28,9 +28,9 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/sorted-doc
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/vcdiff
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/wakeup
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/yow
-@exec ln -sf ja %D/lib/xemacs/mule-packages/etc/app-defaults/ja_JP.EUC
-@unexec rm -f %D/lib/xemacs/mule-packages/etc/app-defaults/ja_JP.EUC
-@unexec rmdir %D/lib/xemacs/mule-packages/etc/app-defaults 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/mule-packages/etc 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/mule-packages 2>/dev/null || true
+@exec ln -sf ja %%PREFIX%%/lib/xemacs/mule-packages/etc/app-defaults/ja_JP.EUC
+@unexec rm -f %%PREFIX%%/lib/xemacs/mule-packages/etc/app-defaults/ja_JP.EUC
+@unexec rmdir %%PREFIX%%/lib/xemacs/mule-packages/etc/app-defaults 2>/dev/null || true
+@unexec rmdir %%PREFIX%%/lib/xemacs/mule-packages/etc 2>/dev/null || true
+@unexec rmdir %%PREFIX%%/lib/xemacs/mule-packages 2>/dev/null || true
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%