From kimura@sh1.radio.gr.jp  Wed Apr 19 03:05:43 2006
Return-Path: <kimura@sh1.radio.gr.jp>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 929B316A401
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 19 Apr 2006 03:05:43 +0000 (UTC)
	(envelope-from kimura@sh1.radio.gr.jp)
Received: from sh1.radio.gr.jp (ppp2.radio.gr.jp [61.195.157.52])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E673143D45
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 19 Apr 2006 03:05:42 +0000 (GMT)
	(envelope-from kimura@sh1.radio.gr.jp)
Received: by sh1.radio.gr.jp (secret sh1.0.9.1/smtpfeed 1.20)
	id k3J37KQJ006570; Wed, 19 Apr 2006 12:07:20 +0900 (JST)
Received: by sh1.radio.gr.jp (secret/fkimura sh1.0.9.0)
	id k3J37KhL006569; Wed, 19 Apr 2006 12:07:20 +0900 (JST)
Message-Id: <200604190307.k3J37KhL006569@sh1.radio.gr.jp>
Date: Wed, 19 Apr 2006 12:07:20 +0900 (JST)
From: Fumihiko Kimura <jfkimura@yahoo.co.jp>
Reply-To: Fumihiko Kimura <jfkimura@yahoo.co.jp>
To: FreeBSD-gnats-submit@freebsd.org
Cc: jfkimura@yahoo.co.jp
Subject: update ports: www/tdiary-devel
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         96034
>Category:       ports
>Synopsis:       update ports: www/tdiary-devel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 19 03:10:10 GMT 2006
>Closed-Date:    Tue May 02 11:28:19 GMT 2006
>Last-Modified:  Tue May 02 11:28:19 GMT 2006
>Originator:     Fumihiko Kimura
>Release:        FreeBSD 6.0-RELEASE i386
>Organization:
>Environment:
>Description:

- update to 2.1.4

>How-To-Repeat:
>Fix:

=== begin  cut here ===
diff -urN tdiary-devel.orig/Makefile tdiary-devel/Makefile
--- tdiary-devel.orig/Makefile	Thu Sep 29 02:46:48 2005
+++ tdiary-devel/Makefile	Wed Apr 19 09:08:06 2006
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tdiary
-PORTVERSION=	2.1.3
+PORTVERSION=	2.1.4
 CATEGORIES?=	www ruby
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.tdiary.org/download/
@@ -18,14 +18,13 @@
 COMMENT=	A Web-based diary system (like weblog) written in Ruby
 
 NO_BUILD=	yes
-CONFLICTS?=	ja-tdiary-devel-[0-9]*
 PKGMESSAGE=	${WRKDIR}/pkg-message
 USE_RUBY=	yes
 RUBY_VER=	1.8
 #TDIARY_LANG	ja:Japanese en:English zh:Traditional-Chinese
 
 RUBY_SHEBANG_FILES=	index.rb update.rb misc/convert2.rb misc/plugin/squeeze.rb \
-			misc/plugin/amazon/amazonimg.rb misc/plugin/rast-register.rb \
+			misc/plugin/amazon/amazonimg.rb \
 			misc/plugin/trackback/tb.rb misc/style/etdiary/etdiary_test.rb \
 			misc/plugin/pingback/pb.rb misc/plugin/xmlrpc/xmlrpc.rb
 
@@ -45,7 +44,7 @@
 .include <bsd.port.pre.mk>
 
 .if ${RUBY_VERSION_CODE} < 182
-IGNORE=		Needs ruby 1.8.2 or higher, install lang/ruby18 and try again
+IGNORE=		needs ruby 1.8.2 or higher, install lang/ruby18 and try again
 .endif
 
 do-install:
diff -urN tdiary-devel.orig/distinfo tdiary-devel/distinfo
--- tdiary-devel.orig/distinfo	Tue Jan 24 12:14:12 2006
+++ tdiary-devel/distinfo	Wed Apr 19 09:01:28 2006
@@ -1,3 +1,3 @@
-MD5 (tdiary-full-2.1.3.tar.gz) = be0f148b95814dbc05431ee40b8a6d15
-SHA256 (tdiary-full-2.1.3.tar.gz) = 8ecf7782595b9c0afa1924eabd013f09dc3e563684a7665ae1b4c8f3f258f515
-SIZE (tdiary-full-2.1.3.tar.gz) = 3215952
+MD5 (tdiary-full-2.1.4.tar.gz) = 49414c4453906c75d6a48f952dc0307a
+SHA256 (tdiary-full-2.1.4.tar.gz) = 4a4aed40bbcb05eae200f715c0d8f118e5aa0bc82d17d62f11b15975141976f1
+SIZE (tdiary-full-2.1.4.tar.gz) = 3490011
=== ended  cut here ===

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: vs 
State-Changed-When: Tue May 2 11:26:45 UTC 2006 
State-Changed-Why:  
Committed, thanks! 
Could you please check if there REALLY is no need for the CONFLICTS line? 
In that case, it should be removed from ja-tdiary as well. 
Also, I do not think that your port uses Ruby at build-time, so you might 
want to check if RUBY_NO_BUILD_DEPENDS applies. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=96034 
>Unformatted:
