aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--japanese/tdiary/Makefile2
-rw-r--r--www/tdiary-devel/Makefile16
-rw-r--r--www/tdiary-devel/distinfo4
-rw-r--r--www/tdiary/Makefile16
-rw-r--r--www/tdiary/distinfo4
5 files changed, 13 insertions, 29 deletions
diff --git a/japanese/tdiary/Makefile b/japanese/tdiary/Makefile
index 428127f6af2d..402ea9722b09 100644
--- a/japanese/tdiary/Makefile
+++ b/japanese/tdiary/Makefile
@@ -10,7 +10,7 @@ CATEGORIES= japanese www ruby
MAINTAINER= jfkimura@yahoo.co.jp
TDIARY_LANG= tdiary.conf-ja
-CONFLICTS= tdiary-1.*
+CONFLICTS= tdiary-*
MASTERDIR?= ${.CURDIR}/../../www/tdiary
.include "${MASTERDIR}/Makefile"
diff --git a/www/tdiary-devel/Makefile b/www/tdiary-devel/Makefile
index fe527bbc446d..882776ec9978 100644
--- a/www/tdiary-devel/Makefile
+++ b/www/tdiary-devel/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= tdiary
-PORTVERSION= 1.5.7
+PORTVERSION= 2.0.0
CATEGORIES?= www ruby
MASTER_SITES= \
${MASTER_SITE_SOURCEFORGE} \
@@ -18,7 +18,7 @@ MAINTAINER= jfkimura@yahoo.co.jp
COMMENT= A Web-based diary system (like weblog) written in Ruby
NO_BUILD= yes
-CONFLICTS?= ja-tdiary-1.*
+CONFLICTS?= ja-tdiary-*
PKGMESSAGE= ${WRKDIR}/pkg-message
USE_RUBY= yes
.if !defined(WITHOUT_RUBY_FEATURES)
@@ -26,7 +26,8 @@ USE_RUBY_FEATURES= fileutils
.endif
RUBY_SHEBANG_FILES= index.rb update.rb misc/convert2.rb misc/plugin/squeeze.rb \
-misc/plugin/windex.rb misc/plugin/a/a_conf.rb misc/plugin/trackback/tb.rb
+ misc/plugin/windex.rb misc/plugin/a/a_conf.rb \
+ misc/plugin/trackback/tb.rb misc/style/etdiary/etdiary_test.rb
TDIARYDIR= ${EXAMPLESDIR}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -41,15 +42,6 @@ RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv
RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/web/escape_ext.so:${PORTSDIR}/www/ruby-nora
.endif
-pre-everything::
- @${ECHO_MSG}
- @${ECHO_MSG} "============================================================================="
- @${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 (Referer header support : disp_referrer.rb)"
- @${ECHO_MSG} "============================================================================="
- @${ECHO_MSG}
-
do-install:
@-${MKDIR} ${TDIARYDIR}
@${SED} -e 's,@@@@PREFIX@@@@,${PREFIX},g' \
diff --git a/www/tdiary-devel/distinfo b/www/tdiary-devel/distinfo
index 1d6e2568b720..9dddfb7566ec 100644
--- a/www/tdiary-devel/distinfo
+++ b/www/tdiary-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (tdiary-full-1.5.7.tar.gz) = 13f728291eed51bc6033fae1510731bc
-SIZE (tdiary-full-1.5.7.tar.gz) = 1640373
+MD5 (tdiary-full-2.0.0.tar.gz) = 810f9c77e222cd55b24ca0844285bfde
+SIZE (tdiary-full-2.0.0.tar.gz) = 1694168
diff --git a/www/tdiary/Makefile b/www/tdiary/Makefile
index fe527bbc446d..882776ec9978 100644
--- a/www/tdiary/Makefile
+++ b/www/tdiary/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= tdiary
-PORTVERSION= 1.5.7
+PORTVERSION= 2.0.0
CATEGORIES?= www ruby
MASTER_SITES= \
${MASTER_SITE_SOURCEFORGE} \
@@ -18,7 +18,7 @@ MAINTAINER= jfkimura@yahoo.co.jp
COMMENT= A Web-based diary system (like weblog) written in Ruby
NO_BUILD= yes
-CONFLICTS?= ja-tdiary-1.*
+CONFLICTS?= ja-tdiary-*
PKGMESSAGE= ${WRKDIR}/pkg-message
USE_RUBY= yes
.if !defined(WITHOUT_RUBY_FEATURES)
@@ -26,7 +26,8 @@ USE_RUBY_FEATURES= fileutils
.endif
RUBY_SHEBANG_FILES= index.rb update.rb misc/convert2.rb misc/plugin/squeeze.rb \
-misc/plugin/windex.rb misc/plugin/a/a_conf.rb misc/plugin/trackback/tb.rb
+ misc/plugin/windex.rb misc/plugin/a/a_conf.rb \
+ misc/plugin/trackback/tb.rb misc/style/etdiary/etdiary_test.rb
TDIARYDIR= ${EXAMPLESDIR}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -41,15 +42,6 @@ RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv
RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/web/escape_ext.so:${PORTSDIR}/www/ruby-nora
.endif
-pre-everything::
- @${ECHO_MSG}
- @${ECHO_MSG} "============================================================================="
- @${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 (Referer header support : disp_referrer.rb)"
- @${ECHO_MSG} "============================================================================="
- @${ECHO_MSG}
-
do-install:
@-${MKDIR} ${TDIARYDIR}
@${SED} -e 's,@@@@PREFIX@@@@,${PREFIX},g' \
diff --git a/www/tdiary/distinfo b/www/tdiary/distinfo
index 1d6e2568b720..9dddfb7566ec 100644
--- a/www/tdiary/distinfo
+++ b/www/tdiary/distinfo
@@ -1,2 +1,2 @@
-MD5 (tdiary-full-1.5.7.tar.gz) = 13f728291eed51bc6033fae1510731bc
-SIZE (tdiary-full-1.5.7.tar.gz) = 1640373
+MD5 (tdiary-full-2.0.0.tar.gz) = 810f9c77e222cd55b24ca0844285bfde
+SIZE (tdiary-full-2.0.0.tar.gz) = 1694168