Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Nov 2003 16:32:30 +0900 (JST)
From:      Fumihiko Kimura <jfkimura@yahoo.co.jp>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/59281: maintainer-update ports: www/tdiary 1.5.5 to 1.5.6
Message-ID:  <200311140732.hAE7WUHe038217@sh0.radio.gr.jp>
Resent-Message-ID: <200311140740.hAE7eGbi069113@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         59281
>Category:       ports
>Synopsis:       maintainer-update ports: www/tdiary 1.5.5 to 1.5.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 13 23:40:15 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Fumihiko Kimura
>Release:        FreeBSD 4.9-RELEASE i386
>Organization:
>Environment:
>Description:

Release Name: 1.5.6
Major new features:

* I18n framework support
  Separated language dependent code to tdiary/lang/LANG.rb, skel/*.rhtml.LANG
  and plugin/LANG/*.rb. In default, you can use English. only setting @lang 
  variable in tdiary.conf to 'en' (00lang.en.rb plugin was obsoleted). 

  Then some plugin was separated main code and language resources. When
  installing a plugin, you have to notice to language resources in plugin/LANG
  directory. 
  But now you have not to copy plugin files, because you can select plugins
  via web browser, see below. 

* Plugin install from your browser 
  01sp.rb added into plugin. This is a plugin to "select plugin". You can
  select plugins you want to use from your browser. Set @options['sp.path']
  variablein tdiary.conf to PATH OF PLUGINS, you can find a new preference
  page.

* document site in available 
  http://docs.tdiary.org/en/ as English documentation site of tDiary. Plugin 
  document and Style document will be in this site. You can see it as link in
  Update form or Select Plugin page. This site is built by Wiki. Please write
  some documents. 

Minor new features:

* @cache_path support in tdiary.conf.
* @referer_day_only in tdiary.conf.
* @options['bot'] as search engine robot in tdiary.conf.

>How-To-Repeat:

Checked:

	FreeBSD 4.9-RELEASE
	FreeBSD FreeBSD 5.1-RELEASE-p10

>Fix:

=== begin  cut here ===
diff -urN --exclude=CVS /usr/ports/www/tdiary/Makefile /usr/ports/www/tdiary-stable/Makefile
--- /usr/ports/www/tdiary/Makefile	Mon Nov 10 06:32:51 2003
+++ /usr/ports/www/tdiary-stable/Makefile	Fri Nov 14 00:04:43 2003
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	tdiary
-PORTVERSION=	1.5.5
-PORTREVISION=	1
+PORTVERSION=	1.5.6
+#PORTREVISION=	0
 CATEGORIES?=	www ruby
 MASTER_SITES=	\
 		${MASTER_SITE_SOURCEFORGE} \
@@ -24,8 +24,8 @@
 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 +41,13 @@
 .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 +59,11 @@
 		${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 -urN --exclude=CVS /usr/ports/www/tdiary/distinfo /usr/ports/www/tdiary-stable/distinfo
--- /usr/ports/www/tdiary/distinfo	Sun Aug 10 10:45:07 2003
+++ /usr/ports/www/tdiary-stable/distinfo	Thu Nov 13 23:18:59 2003
@@ -1 +1 @@
-MD5 (tdiary-full-1.5.5.tar.gz) = f035b1f9a4938ebab06518670704613b
+MD5 (tdiary-full-1.5.6.tar.gz) = 559fd40263ae7fc76a1792fc71757c8f
diff -urN --exclude=CVS /usr/ports/www/tdiary/pkg-message /usr/ports/www/tdiary-stable/pkg-message
--- /usr/ports/www/tdiary/pkg-message	Mon Nov 10 06:32:51 2003
+++ /usr/ports/www/tdiary-stable/pkg-message	Sun Nov  9 12:34:59 2003
@@ -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/
=== ended  cut here ===

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311140732.hAE7WUHe038217>