Revert last change and instead restore the previous work-around for

PR pkg/39778 which is less invasive.

4 files changed, 31 insertions, 38 deletions

diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index 77d097a7872..a84c307bb62 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2011/07/21 01:17:42 tron Exp $
+# $NetBSD: Makefile,v 1.17 2011/07/21 01:35:44 tron Exp $
 
 PKGNAME?=	${DISTNAME}
 COMMENT?=	GNU editing macros (editor)
 
 DISTNAME=	emacs-22.3
-PKGREVISION=	15
+PKGREVISION=	14
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
 
@@ -74,11 +74,6 @@ 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 2b00035caa3..c276d8067e5 100644
--- a/editors/emacs22/PLIST
+++ b/editors/emacs22/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2011/07/21 01:17:42 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/07/21 01:35:44 tron Exp $
 bin/emacs-b2m
 bin/emacs-ctags
 bin/emacs-ebrowse
@@ -568,12 +568,18 @@ 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
@@ -586,6 +592,8 @@ 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
@@ -636,6 +644,10 @@ 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
@@ -650,6 +662,10 @@ 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/hacks.mk b/editors/emacs22/hacks.mk
index 0216de6f684..8ae5ca2f698 100644
--- a/editors/emacs22/hacks.mk
+++ b/editors/emacs22/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.4 2011/07/20 23:41:12 tron Exp $
+# $NetBSD: hacks.mk,v 1.5 2011/07/21 01:35:44 tron Exp $
 
 .if !defined(EMACS_HACKS_MK)
 EMACS_HACKS_MK=	defined
@@ -9,11 +9,19 @@ EMACS_HACKS_MK=	defined
 ### On NetBSD/i386, gcc optimisation, at least for version 4.5.3 produces a
 ### "temacs" binary which segfaults.
 ###
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
-.  if !empty(CC_VERSION:Mgcc-4.5.*)
+.  if !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
+.    if !empty(CC_VERSION:Mgcc-4.5.*)
 PKG_HACKS+=		optimisation
 BUILDLINK_TRANSFORM+=	rename:-O[0-9]*:-O0
+.    endif
+.  endif
+
+###
+### Workaround for PR pkg/39778
+###
+.  if !empty(MACHINE_PLATFORM:MNetBSD-[4-9].*-x86_64)
+pre-build:
+	${TOUCH} ${WRKSRC}/leim/quail/tsang-b5.el
 .  endif
-.endif
 
 .endif  # EMACS_HACKS_MK
diff --git a/editors/emacs22/patches/patch-ag b/editors/emacs22/patches/patch-ag
deleted file mode 100644
index 817a5ee80f8..00000000000
--- a/editors/emacs22/patches/patch-ag
+++ /dev/null
@@ -1,26 +0,0 @@
-$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}