ports/106215: [MAINTAINER] japanese/tdiary: update with master port's security update

[TAKATSU Tomonari]

>Number:         106215
>Category:       ports
>Synopsis:       [MAINTAINER] japanese/tdiary: update with master port's security update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 02 14:30:10 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     TAKATSU Tomonari
>Release:        FreeBSD 6.2-PRERELEASE i386
>Organization:
none (personal)
>Environment:
System: FreeBSD photon.rtfm.jp 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Tue Nov 21 20:55:36 JST 2006
>Description:
- update with master port's security update
  see also PR ports/106208 and PR ports/106209

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

diff -urN /usr/ports/japanese/tdiary.orig/Makefile /usr/ports/japanese/tdiary/Makefile
--- /usr/ports/japanese/tdiary.orig/Makefile	Sun Nov 19 10:19:28 2006
+++ /usr/ports/japanese/tdiary/Makefile	Sat Dec  2 21:57:06 2006
@@ -9,16 +9,20 @@
 
 MAINTAINER=	tota at rtfm.jp
 
-TDIARY_LANG=	tdiary.conf-ja
+TDIARY_LANG=	ja
 MASTERDIR?=	${.CURDIR}/../../www/tdiary
 
-.if	defined(WITH_TDIARY_DEVEL)
-CONFLICTS=	tdiary-devel-[0-9]*
+.if defined(WITH_TDIARY_DEVEL)
+CONFLICTS=	ja-tdiary-[0-9]* \
+		tdiary-[0-9]* \
+		tdiary-devel-[0-9]*
 PKGNAMESUFFIX=	-devel
 MASTERDIR=	${.CURDIR}/../../www/tdiary-devel
 MD5_FILE=	${.CURDIR}/../../www/tdiary-devel/distinfo
 .else
-CONFLICTS=	tdiary-[0-9]*
+CONFLICTS=	ja-tdiary-devel-[0-9]* \
+		tdiary-[0-9]* \
+		tdiary-devel-[0-9]*
 MD5_FILE=	${.CURDIR}/../../www/tdiary/distinfo
 .endif
 
>Release-Note:
>Audit-Trail:
>Unformatted: