Don't install certain input methods whose build is unreliable on

64bit platforms. This fixes PR pkg/39778 by myself.

4 files changed, 36 insertions, 20 deletions

diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index 997dd630bfa..77d097a7872 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2011/07/20 23:29:27 tron Exp $
+# $NetBSD: Makefile,v 1.16 2011/07/21 01:17:42 tron Exp $
 
 PKGNAME?=	${DISTNAME}
 COMMENT?=	GNU editing macros (editor)
 
 DISTNAME=	emacs-22.3
-PKGREVISION=	14
+PKGREVISION=	15
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
 
@@ -74,6 +74,11 @@ post-extract:
 	cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
 	${CHMOD} -R go-w ${WRKSRC}
 
+post-install:
+	cd ${DESTDIR}${PREFIX}/share/emacs/${PKGVERSION_NOREV}/leim/quail && \
+	rm -f CTLau-b5.el CTLau.el PY.el ZIRANMA.el quick-b5.el quick-cns.el \
+	  tsang-b5.el tsang-cns.el
+
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"
 
diff --git a/editors/emacs22/PLIST b/editors/emacs22/PLIST
index 8248443769a..2b00035caa3 100644
--- a/editors/emacs22/PLIST
+++ b/editors/emacs22/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/08/05 10:30:29 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2011/07/21 01:17:42 tron Exp $
 bin/emacs-b2m
 bin/emacs-ctags
 bin/emacs-ebrowse
@@ -568,18 +568,12 @@ share/emacs/${PKGVERSION}/leim/quail/ARRAY30.el.gz
 share/emacs/${PKGVERSION}/leim/quail/ARRAY30.elc
 share/emacs/${PKGVERSION}/leim/quail/CCDOSPY.el.gz
 share/emacs/${PKGVERSION}/leim/quail/CCDOSPY.elc
-share/emacs/${PKGVERSION}/leim/quail/CTLau-b5.el.gz
-share/emacs/${PKGVERSION}/leim/quail/CTLau-b5.elc
-share/emacs/${PKGVERSION}/leim/quail/CTLau.el.gz
-share/emacs/${PKGVERSION}/leim/quail/CTLau.elc
 share/emacs/${PKGVERSION}/leim/quail/ECDICT.el.gz
 share/emacs/${PKGVERSION}/leim/quail/ECDICT.elc
 share/emacs/${PKGVERSION}/leim/quail/ETZY.el.gz
 share/emacs/${PKGVERSION}/leim/quail/ETZY.elc
 share/emacs/${PKGVERSION}/leim/quail/PY-b5.el.gz
 share/emacs/${PKGVERSION}/leim/quail/PY-b5.elc
-share/emacs/${PKGVERSION}/leim/quail/PY.el.gz
-share/emacs/${PKGVERSION}/leim/quail/PY.elc
 share/emacs/${PKGVERSION}/leim/quail/Punct-b5.el.gz
 share/emacs/${PKGVERSION}/leim/quail/Punct-b5.elc
 share/emacs/${PKGVERSION}/leim/quail/Punct.el.gz
@@ -592,8 +586,6 @@ share/emacs/${PKGVERSION}/leim/quail/SW.el.gz
 share/emacs/${PKGVERSION}/leim/quail/SW.elc
 share/emacs/${PKGVERSION}/leim/quail/TONEPY.el.gz
 share/emacs/${PKGVERSION}/leim/quail/TONEPY.elc
-share/emacs/${PKGVERSION}/leim/quail/ZIRANMA.el.gz
-share/emacs/${PKGVERSION}/leim/quail/ZIRANMA.elc
 share/emacs/${PKGVERSION}/leim/quail/ZOZY.el.gz
 share/emacs/${PKGVERSION}/leim/quail/ZOZY.elc
 share/emacs/${PKGVERSION}/leim/quail/croatian.el.gz
@@ -644,10 +636,6 @@ share/emacs/${PKGVERSION}/leim/quail/py-punct.el.gz
 share/emacs/${PKGVERSION}/leim/quail/py-punct.elc
 share/emacs/${PKGVERSION}/leim/quail/pypunct-b5.el.gz
 share/emacs/${PKGVERSION}/leim/quail/pypunct-b5.elc
-share/emacs/${PKGVERSION}/leim/quail/quick-b5.el.gz
-share/emacs/${PKGVERSION}/leim/quail/quick-b5.elc
-share/emacs/${PKGVERSION}/leim/quail/quick-cns.el.gz
-share/emacs/${PKGVERSION}/leim/quail/quick-cns.elc
 share/emacs/${PKGVERSION}/leim/quail/rfc1345.el.gz
 share/emacs/${PKGVERSION}/leim/quail/rfc1345.elc
 share/emacs/${PKGVERSION}/leim/quail/sgml-input.el.gz
@@ -662,10 +650,6 @@ share/emacs/${PKGVERSION}/leim/quail/thai.el.gz
 share/emacs/${PKGVERSION}/leim/quail/thai.elc
 share/emacs/${PKGVERSION}/leim/quail/tibetan.el.gz
 share/emacs/${PKGVERSION}/leim/quail/tibetan.elc
-share/emacs/${PKGVERSION}/leim/quail/tsang-b5.el.gz
-share/emacs/${PKGVERSION}/leim/quail/tsang-b5.elc
-share/emacs/${PKGVERSION}/leim/quail/tsang-cns.el.gz
-share/emacs/${PKGVERSION}/leim/quail/tsang-cns.elc
 share/emacs/${PKGVERSION}/leim/quail/uni-input.el.gz
 share/emacs/${PKGVERSION}/leim/quail/uni-input.elc
 share/emacs/${PKGVERSION}/leim/quail/viqr.el.gz
diff --git a/editors/emacs22/distinfo b/editors/emacs22/distinfo
index 387cff814f0..b835796332a 100644
--- a/editors/emacs22/distinfo
+++ b/editors/emacs22/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2011/01/14 11:06:52 tron Exp $
+$NetBSD: distinfo,v 1.10 2011/07/21 01:17:42 tron Exp $
 
 SHA1 (emacs-22.3.tar.gz) = 5e9b3e0205099a83be7198fd43ba1c9442a3feb0
 RMD160 (emacs-22.3.tar.gz) = a7eed5099d0cab25f34152f1b18b5c1b4e2e0746
@@ -9,6 +9,7 @@ SHA1 (patch-ac) = c36626c2639b6aedf9ba6f90962e9a858fdec0a8
 SHA1 (patch-ad) = b45adb120cca8fd294cdcefbb706d01319f98131
 SHA1 (patch-ae) = 5468981ef9a5ba21460b4549804d49b1c66a968f
 SHA1 (patch-af) = 9a30adf280d660c58e841ddb25dfcf1613a5f9fe
+SHA1 (patch-ag) = 4c8ca4878f4688900222cd273d9beb1fe25e1d14
 SHA1 (patch-aj) = 21627a4528d28b666aa0f708359a617bf3253aaa
 SHA1 (patch-ak) = 8d640bf8f16bb0396c51626d611ad472fa0b9f9c
 SHA1 (patch-am) = 3e5a6501b1b7bd7a15a14e5fc4476c6c589b7831
diff --git a/editors/emacs22/patches/patch-ag b/editors/emacs22/patches/patch-ag
new file mode 100644
index 00000000000..817a5ee80f8
--- /dev/null
+++ b/editors/emacs22/patches/patch-ag
@@ -0,0 +1,26 @@
+$NetBSD: patch-ag,v 1.1 2011/07/21 01:18:21 tron Exp $
+
+Disable build of input methods which doesn't work reliable:
+
+http://lists.gnu.org/archive/html/bug-gnu-emacs/2009-01/msg00925.html
+http://osdir.com/ml/bug-gnu-emacs-gnu/2010-03/msg00296.html
+
+--- leim/Makefile.in.orig	2008-01-07 08:09:43.000000000 +0000
++++ leim/Makefile.in	2011-07-21 01:58:44.000000000 +0100
+@@ -132,15 +132,7 @@
+ 	${srcdir}/quail/georgian.elc \
+ 	${srcdir}/quail/sisheng.elc
+ 
+-MISC= \
+-	quail/tsang-b5.elc	\
+-	quail/quick-b5.elc	\
+-	quail/tsang-cns.elc	\
+-	quail/quick-cns.elc	\
+-	quail/PY.elc		\
+-	quail/ZIRANMA.elc	\
+-	quail/CTLau.elc		\
+-	quail/CTLau-b5.elc
++MISC=
+ 
+ CHINESE=${CHINESE-GB} ${CHINESE-BIG5}
+ EASTASIA=${CHINESE} ${JAPANESE} ${KOREAN}