Index: head/www/tdiary-devel/Makefile
===================================================================
--- head/www/tdiary-devel/Makefile	(revision 161183)
+++ head/www/tdiary-devel/Makefile	(revision 161184)
@@ -1,67 +1,66 @@
 # New ports collection makefile for:    tdiary-devel
 # Date created:                 9 June 2005
 # Whom:                         Fumihiko Kimura <jfkimura@yahoo.co.jp>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	tdiary
-PORTVERSION=	2.1.3
+PORTVERSION=	2.1.4
 CATEGORIES?=	www ruby
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.tdiary.org/download/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}-full-${PORTVERSION}
 
 MAINTAINER=	jfkimura@yahoo.co.jp
 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
 
 PLIST_FILES=	${TDIARYDIR:S|${LOCALBASE}/||}/tdiaryinst.rb
 TDIARYDIR=	${EXAMPLESDIR}${PKGNAMESUFFIX}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .if  !defined(TDIARY_LANG)
 TDIARY_LANG=	en
 .endif
 .if defined(WITH_TDIARY_UCONV)
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv
 .endif
 .if defined(WITH_TDIARY_NORA)
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/web/escape_ext.so:${PORTSDIR}/www/ruby-nora
 .endif
 .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:
 	@-${MKDIR} ${TDIARYDIR}
 	@${SED} -e 's,@@@@PREFIX@@@@,${PREFIX},g' \
 		-e 's,@@@@TDIARY@@@@,${PORTNAME}${PKGNAMESUFFIX},g' \
 		-e 's,@@@@LANG@@@@,${TDIARY_LANG},g' \
 		${FILESDIR}/tdiaryinst.rb.in > ${TDIARYDIR}/tdiaryinst.rb
 	@${CP} -pR ${WRKSRC}/ ${TDIARYDIR}
 	@${RUBY} -i -pe 'sub(/%Y-%m-%d/, "%Y-%m-%d [%a]")' ${TDIARYDIR}/misc/i18n/tdiary.conf.sample-en
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${TDIARYDIR}
 
 post-install:
 	@cd ${WRKSRC} && ${FIND} . -type f -o -type l | ${SED} -e 's,^\.,${TDIARYDIR:S|${LOCALBASE}/||},' >> ${TMPPLIST}
 	@cd ${WRKSRC} && ${FIND} . -type d -depth  | ${SED} -e 's,^\.,@dirrm ${TDIARYDIR:S|${LOCALBASE}/||},' >> ${TMPPLIST}
 	@${SED}	-e 's|%%EXAMPLESDIR%%|${TDIARYDIR}|' < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/www/tdiary-devel/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.18
\ No newline at end of property
+1.19
\ No newline at end of property
Index: head/www/tdiary-devel/distinfo
===================================================================
--- head/www/tdiary-devel/distinfo	(revision 161183)
+++ head/www/tdiary-devel/distinfo	(revision 161184)
@@ -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

Property changes on: head/www/tdiary-devel/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.11
\ No newline at end of property
+1.12
\ No newline at end of property