Replace use of traditional CPP with AWK. This fixes one expansion bug

and additionally works with clang. Discussed with obache.

4 files changed, 47 insertions, 3 deletions

diff --git a/inputmethod/canna-lib/Makefile b/inputmethod/canna-lib/Makefile
index 9b2360339d3..9360fbc44ef 100644
--- a/inputmethod/canna-lib/Makefile
+++ b/inputmethod/canna-lib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2010/05/28 11:06:34 obache Exp $
+# $NetBSD: Makefile,v 1.13 2012/07/03 17:44:39 joerg Exp $
 
-PKGREVISION=	2
+PKGREVISION=	3
 CANNA_MODULE=	lib
 
 PKG_DESTDIR_SUPPORT= user-destdir
@@ -21,6 +21,11 @@ post-patch:
 		> ${WRKSRC}/cmd/${f}/Imakefile
 .endfor
 
+MAKE_ENV+=	AWK=${AWK:Q}
+
+post-extract:
+	${CP} ${FILESDIR}/dic-phono-filter.awk ${WRKSRC}/dic/phono/
+
 post-configure:
 	@${LN} -s ${WRKSRC}/server/*.h ${WRKSRC}/include
 
diff --git a/inputmethod/canna/distinfo b/inputmethod/canna/distinfo
index 96d408a61e5..bc0943882dd 100644
--- a/inputmethod/canna/distinfo
+++ b/inputmethod/canna/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2011/12/07 16:05:59 roy Exp $
+$NetBSD: distinfo,v 1.11 2012/07/03 17:44:39 joerg Exp $
 
 SHA1 (Canna36p4.tar.gz) = 4edc22e2e4e5c6db42daa2083fabb53aa1ae8168
 RMD160 (Canna36p4.tar.gz) = 7f8bb7f5d87e6b939ff2b84edf58072c75a5d09d
@@ -19,3 +19,4 @@ SHA1 (patch-am) = 756aed6fc81a9d75a55d123c8dc00c0932b8df7f
 SHA1 (patch-an) = ef892b0837e7b3b5b569a7a9a518df2379c43f1c
 SHA1 (patch-ao) = c577319f50df6624333726cd62b48d869989d881
 SHA1 (patch-ap) = 3f514037c4d67b2e18b27285370fe2ea84d977cc
+SHA1 (patch-dic_phono_Imakefile) = 3192d7c6e38caf2e5e8378283d673df29c2dc430
diff --git a/inputmethod/canna/files/dic-phono-filter.awk b/inputmethod/canna/files/dic-phono-filter.awk
new file mode 100644
index 00000000000..1590c18f381
--- /dev/null
+++ b/inputmethod/canna/files/dic-phono-filter.awk
@@ -0,0 +1,13 @@
+BEGIN {
+	skip = 0
+}
+
+/^#ifdef SHIFT/ { skip = 0 }
+/^#ifdef ASCII/ { skip = 1 }
+/^#ifndef SHIFT/ { skip = 1 }
+/^#ifndef ASCII/ { skip = 0 }
+/^#else/ { skip = !skip }
+/^#endif/ { skip = 0 }
+/^#/ { next; }
+
+{ if (!skip) print }
diff --git a/inputmethod/canna/patches/patch-dic_phono_Imakefile b/inputmethod/canna/patches/patch-dic_phono_Imakefile
new file mode 100644
index 00000000000..25de41be927
--- /dev/null
+++ b/inputmethod/canna/patches/patch-dic_phono_Imakefile
@@ -0,0 +1,25 @@
+$NetBSD: patch-dic_phono_Imakefile,v 1.1 2012/07/03 17:44:39 joerg Exp $
+
+--- dic/phono/Imakefile.orig	2012-06-17 06:10:27.000000000 +0000
++++ dic/phono/Imakefile
+@@ -54,16 +54,16 @@ AllTarget($(ROMKANA_TABLES))
+ 
+ #ifdef __EMX__
+ .kpdef.kp:
+-	$(FORCPP) -7 < $< | $(CPP) $(ROMAJI_DIC_DEF) | $(FORCPP) -8 | $(KPDIC) > $@
++	$(FORCPP) -7 < $< | tee ${.TARGET}.before | ${AWK} -f dic-phono-filter.awk | tee ${.TARGET}.after |$(FORCPP) -8 | $(KPDIC) > $@
+ 
+ .kpdef.cbp:
+-	$(FORCPP) -7 < $< | $(CPP) $(ROMAJI_DIC_DEF) | $(FORCPP) -8 | $(KPDIC) > $@
++	$(FORCPP) -7 < $< | tee ${.TARGET}.before | ${AWK} -f dic-phono-filter.awk  | tee ${.TARGET}.after | $(FORCPP) -8 | $(KPDIC) > $@
+ #else
+ .kpdef.kp:
+-	$(FORCPP) -7 < $< | $(CPP) $(ROMAJI_DIC_DEF) | $(FORCPP) -8 | $(KPDIC) > `basename $< '.kpdef'`.kp
++	$(FORCPP) -7 < $< | tee ${.TARGET}.before | ${AWK} -f dic-phono-filter.awk  | tee ${.TARGET}.after | $(FORCPP) -8 | $(KPDIC) > `basename $< '.kpdef'`.kp
+ 
+ .kpdef.cbp:
+-	$(FORCPP) -7 < $< | $(CPP) $(ROMAJI_DIC_DEF) | $(FORCPP) -8 | $(KPDIC) > `basename $< '.kpdef'`.cbp
++	$(FORCPP) -7 < $< | tee ${.TARGET}.before | ${AWK} -f dic-phono-filter.awk  | tee ${.TARGET}.after | $(FORCPP) -8 | $(KPDIC) > `basename $< '.kpdef'`.cbp
+ #endif
+ 
+ MakeDirectories(install,$(DICDIR))