- Update to 2.0.2

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

5 files changed, 33 insertions, 19 deletions

diff --git a/www/tdiary/Makefile b/www/tdiary/Makefile
index e5134a5f1769..19cf02e6a648 100644
--- a/www/tdiary/Makefile
+++ b/www/tdiary/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	tdiary
-PORTVERSION=	2.0.1
+PORTVERSION=	2.0.2
 CATEGORIES?=	www ruby
-MASTER_SITES=	\
-		${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.tdiary.org/download/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-full-${PORTVERSION}
@@ -17,10 +16,11 @@ 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-*
-PKGMESSAGE=		${WRKDIR}/pkg-message
-USE_RUBY=		yes
+NO_BUILD=	yes
+CONFLICTS?=	ja-tdiary-[0-9]*
+PKGMESSAGE=	${WRKDIR}/pkg-message
+USE_RUBY=	yes
+
 .if  !defined(WITHOUT_RUBY_FEATURES)
 USE_RUBY_FEATURES=	fileutils
 .endif
@@ -29,18 +29,30 @@ RUBY_SHEBANG_FILES=	index.rb update.rb misc/convert2.rb misc/plugin/squeeze.rb \
 			misc/plugin/windex.rb \
 			misc/plugin/trackback/tb.rb misc/style/etdiary/etdiary_test.rb
 
+PLIST_FILES=	${TDIARYDIR:S|${LOCALBASE}/||}/tdiaryinst.rb
 TDIARYDIR=	${EXAMPLESDIR}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+#TDIARY_LANG	ja:Japanese en:English zh:Traditional-Chinese
+
 .if  !defined(TDIARY_LANG)
-TDIARY_LANG=	tdiary.conf-en
+TDIARY_LANG=	en
+.else
+.if ${TDIARY_LANG} == "tdiary.conf-ja"
+TDIARY_LANG=	ja
+.endif
 .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} < 163
+IGNORE=		Needs ruby 1.6.3 or higher, check ruby's version and try again
+.endif
 
 do-install:
 	@-${MKDIR} ${TDIARYDIR}
@@ -48,12 +60,11 @@ 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
+.if ${TDIARY_LANG} == ja
 	@${ECHO_MSG} "===>  TDIARY : Japanese Language messages support"
 	@${RUBY} -i -pe 'sub(/%Y-%m-%d/, "%Y-%m-%d [%J]")' ${TDIARYDIR}/tdiary.conf.sample
+.else
+	@${RUBY} -i -pe 'sub(/%Y-%m-%d/, "%Y-%m-%d [%a]")' ${TDIARYDIR}/misc/i18n/tdiary.conf.sample-en
 .endif
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${TDIARYDIR}
 
@@ -63,4 +74,4 @@ post-install:
 	@${SED}	-e 's|%%EXAMPLESDIR%%|${EXAMPLESDIR}|' < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/tdiary/distinfo b/www/tdiary/distinfo
index 1602b5cd1db5..8491555921da 100644
--- a/www/tdiary/distinfo
+++ b/www/tdiary/distinfo
@@ -1,2 +1,2 @@
-MD5 (tdiary-full-2.0.1.tar.gz) = 05e75ef43bf89aa46c926acc825a5039
-SIZE (tdiary-full-2.0.1.tar.gz) = 1704264
+MD5 (tdiary-full-2.0.2.tar.gz) = 1c4d1dd765d10b4d074b3bc50d2e65ff
+SIZE (tdiary-full-2.0.2.tar.gz) = 2121313
diff --git a/www/tdiary/files/tdiaryinst.rb.in b/www/tdiary/files/tdiaryinst.rb.in
index b391504c7e10..2be03b38607f 100644
--- a/www/tdiary/files/tdiaryinst.rb.in
+++ b/www/tdiary/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
@@ -281,6 +284,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/pkg-descr b/www/tdiary/pkg-descr
index cdcc8f8482cd..55b8478021e8 100644
--- a/www/tdiary/pkg-descr
+++ b/www/tdiary/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.6.3 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.
diff --git a/www/tdiary/pkg-plist b/www/tdiary/pkg-plist
deleted file mode 100644
index 61131e7ddb35..000000000000
--- a/www/tdiary/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-%%EXAMPLESDIR%%/tdiaryinst.rb