Let me know if you have any questions.
Jim
Index: Makefile =================================================================== RCS file: /cvs/ports/japanese/Makefile,v retrieving revision 1.20 diff -u -r1.20 Makefile --- Makefile 2006/11/14 00:03:09 1.20 +++ Makefile 2006/11/14 14:48:58 @@ -26,6 +26,10 @@ SUBDIR += onew,wnn4 SUBDIR += onew,wnn4,canna SUBDIR += p5-Text-Kakasi +<<<<<<< Makefile + SUBDIR += sazanami-ttf +======= SUBDIR += sazanmi-ttf +>>>>>>> 1.20 .include <bsd.port.subdir.mk>