Version up to 21.1.13. Corresponding with this change,bsd.emacs.mk's

xemacs21 version will be changed by shige :)

16 files changed, 29 insertions, 46 deletions

diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index 314aa07449be..528807a88417 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
 XEMACS_REL=	21.1
-XEMACS_VER=	21.1.12
+XEMACS_VER=	21.1.13
 XEMACS_ARCH=	${CONFIGURE_TARGET}
 
 SLAVEDIRS+=	editors/xemacs21-mule
diff --git a/editors/xemacs-devel/distinfo b/editors/xemacs-devel/distinfo
index c9f3c78e0b2d..d176fe9a10dd 100644
--- a/editors/xemacs-devel/distinfo
+++ b/editors/xemacs-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (xemacs/xemacs-21.1.12.tar.gz) = 96eb9c1b011e633c3b9094515f7df95b
-MD5 (xemacs/xemacs-21.1.12-elc.tar.gz) = f8f92769624d8b698c95d290fae9ff2c
-MD5 (xemacs/xemacs-21.1.12-info.tar.gz) = 1c815ecdc153000659a7bc0c51ae5737
+MD5 (xemacs/xemacs-21.1.13.tar.gz) = a378285e382382f60183e66d16d7aa16
+MD5 (xemacs/xemacs-21.1.13-elc.tar.gz) = f2ff7fac4adcd9f5bde7e67c75e4e9a5
+MD5 (xemacs/xemacs-21.1.13-info.tar.gz) = 8cb9a86b5d68574d89662e2e6206c412
diff --git a/editors/xemacs-devel/pkg-plist b/editors/xemacs-devel/pkg-plist
index 8ab1328eb637..c1af6a53b657 100644
--- a/editors/xemacs-devel/pkg-plist
+++ b/editors/xemacs-devel/pkg-plist
@@ -14,7 +14,6 @@ bin/xemacs-%%XEMACS_VER%%
 etc/rc.d/xemacs21.sh
 @exec mkdir -p /var/run/emacs/lock ; chmod 1777 /var/run/emacs/lock
 @exec mkdir -p %D/lib/xemacs/site-lisp ; chmod 755 %D/lib/xemacs/site-lisp
-@exec mkdir -p %D/share/emacs/site-lisp ; chmod 755 %D/share/emacs/site-lisp
 lib/xemacs-%%XEMACS_VER%%/etc/BETA
 lib/xemacs-%%XEMACS_VER%%/etc/CHARSETS
 lib/xemacs-%%XEMACS_VER%%/etc/CODING-STANDARDS
@@ -942,8 +941,6 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-sun.el
 lib/xemacs-%%XEMACS_VER%%/lisp/x-win-sun.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.el
 lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/xpm-button.el
-lib/xemacs-%%XEMACS_VER%%/lisp/xpm-button.elc
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/term
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mule
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp
@@ -959,7 +956,5 @@ lib/xemacs-%%XEMACS_VER%%/lisp/xpm-button.elc
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc/custom
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc
 @dirrm lib/xemacs-%%XEMACS_VER%%
-@unexec rmdir %D/share/emacs/site-lisp 2>/dev/null || true
-@unexec rmdir %D/share/emacs 2>/dev/null || true
 @unexec rmdir %D/lib/xemacs/site-lisp 2>/dev/null || true
 @unexec rmdir %D/lib/xemacs 2>/dev/null || true
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 314aa07449be..528807a88417 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
 XEMACS_REL=	21.1
-XEMACS_VER=	21.1.12
+XEMACS_VER=	21.1.13
 XEMACS_ARCH=	${CONFIGURE_TARGET}
 
 SLAVEDIRS+=	editors/xemacs21-mule
diff --git a/editors/xemacs/distinfo b/editors/xemacs/distinfo
index c9f3c78e0b2d..d176fe9a10dd 100644
--- a/editors/xemacs/distinfo
+++ b/editors/xemacs/distinfo
@@ -1,3 +1,3 @@
-MD5 (xemacs/xemacs-21.1.12.tar.gz) = 96eb9c1b011e633c3b9094515f7df95b
-MD5 (xemacs/xemacs-21.1.12-elc.tar.gz) = f8f92769624d8b698c95d290fae9ff2c
-MD5 (xemacs/xemacs-21.1.12-info.tar.gz) = 1c815ecdc153000659a7bc0c51ae5737
+MD5 (xemacs/xemacs-21.1.13.tar.gz) = a378285e382382f60183e66d16d7aa16
+MD5 (xemacs/xemacs-21.1.13-elc.tar.gz) = f2ff7fac4adcd9f5bde7e67c75e4e9a5
+MD5 (xemacs/xemacs-21.1.13-info.tar.gz) = 8cb9a86b5d68574d89662e2e6206c412
diff --git a/editors/xemacs/pkg-plist b/editors/xemacs/pkg-plist
index 8ab1328eb637..c1af6a53b657 100644
--- a/editors/xemacs/pkg-plist
+++ b/editors/xemacs/pkg-plist
@@ -14,7 +14,6 @@ bin/xemacs-%%XEMACS_VER%%
 etc/rc.d/xemacs21.sh
 @exec mkdir -p /var/run/emacs/lock ; chmod 1777 /var/run/emacs/lock
 @exec mkdir -p %D/lib/xemacs/site-lisp ; chmod 755 %D/lib/xemacs/site-lisp
-@exec mkdir -p %D/share/emacs/site-lisp ; chmod 755 %D/share/emacs/site-lisp
 lib/xemacs-%%XEMACS_VER%%/etc/BETA
 lib/xemacs-%%XEMACS_VER%%/etc/CHARSETS
 lib/xemacs-%%XEMACS_VER%%/etc/CODING-STANDARDS
@@ -942,8 +941,6 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-sun.el
 lib/xemacs-%%XEMACS_VER%%/lisp/x-win-sun.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.el
 lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/xpm-button.el
-lib/xemacs-%%XEMACS_VER%%/lisp/xpm-button.elc
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/term
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mule
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp
@@ -959,7 +956,5 @@ lib/xemacs-%%XEMACS_VER%%/lisp/xpm-button.elc
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc/custom
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc
 @dirrm lib/xemacs-%%XEMACS_VER%%
-@unexec rmdir %D/share/emacs/site-lisp 2>/dev/null || true
-@unexec rmdir %D/share/emacs 2>/dev/null || true
 @unexec rmdir %D/lib/xemacs/site-lisp 2>/dev/null || true
 @unexec rmdir %D/lib/xemacs 2>/dev/null || true
diff --git a/editors/xemacs21-mule-common/pkg-descr b/editors/xemacs21-mule-common/pkg-descr
index eab63151383a..693523b2f6a6 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.12), the next generation of Emacs. 
+for XEmacs with Mule(version 21.1.13), the next generation of Emacs. 
 
-You must install one of packages, xemacs-mule-21.1.12,
-ja-xemacs-*-21.1.12 (ja-xemacs-canna-21.1.12, ja-xemacs-canna+freewnn-21.1.12, etc.),
-each of which contains only the executables for XEmacs with Mule(vresion 21.1.12).
+You must install one of packages, xemacs-mule-21.1.13,
+ja-xemacs-*-21.1.13 (ja-xemacs-canna-21.1.13, ja-xemacs-canna+freewnn-21.1.13, etc.),
+each of which contains only the executables for XEmacs with Mule(vresion 21.1.13).
 
 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 2729513e63df..b504f078e985 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.12 (ja-xemacs-21.1.12, ja-xemacs-canna-21.1.12, etc.)"
-echo ", each of which contains only the executables for XEmacs(version 21.1.12)"
+echo " ja-xemacs-*-21.1.13 (ja-xemacs-21.1.13, ja-xemacs-canna-21.1.13, etc.)"
+echo ", each of which contains only the executables for XEmacs(version 21.1.13)"
 echo "################################################################"
diff --git a/editors/xemacs21-mule-common/pkg-plist b/editors/xemacs21-mule-common/pkg-plist
index 495c9d2d6cf1..0d27096de826 100644
--- a/editors/xemacs21-mule-common/pkg-plist
+++ b/editors/xemacs21-mule-common/pkg-plist
@@ -935,8 +935,6 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-sun.el
 lib/xemacs-%%XEMACS_VER%%/lisp/x-win-sun.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.el
 lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/xpm-button.el
-lib/xemacs-%%XEMACS_VER%%/lisp/xpm-button.elc
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/term
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mule
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index 8b2abf33e9ef..b39024d5980c 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -23,7 +23,7 @@
 MULE_SLAVE=	yes
 .endif
 
-MAINTAINER=	kiri@kiri.toba-cmt.ac.jp
+MAINTAINER=	kiri@FreeBSD.org
 
 BUILD_DEPENDS=	${BUILD_INPUT_METHOD}
 .if defined(MULE_SLAVE)
diff --git a/editors/xemacs21-mule/pkg-descr b/editors/xemacs21-mule/pkg-descr
index 26b29cdb2748..b5d9d108a1e7 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.12), the next generation of Emacs.
+Mule(version 21.1.13), the next generation of Emacs.
 
-You need to install a package, xemacs-common-21.1.12, containing emacs
+You need to install a package, xemacs-common-21.1.13, containing emacs
 lisp files, info pages, and so on (except executables) for
-XEmacs with Mule(version 21.1.12).
+XEmacs with Mule(version 21.1.13).
 
 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, FreeWnn and Wnn6) is available.
 
-This package and the package, xemacs-common-21.1.12 are designed
+This package and the package, xemacs-common-21.1.13 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-sumo/Makefile b/editors/xemacs21-sumo/Makefile
index f6c01d84e3a2..5f6b4e21a586 100644
--- a/editors/xemacs21-sumo/Makefile
+++ b/editors/xemacs21-sumo/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	# empty
 DISTFILES=	# empty
 EXTRACT_ONLY=	# empty
 
-MAINTAINER=	kiri@pis.toba-cmt.ac.jp
+MAINTAINER=	kiri@FreeBSD.org
 
 .if defined(NAMEPREFIX) && ${NAMEPREFIX} == "mule-" || \
 	defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} != ""
@@ -28,7 +28,7 @@ NO_BUILD=	yes
 
 XEMACS_MAJOR_VER=	21
 XEMACS_REL=		21.1
-XEMACS_VER=		21.1.12
+XEMACS_VER=		21.1.13
 XEMACS_ARCH=		${MACHINE_ARCH}--freebsd
 
 do-install:		# empty
diff --git a/editors/xemacs21/Makefile b/editors/xemacs21/Makefile
index 314aa07449be..528807a88417 100644
--- a/editors/xemacs21/Makefile
+++ b/editors/xemacs21/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
 XEMACS_REL=	21.1
-XEMACS_VER=	21.1.12
+XEMACS_VER=	21.1.13
 XEMACS_ARCH=	${CONFIGURE_TARGET}
 
 SLAVEDIRS+=	editors/xemacs21-mule
diff --git a/editors/xemacs21/distinfo b/editors/xemacs21/distinfo
index c9f3c78e0b2d..d176fe9a10dd 100644
--- a/editors/xemacs21/distinfo
+++ b/editors/xemacs21/distinfo
@@ -1,3 +1,3 @@
-MD5 (xemacs/xemacs-21.1.12.tar.gz) = 96eb9c1b011e633c3b9094515f7df95b
-MD5 (xemacs/xemacs-21.1.12-elc.tar.gz) = f8f92769624d8b698c95d290fae9ff2c
-MD5 (xemacs/xemacs-21.1.12-info.tar.gz) = 1c815ecdc153000659a7bc0c51ae5737
+MD5 (xemacs/xemacs-21.1.13.tar.gz) = a378285e382382f60183e66d16d7aa16
+MD5 (xemacs/xemacs-21.1.13-elc.tar.gz) = f2ff7fac4adcd9f5bde7e67c75e4e9a5
+MD5 (xemacs/xemacs-21.1.13-info.tar.gz) = 8cb9a86b5d68574d89662e2e6206c412
diff --git a/editors/xemacs21/pkg-plist b/editors/xemacs21/pkg-plist
index 8ab1328eb637..c1af6a53b657 100644
--- a/editors/xemacs21/pkg-plist
+++ b/editors/xemacs21/pkg-plist
@@ -14,7 +14,6 @@ bin/xemacs-%%XEMACS_VER%%
 etc/rc.d/xemacs21.sh
 @exec mkdir -p /var/run/emacs/lock ; chmod 1777 /var/run/emacs/lock
 @exec mkdir -p %D/lib/xemacs/site-lisp ; chmod 755 %D/lib/xemacs/site-lisp
-@exec mkdir -p %D/share/emacs/site-lisp ; chmod 755 %D/share/emacs/site-lisp
 lib/xemacs-%%XEMACS_VER%%/etc/BETA
 lib/xemacs-%%XEMACS_VER%%/etc/CHARSETS
 lib/xemacs-%%XEMACS_VER%%/etc/CODING-STANDARDS
@@ -942,8 +941,6 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-sun.el
 lib/xemacs-%%XEMACS_VER%%/lisp/x-win-sun.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.el
 lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc
-lib/xemacs-%%XEMACS_VER%%/lisp/xpm-button.el
-lib/xemacs-%%XEMACS_VER%%/lisp/xpm-button.elc
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/term
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mule
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp
@@ -959,7 +956,5 @@ lib/xemacs-%%XEMACS_VER%%/lisp/xpm-button.elc
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc/custom
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc
 @dirrm lib/xemacs-%%XEMACS_VER%%
-@unexec rmdir %D/share/emacs/site-lisp 2>/dev/null || true
-@unexec rmdir %D/share/emacs 2>/dev/null || true
 @unexec rmdir %D/lib/xemacs/site-lisp 2>/dev/null || true
 @unexec rmdir %D/lib/xemacs 2>/dev/null || true
diff --git a/japanese/xemacs21-canna/pkg-descr b/japanese/xemacs21-canna/pkg-descr
index 4f155794ff24..df1f80139f5d 100644
--- a/japanese/xemacs21-canna/pkg-descr
+++ b/japanese/xemacs21-canna/pkg-descr
@@ -1,9 +1,9 @@
 This is a package containing only the executables for XEmacs with
-Mule(version 21.1.12), the next generation of Emacs.
+Mule(version 21.1.13), the next generation of Emacs.
 
-You need to install a package, xemacs-common-21.1.12, containing emacs
+You need to install a package, xemacs-common-21.1.13, containing emacs
 lisp files, info pages, and so on (except executables) for
-XEmacs with Mule(version 21.1.12).
+XEmacs with Mule(version 21.1.13).
 
 This package is built with Japanese support by using SKK, SJ3, Canna,
 Wnn4 or Wnn6 as an external input engine. Each input method would be
@@ -19,7 +19,7 @@ If you use with SJ3 or SKK, you should be installed sj3serv or skkserv
 in advance. SKK is supported as already builtin. Also it will
 support several input methods under leim. 
 
-This package and the package xemacs-common-21.1.12, might clobber any
+This package and the package xemacs-common-21.1.13, might clobber any
 existing emacs installation.  In particular, the executables and man
 pages of etags/ctags are installed, and the info pages that come with
 the original emacs will be overwritten too.