From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Dec 2 14:30:14 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5AFB616A407 for ; Sat, 2 Dec 2006 14:30:14 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id 43A4C43CA7 for ; Sat, 2 Dec 2006 14:29:50 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kB2EUA2c032509 for ; Sat, 2 Dec 2006 14:30:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kB2EUAaA032507; Sat, 2 Dec 2006 14:30:10 GMT (envelope-from gnats) Resent-Date: Sat, 2 Dec 2006 14:30:10 GMT Resent-Message-Id: <200612021430.kB2EUAaA032507@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, TAKATSU Tomonari Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7AFD316A407 for ; Sat, 2 Dec 2006 14:28:39 +0000 (UTC) (envelope-from tota@rtfm.jp) Received: from rtfm.jp (www.rtfm.jp [38.99.89.144]) by mx1.FreeBSD.org (Postfix) with ESMTP id B1C5443C9D for ; Sat, 2 Dec 2006 14:28:18 +0000 (GMT) (envelope-from tota@rtfm.jp) Received: by rtfm.jp (Postfix, from userid 1001) id 5B5E56D44D; Sat, 2 Dec 2006 23:28:40 +0900 (JST) Message-Id: <20061202142840.5B5E56D44D@rtfm.jp> Date: Sat, 2 Dec 2006 23:28:40 +0900 (JST) From: TAKATSU Tomonari To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/106215: [MAINTAINER] japanese/tdiary: update with master port's security update X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Dec 2006 14:30:14 -0000 >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@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: