diff -urN /usr/ports/japanese/tdiary-old/Makefile /usr/ports/japanese/tdiary/Makefile
--- /usr/ports/japanese/tdiary-old/Makefile	Mon Jul 21 13:04:01 2003
+++ /usr/ports/japanese/tdiary/Makefile	Sat Dec 13 16:00:04 2003
@@ -10,6 +10,7 @@
 MAINTAINER=	jfkimura@yahoo.co.jp
 
 TDIARY_LANG=	tdiary.conf-ja
+CONFLICTS=	tdiary-1.*
 MASTERDIR?=	${.CURDIR}/../../www/tdiary
 
 .include "${MASTERDIR}/Makefile"
=== ended  cut here ===