diff -urN tdiary157/Makefile tdiary/Makefile
--- tdiary157/Makefile	Thu May  6 22:13:10 2004
+++ tdiary/Makefile	Sun Jun 27 10:38:55 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tdiary
-PORTVERSION=	1.5.7
+PORTVERSION=	2.0.0
 CATEGORIES?=	www ruby
 MASTER_SITES=	\
 		${MASTER_SITE_SOURCEFORGE} \
@@ -18,7 +18,7 @@
 COMMENT=	A Web-based diary system (like weblog) written in Ruby
 
 NO_BUILD=		yes
-CONFLICTS?=		ja-tdiary-1.*
+CONFLICTS?=		ja-tdiary-*
 PKGMESSAGE=		${WRKDIR}/pkg-message
 USE_RUBY=		yes
 .if  !defined(WITHOUT_RUBY_FEATURES)
@@ -26,7 +26,8 @@
 .endif
 
 RUBY_SHEBANG_FILES=	index.rb update.rb misc/convert2.rb misc/plugin/squeeze.rb \
-misc/plugin/windex.rb misc/plugin/a/a_conf.rb misc/plugin/trackback/tb.rb
+			misc/plugin/windex.rb misc/plugin/a/a_conf.rb \
+			misc/plugin/trackback/tb.rb misc/style/etdiary/etdiary_test.rb
 
 TDIARYDIR=	${EXAMPLESDIR}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -40,15 +41,6 @@
 .if defined(WITH_TDIARY_NORA)
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/web/escape_ext.so:${PORTSDIR}/www/ruby-nora
 .endif
-
-pre-everything::
-	@${ECHO_MSG}
-	@${ECHO_MSG} "============================================================================="
-	@${ECHO_MSG} "When you chose plugin, it becomes necessary.  Use the following options:"
-	@${ECHO_MSG} "  WITH_TDIARY_UCONV=yes	(RDF file creates  with UTF-8 : output_rdf.rb)"
-	@${ECHO_MSG} "  WITH_TDIARY_NORA=yes	(Referer header support       : disp_referrer.rb)"
-	@${ECHO_MSG} "============================================================================="
-	@${ECHO_MSG}
 
 do-install:
 	@-${MKDIR} ${TDIARYDIR}
diff -urN tdiary157/distinfo tdiary/distinfo
--- tdiary157/distinfo	Thu May  6 22:13:10 2004
+++ tdiary/distinfo	Sun Jun 27 09:35:20 2004
@@ -1,2 +1,2 @@
-MD5 (tdiary-full-1.5.7.tar.gz) = 13f728291eed51bc6033fae1510731bc
-SIZE (tdiary-full-1.5.7.tar.gz) = 1640373
+MD5 (tdiary-full-2.0.0.tar.gz) = 810f9c77e222cd55b24ca0844285bfde
+SIZE (tdiary-full-2.0.0.tar.gz) = 1694168
==== END here