- Update to 2.1.2

PR:		ports/83828
Submitted by:	Fumihiko Kimura <jfkimura@yahoo.co.jp> (maintainer)
Security:	http://jvn.jp/jp/JVN%2360776919/index.html

4 files changed, 11 insertions, 15 deletions

diff --git a/www/tdiary-devel/Makefile b/www/tdiary-devel/Makefile
index 46ced4c7e41c..e5b812689f7c 100644
--- a/www/tdiary-devel/Makefile
+++ b/www/tdiary-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tdiary
-PORTVERSION=	2.1.1
+PORTVERSION=	2.1.2
 CATEGORIES?=	www ruby
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.tdiary.org/download/
@@ -22,6 +22,7 @@ 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/windex.rb misc/plugin/rast-register.rb \
@@ -33,7 +34,7 @@ TDIARYDIR=	${EXAMPLESDIR}${PKGNAMESUFFIX}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .if  !defined(TDIARY_LANG)
-TDIARY_LANG=	tdiary.conf-en
+TDIARY_LANG=	en
 .endif
 .if defined(WITH_TDIARY_UCONV)
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv
@@ -54,15 +55,7 @@ do-install:
 		-e 's,@@@@LANG@@@@,${TDIARY_LANG},g' \
 		${FILESDIR}/tdiaryinst.rb.in > ${TDIARYDIR}/tdiaryinst.rb
 	@${CP} -pR ${WRKSRC}/ ${TDIARYDIR}
-.if ${TDIARY_LANG} == tdiary.conf-en
-	@${ECHO_MSG} "===>  TDIARY : English Language messages support"
 	@${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"
-	@${RUBY} -i -pe 'sub(/%Y-%m-%d/, "%Y-%m-%d [%J]")' ${TDIARYDIR}/tdiary.conf.sample
-	@${ECHO_MSG}
-	@${ECHO_MSG} "===>  When you install in home directory, let's choose plugin of 'jdate.rb' to just display 'YOUBI'."
-.endif
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${TDIARYDIR}
 
 post-install:
diff --git a/www/tdiary-devel/distinfo b/www/tdiary-devel/distinfo
index bea73049d39e..cafc3f3a866c 100644
--- a/www/tdiary-devel/distinfo
+++ b/www/tdiary-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (tdiary-full-2.1.1.tar.gz) = 74bf1819643c512c6f0af1bc6599c1c5
-SIZE (tdiary-full-2.1.1.tar.gz) = 2138225
+MD5 (tdiary-full-2.1.2.tar.gz) = 9fed458ba325b771d89e582c6ad28a84
+SIZE (tdiary-full-2.1.2.tar.gz) = 2924123
diff --git a/www/tdiary-devel/files/tdiaryinst.rb.in b/www/tdiary-devel/files/tdiaryinst.rb.in
index faf8520e7ad1..435c506b1ad1 100644
--- a/www/tdiary-devel/files/tdiaryinst.rb.in
+++ b/www/tdiary-devel/files/tdiaryinst.rb.in
@@ -85,7 +85,7 @@ def usage
   STDERR.print "    --name=<author_name>      Specify author name\n"
   STDERR.print "    --mail=<author_mail>      Specify author mail address\n"
   STDERR.print "    --tdiarymaster=<dir>      Specify tDiary master directory default: @@@@PREFIX@@@@/share/examples/tdiary\n"
-  STDERR.print "    --lang=<language>         Specify your language ('en' or 'ja') default: @@@@LANG@@@@\n"
+  STDERR.print "    --lang=<language>         Specify your language ('en' or 'ja' or 'zh') default: @@@@LANG@@@@\n"
   STDERR.print "    --suexec                  Use suExec for CGI execution\n"
   STDERR.print "    --symlink                 Use symbolic link for tDiary master files\n"
   STDERR.print "    --quiet                   Do not display any information\n"
@@ -158,6 +158,9 @@ class TdiaryInstall
     when 'tdiary.conf-ja' , 'ja'
       @lang = 'ja'
       @tdconfig = 'tdiary.conf-ja'
+    when 'zh'
+      @lang = 'zh'
+      @tdconfig = 'tdiary.conf-en'
     else
       raise "Unknown Language : #{value}"
     end
@@ -215,7 +218,6 @@ class TdiaryInstall
 
   def copyBaseFile
     FileUtils16.cp_r("#{@tdiarymaster}/doc", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", :preserve, *@fileutilOptions)
-#   FileUtils16.cp_r("#{@tdiarymaster}/erb", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", :preserve, *@fileutilOptions)
     FileUtils16.cp_r("#{@tdiarymaster}/misc", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", :preserve, *@fileutilOptions)
     FileUtils16.cp_r("#{@tdiarymaster}/plugin", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", :preserve, *@fileutilOptions)
     FileUtils16.cp_r("#{@tdiarymaster}/skel", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", :preserve, *@fileutilOptions)
@@ -281,6 +283,7 @@ class TdiaryInstall
         line = "@author_mail = '#{@author_mail}'\n" if line =~ /^\@author_mail\s/
         line = "@html_title = '#{@author_name} diary'\n" if line =~ /^\@html_title\s/
         line = "@index_page = 'http://#{@author_host}/~#{@username}\/'" if line =~ /^\@index_page\s/
+	line = "@lang = '#{@lang}'\n" if line =~ /^\@lang\s/
         s += line
       }
     }
diff --git a/www/tdiary-devel/pkg-descr b/www/tdiary-devel/pkg-descr
index 3497bb3b4fe4..8dd320968576 100644
--- a/www/tdiary-devel/pkg-descr
+++ b/www/tdiary-devel/pkg-descr
@@ -2,7 +2,7 @@ tDiary is a Web-based interface system that works as a personal diary.
 It is possible for diary readers to add comments to your diary.
 
      -  require Ruby 1.8.2 or later
-     -  currently supported: Japanese, English
+     -  currently supported: Japanese, English, Traditional-Chinese
     tDiary is developed on http://sourceforge.net/projects/tdiary/ .
     See URL for more information.