Update to 1.5.6.

PR:		ports/59281
Submitted by:	Fumihiko Kimura <jfkimura@yahoo.co.jp> (MAINTAINER)

3 files changed, 15 insertions, 31 deletions

diff --git a/www/tdiary/Makefile b/www/tdiary/Makefile
index d20d027262ef..13383966da2f 100644
--- a/www/tdiary/Makefile
+++ b/www/tdiary/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tdiary
-PORTVERSION=	1.5.5
-PORTREVISION=	1
+PORTVERSION=	1.5.6
 CATEGORIES?=	www ruby
 MASTER_SITES=	\
 		${MASTER_SITE_SOURCEFORGE} \
@@ -24,8 +23,8 @@ USE_RUBY=		yes
 USE_RUBY_FEATURES=	fileutils
 .endif
 
-RUBY_SHEBANG_FILES=	index.rb update.rb misc/convert2.rb misc/posttdiary.rb misc/plugin/squeeze.rb misc/plugin/weather.rb \
-misc/plugin/windex.rb misc/plugin/a/a_conf.rb misc/plugin/todo/todo.rb misc/plugin/trackback/tb.rb
+RUBY_SHEBANG_FILES=	index.rb update.rb misc/convert2.rb misc/posttdiary.rb misc/plugin/squeeze.rb \
+misc/plugin/windex.rb misc/plugin/a/a_conf.rb misc/plugin/trackback/tb.rb
 
 TDIARYDIR=	${EXAMPLESDIR}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -41,15 +40,13 @@ RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/web/escape_ext.so:${PORTSDIR}/www/ruby-nora
 .endif
 
 pre-everything::
-.if ! ${TDIARY_LANG} == "tdiary.conf-en"
 	@${ECHO_MSG}
 	@${ECHO_MSG} "============================================================================="
-	@${ECHO_MSG} "You may use the following options:"
+	@${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	(with Referer header support  : disp_referrer.rb)"
+	@${ECHO_MSG} "  WITH_TDIARY_NORA=yes	(Referer header support       : disp_referrer.rb)"
 	@${ECHO_MSG} "============================================================================="
 	@${ECHO_MSG}
-.endif
 
 do-install:
 	@-${MKDIR} ${TDIARYDIR}
@@ -61,30 +58,11 @@ do-install:
 		${FILESDIR}/tdiary-FreeBSD.sh.in > ${TDIARYDIR}/tdiary-FreeBSD.sh
 	@${CHMOD} ugo=rx ${TDIARYDIR}/tdiary-FreeBSD.sh
 	@${CP} -pR ${WRKSRC}/ ${TDIARYDIR}
-.if defined(WITH_TDIARY_UCONV)
-	@${ECHO_MSG} "===>  Option : WITH_TDIARY_UCONV .. Done."
-	@${INSTALL_DATA} ${WRKSRC}/misc/plugin/output_rdf.rb ${TDIARYDIR}/plugin
-	@${TOUCH} ${TDIARYDIR}/t.rdf
-	@${CHMOD} 706 ${TDIARYDIR}/t.rdf
-	@${ECHO_CMD} '${TDIARYDIR:S|${LOCALBASE}/||}/plugin/output_rdf.rb' >> ${TMPPLIST}
-	@${ECHO_CMD} '${TDIARYDIR:S|${LOCALBASE}/||}/t.rdf' >> ${TMPPLIST}
-.endif
-.if defined(WITH_TDIARY_NORA)
-	@${ECHO_MSG} "===>  Option : WITH_TDIARY_NORA  .. Done."
-	@${INSTALL_DATA} ${WRKSRC}/misc/plugin/disp_referrer.rb ${TDIARYDIR}/plugin
-	@${ECHO_CMD} '${TDIARYDIR:S|${LOCALBASE}/||}/plugin/disp_referrer.rb' >> ${TMPPLIST}
-.endif
-	@${INSTALL_DATA} ${WRKSRC}/misc/plugin/comment_mail-sendmail.rb ${TDIARYDIR}/plugin
-	@${ECHO_CMD} '${TDIARYDIR:S|${LOCALBASE}/||}/plugin/comment_mail-sendmail.rb' >> ${TMPPLIST}
 .if ${TDIARY_LANG} == tdiary.conf-en
 	@${ECHO_MSG} "===>  TDIARY : English Language messages support"
-	@${INSTALL_DATA} ${WRKSRC}/misc/i18n/00lang.en.rb ${TDIARYDIR}/plugin
-	@${ECHO_CMD} '${TDIARYDIR:S|${LOCALBASE}/||}/plugin/00lang.en.rb' >> ${TMPPLIST}
 	@${RUBY} -i -pe 'sub(/%Y-%m-%d/, "%Y-%m-%d [%a]")' ${TDIARYDIR}/misc/i18n/tdiary.conf.sample-en
 .else
 	@${ECHO_MSG} "===>  TDIARY : Japanese Language messages support"
-	@${INSTALL_DATA} ${WRKSRC}/misc/plugin/jdate.rb ${TDIARYDIR}/plugin
-	@${ECHO_CMD} '${TDIARYDIR:S|${LOCALBASE}/||}/plugin/jdate.rb' >> ${TMPPLIST}
 	@${RUBY} -i -pe 'sub(/%Y-%m-%d/, "%Y-%m-%d [%J]")' ${TDIARYDIR}/tdiary.conf.sample
 .endif
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${TDIARYDIR}
diff --git a/www/tdiary/distinfo b/www/tdiary/distinfo
index ae24b3d1f61f..d718cd57e6c2 100644
--- a/www/tdiary/distinfo
+++ b/www/tdiary/distinfo
@@ -1 +1 @@
-MD5 (tdiary-full-1.5.5.tar.gz) = f035b1f9a4938ebab06518670704613b
+MD5 (tdiary-full-1.5.6.tar.gz) = 559fd40263ae7fc76a1792fc71757c8f
diff --git a/www/tdiary/pkg-message b/www/tdiary/pkg-message
index 9de93afe68bd..237ee08b2814 100644
--- a/www/tdiary/pkg-message
+++ b/www/tdiary/pkg-message
@@ -3,13 +3,19 @@
 There is a script to install tDiary in a user directory.
 This script should be run manually.
 
-  # ruby %%EXAMPLESDIR%%/tdiaryinst.rb --user=hoge
+[Ruby 1.6.x]
+
+  # ruby %%EXAMPLESDIR%%/tdiaryinst.rb --user=User
    or
   % ruby %%EXAMPLESDIR%%/tdiaryinst.rb
 
-same as script :
-    %%EXAMPLESDIR%%/tdiary-FreeBSD.sh
+[Ruby 1.8.x]
+
+  # %%EXAMPLESDIR%%/tdiary-FreeBSD.sh User
+   or
+  % %%EXAMPLESDIR%%/tdiary-FreeBSD.sh install
 
+---
 There is a document by English in the following directories.
   See ...
   %%EXAMPLESDIR%%/misc/i18n/