aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2006-12-03 00:45:03 +0800
committermiwi <miwi@FreeBSD.org>2006-12-03 00:45:03 +0800
commit579967c39d853d03cf45bbdb228e597b8ee472d9 (patch)
treeee8ba9fc9110b2b296b1f727146b2fb203002626
parent57c20a4459a0ddc27df40a481919c3db8fa6cc11 (diff)
downloadfreebsd-ports-gnome-579967c39d853d03cf45bbdb228e597b8ee472d9.tar.gz
freebsd-ports-gnome-579967c39d853d03cf45bbdb228e597b8ee472d9.tar.zst
freebsd-ports-gnome-579967c39d853d03cf45bbdb228e597b8ee472d9.zip
- Update to 2.0.3
PR: ports/106208 Submitted by: TAKATSU Tomonari <tota@rtfm.jp> (maintainer) Security: http://www.vuxml.org/freebsd/666b8c9e-8212-11db-851e-0016179b2dd5.html
-rw-r--r--www/tdiary/Makefile21
-rw-r--r--www/tdiary/distinfo6
-rw-r--r--www/tdiary/files/pkg-message.in8
3 files changed, 16 insertions, 19 deletions
diff --git a/www/tdiary/Makefile b/www/tdiary/Makefile
index f0d570683d5c..e7cbc90da557 100644
--- a/www/tdiary/Makefile
+++ b/www/tdiary/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= tdiary
-PORTVERSION= 2.0.2
-PORTREVISION= 1
+PORTVERSION= 2.0.3
CATEGORIES?= www ruby
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.tdiary.org/download/
@@ -18,11 +17,13 @@ MAINTAINER= tota@rtfm.jp
COMMENT= A Web-based diary system (like weblog) written in Ruby
NO_BUILD= yes
-CONFLICTS?= ja-tdiary-[0-9]*
+CONFLICTS?= tdiary-devel-[0-9]* \
+ ja-tdiary-[0-9]* \
+ ja-tdiary-devel-[0-9]*
PKGMESSAGE= ${WRKDIR}/pkg-message
USE_RUBY= yes
-.if !defined(WITHOUT_RUBY_FEATURES)
+.if !defined(WITHOUT_RUBY_FEATURES)
USE_RUBY_FEATURES= fileutils
.endif
@@ -36,12 +37,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
#TDIARY_LANG ja:Japanese en:English zh:Traditional-Chinese
-.if !defined(TDIARY_LANG)
+.if !defined(TDIARY_LANG) || ( defined(TDIARY_LANG) && ${TDIARY_LANG} != ja )
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
@@ -49,15 +46,17 @@ RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv
.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} < 167
-IGNORE= Needs ruby 1.6.7 or higher, check ruby's version and try again
+IGNORE= only works with Ruby 1.6.7 or later
.endif
do-install:
@-${MKDIR} ${TDIARYDIR}
- @${SED} -e 's,@@@@PREFIX@@@@,${PREFIX},g' \
+ @${SED} -e 's,#!/usr/bin/env ruby,#!${RUBY},' \
+ -e 's,@@@@PREFIX@@@@,${PREFIX},g' \
-e 's,@@@@LANG@@@@,${TDIARY_LANG},g' \
${FILESDIR}/tdiaryinst.rb.in > ${TDIARYDIR}/tdiaryinst.rb
@${CP} -pR ${WRKSRC}/ ${TDIARYDIR}
diff --git a/www/tdiary/distinfo b/www/tdiary/distinfo
index 170b6e5f1e6f..a8ea7c6aefed 100644
--- a/www/tdiary/distinfo
+++ b/www/tdiary/distinfo
@@ -1,3 +1,3 @@
-MD5 (tdiary-full-2.0.2.tar.gz) = 1c4d1dd765d10b4d074b3bc50d2e65ff
-SHA256 (tdiary-full-2.0.2.tar.gz) = d0e0d29b24be6e8e0c334969ff50fffaabedc0391cc9096de6f2b0bc597e9a7f
-SIZE (tdiary-full-2.0.2.tar.gz) = 2121313
+MD5 (tdiary-full-2.0.3.tar.gz) = 291119b2ccac6c9ede339c0a03d4d13c
+SHA256 (tdiary-full-2.0.3.tar.gz) = 7f98121758f00706db641a6782d06e7bd438f627b7c4947926567854d417e91b
+SIZE (tdiary-full-2.0.3.tar.gz) = 2128791
diff --git a/www/tdiary/files/pkg-message.in b/www/tdiary/files/pkg-message.in
index da4b6adc0e12..d58095bbaf0d 100644
--- a/www/tdiary/files/pkg-message.in
+++ b/www/tdiary/files/pkg-message.in
@@ -11,11 +11,9 @@ This script should be run manually.
--help Display Help information
---
-There is a document by English in the following directories.
+There are documents in the following directories.
See ...
+ %%EXAMPLESDIR%%/doc/
%%EXAMPLESDIR%%/misc/i18n/
- and
- Explanation by English of a tDiary system can refer to the following page :
-
- http://tdiary-users.sourceforge.jp/cgi-bin/wiki.cgi?FrontPage_en
=============================================================================
+