diff -urN tdiary.orig/Makefile tdiary/Makefile
--- tdiary.orig/Makefile	Sat Dec 13 21:33:20 2003
+++ tdiary/Makefile	Sat Jun 26 18:16:21 2004
@@ -10,7 +10,7 @@
 MAINTAINER=	jfkimura@yahoo.co.jp
 
 TDIARY_LANG=	tdiary.conf-ja
-CONFLICTS=	tdiary-1.*
+CONFLICTS=	tdiary-*
 MASTERDIR?=	${.CURDIR}/../../www/tdiary
 
 .include "${MASTERDIR}/Makefile"
==== END here